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

Merge pull request #1852 from matrix-org/paul/issue-1382 

Don't clobber a displayname or avatar_url if provided by an m.room.member event
This commit is contained in:
Paul Evans 2017-01-25 18:15:19 +00:00 committed by GitHub
parent ba8e144554 10e48d8310
commit e978247fe5
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
synapse/handlers/message.py
View File

@ -208,8 +208,10 @@ class MessageHandler(BaseHandler):
content = builder.content content = builder.content
try: try:
content["displayname"] = yield profile.get_displayname(target) if "displayname" not in content:
content["avatar_url"] = yield profile.get_avatar_url(target) 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: except Exception as e:
logger.info( logger.info(
"Failed to get profile information for %r: %s", "Failed to get profile information for %r: %s",