From 8d502a801aacb0f9ef455836f0ce96fdcb371f40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gon=C3=A7alo=20Ribeiro?= Date: Mon, 21 Oct 2019 00:04:25 +0100 Subject: [PATCH] Add support for attachments' captions (keybase) --- bridge/keybase/keybase.go | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/bridge/keybase/keybase.go b/bridge/keybase/keybase.go index 17b19c83..fdd5d7a0 100644 --- a/bridge/keybase/keybase.go +++ b/bridge/keybase/keybase.go @@ -1,10 +1,10 @@ package bkeybase import ( - "strconv" "io/ioutil" "os" "path/filepath" + "strconv" "github.com/42wim/matterbridge/bridge" "github.com/42wim/matterbridge/bridge/config" @@ -80,19 +80,21 @@ func (b *Bkeybase) Send(msg config.Message) (string, error) { } defer os.RemoveAll(dir) fname := msg.Extra["file"][0].(config.FileInfo).Name - fpath := filepath.Join(dir, msg.Extra["file"][0].(config.FileInfo).Name) - if err := ioutil.WriteFile(fpath, *msg.Extra["file"][0].(config.FileInfo).Data, 0600); err != nil { + fdata := *msg.Extra["file"][0].(config.FileInfo).Data + fcaption := msg.Extra["file"][0].(config.FileInfo).Comment + fpath := filepath.Join(dir, fname) + if err = ioutil.WriteFile(fpath, fdata, 0600); err != nil { return "", err } - resp, err := b.kbc.SendAttachmentByTeam(b.team, fpath, fname, &b.channel) - return strconv.Itoa(resp.Result.MsgID), err - } else { - // Send regular message - resp, err := b.kbc.SendMessageByTeamName(b.team, msg.Username+msg.Text, &b.channel) - if err != nil { - return "", err - } + resp, err := b.kbc.SendAttachmentByTeam(b.team, fpath, fcaption, &b.channel) return strconv.Itoa(resp.Result.MsgID), err } + + // Send regular message + resp, err := b.kbc.SendMessageByTeamName(b.team, msg.Username+msg.Text, &b.channel) + if err != nil { + return "", err + } + return strconv.Itoa(resp.Result.MsgID), err }