diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-08-20 15:50:37 +0100 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-08-20 16:06:47 +0100 |
| commit | 50718825bd8d0ecc7ca8e700d2187360857ac8df (patch) | |
| tree | f377d1f5e41c7f76440e0448c186960b4377db23 | |
| parent | Define __copy__ and __deepcopy__ as identity functions on DomainSpecificStrin... (diff) | |
| download | synapse-50718825bd8d0ecc7ca8e700d2187360857ac8df.tar.xz | |
Fix exception name in _fill_out_join_content() exception
Diffstat (limited to '')
| -rw-r--r-- | synapse/handlers/room.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index 6bdba3f5e1..4c297dbe33 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): |