mirror of
https://github.com/element-hq/synapse
synced 2024-09-06 01:50:08 +00:00
Style changes.
This commit is contained in:
parent
73dd81ca62
commit
76d7fd39cd
1 changed files with 5 additions and 6 deletions
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue