Fix typo where we thought a list was a dict

2014-12-16 15:59:40 +00:00 · 2014-12-16 15:59:40 +00:00 · 23da4a4051
parent 42b725ce52
commit 23da4a4051
1 changed files with 4 additions and 3 deletions
--- a/synapse/state.py
+++ b/synapse/state.py
@ -263,9 +263,10 @@ class StateHandler(object):
        }

        if event_type:
-            prev_states = conflicted_state.get(
-                (event_type, state_key), {}
-            ).keys()
+            prev_states_events = conflicted_state.get(
+                (event_type, state_key), []
+            )
+            prev_states = [s.event_id for s in prev_states_events]
        else:
            prev_states = []