iartamonov/mautrix-telegram
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

media: default unknown media mime to application/octet-stream

Browse Source 
Keeps the photo jpeg default but only for photos so we don't incorrectly
flag unknown extensions as jpegs.
This commit is contained in:
Nick Mills-Barrett
2025-11-18 11:22:39 +00:00
parent 795a732720
commit ca46d36998
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/connector/media/transfer.go
+4 -4
View File
@@ -204,6 +204,8 @@ func (t *Transferer) WithPhoto(pc tg.PhotoClass) *ReadyTransferer {
photo := pc.(*tg.Photo) photo := pc.(*tg.Photo)
var largest tg.PhotoSizeClass var largest tg.PhotoSizeClass
t.fileInfo.Width, t.fileInfo.Height, t.fileInfo.Size, largest = getLargestPhotoSize(photo.GetSizes()) t.fileInfo.Width, t.fileInfo.Height, t.fileInfo.Size, largest = getLargestPhotoSize(photo.GetSizes())
// All photos are jpeg in Telegram
t.fileInfo.MimeType = "image/jpeg"
return &ReadyTransferer{ return &ReadyTransferer{
inner: t, inner: t,
loc: &tg.InputPhotoFileLocation{ loc: &tg.InputPhotoFileLocation{
@@ -357,9 +359,7 @@ func (t *ReadyTransferer) Stream(ctx context.Context) (r io.Reader, mimeType str
case *tg.StorageFileWebp: case *tg.StorageFileWebp:
t.inner.fileInfo.MimeType = "image/webp" t.inner.fileInfo.MimeType = "image/webp"
default: default:
// Just guess it's a JPEG. All documents should have specified the t.inner.fileInfo.MimeType = "application/octet-stream"
// MIME type, and all photos are JPEG.
t.inner.fileInfo.MimeType = "image/jpeg"
} }
} }
@@ -409,7 +409,7 @@ func (t *ReadyTransferer) DirectDownloadURL(ctx context.Context, loggedInUserID
} }
mxc, err := portal.Bridge.Matrix.GenerateContentURI(ctx, mediaID) mxc, err := portal.Bridge.Matrix.GenerateContentURI(ctx, mediaID)
if t.inner.fileInfo.MimeType == "" { if t.inner.fileInfo.MimeType == "" {
t.inner.fileInfo.MimeType = "image/jpeg" t.inner.fileInfo.MimeType = "application/octet-stream"
} }
if t.inner.fileInfo.MimeType == "application/x-tgsticker" { if t.inner.fileInfo.MimeType == "application/x-tgsticker" {
t.inner.fileInfo.MimeType = "video/lottie+json" t.inner.fileInfo.MimeType = "video/lottie+json"