lug/matterbridge
10
0
Fork 2
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

Refactored postMessage to use in more places.

Browse Source
This commit is contained in:
Patrick Connolly
2018-11-19 20:25:15 +08:00
parent 0f1c31ff14
commit f0bedfdd15
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bridge/slack/slack.go
View File

@@ -309,8 +309,8 @@ func (b *Bslack) sendRTM(msg config.Message) (string, error) {
if msg.Extra != nil { if msg.Extra != nil {
for _, rmsg := range helper.HandleExtra(&msg, b.General) { for _, rmsg := range helper.HandleExtra(&msg, b.General) {
messageOptions = b.prepareMessageOptions(&rmsg) messageOptions = b.prepareMessageOptions(&rmsg)
messageOptions = append(messageOptions, slack.MsgOptionText(rmsg.Username+rmsg.Text, false)) rmsg.Text = rmsg.Username + rmsg.Text
_, _, err = b.rtm.PostMessage(channelInfo.ID, messageOptions...) _, err = b.postMessage(&rmsg, messageOptions, channelInfo)
if err != nil { if err != nil {
b.Log.Error(err) b.Log.Error(err)
} }
@@ -321,7 +321,6 @@ func (b *Bslack) sendRTM(msg config.Message) (string, error) {
// Post message. // Post message.
messageOptions = b.prepareMessageOptions(&msg) messageOptions = b.prepareMessageOptions(&msg)
messageOptions = append(messageOptions, slack.MsgOptionText(msg.Text, false))
return b.postMessage(&msg, messageOptions, channelInfo) return b.postMessage(&msg, messageOptions, channelInfo)
} }
@@ -416,6 +415,7 @@ func (b *Bslack) postMessage(msg *config.Message, messageOptions []slack.MsgOpti
if msg.Text == "" { if msg.Text == "" {
return "", nil return "", nil
} }
messageOptions = append(messageOptions, slack.MsgOptionText(msg.Text, false))
for { for {
_, id, err := b.rtm.PostMessage(channelInfo.ID, messageOptions...) _, id, err := b.rtm.PostMessage(channelInfo.ID, messageOptions...)
if err == nil { if err == nil {