Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Don't clobber a displayname or avatar_url if provided by an m.room.member event #1852

Merged
merged 1 commit into from
Jan 25, 2017
Merged

Don't clobber a displayname or avatar_url if provided by an m.room.member event #1852

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions synapse/handlers/message.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,10 @@ def create_event(self, event_dict, token_id=None, txn_id=None, prev_event_ids=No
content = builder.content

try:
content["displayname"] = yield profile.get_displayname(target)
content["avatar_url"] = yield profile.get_avatar_url(target)
if "displayname" not in content:
content["displayname"] = yield profile.get_displayname(target)
if "avatar_url" not in content:
content["avatar_url"] = yield profile.get_avatar_url(target)
except Exception as e:
logger.info(
"Failed to get profile information for %r: %s",
Expand Down