MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-12-17 07:43:51 +01:00
Code Issues Projects Releases Wiki Activity

Remove unused options

Browse source
This commit is contained in:
Erik Johnston 2017-05-25 14:28:34 +01:00
parent 11f139a647
commit dbc0dfd2d5
1 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
synapse/state.py
View file

@ -239,16 +239,9 @@ class StateHandler(object):
defer.returnValue(context) defer.returnValue(context)
logger.debug("calling resolve_state_groups from compute_event_context") logger.debug("calling resolve_state_groups from compute_event_context")
if event.is_state(): entry = yield self.resolve_state_groups(
entry = yield self.resolve_state_groups( event.room_id, [e for e, _ in event.prev_events],
event.room_id, [e for e, _ in event.prev_events], )
event_type=event.type,
state_key=event.state_key,
)
else:
entry = yield self.resolve_state_groups(
event.room_id, [e for e, _ in event.prev_events],
)
curr_state = entry.state curr_state = entry.state
@ -284,7 +277,7 @@ class StateHandler(object):
@defer.inlineCallbacks @defer.inlineCallbacks
@log_function @log_function
def resolve_state_groups(self, room_id, event_ids, event_type=None, state_key=""): def resolve_state_groups(self, room_id, event_ids):
""" Given a list of event_ids this method fetches the state at each """ Given a list of event_ids this method fetches the state at each
event, resolves conflicts between them and returns them. event, resolves conflicts between them and returns them.