From ed596af19e58c83a2bd65742392eee9854e9a6f6 Mon Sep 17 00:00:00 2001 From: Takayoshi Aoyagi Date: Wed, 14 Oct 2015 13:00:44 +0900 Subject: [PATCH] Adapted to latest slack API --- main.go | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/main.go b/main.go index 131144a..717fb22 100644 --- a/main.go +++ b/main.go @@ -16,6 +16,7 @@ import ( "github.com/codegangsta/cli" "github.com/jhoonb/archivex" "github.com/nlopes/slack" + //"github.com/k0kubun/pp" ) func check(e error) { @@ -96,7 +97,7 @@ func MarshalIndent(v interface{}, prefix string, indent string) ([]byte, error) return b, nil } -func dumpUsers(api *slack.Slack, dir string) { +func dumpUsers(api *slack.Client, dir string) { users, err := api.GetUsers() check(err) @@ -106,7 +107,7 @@ func dumpUsers(api *slack.Slack, dir string) { check(err) } -func dumpRooms(api *slack.Slack, dir string, rooms []string) { +func dumpRooms(api *slack.Client, dir string, rooms []string) { // Dump Channels channels := dumpChannels(api, dir, rooms) @@ -116,7 +117,7 @@ func dumpRooms(api *slack.Slack, dir string, rooms []string) { if len(groups) > 0 { for _, group := range groups { channel := slack.Channel{} - channel.Id = group.Id + channel.ID = group.Conversation.ID channel.Name = group.Name channel.Created = group.Created channel.Creator = group.Creator @@ -142,7 +143,7 @@ func dumpRooms(api *slack.Slack, dir string, rooms []string) { check(err) } -func dumpChannels(api *slack.Slack, dir string, rooms []string) []slack.Channel { +func dumpChannels(api *slack.Client, dir string, rooms []string) []slack.Channel { channels, err := api.GetChannels(false) check(err) @@ -163,13 +164,13 @@ func dumpChannels(api *slack.Slack, dir string, rooms []string) []slack.Channel } for _, channel := range channels { - dumpChannel(api, dir, channel.Id, channel.Name, "channel") + dumpChannel(api, dir, channel.Conversation.ID, channel.Name, "channel") } return channels } -func dumpGroups(api *slack.Slack, dir string, rooms []string) []slack.Group { +func dumpGroups(api *slack.Client, dir string, rooms []string) []slack.Group { groups, err := api.GetGroups(false) check(err) if len(rooms) > 0 { @@ -189,13 +190,13 @@ func dumpGroups(api *slack.Slack, dir string, rooms []string) []slack.Group { } for _, group := range groups { - dumpChannel(api, dir, group.Id, group.Name, "group") + dumpChannel(api, dir, group.Conversation.ID, group.Name, "group") } return groups } -func dumpChannel(api *slack.Slack, dir, id, name, channelType string) { +func dumpChannel(api *slack.Client, dir, id, name, channelType string) { var messages []slack.Message if channelType == "group" { messages = fetchGroupHistory(api, id) @@ -239,7 +240,7 @@ func writeMessagesFile(messages []slack.Message, dir string, name string, filena check(err) } -func fetchGroupHistory(api *slack.Slack, ID string) []slack.Message { +func fetchGroupHistory(api *slack.Client, ID string) []slack.Message { historyParams := slack.NewHistoryParameters() historyParams.Count = 1000 @@ -267,7 +268,7 @@ func fetchGroupHistory(api *slack.Slack, ID string) []slack.Message { return messages } -func fetchChannelHistory(api *slack.Slack, ID string) []slack.Message { +func fetchChannelHistory(api *slack.Client, ID string) []slack.Message { historyParams := slack.NewHistoryParameters() historyParams.Count = 1000