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

directdownload,tomatrix: add missing nil checks

Browse Source
This commit is contained in:
Tulir Asokan
2025-12-03 16:03:29 +02:00
parent 1ecb9e8b64
commit 35c161185c
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/connector/directdownload.go
+4 -4
View File
@@ -191,10 +191,10 @@ func (tc *TelegramConnector) Download(ctx context.Context, mediaID networkid.Med
chatFull, ok := fullChat.FullChat.(*tg.ChatFull) chatFull, ok := fullChat.FullChat.(*tg.ChatFull)
if !ok { if !ok {
return nil, fmt.Errorf("full chat is %T not *tg.ChatFull", fullChat.FullChat) return nil, fmt.Errorf("full chat is %T not *tg.ChatFull", fullChat.FullChat)
} } else if chatFull.ChatPhoto == nil {
// FIXME: these 2 are basically not found errors
// FIXME: this is basically a not found error return nil, fmt.Errorf("photo not found on chat")
if photoID := chatFull.ChatPhoto.GetID(); photoID != info.ID { } else if photoID := chatFull.ChatPhoto.GetID(); photoID != info.ID {
return nil, fmt.Errorf("photo id mismatch: %d != %d", photoID, info.ID) return nil, fmt.Errorf("photo id mismatch: %d != %d", photoID, info.ID)
} }
pkg/connector/tomatrix.go
+6 -2
View File
@@ -400,8 +400,12 @@ func (c *TelegramClient) convertMediaRequiringUpload(ctx context.Context, portal
} else { } else {
content.Body = "image" content.Body = "image"
} }
telegramMediaID = msgMedia.Photo.GetID() photo, ok := msgMedia.Photo.(*tg.Photo)
mediaTransferer = transferer.WithPhoto(msgMedia.Photo) if !ok {
return nil, nil, fmt.Errorf("unrecognized photo type %T", msgMedia.Photo)
}
telegramMediaID = photo.GetID()
mediaTransferer = transferer.WithPhoto(photo)
case *tg.MessageMediaDocument: case *tg.MessageMediaDocument:
document, ok := msgMedia.Document.(*tg.Document) document, ok := msgMedia.Document.(*tg.Document)
if !ok { if !ok {