1
0

Better errors regarding changing avatar_url (#6497)

* commit '5e8abe901':
  Better errors regarding changing avatar_url (#6497)
This commit is contained in:
Andrew Morgan
2020-03-19 17:46:16 +00:00
2 changed files with 9 additions and 3 deletions

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

@@ -0,0 +1 @@
Fix error message when setting your profile's avatar URL mentioning displaynames, and prevent NoneType avatar_urls.

View File

@@ -122,11 +122,16 @@ class ProfileAvatarURLRestServlet(RestServlet):
content = parse_json_object_from_request(request)
try:
new_name = content["avatar_url"]
new_avatar_url = content.get("avatar_url")
except Exception:
return 400, "Unable to parse name"
return 400, "Unable to parse avatar_url"
await self.profile_handler.set_avatar_url(user, requester, new_name, is_admin)
if new_avatar_url is None:
return 400, "Missing required key: avatar_url"
await self.profile_handler.set_avatar_url(
user, requester, new_avatar_url, is_admin
)
if self.hs.config.shadow_server:
shadow_user = UserID(user.localpart, self.hs.config.shadow_server.get("hs"))