Autisticats/mautrix-discord
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

msgconv: don't set EncryptedFile if there isn't one

Browse Source 
FIXME: This probably isn't proper handling, but this is enough to
prevent panics.
This commit is contained in:
Skip R
2026-01-13 14:49:01 -08:00
parent 3d59a0eb3f
commit bdbfd661a2
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/attachment/attachment.go
View File

@@ -34,5 +34,6 @@ type ReuploadedAttachment struct {
AttachmentReupload AttachmentReupload
DownloadedSize int DownloadedSize int
MXC id.ContentURIString MXC id.ContentURIString
// This can be nil if the room isn't encrypted.
EncryptedFile *event.EncryptedFileInfo EncryptedFile *event.EncryptedFileInfo
} }

2
pkg/msgconv/from-discord.go
View File

@@ -488,10 +488,12 @@ func (mc *MessageConverter) renderDiscordLinkEmbedImage(ctx context.Context, int
} }
preview.ImageSize = event.IntOrString(reupload.DownloadedSize) preview.ImageSize = event.IntOrString(reupload.DownloadedSize)
preview.ImageType = reupload.MimeType preview.ImageType = reupload.MimeType
if reupload.EncryptedFile != nil {
preview.ImageEncryption = &event.EncryptedFileInfo{ preview.ImageEncryption = &event.EncryptedFileInfo{
EncryptedFile: reupload.EncryptedFile.EncryptedFile, EncryptedFile: reupload.EncryptedFile.EncryptedFile,
URL: reupload.MXC, URL: reupload.MXC,
} }
}
} }
func (mc *MessageConverter) renderDiscordLinkEmbed(ctx context.Context, intent bridgev2.MatrixAPI, portal *bridgev2.Portal, embed *discordgo.MessageEmbed) *event.BeeperLinkPreview { func (mc *MessageConverter) renderDiscordLinkEmbed(ctx context.Context, intent bridgev2.MatrixAPI, portal *bridgev2.Portal, embed *discordgo.MessageEmbed) *event.BeeperLinkPreview {