Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Apply & bundle edits for non-message events. (#15295)

This commit is contained in:
Patrick Cloke 2023-03-21 14:19:54 -04:00 committed by GitHub
parent 96bcc5d902
commit 1bc4feb6c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/15295.bugfix Normal file
View File

@ -0,0 +1 @@
Fix a long-standing bug where edits of non-`m.room.message` events would not be correctly bundled or have their new content applied.

11
synapse/storage/databases/main/relations.py
View File

@ -472,12 +472,11 @@ class RelationsWorkerStore(SQLBaseStore):
the event will map to None. the event will map to None.
""" """
# We only allow edits for `m.room.message` events that have the same sender # We only allow edits for events that have the same sender and event type.
# and event type. We can't assert these things during regular event auth so # We can't assert these things during regular event auth so we have to do
# we have to do the checks post hoc. # the checks post hoc.
# Fetches latest edit that has the same type and sender as the # Fetches latest edit that has the same type and sender as the original.
# original, and is an `m.room.message`.
if isinstance(self.database_engine, PostgresEngine): if isinstance(self.database_engine, PostgresEngine):
# The `DISTINCT ON` clause will pick the *first* row it encounters, # The `DISTINCT ON` clause will pick the *first* row it encounters,
# so ordering by origin server ts + event ID desc will ensure we get # so ordering by origin server ts + event ID desc will ensure we get
@ -493,7 +492,6 @@ class RelationsWorkerStore(SQLBaseStore):
WHERE WHERE
%s %s
AND relation_type = ? AND relation_type = ?
AND edit.type = 'm.room.message'
ORDER by original.event_id DESC, edit.origin_server_ts DESC, edit.event_id DESC ORDER by original.event_id DESC, edit.origin_server_ts DESC, edit.event_id DESC
""" """
else: else:
@ -512,7 +510,6 @@ class RelationsWorkerStore(SQLBaseStore):
WHERE WHERE
%s %s
AND relation_type = ? AND relation_type = ?
AND edit.type = 'm.room.message'
ORDER by edit.origin_server_ts, edit.event_id ORDER by edit.origin_server_ts, edit.event_id
""" """