From f0bedfdd158e48ea4af65fe4a09ae5bfbc3fc7c1 Mon Sep 17 00:00:00 2001 From: Patrick Connolly Date: Mon, 19 Nov 2018 20:25:15 +0800 Subject: [PATCH] Refactored postMessage to use in more places. --- bridge/slack/slack.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bridge/slack/slack.go b/bridge/slack/slack.go index 6e65ab78..9ebbde26 100644 --- a/bridge/slack/slack.go +++ b/bridge/slack/slack.go @@ -309,8 +309,8 @@ func (b *Bslack) sendRTM(msg config.Message) (string, error) { if msg.Extra != nil { for _, rmsg := range helper.HandleExtra(&msg, b.General) { messageOptions = b.prepareMessageOptions(&rmsg) - messageOptions = append(messageOptions, slack.MsgOptionText(rmsg.Username+rmsg.Text, false)) - _, _, err = b.rtm.PostMessage(channelInfo.ID, messageOptions...) + rmsg.Text = rmsg.Username + rmsg.Text + _, err = b.postMessage(&rmsg, messageOptions, channelInfo) if err != nil { b.Log.Error(err) } @@ -321,7 +321,6 @@ func (b *Bslack) sendRTM(msg config.Message) (string, error) { // Post message. messageOptions = b.prepareMessageOptions(&msg) - messageOptions = append(messageOptions, slack.MsgOptionText(msg.Text, false)) return b.postMessage(&msg, messageOptions, channelInfo) } @@ -416,6 +415,7 @@ func (b *Bslack) postMessage(msg *config.Message, messageOptions []slack.MsgOpti if msg.Text == "" { return "", nil } + messageOptions = append(messageOptions, slack.MsgOptionText(msg.Text, false)) for { _, id, err := b.rtm.PostMessage(channelInfo.ID, messageOptions...) if err == nil {