Merge pull request #450 from matrix-org/matthew/no-identicons

Matthew/no identicons
This commit is contained in:
Matthew Hodgson 2015-12-18 18:14:06 +00:00
commit c8ea2d5b1f

View File

@ -132,25 +132,9 @@ class RegistrationHandler(BaseHandler):
raise RegistrationError( raise RegistrationError(
500, "Cannot generate user ID.") 500, "Cannot generate user ID.")
# create a default avatar for the user # We used to generate default identicons here, but nowadays
# XXX: ideally clients would explicitly specify one, but given they don't # we want clients to generate their own as part of their branding
# and we want consistent and pretty identicons for random users, we'll # rather than there being consistent matrix-wide ones, so we don't.
# 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
defer.returnValue((user_id, token)) defer.returnValue((user_id, token))