From 4e50fd864921c556988c919269448efdb90fa961 Mon Sep 17 00:00:00 2001 From: Wim Date: Mon, 10 Aug 2020 00:29:54 +0200 Subject: Use mattermost v5 module (#1192) --- matterclient/channels.go | 4 ++-- matterclient/helpers.go | 4 ++-- matterclient/matterclient.go | 2 +- matterclient/messages.go | 2 +- matterclient/users.go | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'matterclient') diff --git a/matterclient/channels.go b/matterclient/channels.go index e1ebf48d..13d3277d 100644 --- a/matterclient/channels.go +++ b/matterclient/channels.go @@ -4,7 +4,7 @@ import ( "errors" "strings" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) // GetChannels returns all channels we're members off @@ -167,7 +167,7 @@ func (m *MMClient) JoinChannel(channelId string) error { //nolint:golint } func (m *MMClient) UpdateChannelsTeam(teamID string) error { - mmchannels, resp := m.Client.GetChannelsForTeamForUser(teamID, m.User.Id, "") + mmchannels, resp := m.Client.GetChannelsForTeamForUser(teamID, m.User.Id, false, "") if resp.Error != nil { return errors.New(resp.Error.DetailedError) } diff --git a/matterclient/helpers.go b/matterclient/helpers.go index d5b1038a..99743af0 100644 --- a/matterclient/helpers.go +++ b/matterclient/helpers.go @@ -13,7 +13,7 @@ import ( "github.com/gorilla/websocket" "github.com/jpillora/backoff" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func (m *MMClient) doLogin(firstConnection bool, b *backoff.Backoff) error { @@ -154,7 +154,7 @@ func (m *MMClient) initUser() error { t := &Team{Team: team, Users: usermap, Id: team.Id} - mmchannels, resp := m.Client.GetChannelsForTeamForUser(team.Id, m.User.Id, "") + mmchannels, resp := m.Client.GetChannelsForTeamForUser(team.Id, m.User.Id, false, "") if resp.Error != nil { return resp.Error } diff --git a/matterclient/matterclient.go b/matterclient/matterclient.go index 35d620c3..ffe88aa4 100644 --- a/matterclient/matterclient.go +++ b/matterclient/matterclient.go @@ -11,7 +11,7 @@ import ( lru "github.com/hashicorp/golang-lru" "github.com/jpillora/backoff" prefixed "github.com/matterbridge/logrus-prefixed-formatter" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" "github.com/sirupsen/logrus" ) diff --git a/matterclient/messages.go b/matterclient/messages.go index 172d0ccf..17065372 100644 --- a/matterclient/messages.go +++ b/matterclient/messages.go @@ -3,7 +3,7 @@ package matterclient import ( "strings" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func (m *MMClient) parseActionPost(rmsg *Message) { diff --git a/matterclient/users.go b/matterclient/users.go index cf13e0df..42c4162c 100644 --- a/matterclient/users.go +++ b/matterclient/users.go @@ -4,7 +4,7 @@ import ( "errors" "time" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func (m *MMClient) GetNickName(userId string) string { //nolint:golint -- cgit v1.2.3