From ad4004fb637457976bbb66587dc67eb24c753a2f Mon Sep 17 00:00:00 2001 From: erroneousboat Date: Sat, 1 Oct 2016 14:07:42 +0200 Subject: [PATCH] Add package that fixes parsing error --- TODO.md | 2 +- src/components/channels.go | 3 ++- src/components/chat.go | 3 ++- src/components/input.go | 3 ++- src/handlers/event.go | 2 +- src/service/slack.go | 2 +- src/vendor/vendor.json | 6 ++++++ src/views/chat.go | 4 ++-- 8 files changed, 17 insertions(+), 8 deletions(-) diff --git a/TODO.md b/TODO.md index fecce21..7f2b9e6 100644 --- a/TODO.md +++ b/TODO.md @@ -16,7 +16,7 @@ Bugs: of chat pane (y). Because message will sometimes span more than one line and we're able to scroll. Only figure out how many messages you want to load. -- [ ] GetMessages for a channel can result in `json: cannot unmarshal number +- [x] GetMessages for a channel can result in `json: cannot unmarshal number into Go value of type string` https://github.com/nlopes/slack/issues/92 - [ ] docs at exported functions - [ ] incoming message event.go probably need a type switch diff --git a/src/components/channels.go b/src/components/channels.go index dde63ec..cae31af 100644 --- a/src/components/channels.go +++ b/src/components/channels.go @@ -4,8 +4,9 @@ import ( "fmt" "strings" - "github.com/erroneousboat/slack-term/src/service" "github.com/gizak/termui" + + "github.com/erroneousboat/slack-term/src/service" ) type Channels struct { diff --git a/src/components/chat.go b/src/components/chat.go index dccf433..e6412a4 100644 --- a/src/components/chat.go +++ b/src/components/chat.go @@ -3,8 +3,9 @@ package components import ( "strings" - "github.com/erroneousboat/slack-term/src/service" "github.com/gizak/termui" + + "github.com/erroneousboat/slack-term/src/service" ) type Chat struct { diff --git a/src/components/input.go b/src/components/input.go index 420c48d..a818764 100644 --- a/src/components/input.go +++ b/src/components/input.go @@ -1,8 +1,9 @@ package components import ( - "github.com/erroneousboat/slack-term/src/service" "github.com/gizak/termui" + + "github.com/erroneousboat/slack-term/src/service" ) // Input is the definition of and input box diff --git a/src/handlers/event.go b/src/handlers/event.go index a2af6c2..93b87fd 100644 --- a/src/handlers/event.go +++ b/src/handlers/event.go @@ -1,8 +1,8 @@ package handlers import ( + "github.com/erroneousboat/slack" "github.com/gizak/termui" - "github.com/nlopes/slack" "github.com/erroneousboat/slack-term/src/context" "github.com/erroneousboat/slack-term/src/views" diff --git a/src/service/slack.go b/src/service/slack.go index 3ca28f8..129cb62 100644 --- a/src/service/slack.go +++ b/src/service/slack.go @@ -6,7 +6,7 @@ import ( "strconv" "time" - "github.com/nlopes/slack" + "github.com/erroneousboat/slack" ) type SlackService struct { diff --git a/src/vendor/vendor.json b/src/vendor/vendor.json index bcb1508..4948d22 100644 --- a/src/vendor/vendor.json +++ b/src/vendor/vendor.json @@ -2,6 +2,12 @@ "comment": "", "ignore": "test", "package": [ + { + "checksumSHA1": "2xFMeuNz5+Q/Zoj4UB7VLVEUUBg=", + "path": "github.com/erroneousboat/slack", + "revision": "bffff62454d1f96706a775078228eb4313863cf2", + "revisionTime": "2016-10-01T12:00:35Z" + }, { "checksumSHA1": "h3TS3NxvpHvzwUysrtqVu2BntAE=", "path": "github.com/gizak/termui", diff --git a/src/views/chat.go b/src/views/chat.go index 235f64b..2688959 100644 --- a/src/views/chat.go +++ b/src/views/chat.go @@ -1,10 +1,10 @@ package views import ( + "github.com/gizak/termui" + "github.com/erroneousboat/slack-term/src/components" "github.com/erroneousboat/slack-term/src/service" - - "github.com/gizak/termui" ) type View struct {