From 169c614489d34d282f814967e252d5630dc9ea9e Mon Sep 17 00:00:00 2001 From: Wim Date: Fri, 2 Feb 2018 20:23:55 +0100 Subject: [PATCH] Download files and reupload to supported bridges (mattermost). Closes #357 --- bridge/mattermost/mattermost.go | 20 ++++++++++++++++++-- matterbridge.toml.sample | 2 +- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/bridge/mattermost/mattermost.go b/bridge/mattermost/mattermost.go index e84e61f1..7f5b6f8e 100644 --- a/bridge/mattermost/mattermost.go +++ b/bridge/mattermost/mattermost.go @@ -287,8 +287,24 @@ func (b *Bmattermost) handleMatterClient(mchan chan *MMMessage) { m.Event = config.EVENT_MSG_DELETE } if len(message.Post.FileIds) > 0 { - for _, link := range b.mc.GetFileLinks(message.Post.FileIds) { - m.Text = m.Text + "\n" + link + for _, id := range message.Post.FileIds { + url, _ := b.mc.Client.GetFileLink(id) + finfo, resp := b.mc.Client.GetFileInfo(id) + if resp.Error != nil { + continue + } + flog.Debugf("trying to download %#v fileid %#v with size %#v", finfo.Name, finfo.Id, finfo.Size) + if int(finfo.Size) > b.General.MediaDownloadSize { + flog.Errorf("File %#v to large to download (%#v). MediaDownloadSize is %#v", finfo.Name, finfo.Size, b.General.MediaDownloadSize) + continue + } + data, resp := b.mc.Client.DownloadFile(id, true) + if resp.Error != nil { + flog.Errorf("download %s failed %#v", finfo.Name, resp.Error) + continue + } + flog.Debugf("download OK %#v %#v", finfo.Name, len(data)) + m.Extra["file"] = append(m.Extra["file"], config.FileInfo{Name: finfo.Name, Data: &data, URL: url, Comment: message.Text}) } } mchan <- m diff --git a/matterbridge.toml.sample b/matterbridge.toml.sample index f3263d59..fea60c12 100644 --- a/matterbridge.toml.sample +++ b/matterbridge.toml.sample @@ -1053,7 +1053,7 @@ MediaServerDownload="https://youserver.com/download" #eg downloading from slack to upload it to mattermost # #It will only download from bridges that don't have public links available, which are for the moment -#slack, telegram and matrix +#slack, telegram, matrix and mattermost # #Optional (default 1000000 (1 megabyte)) MediaDownloadSize=1000000