OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Handle a display name / avatar URL not included in a federation request. (#9023) 

These may be omitted if not set, but Synapse assumed they would
be in the response.
pull/9030/head
Patrick Cloke 2021-01-06 07:29:03 -05:00 committed by GitHub
parent c027a199f3
commit 0248409bfa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/9023.bugfix Normal file
View File

@ -0,0 +1 @@
Fix a longstanding issue where an internal server error would occur when requesting a profile over federation that did not include a display name / avatar URL.

4
synapse/handlers/profile.py
View File

@ -156,7 +156,7 @@ class ProfileHandler(BaseHandler):
except HttpResponseException as e: except HttpResponseException as e:
raise e.to_synapse_error() raise e.to_synapse_error()
return result["displayname"] return result.get("displayname")
async def set_displayname( async def set_displayname(
self, self,
@ -246,7 +246,7 @@ class ProfileHandler(BaseHandler):
except HttpResponseException as e: except HttpResponseException as e:
raise e.to_synapse_error() raise e.to_synapse_error()
return result["avatar_url"] return result.get("avatar_url")
async def set_avatar_url( async def set_avatar_url(
self, self,