Unverified Commit 87ed4aff authored by mathieui's avatar mathieui

Fix the nick conflict code

also yapf -rip
parent 957ee808
......@@ -2114,8 +2114,9 @@ class Core(object):
tab.add_message(msg, typ=2)
if code == '409':
if config.get('alternative_nickname') != '':
tab.own_nick += config.get('alternative_nickname')
tab.join()
if not tab.joined:
tab.own_nick += config.get('alternative_nickname')
tab.join()
else:
if not tab.joined:
tab.add_message(
......
......@@ -415,7 +415,8 @@ class HandlerCore:
result = yield from self.core.xmpp[
'xep_0084'].retrieve_avatar(
jid, avatar_hash, timeout=60)
avatar = result['pubsub']['items']['item']['avatar_data']['value']
avatar = result['pubsub']['items']['item']['avatar_data'][
'value']
if sha1(avatar).hexdigest().lower() != avatar_hash.lower():
raise Exception('Avatar sha1 doesn’t match 0084 hash.')
contact.avatar = avatar
......@@ -433,7 +434,10 @@ class HandlerCore:
with open(cached_path, 'wb') as avatar_file:
avatar_file.write(contact.avatar)
except OSError:
log.debug('Failed writing %s avatar to cache:', jid, exc_info=True)
log.debug(
'Failed writing %s avatar to cache:',
jid,
exc_info=True)
pass
return
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment