rms/mirrors-mautrix-telegram
1
0
Fork 0
mirror of https://github.com/mautrix/telegram.git synced 2026-05-17 07:25:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

handlematrix: also read edit responses properly

Browse Source
This commit is contained in:
Tulir Asokan
2026-03-30 17:58:35 +03:00
parent 358318c734
commit bd6d40cad0
1 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
pkg/connector/handlematrix.go
View File

@@ -403,6 +403,7 @@ func (t *TelegramClient) HandleMatrixMessage(ctx context.Context, msg *bridgev2.
tgMessageID = sentMessage.ID
tgDate = sentMessage.Date
hasher.Write([]byte(msg.Content.Body))
hasher.Write(mediaHashID(ctx, sentMessage.Media))
case *tg.Updates:
var realSentMessage *tg.Message
for _, u := range sentMessage.Updates {
@@ -533,15 +534,37 @@ func (t *TelegramClient) HandleMatrixEdit(ctx context.Context, msg *bridgev2.Mat
switch sentMessage := updates.(type) {
case *tg.UpdateShortSentMessage:
hasher.Write([]byte(msg.Content.Body))
hasher.Write(mediaHashID(ctx, sentMessage.Media))
case *tg.Updates:
var realSentMessage *tg.Message
for _, u := range sentMessage.Updates {
switch update := u.(type) {
case *tg.UpdateNewMessage:
msg := update.Message.(*tg.Message)
hasher.Write([]byte(msg.Message))
hasher.Write(mediaHashID(ctx, msg.Media))
if realSentMessage != nil {
log.Warn().
Int("prev_id", realSentMessage.ID).
Int("new_id", update.Message.GetID()).
Msg("Multiple messages in edit response")
}
realSentMessage = update.Message.(*tg.Message)
case *tg.UpdateNewChannelMessage:
if realSentMessage != nil {
log.Warn().
Int("prev_id", realSentMessage.ID).
Int("new_id", update.Message.GetID()).
Msg("Multiple messages in edit response")
}
realSentMessage = update.Message.(*tg.Message)
default:
log.Warn().Type("update_type", update).Msg("Unexpected update type in edit message response")
}
}
if realSentMessage != nil {
hasher.Write([]byte(realSentMessage.Message))
hasher.Write(mediaHashID(ctx, realSentMessage.Media))
} else {
hasher.Write([]byte(msg.Content.Body))
}
default:
return fmt.Errorf("unknown update from message response %T", updates)
}