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

store: fix GetByMXC parameter type

Browse Source
This commit is contained in:
Tulir Asokan
2026-03-29 17:44:59 +03:00
parent d124008443
commit f7cbf751a0
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/connector/handlematrix.go
+1 -1
View File
@@ -560,7 +560,7 @@ func (t *TelegramClient) PreHandleMatrixReaction(ctx context.Context, msg *bridg
keyNoVariation := variationselector.Remove(msg.Content.RelatesTo.Key) keyNoVariation := variationselector.Remove(msg.Content.RelatesTo.Key)
emojiID := ids.MakeEmojiIDFromEmoticon(msg.Content.RelatesTo.Key) emojiID := ids.MakeEmojiIDFromEmoticon(msg.Content.RelatesTo.Key)
if strings.HasPrefix(msg.Content.RelatesTo.Key, "mxc://") { if strings.HasPrefix(msg.Content.RelatesTo.Key, "mxc://") {
if file, err := t.main.Store.TelegramFile.GetByMXC(ctx, msg.Content.RelatesTo.Key); err != nil { if file, err := t.main.Store.TelegramFile.GetByMXC(ctx, id.ContentURIString(msg.Content.RelatesTo.Key)); err != nil {
return resp, err return resp, err
} else if file == nil { } else if file == nil {
return resp, fmt.Errorf("reaction MXC URI %s does not correspond with any known Telegram files", msg.Content.RelatesTo.Key) return resp, fmt.Errorf("reaction MXC URI %s does not correspond with any known Telegram files", msg.Content.RelatesTo.Key)
pkg/connector/matrixfmt/html.go
+1 -1
View File
@@ -405,7 +405,7 @@ func (parser *HTMLParser) imgToString(node *html.Node, ctx Context) *EntityStrin
if !isEmoji { if !isEmoji {
return NewEntityString(alt) return NewEntityString(alt)
} }
if file, _ := parser.Store.TelegramFile.GetByMXC(ctx.Ctx, src); file != nil { if file, _ := parser.Store.TelegramFile.GetByMXC(ctx.Ctx, id.ContentURIString(src)); file != nil {
if documentID, err := strconv.ParseInt(string(file.LocationID), 10, 64); err == nil { if documentID, err := strconv.ParseInt(string(file.LocationID), 10, 64); err == nil {
// Hardcode to a sparkle emoji because telegram requires the custom emoji fallback to be an emoji, // Hardcode to a sparkle emoji because telegram requires the custom emoji fallback to be an emoji,
// but we don't know the actual emoji that should be used. // but we don't know the actual emoji that should be used.
pkg/connector/store/telegramfile.go
+1 -1
View File
@@ -60,7 +60,7 @@ func (fq *TelegramFileQuery) GetByLocationID(ctx context.Context, locationID Tel
return fq.QueryOne(ctx, getTelegramFileByLocationIDQuery, locationID) return fq.QueryOne(ctx, getTelegramFileByLocationIDQuery, locationID)
} }
func (fq *TelegramFileQuery) GetByMXC(ctx context.Context, mxc string) (*TelegramFile, error) { func (fq *TelegramFileQuery) GetByMXC(ctx context.Context, mxc id.ContentURIString) (*TelegramFile, error) {
return fq.QueryOne(ctx, getTelegramFileByMXCQuery, mxc) return fq.QueryOne(ctx, getTelegramFileByMXCQuery, mxc)
} }