aboutsummaryrefslogtreecommitdiff
path: root/ui/messages
diff options
context:
space:
mode:
authorTulir Asokan <tulir@maunium.net>2020-05-06 20:06:35 +0300
committerTulir Asokan <tulir@maunium.net>2020-05-06 20:06:35 +0300
commit5b3e91524e000fe07fe30eff70061c9dd796014e (patch)
tree47eac32a4ce211b7d240841fe35e1a0cb745680c /ui/messages
parent96bb87e8ac8f45d56d487ea6c16d67f057d97e1f (diff)
parentebdfe914283fb91204ca8512a0a73a78fe41998f (diff)
Merge branch 'e2ee'
Diffstat (limited to 'ui/messages')
-rw-r--r--ui/messages/filemessage.go59
-rw-r--r--ui/messages/parser.go6
2 files changed, 41 insertions, 24 deletions
diff --git a/ui/messages/filemessage.go b/ui/messages/filemessage.go
index 7422146..3d5e554 100644
--- a/ui/messages/filemessage.go
+++ b/ui/messages/filemessage.go
@@ -22,7 +22,7 @@ import (
"image"
"image/color"
- "maunium.net/go/gomuks/matrix/muksevt"
+ "maunium.net/go/mautrix/crypto/attachment"
"maunium.net/go/mautrix/event"
"maunium.net/go/mautrix/id"
"maunium.net/go/mauview"
@@ -32,14 +32,19 @@ import (
"maunium.net/go/gomuks/debug"
"maunium.net/go/gomuks/interface"
"maunium.net/go/gomuks/lib/ansimage"
+ "maunium.net/go/gomuks/matrix/muksevt"
"maunium.net/go/gomuks/ui/messages/tstring"
)
type FileMessage struct {
- Type event.MessageType
- Body string
- URL id.ContentURI
- Thumbnail id.ContentURI
+ Type event.MessageType
+ Body string
+
+ URL id.ContentURI
+ File *attachment.EncryptedFile
+ Thumbnail id.ContentURI
+ ThumbnailFile *attachment.EncryptedFile
+
imageData []byte
buffer []tstring.TString
@@ -49,14 +54,23 @@ type FileMessage struct {
// NewFileMessage creates a new FileMessage object with the provided values and the default state.
func NewFileMessage(matrix ifc.MatrixContainer, evt *muksevt.Event, displayname string) *UIMessage {
content := evt.Content.AsMessage()
- url, _ := content.URL.Parse()
- thumbnail, _ := content.GetInfo().ThumbnailURL.Parse()
+ var file, thumbnailFile *attachment.EncryptedFile
+ if content.File != nil {
+ file = &content.File.EncryptedFile
+ content.URL = content.File.URL
+ }
+ if content.GetInfo().ThumbnailFile != nil {
+ thumbnailFile = &content.Info.ThumbnailFile.EncryptedFile
+ content.Info.ThumbnailURL = content.Info.ThumbnailFile.URL
+ }
return newUIMessage(evt, displayname, &FileMessage{
- Type: content.MsgType,
- Body: content.Body,
- URL: url,
- Thumbnail: thumbnail,
- matrix: matrix,
+ Type: content.MsgType,
+ Body: content.Body,
+ URL: content.URL.ParseOrIgnore(),
+ File: file,
+ Thumbnail: content.GetInfo().ThumbnailURL.ParseOrIgnore(),
+ ThumbnailFile: thumbnailFile,
+ matrix: matrix,
})
}
@@ -96,17 +110,20 @@ func (msg *FileMessage) String() string {
}
func (msg *FileMessage) DownloadPreview() {
- url := msg.Thumbnail
- if url.IsEmpty() {
- if msg.Type == event.MsgImage && !msg.URL.IsEmpty() {
- msg.Thumbnail = msg.URL
- url = msg.Thumbnail
- } else {
- return
- }
+ var url id.ContentURI
+ var file *attachment.EncryptedFile
+ if !msg.Thumbnail.IsEmpty() {
+ url = msg.Thumbnail
+ file = msg.ThumbnailFile
+ } else if msg.Type == event.MsgImage && !msg.URL.IsEmpty() {
+ msg.Thumbnail = msg.URL
+ url = msg.URL
+ file = msg.File
+ } else {
+ return
}
debug.Print("Loading file:", url)
- data, err := msg.matrix.Download(url)
+ data, err := msg.matrix.Download(url, file)
if err != nil {
debug.Printf("Failed to download file %s: %v", url, err)
return
diff --git a/ui/messages/parser.go b/ui/messages/parser.go
index 9e44647..4a214f1 100644
--- a/ui/messages/parser.go
+++ b/ui/messages/parser.go
@@ -20,13 +20,13 @@ import (
"fmt"
"strings"
- "maunium.net/go/gomuks/debug"
- "maunium.net/go/gomuks/matrix/muksevt"
"maunium.net/go/mautrix/event"
"maunium.net/go/mautrix/id"
"maunium.net/go/tcell"
+ "maunium.net/go/gomuks/debug"
"maunium.net/go/gomuks/interface"
+ "maunium.net/go/gomuks/matrix/muksevt"
"maunium.net/go/gomuks/matrix/rooms"
"maunium.net/go/gomuks/ui/messages/html"
"maunium.net/go/gomuks/ui/messages/tstring"
@@ -82,7 +82,7 @@ func directParseEvent(matrix ifc.MatrixContainer, room *rooms.Room, evt *muksevt
}
return ParseMessage(matrix, room, evt, displayname)
case *event.EncryptedEventContent:
- return NewExpandedTextMessage(evt, displayname, tstring.NewStyleTString("Encrypted messages are not yet supported", tcell.StyleDefault.Italic(true)))
+ return NewExpandedTextMessage(evt, displayname, tstring.NewStyleTString("Decryption failed or gomuks not built with encryption support", tcell.StyleDefault.Italic(true)))
case *event.TopicEventContent, *event.RoomNameEventContent, *event.CanonicalAliasEventContent:
return ParseStateEvent(evt, displayname)
case *event.MemberEventContent: