mirror of
https://github.com/element-hq/synapse
synced 2024-09-06 01:50:08 +00:00
Remove unused options
This commit is contained in:
parent
11f139a647
commit
dbc0dfd2d5
1 changed files with 4 additions and 11 deletions
|
@ -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.
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue