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

handlematrix: don't block read receipt handler on reaction poll

Browse Source
This commit is contained in:
Tulir Asokan
2025-12-05 15:37:43 +02:00
parent 9dd8f30480
commit fa28593635
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/connector/handlematrix.go
+7 -6
View File
@@ -651,7 +651,7 @@ func (t *TelegramClient) HandleMatrixReadReceipt(ctx context.Context, msg *bridg
return parseErr return parseErr
} }
var readMentionsErr, readReactionsErr, readMessagesErr, reactionPollErr error var readMentionsErr, readReactionsErr, readMessagesErr error
var wg sync.WaitGroup var wg sync.WaitGroup
// Read mentions // Read mentions
@@ -717,11 +717,12 @@ func (t *TelegramClient) HandleMatrixReadReceipt(ctx context.Context, msg *bridg
} }
}() }()
// Poll for reactions // Poll for reactions (non-blocking to avoid deadlock when portal event buffer is disabled)
wg.Add(1)
go func() { go func() {
defer wg.Done() err := t.maybePollForReactions(ctx, msg.Portal)
reactionPollErr = t.maybePollForReactions(ctx, msg.Portal) if err != nil {
log.Err(err).Msg("failed to poll for reactions after read receipt")
}
}() }()
if peerType == ids.PeerTypeChannel && !msg.Portal.Metadata.(*PortalMetadata).FullSynced { if peerType == ids.PeerTypeChannel && !msg.Portal.Metadata.(*PortalMetadata).FullSynced {
@@ -736,7 +737,7 @@ func (t *TelegramClient) HandleMatrixReadReceipt(ctx context.Context, msg *bridg
} }
wg.Wait() wg.Wait()
return errors.Join(readMentionsErr, readReactionsErr, readMessagesErr, reactionPollErr) return errors.Join(readMentionsErr, readReactionsErr, readMessagesErr)
} }
func (t *TelegramClient) HandleMatrixTyping(ctx context.Context, msg *bridgev2.MatrixTyping) error { func (t *TelegramClient) HandleMatrixTyping(ctx context.Context, msg *bridgev2.MatrixTyping) error {