Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-10-01 08:25:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Style changes.

Browse Source
This commit is contained in:
Erik Johnston 2015-01-30 13:52:02 +00:00
parent 73dd81ca62
commit 76d7fd39cd
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
synapse/state.py
View File

@ -37,6 +37,9 @@ def _get_state_key_from_event(event):
KeyStateTuple = namedtuple("KeyStateTuple", ("context", "type", "state_key"))
AuthEventTypes = (EventTypes.Create, EventTypes.Member, EventTypes.PowerLevels,)
class StateHandler(object):
""" Responsible for doing state conflict resolution.
"""
@ -215,7 +218,7 @@ class StateHandler(object):
auth_events = {
k: e for k, e in unconflicted_state.items()
if k[0] in (EventTypes.Create, EventTypes.Member, EventTypes.PowerLevels,)
if k[0] in AuthEventTypes
}
try:
@ -240,10 +243,6 @@ class StateHandler(object):
1. power levels
2. memberships
3. other events.
:param conflicted_state:
:param auth_events:
:return:
"""
resolved_state = {}
power_key = (EventTypes.PowerLevels, "")
@ -305,4 +304,4 @@ class StateHandler(object):
def key_func(e):
return -int(e.depth), hashlib.sha1(e.event_id).hexdigest()
return sorted(events, key=key_func)
return sorted(events, key=key_func)