MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-12-15 10:53:52 +01:00
Code Issues Projects Releases Wiki Activity

Fixes

Browse source
This commit is contained in:
Erik Johnston 2017-05-05 10:17:56 +01:00
parent aa93cb9f44
commit cf589f2c1e
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
synapse/storage/roommember.py
View file

@ -427,8 +427,9 @@ class RoomMemberStore(SQLBaseStore):
missing_member_event_ids = [] missing_member_event_ids = []
users_in_room = {} users_in_room = {}
for event_id, ev_entry in event_map.iteritems(): for event_id in member_event_ids:
if event_id: ev_entry = event_map.get(event_id)
if ev_entry:
if ev_entry.event.membership == Membership.JOIN: if ev_entry.event.membership == Membership.JOIN:
users_in_room[to_ascii(ev_entry.event.state_key)] = ProfileInfo( users_in_room[to_ascii(ev_entry.event.state_key)] = ProfileInfo(
display_name=to_ascii( display_name=to_ascii(
@ -445,7 +446,7 @@ class RoomMemberStore(SQLBaseStore):
rows = yield self._simple_select_many_batch( rows = yield self._simple_select_many_batch(
table="room_memberships", table="room_memberships",
column="event_id", column="event_id",
iterable=member_event_ids, iterable=missing_member_event_ids,
retcols=('user_id', 'display_name', 'avatar_url',), retcols=('user_id', 'display_name', 'avatar_url',),
keyvalues={ keyvalues={
"membership": Membership.JOIN, "membership": Membership.JOIN,