diff options
| author | Wim <wim@42.be> | 2018-11-25 00:23:42 +0100 |
|---|---|---|
| committer | Wim <wim@42.be> | 2018-11-25 19:27:45 +0100 |
| commit | f00d4d7d3fe1c3b9366951f461a3f695ebb892fd (patch) | |
| tree | 38b5934f21514fc4ac5b7e8b25d844d7facb1928 /bridge | |
| parent | 0929535b2e44a01ac8085adfa4e2fd3b9c1599ef (diff) | |
| download | matterbridge-msglm-f00d4d7d3fe1c3b9366951f461a3f695ebb892fd.tar.gz matterbridge-msglm-f00d4d7d3fe1c3b9366951f461a3f695ebb892fd.tar.bz2 matterbridge-msglm-f00d4d7d3fe1c3b9366951f461a3f695ebb892fd.zip | |
Make sure threaded files stay in thread (slack). Fixes #590
Diffstat (limited to 'bridge')
| -rw-r--r-- | bridge/slack/slack.go | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/bridge/slack/slack.go b/bridge/slack/slack.go index 307a9023..ad48edf0 100644 --- a/bridge/slack/slack.go +++ b/bridge/slack/slack.go @@ -389,11 +389,16 @@ func (b *Bslack) uploadFile(msg *config.Message, channelID string) { ts := time.Now() b.Log.Debugf("Adding file %s to cache at %s with timestamp", fi.Name, ts.String()) b.cache.Add("filename"+fi.Name, ts) + initialComment := fmt.Sprintf("File from %s", msg.Username) + if fi.Comment != "" { + initialComment += fmt.Sprintf("with comment: %s", fi.Comment) + } res, err := b.sc.UploadFile(slack.FileUploadParameters{ - Reader: bytes.NewReader(*fi.Data), - Filename: fi.Name, - Channels: []string{channelID}, - InitialComment: fi.Comment, + Reader: bytes.NewReader(*fi.Data), + Filename: fi.Name, + Channels: []string{channelID}, + InitialComment: initialComment, + ThreadTimestamp: msg.ParentID, }) if err != nil { b.Log.Errorf("uploadfile %#v", err) |