Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 22:14:55 -04:00
Code Issues Projects Releases Packages Wiki Activity

Derive current_state_events from state groups

Browse source
This commit is contained in:
Erik Johnston 2017-01-20 11:52:51 +00:00
parent 97efe99ae9
commit 09eb08f910
4 changed files with 138 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

3
synapse/state.py
View file

@ -429,6 +429,9 @@ def resolve_events(state_sets, state_map_factory):
dict[(str, str), synapse.events.FrozenEvent] is a map from
(type, state_key) to event.
"""
if len(state_sets) == 1:
return state_sets[0]
unconflicted_state, conflicted_state = _seperate(
state_sets,
)