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

Fix exception name in _fill_out_join_content() exception

This commit is contained in:
Paul "LeoNerd" Evans 2014-08-20 15:50:37 +01:00
parent e01bdf2432
commit 50718825bd
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
synapse/handlers/room.py
View File

@ -640,6 +640,8 @@ class RoomMemberHandler(BaseHandler):
@defer.inlineCallbacks @defer.inlineCallbacks
def _fill_out_join_content(self, user_id, content): def _fill_out_join_content(self, user_id, content):
# If event doesn't include a display name, add one. # If event doesn't include a display name, add one.
# TODO(paul): This really ought to use the distributor's
# collect_presencelike_data signal instead.
profile_handler = self.hs.get_handlers().profile_handler profile_handler = self.hs.get_handlers().profile_handler
if "displayname" not in content: if "displayname" not in content:
try: try:
@ -661,7 +663,7 @@ class RoomMemberHandler(BaseHandler):
if avatar_url: if avatar_url:
content["avatar_url"] = avatar_url content["avatar_url"] = avatar_url
except: except:
logger.exception("Failed to set display_name") logger.exception("Failed to set avatar_url")
@defer.inlineCallbacks @defer.inlineCallbacks
def _should_invite_join(self, room_id, prev_state, do_auth): def _should_invite_join(self, room_id, prev_state, do_auth):