GitHub/matterbridge
3
0
Fork 0
mirror of https://github.com/42wim/matterbridge.git synced 2024-12-18 17:12:37 +01:00
Code Issues Projects Releases Wiki Activity

Add error message about non-existing channels (slack)

Browse Source
This commit is contained in:
Wim 2016-10-08 21:57:03 +02:00
parent 2d6ed51d94
commit db0e4ba8c5
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bridge/slack/slack.go
View File

@ -1,6 +1,7 @@
package bslack
import (
"fmt"
"github.com/42wim/matterbridge/bridge/config"
"github.com/42wim/matterbridge/matterhook"
log "github.com/Sirupsen/logrus"
@ -115,21 +116,25 @@ func (b *Bslack) SendType(nick string, message string, channel string, mtype str
}
return nil
}
newmsg := b.rtm.NewOutgoingMessage(message, b.getChannelByName(channel).ID)
schannel, err := b.getChannelByName(channel)
if err != nil {
return err
}
newmsg := b.rtm.NewOutgoingMessage(message, schannel.ID)
b.rtm.SendMessage(newmsg)
return nil
}
func (b *Bslack) getChannelByName(name string) *slack.Channel {
func (b *Bslack) getChannelByName(name string) (*slack.Channel, error) {
if b.channels == nil {
return nil
return nil, fmt.Errorf("%s: channel %s not found (no channels found)", b.FullOrigin(), name)
}
for _, channel := range b.channels {
if channel.Name == name {
return &channel
return &channel, nil
}
}
return nil
return nil, fmt.Errorf("%s: channel %s not found", b.FullOrigin(), name)
}
func (b *Bslack) handleSlack() {

6
gateway/gateway.go
View File

@ -1,6 +1,7 @@
package gateway
import (
"fmt"
"github.com/42wim/matterbridge/bridge"
"github.com/42wim/matterbridge/bridge/config"
log "github.com/Sirupsen/logrus"
@ -109,7 +110,10 @@ func (gw *Gateway) handleMessage(msg config.Message, dest bridge.Bridge) {
}
gw.modifyMessage(&msg, dest)
log.Debugf("Sending %#v from %s to %s", msg, msg.FullOrigin, dest.FullOrigin())
dest.Send(msg)
err := dest.Send(msg)
if err != nil {
fmt.Println(err)
}
}
}

5
gateway/samechannel/samechannel.go
View File

@ -60,7 +60,10 @@ func (gw *SameChannelGateway) handleMessage(msg config.Message, dest bridge.Brid
}
gw.modifyMessage(&msg, dest)
log.Debugf("Sending %#v from %s to %s", msg, msg.FullOrigin, dest.FullOrigin())
dest.Send(msg)
err := dest.Send(msg)
if err != nil {
log.Error(err)
}
}
func setNickFormat(msg *config.Message, format string) {