diff options
author | Patrick Cloke <clokep@users.noreply.github.com> | 2022-10-12 12:15:52 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-12 12:15:52 -0400 |
commit | 87099b6ea5cb48b03d2007c46af80bc3f0767519 (patch) | |
tree | a09867b53cdfa4024344ac9da78b24e96cb39a0f /synapse/push | |
parent | Bump typing-extensions from 4.1.1 to 4.4.0 (#14134) (diff) | |
download | synapse-87099b6ea5cb48b03d2007c46af80bc3f0767519.tar.xz |
Return the main timeline for events which are not part of a thread. (#14140)
Fixes a bug where threaded receipts could not be sent for the main timeline.
Diffstat (limited to 'synapse/push')
-rw-r--r-- | synapse/push/bulk_push_rule_evaluator.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/push/bulk_push_rule_evaluator.py b/synapse/push/bulk_push_rule_evaluator.py index 8d94aeaa32..a75386f6a0 100644 --- a/synapse/push/bulk_push_rule_evaluator.py +++ b/synapse/push/bulk_push_rule_evaluator.py @@ -236,7 +236,7 @@ class BulkPushRuleEvaluator: else: # Since the event has not yet been persisted we check whether # the parent is part of a thread. - thread_id = await self.store.get_thread_id(relation.parent_id) or "main" + thread_id = await self.store.get_thread_id(relation.parent_id) # It's possible that old room versions have non-integer power levels (floats or # strings). Workaround this by explicitly converting to int. |