Skip to content
Snippets Groups Projects
Commit 6ae8373d authored by Erik Johnston's avatar Erik Johnston
Browse files

Don't assume existance of events when updating user directory

parent a837765e
No related branches found
No related tags found
No related merge requests found
...@@ -225,7 +225,7 @@ class UserDirectoyHandler(object): ...@@ -225,7 +225,7 @@ class UserDirectoyHandler(object):
logger.debug("Server is still in room: %r", room_id) logger.debug("Server is still in room: %r", room_id)
if change: # The user joined if change: # The user joined
event = yield self.store.get_event(event_id) event = yield self.store.get_event(event_id, allow_none=True)
profile = ProfileInfo( profile = ProfileInfo(
avatar_url=event.content.get("avatar_url"), avatar_url=event.content.get("avatar_url"),
display_name=event.content.get("displayname"), display_name=event.content.get("displayname"),
...@@ -379,8 +379,11 @@ class UserDirectoyHandler(object): ...@@ -379,8 +379,11 @@ class UserDirectoyHandler(object):
if not prev_event_id or not event_id: if not prev_event_id or not event_id:
return return
prev_event = yield self.store.get_event(prev_event_id) prev_event = yield self.store.get_event(prev_event_id, allow_none=True)
event = yield self.store.get_event(event_id) event = yield self.store.get_event(event_id, allow_none=True)
if not prev_event or not event:
return
if event.membership != Membership.JOIN: if event.membership != Membership.JOIN:
return return
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment