jshiffer/matterbridge
1
0
Fork 1
mirror of https://github.com/42wim/matterbridge.git synced 2024-11-25 04:02:03 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix lookup bot username (slack). #213

Browse Source
This commit is contained in:
Wim 2017-07-16 14:18:33 +02:00
parent 4abaf2b236
commit 335ddf8db5
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bridge/slack/slack.go
View File

@ -226,7 +226,8 @@ func (b *Bslack) handleSlack() {
text = b.replaceURL(text) text = b.replaceURL(text)
text = html.UnescapeString(text) text = html.UnescapeString(text)
flog.Debugf("Sending message from %s on %s to gateway", message.Username, b.Account) flog.Debugf("Sending message from %s on %s to gateway", message.Username, b.Account)
b.Remote <- config.Message{Text: text, Username: message.Username, Channel: message.Channel, Account: b.Account, Avatar: b.getAvatar(message.Username), UserID: message.UserID} msg := config.Message{Text: text, Username: message.Username, Channel: message.Channel, Account: b.Account, Avatar: b.getAvatar(message.Username), UserID: message.UserID}
b.Remote <- msg
} }
} }
} }
@ -249,24 +250,27 @@ func (b *Bslack) handleSlackClient(mchan chan *MMMessage) {
if err != nil { if err != nil {
continue continue
} }
user, err := b.rtm.GetUserInfo(ev.User)
if err != nil {
continue
}
m := &MMMessage{} m := &MMMessage{}
m.UserID = user.ID if ev.BotID == "" {
m.Username = user.Name user, err := b.rtm.GetUserInfo(ev.User)
if err != nil {
continue
}
m.UserID = user.ID
m.Username = user.Name
}
m.Channel = channel.Name m.Channel = channel.Name
m.Text = ev.Text m.Text = ev.Text
m.Raw = ev m.Raw = ev
m.Text = b.replaceMention(m.Text) m.Text = b.replaceMention(m.Text)
if ev.BotID != "" && user.Name == "" { if ev.BotID != "" {
bot, err := b.rtm.GetBotInfo(ev.BotID) bot, err := b.rtm.GetBotInfo(ev.BotID)
if err != nil { if err != nil {
continue continue
} }
if bot.Name != "" { if bot.Name != "" {
m.Username = bot.Name m.Username = bot.Name
m.UserID = bot.ID
} }
} }
mchan <- m mchan <- m