summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormathieui <mathieui@mathieui.net>2018-02-11 19:53:38 +0100
committermathieui <mathieui@mathieui.net>2018-02-11 19:53:38 +0100
commit87ed4aff12e6251ced6a34e50fe643b84e60790f (patch)
treeeb97f7d55d9240ae59bc1ee3dfc927b71932c675
parent957ee8084d89d5437d047aa3fef734fe005497c4 (diff)
downloadpoezio-87ed4aff12e6251ced6a34e50fe643b84e60790f.tar.gz
poezio-87ed4aff12e6251ced6a34e50fe643b84e60790f.tar.bz2
poezio-87ed4aff12e6251ced6a34e50fe643b84e60790f.tar.xz
poezio-87ed4aff12e6251ced6a34e50fe643b84e60790f.zip
Fix the nick conflict code
also yapf -rip
-rw-r--r--poezio/core/core.py5
-rw-r--r--poezio/core/handlers.py8
2 files changed, 9 insertions, 4 deletions
diff --git a/poezio/core/core.py b/poezio/core/core.py
index fc76be9b..8089408c 100644
--- a/poezio/core/core.py
+++ b/poezio/core/core.py
@@ -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(
diff --git a/poezio/core/handlers.py b/poezio/core/handlers.py
index 626f2093..60cf405d 100644
--- a/poezio/core/handlers.py
+++ b/poezio/core/handlers.py
@@ -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