summaryrefslogtreecommitdiff
path: root/poezio
diff options
context:
space:
mode:
authormathieui <mathieui@mathieui.net>2017-11-28 22:29:37 +0100
committermathieui <mathieui@mathieui.net>2017-11-28 22:29:37 +0100
commit1a1164b9b1596b84e99a9deb0e9ca66c9c1c6b7f (patch)
treeda960dd2e5584a3f2e9dce9a8daf6f40bdee3d02 /poezio
parenta9008d38365c79deef74c3322b152dbedc193fd0 (diff)
downloadpoezio-1a1164b9b1596b84e99a9deb0e9ca66c9c1c6b7f.tar.gz
poezio-1a1164b9b1596b84e99a9deb0e9ca66c9c1c6b7f.tar.bz2
poezio-1a1164b9b1596b84e99a9deb0e9ca66c9c1c6b7f.tar.xz
poezio-1a1164b9b1596b84e99a9deb0e9ca66c9c1c6b7f.zip
Do not use the /join interface on nickname conflict
Therefore do not add bookmarks while doing this, it is wrong.
Diffstat (limited to 'poezio')
-rw-r--r--poezio/core/core.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/poezio/core/core.py b/poezio/core/core.py
index 7678c747..38d564b8 100644
--- a/poezio/core/core.py
+++ b/poezio/core/core.py
@@ -2115,10 +2115,8 @@ class Core(object):
tab.add_message(msg, typ=2)
if code == '409':
if config.get('alternative_nickname') != '':
- self.command.join(
- '%s/%s' %
- (tab.name,
- tab.own_nick + config.get('alternative_nickname')))
+ tab.own_nick += config.get('alternative_nickname')
+ tab.join()
else:
if not tab.joined:
tab.add_message(