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

Omit displayname or avatar_url if they aren't set instead of returning null #7497

Merged
merged 3 commits into from
May 19, 2020
Merged

Omit displayname or avatar_url if they aren't set instead of returning null #7497

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f84aed7
Omit displayname or avatar_url if they aren't set instead of returnin…
aaronraimist May 14, 2020
92d0d76
Add changelog
aaronraimist May 14, 2020
6ffdfbb
Update changelog.d/7497.bugfix
aaronraimist May 16, 2020
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
1 change: 1 addition & 0 deletions changelog.d/7497.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Omit displayname or avatar_url if they aren't set instead of returning null.
aaronraimist marked this conversation as resolved.
Show resolved Hide resolved
8 changes: 6 additions & 2 deletions synapse/handlers/message.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,9 +484,13 @@ def create_event(

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