diff options
author | MOZGIII <mike-n@narod.ru> | 2019-08-12 15:41:24 +0300 |
---|---|---|
committer | MOZGIII <mike-n@narod.ru> | 2019-08-12 15:41:24 +0300 |
commit | d93879bca5109a18b55e88ad2e821aea151f1f9f (patch) | |
tree | e17cb171a22b6e1f1fb72bfea9d3a003bc04b86d | |
parent | 79a006c8de311a7bbab540e62bd3fac998d415d5 (diff) | |
download | matterbridge-msglm-d93879bca5109a18b55e88ad2e821aea151f1f9f.tar.gz matterbridge-msglm-d93879bca5109a18b55e88ad2e821aea151f1f9f.tar.bz2 matterbridge-msglm-d93879bca5109a18b55e88ad2e821aea151f1f9f.zip |
Proper support for uploading files via webhooks for discord
-rw-r--r-- | bridge/discord/discord.go | 63 | ||||
-rw-r--r-- | bridge/discord/helpers.go | 24 |
2 files changed, 53 insertions, 34 deletions
diff --git a/bridge/discord/discord.go b/bridge/discord/discord.go index 1ae655bf..502e6e41 100644 --- a/bridge/discord/discord.go +++ b/bridge/discord/discord.go @@ -261,16 +261,11 @@ func (b *Bdiscord) Send(msg config.Message) (string, error) { return "", err } } - msg, err := b.webhookExecute( - wID, - wToken, - true, - &discordgo.WebhookParams{ - Content: msg.Text, - Username: msg.Username, - AvatarURL: msg.Avatar, - }) - return msg.ID, err + msg, err := b.webhookSend(&msg, wID, wToken) + if err != nil { + return "", err + } + return msg.ID, nil } b.Log.Debugf("Broadcasting using token (API)") @@ -376,3 +371,51 @@ func (b *Bdiscord) handleUploadFile(msg *config.Message, channelID string) (stri } return "", nil } + +// webhookSend send one or more message via webhook, taking care of file +// uploads (from slack, telegram or mattermost). +// Returns messageID and error. +func (b *Bdiscord) webhookSend(msg *config.Message, webhookID, token string) (*discordgo.Message, error) { + var err error + + // WebhookParams can have either `Content` or `File`. + res, err := b.c.WebhookExecute( + webhookID, + token, + true, + &discordgo.WebhookParams{ + Content: msg.Text, + Username: msg.Username, + AvatarURL: msg.Avatar, + }, + ) + if err != nil { + return nil, err + } + + if msg.Extra != nil { + for _, f := range msg.Extra["file"] { + fi := f.(config.FileInfo) + file := discordgo.File{ + Name: fi.Name, + ContentType: "", + Reader: bytes.NewReader(*fi.Data), + } + _, err := b.c.WebhookExecute( + webhookID, + token, + false, + &discordgo.WebhookParams{ + Username: msg.Username, + AvatarURL: msg.Avatar, + File: &file, + }, + ) + if err != nil { + return nil, fmt.Errorf("file upload failed: %s", err) + } + } + } + + return res, nil +} diff --git a/bridge/discord/helpers.go b/bridge/discord/helpers.go index 58676842..1447c530 100644 --- a/bridge/discord/helpers.go +++ b/bridge/discord/helpers.go @@ -1,7 +1,6 @@ package bdiscord import ( - "encoding/json" "errors" "regexp" "strings" @@ -236,26 +235,3 @@ func enumerateUsernames(s string) []string { } return usernames } - -// webhookExecute executes a webhook. -// webhookID: The ID of a webhook. -// token : The auth token for the webhook -// wait : Waits for server confirmation of message send and ensures that the return struct is populated (it is nil otherwise) -func (b *Bdiscord) webhookExecute(webhookID, token string, wait bool, data *discordgo.WebhookParams) (st *discordgo.Message, err error) { - uri := discordgo.EndpointWebhookToken(webhookID, token) - - if wait { - uri += "?wait=true" - } - response, err := b.c.RequestWithBucketID("POST", uri, data, discordgo.EndpointWebhookToken("", "")) - if !wait || err != nil { - return nil, err - } - - err = json.Unmarshal(response, &st) - if err != nil { - return nil, discordgo.ErrJSONUnmarshal - } - - return st, nil -} |