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

Review: Treat attachments separately when building message.

Browse Source
This commit is contained in:
Patrick Connolly
2018-12-01 19:21:17 +08:00
parent faf614dad6
commit cb1d7be4fd
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bridge/slack/slack.go
View File

@@ -477,18 +477,21 @@ func (b *Bslack) prepareMessageOptions(msg *config.Message) []slack.MsgOption {
if msg.Avatar != "" { if msg.Avatar != "" {
params.IconURL = msg.Avatar params.IconURL = msg.Avatar
} }
var attachments []slack.Attachment
// add a callback ID so we can see we created it // add a callback ID so we can see we created it
params.Attachments = append(params.Attachments, slack.Attachment{CallbackID: "matterbridge_" + b.uuid}) attachments = append(attachments, slack.Attachment{CallbackID: "matterbridge_" + b.uuid})
// add file attachments // add file attachments
params.Attachments = append(params.Attachments, b.createAttach(msg.Extra)...) attachments = append(attachments, b.createAttach(msg.Extra)...)
// add slack attachments (from another slack bridge) // add slack attachments (from another slack bridge)
if msg.Extra != nil { if msg.Extra != nil {
for _, attach := range msg.Extra[sSlackAttachment] { for _, attach := range msg.Extra[sSlackAttachment] {
params.Attachments = append(params.Attachments, attach.([]slack.Attachment)...) attachments = append(attachments, attach.([]slack.Attachment)...)
} }
} }
var opts []slack.MsgOption var opts []slack.MsgOption
opts = append(opts, slack.MsgOptionAttachments(params.Attachments...)) opts = append(opts, slack.MsgOptionAttachments(attachments...))
opts = append(opts, slack.MsgOptionPostMessageParameters(params)) opts = append(opts, slack.MsgOptionPostMessageParameters(params))
return opts return opts
} }