Don't use form of get_state_for_events with None state_key
This commit is contained in:
parent
40d9765123
commit
892ee473d9
1 changed files with 13 additions and 6 deletions
|
@ -53,16 +53,23 @@ class BaseHandler(object):
|
||||||
self.event_builder_factory = hs.get_event_builder_factory()
|
self.event_builder_factory = hs.get_event_builder_factory()
|
||||||
|
|
||||||
@defer.inlineCallbacks
|
@defer.inlineCallbacks
|
||||||
def _filter_events_for_clients(self, users, events):
|
def _filter_events_for_clients(self, user_tuples, events):
|
||||||
""" Returns dict of user_id -> list of events that user is allowed to
|
""" Returns dict of user_id -> list of events that user is allowed to
|
||||||
see.
|
see.
|
||||||
"""
|
"""
|
||||||
|
# If there is only one user, just get the state for that one user,
|
||||||
|
# otherwise just get all the state.
|
||||||
|
if len(user_tuples) == 1:
|
||||||
|
types = (
|
||||||
|
(EventTypes.RoomHistoryVisibility, ""),
|
||||||
|
(EventTypes.Member, user_tuples[0][0]),
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
types = None
|
||||||
|
|
||||||
event_id_to_state = yield self.store.get_state_for_events(
|
event_id_to_state = yield self.store.get_state_for_events(
|
||||||
frozenset(e.event_id for e in events),
|
frozenset(e.event_id for e in events),
|
||||||
types=(
|
types=types
|
||||||
(EventTypes.RoomHistoryVisibility, ""),
|
|
||||||
(EventTypes.Member, None),
|
|
||||||
)
|
|
||||||
)
|
)
|
||||||
|
|
||||||
forgotten = yield defer.gatherResults([
|
forgotten = yield defer.gatherResults([
|
||||||
|
@ -122,7 +129,7 @@ class BaseHandler(object):
|
||||||
for event in events
|
for event in events
|
||||||
if allowed(event, user_id, is_guest)
|
if allowed(event, user_id, is_guest)
|
||||||
]
|
]
|
||||||
for user_id, is_guest in users
|
for user_id, is_guest in user_tuples
|
||||||
})
|
})
|
||||||
|
|
||||||
@defer.inlineCallbacks
|
@defer.inlineCallbacks
|
||||||
|
|
Loading…
Reference in a new issue