third-party-mirrors/matterbridge
1
0
Fork 0
mirror of https://github.com/42wim/matterbridge.git synced 2025-04-18 01:42:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge a8a63ff7f8815a504904aea62807daeee59ebaca into c4157a4d5b49fce79c80a30730dc7c404bacd663

Browse Source
This commit is contained in:
Arusekk 2025-04-03 14:39:10 +00:00 committed by GitHub
commit e5a97a5409
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
bridge/slack/slack.go
View File

@ -155,18 +155,6 @@ func (b *Bslack) JoinChannel(channel config.ChannelInfo) error {
return nil
}
// try to join a channel when in legacy
if b.legacy {
_, _, _, err := b.sc.JoinConversation(channel.Name)
if err != nil {
switch err.Error() {
case "name_taken", "restricted_action":
case "default":
return err
}
}
}
b.channels.populateChannels(false)
channelInfo, err := b.channels.getChannel(channel.Name)
@ -179,9 +167,16 @@ func (b *Bslack) JoinChannel(channel config.ChannelInfo) error {
channel.Name = channelInfo.Name
}
// we can't join a channel unless we are using legacy tokens #651
if !channelInfo.IsMember && !b.legacy {
return fmt.Errorf("slack integration that matterbridge is using is not member of channel '%s', please add it manually", channelInfo.Name)
if !channelInfo.IsMember {
// try to join a channel
_, _, _, err := b.sc.JoinConversation(channel.Name)
if err != nil {
switch err.Error() {
case "name_taken", "restricted_action":
case "default":
return fmt.Errorf("slack integration that matterbridge is using is not member of channel '%s', please add it manually: %#v", channelInfo.Name, err)
}
}
}
return nil
}