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

Finish implementing the new join dance.

Browse source
This commit is contained in:
Erik Johnston 2014-10-17 15:04:17 +01:00
parent 1116f5330e
commit f71627567b
6 changed files with 225 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

10
synapse/state.py
View file

@ -130,7 +130,13 @@ class StateHandler(object):
defer.returnValue(is_new)
@defer.inlineCallbacks
def annotate_state_groups(self, event):
def annotate_state_groups(self, event, state=None):
if state:
event.state_group = None
event.old_state_events = None
event.state_events = state
return
state_groups = yield self.store.get_state_groups(
event.prev_events
)
@ -177,7 +183,7 @@ class StateHandler(object):
new_powers_deferreds = []
for e in curr_events:
new_powers_deferreds.append(
self.store.get_power_level(e.context, e.user_id)
self.store.get_power_level(e.room_id, e.user_id)
)
new_powers = yield defer.gatherResults(