From 28ce49dcaaa1f7e958e09aff2af7d1e956796ad9 Mon Sep 17 00:00:00 2001
From: mathieui <mathieui@mathieui.net>
Date: Fri, 29 Jun 2018 21:18:09 +0200
Subject: Update poezio for the new tabs module

---
 poezio/core/completions.py | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

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

diff --git a/poezio/core/completions.py b/poezio/core/completions.py
index c86e3514..331ab553 100644
--- a/poezio/core/completions.py
+++ b/poezio/core/completions.py
@@ -25,7 +25,7 @@ class CompletionCore:
     def help(self, the_input):
         """Completion for /help."""
         commands = sorted(self.core.commands.keys()) + sorted(
-            self.core.current_tab().commands.keys())
+            self.core.tabs.current_tab.commands.keys())
         return Completion(the_input.new_completion, commands, 1, quotify=False)
 
     def status(self, the_input):
@@ -47,7 +47,8 @@ class CompletionCore:
         if arg == 1:
             to_suggest = []
             for bookmark in self.core.bookmarks:
-                tab = self.core.get_tab_by_name(bookmark.jid, tabs.MucTab)
+                tab = self.core.tabs.by_name_and_class(bookmark.jid,
+                                                       tabs.MucTab)
                 if tab is not None and tab.joined:
                     to_suggest.append(bookmark.jid)
             return Completion(
@@ -121,7 +122,7 @@ class CompletionCore:
                      for elem in self.core.bookmarks]
         to_suggest = []
         for bookmark in bookmarks:
-            tab = self.core.get_tab_by_name(bookmark, tabs.MucTab)
+            tab = self.core.tabs.by_name_and_class(bookmark, tabs.MucTab)
             if not tab or (tab and not tab.joined):
                 to_suggest.append(bookmark)
         relevant_rooms.extend(sorted(to_suggest))
@@ -134,8 +135,8 @@ class CompletionCore:
             serv_list = []
             for tab in self.core.get_tabs(tabs.MucTab):
                 if tab.joined:
-                    serv_list.append('%s@%s' % (jid.user,
-                                                safeJID(tab.name).host))
+                    serv_list.append(
+                        '%s@%s' % (jid.user, safeJID(tab.name).host))
             serv_list.extend(relevant_rooms)
             return Completion(
                 the_input.new_completion, serv_list, 1, quotify=True)
@@ -183,7 +184,7 @@ class CompletionCore:
         """
         list_ = []
         list_.extend(self.core.key_func.keys())
-        list_.extend(self.core.current_tab().key_func.keys())
+        list_.extend(self.core.tabs.current_tab.key_func.keys())
         return Completion(the_input.new_completion, list_, 1, quotify=False)
 
     def bookmark(self, the_input):
@@ -202,7 +203,7 @@ class CompletionCore:
         jid = safeJID(args[1])
 
         if jid.server and (jid.resource or jid.full.endswith('/')):
-            tab = self.core.get_tab_by_name(jid.bare, tabs.MucTab)
+            tab = self.core.tabs.by_name_and_class(jid.bare, tabs.MucTab)
             nicks = [tab.own_nick] if tab else []
             default = os.environ.get('USER') if os.environ.get(
                 'USER') else 'poezio'
@@ -434,7 +435,7 @@ class CompletionCore:
         jid = safeJID(args[1])
 
         if jid.server and (jid.resource or jid.full.endswith('/')):
-            tab = self.core.get_tab_by_name(jid.bare, tabs.MucTab)
+            tab = self.core.tabs.by_name_and_class(jid.bare, tabs.MucTab)
             nicks = [tab.own_nick] if tab else []
             default = os.environ.get('USER') if os.environ.get(
                 'USER') else 'poezio'
-- 
cgit v1.2.3