diff options
author | Patrick Cloke <clokep@users.noreply.github.com> | 2022-10-24 12:07:16 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-24 17:07:16 +0100 |
commit | 581b37b5d6c1c9430108930a4fe409cf3f86332f (patch) | |
tree | b418b9971d0ae026ab6086a59c267e72f0a8a810 /synapse/storage/databases/main | |
parent | Fix typo in cibuildwheel conf introduced in #14253 (diff) | |
download | synapse-581b37b5d6c1c9430108930a4fe409cf3f86332f.tar.xz |
Revert behavior change for bundling edits of non-message events (#14283)
Diffstat (limited to 'synapse/storage/databases/main')
-rw-r--r-- | synapse/storage/databases/main/relations.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/synapse/storage/databases/main/relations.py b/synapse/storage/databases/main/relations.py index 1de62ee9df..c022510e76 100644 --- a/synapse/storage/databases/main/relations.py +++ b/synapse/storage/databases/main/relations.py @@ -484,11 +484,12 @@ class RelationsWorkerStore(SQLBaseStore): the event will map to None. """ - # We only allow edits for events that have the same sender and event type. - # We can't assert these things during regular event auth so we have to do - # the checks post hoc. + # We only allow edits for `m.room.message` events that have the same sender + # and event type. We can't assert these things during regular event auth so + # we have to do the checks post hoc. - # Fetches latest edit that has the same type and sender as the original. + # Fetches latest edit that has the same type and sender as the + # original, and is an `m.room.message`. if isinstance(self.database_engine, PostgresEngine): # The `DISTINCT ON` clause will pick the *first* row it encounters, # so ordering by origin server ts + event ID desc will ensure we get @@ -504,6 +505,7 @@ class RelationsWorkerStore(SQLBaseStore): WHERE %s AND relation_type = ? + AND edit.type = 'm.room.message' ORDER by original.event_id DESC, edit.origin_server_ts DESC, edit.event_id DESC """ else: @@ -522,6 +524,7 @@ class RelationsWorkerStore(SQLBaseStore): WHERE %s AND relation_type = ? + AND edit.type = 'm.room.message' ORDER by edit.origin_server_ts, edit.event_id """ |