From 50718825bd8d0ecc7ca8e700d2187360857ac8df Mon Sep 17 00:00:00 2001 From: "Paul \"LeoNerd\" Evans" Date: Wed, 20 Aug 2014 15:50:37 +0100 Subject: [PATCH] Fix exception name in _fill_out_join_content() exception --- synapse/handlers/room.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index 6bdba3f5e..4c297dbe3 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -640,6 +640,8 @@ class RoomMemberHandler(BaseHandler): @defer.inlineCallbacks def _fill_out_join_content(self, user_id, content): # 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 if "displayname" not in content: try: @@ -661,7 +663,7 @@ class RoomMemberHandler(BaseHandler): if avatar_url: content["avatar_url"] = avatar_url except: - logger.exception("Failed to set display_name") + logger.exception("Failed to set avatar_url") @defer.inlineCallbacks def _should_invite_join(self, room_id, prev_state, do_auth):