summary refs log tree commit diff
path: root/synapse/storage/controllers
diff options
context:
space:
mode:
authorShay <hillerys@element.io>2023-06-13 13:22:06 -0700
committerGitHub <noreply@github.com>2023-06-13 13:22:06 -0700
commit553f2f53e7930d721d2070ffa45af6397f5ecb60 (patch)
tree3a6a53554176bf65125a2f98342c5cb082296d0f /synapse/storage/controllers
parentFix MSC3983 support: only one OTK per device was returned through federation ... (diff)
downloadsynapse-553f2f53e7930d721d2070ffa45af6397f5ecb60.tar.xz
Replace `EventContext` fields `prev_group` and `delta_ids` with field `state_group_deltas` (#15233)
Diffstat (limited to 'synapse/storage/controllers')
-rw-r--r--synapse/storage/controllers/persist_events.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/storage/controllers/persist_events.py b/synapse/storage/controllers/persist_events.py
index f1d2c71c91..35c0680365 100644
--- a/synapse/storage/controllers/persist_events.py
+++ b/synapse/storage/controllers/persist_events.py
@@ -839,9 +839,8 @@ class EventsPersistenceStorageController:
                         "group" % (ev.event_id,)
                     )
                 continue
-
-            if ctx.prev_group:
-                state_group_deltas[(ctx.prev_group, ctx.state_group)] = ctx.delta_ids
+            if ctx.state_group_deltas:
+                state_group_deltas.update(ctx.state_group_deltas)
 
         # We need to map the event_ids to their state groups. First, let's
         # check if the event is one we're persisting, in which case we can