cwinfo/matterbridge
4
0
Fork 0
mirror of https://github.com/cwinfo/matterbridge.git synced 2025-07-02 15:06:17 +00:00
Code Releases Activity

Add protocol to msg.ID in cache (#596)

Browse Source
This commit is contained in:
Wim
2018-11-19 21:28:23 +01:00
committed by GitHub
parent 57eba77561
commit ae32bae791
5 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
bridge/slack/slack.go
View File

@ -324,10 +324,8 @@ func (b *Bslack) deleteMessage(msg *config.Message, channelInfo *slack.Channel)
return true, nil
}
// If we get a "slack <ID>", split it.
ts := strings.Fields(msg.ID)
for {
_, _, err := b.rtm.DeleteMessage(channelInfo.ID, ts[1])
_, _, err := b.rtm.DeleteMessage(channelInfo.ID, msg.ID)
if err == nil {
return true, nil
}
@ -344,9 +342,8 @@ func (b *Bslack) editMessage(msg *config.Message, channelInfo *slack.Channel) (b
return false, nil
}
ts := strings.Fields(msg.ID)
for {
_, _, _, err := b.rtm.UpdateMessage(channelInfo.ID, ts[1], msg.Text)
_, _, _, err := b.rtm.UpdateMessage(channelInfo.ID, msg.ID, msg.Text)
if err == nil {
return true, nil
}
@ -362,7 +359,7 @@ func (b *Bslack) postMessage(msg *config.Message, messageParameters *slack.PostM
for {
_, id, err := b.rtm.PostMessage(channelInfo.ID, msg.Text, *messageParameters)
if err == nil {
return "slack " + id, nil
return id, nil
}
if err = b.handleRateLimit(err); err != nil {
@ -413,10 +410,7 @@ func (b *Bslack) prepareMessageParameters(msg *config.Message) *slack.PostMessag
params.Username = msg.Username
params.LinkNames = 1 // replace mentions
params.IconURL = config.GetIconURL(msg, b.GetString(iconURLConfig))
msgFields := strings.Fields(msg.ParentID)
if len(msgFields) >= 2 {
params.ThreadTimestamp = msgFields[1]
}
params.ThreadTimestamp = msg.ParentID
if msg.Avatar != "" {
params.IconURL = msg.Avatar
}