From a6f6fb3ef22658508671296a31367a198205da99 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Wed, 8 Apr 2020 15:30:29 +0300 Subject: Display thumbnail for all files and add commands to download and open files --- ui/messages/parser.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'ui/messages/parser.go') diff --git a/ui/messages/parser.go b/ui/messages/parser.go index 1c145e5..d0bc6e0 100644 --- a/ui/messages/parser.go +++ b/ui/messages/parser.go @@ -24,7 +24,6 @@ import ( "maunium.net/go/mautrix" "maunium.net/go/tcell" - "maunium.net/go/gomuks/debug" "maunium.net/go/gomuks/interface" "maunium.net/go/gomuks/matrix/rooms" "maunium.net/go/gomuks/ui/messages/html" @@ -132,18 +131,19 @@ func ParseMessage(matrix ifc.MatrixContainer, room *rooms.Room, evt *event.Event evt.Content = *evt.Gomuks.Edits[len(evt.Gomuks.Edits)-1].Content.NewContent } switch evt.Content.MsgType { - case "m.text", "m.notice", "m.emote": + case mautrix.MsgText, mautrix.MsgNotice, mautrix.MsgEmote: if evt.Content.Format == mautrix.FormatHTML { return NewHTMLMessage(evt, displayname, html.Parse(room, evt, displayname)) } evt.Content.Body = strings.Replace(evt.Content.Body, "\t", " ", -1) return NewTextMessage(evt, displayname, evt.Content.Body) - case "m.file", "m.video", "m.audio", "m.image": - data, hs, id, err := matrix.Download(evt.Content.URL) - if err != nil { - debug.Printf("Failed to download %s: %v", evt.Content.URL, err) + case mautrix.MsgImage, mautrix.MsgVideo, mautrix.MsgAudio, mautrix.MsgFile: + msg := NewFileMessage(matrix, evt, displayname) + if !matrix.Preferences().DisableDownloads { + renderer := msg.Renderer.(*FileMessage) + renderer.DownloadPreview() } - return NewFileMessage(matrix, evt, displayname, evt.Content.Body, hs, id, data) + return msg } return nil } -- cgit v1.2.3