From 1a1164b9b1596b84e99a9deb0e9ca66c9c1c6b7f Mon Sep 17 00:00:00 2001
From: mathieui <mathieui@mathieui.net>
Date: Tue, 28 Nov 2017 22:29:37 +0100
Subject: Do not use the /join interface on nickname conflict

Therefore do not add bookmarks while doing this, it is wrong.
---
 poezio/core/core.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'poezio/core/core.py')

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(
-- 
cgit v1.2.3