stonewareslord/telematrix
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Handle users without profile pictures correctly

Browse Source
This commit is contained in:
Max Sandholm 2017-04-04 00:07:07 +03:00
parent fc65d5f0f5
commit 15e84f6861
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
telematrix/__init__.py
View File

@ -471,14 +471,20 @@ async def update_matrix_displayname_avatar(tg_user):
await matrix_put('client', 'profile/{}/displayname'.format(user_id), user_id, {'displayname': name}) await matrix_put('client', 'profile/{}/displayname'.format(user_id), user_id, {'displayname': name})
db_user.name = name db_user.name = name
if db_user.profile_pic_id != pp_file_id: if db_user.profile_pic_id != pp_file_id:
pp_uri, _ = await upload_tgfile_to_matrix(pp_file_id, user_id) if pp_file_id:
await matrix_put('client', 'profile/{}/avatar_url'.format(user_id), user_id, {'avatar_url':pp_uri}) pp_uri, _ = await upload_tgfile_to_matrix(pp_file_id, user_id)
await matrix_put('client', 'profile/{}/avatar_url'.format(user_id), user_id, {'avatar_url':pp_uri})
else:
await matrix_put('client', 'profile/{}/avatar_url'.format(user_id), user_id, {'avatar_url':None})
db_user.profile_pic_id = pp_file_id db_user.profile_pic_id = pp_file_id
else: else:
db_user = db.TgUser(tg_user['id'], name, pp_file_id) db_user = db.TgUser(tg_user['id'], name, pp_file_id)
await matrix_put('client', 'profile/{}/displayname'.format(user_id), user_id, {'displayname': name}) await matrix_put('client', 'profile/{}/displayname'.format(user_id), user_id, {'displayname': name})
pp_uri, _ = await upload_tgfile_to_matrix(pp_file_id, user_id) if pp_file_id:
await matrix_put('client', 'profile/{}/avatar_url'.format(user_id), user_id, {'avatar_url':pp_uri}) pp_uri, _ = await upload_tgfile_to_matrix(pp_file_id, user_id)
await matrix_put('client', 'profile/{}/avatar_url'.format(user_id), user_id, {'avatar_url':pp_uri})
else:
await matrix_put('client', 'profile/{}/avatar_url'.format(user_id), user_id, {'avatar_url':None})
db.session.add(db_user) db.session.add(db_user)
db.session.commit() db.session.commit()