From 8b68140dc9e4bc6d51f49a4a38a09e1a0b0ffd67 Mon Sep 17 00:00:00 2001 From: Simon Magnin-Feysot Date: Tue, 7 Apr 2020 18:06:20 +0200 Subject: refactor to allow every file message to be downloaded --- ui/messages/filemessage.go | 142 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 142 insertions(+) create mode 100644 ui/messages/filemessage.go (limited to 'ui/messages/filemessage.go') diff --git a/ui/messages/filemessage.go b/ui/messages/filemessage.go new file mode 100644 index 0000000..3878b56 --- /dev/null +++ b/ui/messages/filemessage.go @@ -0,0 +1,142 @@ +// gomuks - A terminal Matrix client written in Go. +// Copyright (C) 2019 Tulir Asokan +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +package messages + +import ( + "bytes" + "fmt" + "image" + "image/color" + + "maunium.net/go/gomuks/matrix/event" + "maunium.net/go/mauview" + "maunium.net/go/tcell" + + "maunium.net/go/gomuks/config" + "maunium.net/go/gomuks/debug" + "maunium.net/go/gomuks/interface" + "maunium.net/go/gomuks/lib/ansimage" + "maunium.net/go/gomuks/ui/messages/tstring" +) + +type FileMessage struct { + Body string + Homeserver string + FileID string + data []byte + buffer []tstring.TString + + matrix ifc.MatrixContainer +} + +// NewFileMessage creates a new FileMessage object with the provided values and the default state. +func NewFileMessage(matrix ifc.MatrixContainer, evt *event.Event, displayname string, body, homeserver, fileID string, data []byte) *UIMessage { + return newUIMessage(evt, displayname, &FileMessage{ + Body: body, + Homeserver: homeserver, + FileID: fileID, + data: data, + matrix: matrix, + }) +} + +func (msg *FileMessage) Clone() MessageRenderer { + data := make([]byte, len(msg.data)) + copy(data, msg.data) + return &FileMessage{ + Body: msg.Body, + Homeserver: msg.Homeserver, + FileID: msg.FileID, + data: data, + matrix: msg.matrix, + } +} + +func (msg *FileMessage) RegisterMatrix(matrix ifc.MatrixContainer) { + msg.matrix = matrix + + if len(msg.data) == 0 { + go msg.updateData() + } +} + +func (msg *FileMessage) NotificationContent() string { + return "Sent a file" +} + +func (msg *FileMessage) PlainText() string { + return fmt.Sprintf("%s: %s", msg.Body, msg.matrix.GetDownloadURL(msg.Homeserver, msg.FileID)) +} + +func (msg *FileMessage) String() string { + return fmt.Sprintf(`&messages.FileMessage{Body="%s", Homeserver="%s", FileID="%s"}`, msg.Body, msg.Homeserver, msg.FileID) +} + +func (msg *FileMessage) updateData() { + defer debug.Recover() + debug.Print("Loading file:", msg.Homeserver, msg.FileID) + data, _, _, err := msg.matrix.Download(fmt.Sprintf("mxc://%s/%s", msg.Homeserver, msg.FileID)) + if err != nil { + debug.Printf("Failed to download file %s/%s: %v", msg.Homeserver, msg.FileID, err) + return + } + debug.Print("File", msg.Homeserver, msg.FileID, "loaded.") + msg.data = data +} + +func (msg *FileMessage) Path() string { + return msg.matrix.GetCachePath(msg.Homeserver, msg.FileID) +} + +func (msg *FileMessage) CalculateBuffer(prefs config.UserPreferences, width int, uiMsg *UIMessage) { + if width < 2 { + return + } + + if prefs.BareMessageView || prefs.DisableImages || uiMsg.Type != "m.image" { + msg.buffer = calculateBufferWithText(prefs, tstring.NewTString(msg.PlainText()), width, uiMsg) + return + } + + img, _, err := image.DecodeConfig(bytes.NewReader(msg.data)) + if err != nil { + debug.Print("File could not be decoded:", err) + } + imgWidth := img.Width + if img.Width > width { + imgWidth = width / 3 + } + + ansFile, err := ansimage.NewScaledFromReader(bytes.NewReader(msg.data), 0, imgWidth, color.Black) + if err != nil { + msg.buffer = []tstring.TString{tstring.NewColorTString("Failed to display image", tcell.ColorRed)} + debug.Print("Failed to display image:", err) + return + } + + msg.buffer = ansFile.Render() +} + +func (msg *FileMessage) Height() int { + return len(msg.buffer) +} + +func (msg *FileMessage) Draw(screen mauview.Screen) { + for y, line := range msg.buffer { + line.Draw(screen, 0, y) + } +} -- cgit v1.2.3-70-g09d2 From 41e7b018c1f36395dccdff586f2668a249a5bcc0 Mon Sep 17 00:00:00 2001 From: Simon Magnin-Feysot Date: Tue, 7 Apr 2020 19:06:10 +0200 Subject: command toggle downloads --- config/config.go | 1 + ui/commands.go | 7 +++++++ ui/messages/base.go | 2 +- ui/messages/expandedtextmessage.go | 2 +- ui/messages/filemessage.go | 4 ++-- ui/messages/htmlmessage.go | 2 +- ui/messages/redactedmessage.go | 2 +- ui/messages/textmessage.go | 2 +- 8 files changed, 15 insertions(+), 7 deletions(-) (limited to 'ui/messages/filemessage.go') diff --git a/config/config.go b/config/config.go index b8ff74b..e8c7b1a 100644 --- a/config/config.go +++ b/config/config.go @@ -47,6 +47,7 @@ type UserPreferences struct { DisableEmojis bool `yaml:"disable_emojis"` DisableMarkdown bool `yaml:"disable_markdown"` DisableHTML bool `yaml:"disable_html"` + DisableDownloads bool `yaml:"disable_downloads"` } // Config contains the main config of gomuks. diff --git a/ui/commands.go b/ui/commands.go index 747be1e..a57a78d 100644 --- a/ui/commands.go +++ b/ui/commands.go @@ -570,6 +570,13 @@ func cmdToggle(cmd *Command) { } else { cmd.Reply("Enabled Markdown input") } + case "downloads": + cmd.Config.Preferences.DisableDownloads = !cmd.Config.Preferences.DisableDownloads + if cmd.Config.Preferences.DisableDownloads { + cmd.Reply("Disabled Downloads input") + } else { + cmd.Reply("Enabled Downloads input") + } default: cmd.Reply("Usage: /toggle ") return diff --git a/ui/messages/base.go b/ui/messages/base.go index e86b85c..58d9b6e 100644 --- a/ui/messages/base.go +++ b/ui/messages/base.go @@ -36,7 +36,7 @@ type MessageRenderer interface { NotificationContent() string PlainText() string CalculateBuffer(prefs config.UserPreferences, width int, msg *UIMessage) - RegisterMatrix(matrix ifc.MatrixContainer) + RegisterMatrix(matrix ifc.MatrixContainer, prefs config.UserPreferences) Height() int Clone() MessageRenderer String() string diff --git a/ui/messages/expandedtextmessage.go b/ui/messages/expandedtextmessage.go index 424db79..c666613 100644 --- a/ui/messages/expandedtextmessage.go +++ b/ui/messages/expandedtextmessage.go @@ -89,4 +89,4 @@ func (msg *ExpandedTextMessage) Draw(screen mauview.Screen) { } } -func (msg *ExpandedTextMessage) RegisterMatrix(matrix ifc.MatrixContainer) {} +func (msg *ExpandedTextMessage) RegisterMatrix(matrix ifc.MatrixContainer, prefs config.UserPreferences) {} diff --git a/ui/messages/filemessage.go b/ui/messages/filemessage.go index 3878b56..9fb3499 100644 --- a/ui/messages/filemessage.go +++ b/ui/messages/filemessage.go @@ -66,10 +66,10 @@ func (msg *FileMessage) Clone() MessageRenderer { } } -func (msg *FileMessage) RegisterMatrix(matrix ifc.MatrixContainer) { +func (msg *FileMessage) RegisterMatrix(matrix ifc.MatrixContainer, prefs config.UserPreferences) { msg.matrix = matrix - if len(msg.data) == 0 { + if len(msg.data) == 0 && !prefs.DisableDownloads { go msg.updateData() } } diff --git a/ui/messages/htmlmessage.go b/ui/messages/htmlmessage.go index e476bc9..ff49e57 100644 --- a/ui/messages/htmlmessage.go +++ b/ui/messages/htmlmessage.go @@ -39,7 +39,7 @@ func NewHTMLMessage(evt *event.Event, displayname string, root html.Entity) *UIM }) } -func (hw *HTMLMessage) RegisterMatrix(matrix ifc.MatrixContainer) {} +func (hw *HTMLMessage) RegisterMatrix(matrix ifc.MatrixContainer, prefs config.UserPreferences) {} func (hw *HTMLMessage) Clone() MessageRenderer { return &HTMLMessage{ diff --git a/ui/messages/redactedmessage.go b/ui/messages/redactedmessage.go index fc34682..56b4822 100644 --- a/ui/messages/redactedmessage.go +++ b/ui/messages/redactedmessage.go @@ -65,4 +65,4 @@ func (msg *RedactedMessage) Draw(screen mauview.Screen) { } } -func (msg *RedactedMessage) RegisterMatrix(matrix ifc.MatrixContainer) {} +func (msg *RedactedMessage) RegisterMatrix(matrix ifc.MatrixContainer, prefs config.UserPreferences) {} diff --git a/ui/messages/textmessage.go b/ui/messages/textmessage.go index 2e27e33..0bfa27b 100644 --- a/ui/messages/textmessage.go +++ b/ui/messages/textmessage.go @@ -102,4 +102,4 @@ func (msg *TextMessage) Draw(screen mauview.Screen) { } } -func (msg *TextMessage) RegisterMatrix(matrix ifc.MatrixContainer) {} +func (msg *TextMessage) RegisterMatrix(matrix ifc.MatrixContainer, prefs config.UserPreferences) {} -- cgit v1.2.3-70-g09d2