diff options
| author | Wim <wim@42.be> | 2021-05-05 22:03:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-05 22:03:28 +0200 |
| commit | a0bca42a7ad98a37f4bdc4d7adc419471163edfb (patch) | |
| tree | 3e87fdb61128039b016adb4e586636484c63ed52 /bridge | |
| parent | af543dcd05cfb5341311e2e214727e26411d2f92 (diff) | |
| download | matterbridge-msglm-a0bca42a7ad98a37f4bdc4d7adc419471163edfb.tar.gz matterbridge-msglm-a0bca42a7ad98a37f4bdc4d7adc419471163edfb.tar.bz2 matterbridge-msglm-a0bca42a7ad98a37f4bdc4d7adc419471163edfb.zip | |
Update vendor (#1461)
* Update vendored libs
* Fix slack api changes
Diffstat (limited to 'bridge')
| -rw-r--r-- | bridge/slack/slack.go | 2 | ||||
| -rw-r--r-- | bridge/slack/users_channels.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bridge/slack/slack.go b/bridge/slack/slack.go index e016a64f..37ddd853 100644 --- a/bridge/slack/slack.go +++ b/bridge/slack/slack.go @@ -156,7 +156,7 @@ func (b *Bslack) JoinChannel(channel config.ChannelInfo) error { // try to join a channel when in legacy if b.legacy { - _, err := b.sc.JoinChannel(channel.Name) + _, _, _, err := b.sc.JoinConversation(channel.Name) if err != nil { switch err.Error() { case "name_taken", "restricted_action": diff --git a/bridge/slack/users_channels.go b/bridge/slack/users_channels.go index 6886414e..41fd0bd8 100644 --- a/bridge/slack/users_channels.go +++ b/bridge/slack/users_channels.go @@ -283,7 +283,7 @@ func (b *channels) populateChannels(wait bool) { // We only retrieve public and private channels, not IMs // and MPIMs as those do not have a channel name. queryParams := &slack.GetConversationsParameters{ - ExcludeArchived: "true", + ExcludeArchived: true, Types: []string{"public_channel,private_channel"}, } for { |