Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pull out full state less

This commit is contained in:
Erik Johnston 2016-08-25 18:15:51 +01:00
parent 721414d98a
commit 0e1900d819
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
synapse/api/auth.py
View File

@ -278,18 +278,19 @@ class Auth(object):
@defer.inlineCallbacks
def check_host_in_room(self, room_id, host):
curr_state = yield self.state.get_current_state(room_id)
curr_state_id = yield self.state.get_current_state_ids(room_id)
for event in curr_state.values():
if event.type == EventTypes.Member:
for (etype, state_key), event_id in curr_state_id.items():
if etype == EventTypes.Member:
try:
if get_domain_from_id(event.state_key) != host:
if get_domain_from_id(state_key) != host:
continue
except:
logger.warn("state_key not user_id: %s", event.state_key)
logger.warn("state_key not user_id: %s", state_key)
continue
if event.content["membership"] == Membership.JOIN:
event = yield self.store.get_event(event_id, allow_none=True)
if event and event.content["membership"] == Membership.JOIN:
defer.returnValue(True)
defer.returnValue(False)

12
synapse/state.py
View File

@ -95,15 +95,19 @@ class StateHandler(object):
_, state = yield self.resolve_state_groups(room_id, latest_event_ids)
if event_type:
event_id = state.get((event_type, state_key))
event = None
if event_id:
event = yield self.store.get_event(event_id, allow_none=True)
defer.returnValue(event)
return
state_map = yield self.store.get_events(state.values(), get_prev_content=False)
state = {
key: state_map[e_id] for key, e_id in state.items() if e_id in state_map
}
if event_type:
defer.returnValue(state.get((event_type, state_key)))
return
defer.returnValue(state)
@defer.inlineCallbacks