diff options
author | Matthew Hodgson <matthew@matrix.org> | 2015-12-17 23:04:20 +0000 |
---|---|---|
committer | Matthew Hodgson <matthew@matrix.org> | 2015-12-17 23:04:20 +0000 |
commit | 772ad4f71503866842eb9033b220b757ef20e711 (patch) | |
tree | 1606727ddb6aebf3798b6b26c9572fd4d1c6eca5 | |
parent | Merge pull request #448 from matrix-org/daniel/3pid (diff) | |
download | synapse-772ad4f71503866842eb9033b220b757ef20e711.tar.xz |
stop generating default identicons. reverts most of 582019f870adbc4a8a8a9ef97b527e0fead77761 and solves vector-web/vector-im#346
Diffstat (limited to '')
-rw-r--r-- | synapse/handlers/register.py | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py index a037da0f70..8a365c20f9 100644 --- a/synapse/handlers/register.py +++ b/synapse/handlers/register.py @@ -132,25 +132,9 @@ class RegistrationHandler(BaseHandler): raise RegistrationError( 500, "Cannot generate user ID.") - # create a default avatar for the user - # XXX: ideally clients would explicitly specify one, but given they don't - # and we want consistent and pretty identicons for random users, we'll - # do it here. - try: - auth_user = UserID.from_string(user_id) - media_repository = self.hs.get_resource_for_media_repository() - identicon_resource = media_repository.getChildWithDefault("identicon", None) - upload_resource = media_repository.getChildWithDefault("upload", None) - identicon_bytes = identicon_resource.generate_identicon(user_id, 320, 320) - content_uri = yield upload_resource.create_content( - "image/png", None, identicon_bytes, len(identicon_bytes), auth_user - ) - profile_handler = self.hs.get_handlers().profile_handler - profile_handler.set_avatar_url( - auth_user, auth_user, ("%s#auto" % (content_uri,)) - ) - except NotImplementedError: - pass # make tests pass without messing around creating default avatars + # We used to generate default identicons here, but nowadays + # we want clients to generate their own as part of their branding + # rather than there being consistent matrix-wide ones, so we don't. defer.returnValue((user_id, token)) |