mypy: Type some more things

This lets us pass under mypy 0.971, and is yet another step towards
mypyc compatibility perhaps.

5 files changed, 12 insertions, 12 deletions

diff --git a/poezio/tabs/basetabs.py b/poezio/tabs/basetabs.py
index de88a6d1..793eae62 100644
--- a/poezio/tabs/basetabs.py
+++ b/poezio/tabs/basetabs.py
@@ -170,15 +170,15 @@ class Tab:
         return 1
 
     @property
-    def info_win(self):
+    def info_win(self) -> windows.TextWin:
         return self.core.information_win
 
     @property
-    def color(self):
+    def color(self) -> Union[Tuple[int, int], Tuple[int, int, 'str']]:
         return STATE_COLORS[self._state]()
 
     @property
-    def vertical_color(self):
+    def vertical_color(self) -> Union[Tuple[int, int], Tuple[int, int, 'str']]:
         return VERTICAL_STATE_COLORS[self._state]()
 
     @property
@@ -492,7 +492,7 @@ class GapTab(Tab):
         return 0
 
     @property
-    def name(self):
+    def name(self) -> str:
         return ''
 
     def refresh(self):
diff --git a/poezio/tabs/conversationtab.py b/poezio/tabs/conversationtab.py
index f6b5708b..de1f988a 100644
--- a/poezio/tabs/conversationtab.py
+++ b/poezio/tabs/conversationtab.py
@@ -83,8 +83,8 @@ class ConversationTab(OneToOneTab):
         self.update_keys()
 
     @property
-    def general_jid(self):
-        return self.jid.bare
+    def general_jid(self) -> JID:
+        return JID(self.jid.bare)
 
     def get_info_header(self):
         raise NotImplementedError
diff --git a/poezio/tabs/muctab.py b/poezio/tabs/muctab.py
index e2c27ab1..e2d546c9 100644
--- a/poezio/tabs/muctab.py
+++ b/poezio/tabs/muctab.py
@@ -556,7 +556,7 @@ class MucTab(ChatTab):
         """
         replaced_id = message.message['replace']['id']
         if replaced_id != '' and config.get_by_tabname(
-                'group_corrections', message.room_from):
+                'group_corrections', JID(message.room_from)):
             try:
                 delayed_date = message.date or datetime.now()
                 modify_hl = self.modify_message(
diff --git a/poezio/tabs/privatetab.py b/poezio/tabs/privatetab.py
index b6c06f2a..1909e3c1 100644
--- a/poezio/tabs/privatetab.py
+++ b/poezio/tabs/privatetab.py
@@ -85,14 +85,14 @@ class PrivateTab(OneToOneTab):
         return super().remote_user_color()
 
     @property
-    def general_jid(self):
+    def general_jid(self) -> JID:
         return self.jid
 
-    def get_dest_jid(self):
+    def get_dest_jid(self) -> JID:
         return self.jid
 
     @property
-    def nick(self):
+    def nick(self) -> str:
         return self.get_nick()
 
     def ack_message(self, msg_id: str, msg_jid: JID):
diff --git a/poezio/tabs/rostertab.py b/poezio/tabs/rostertab.py
index 66aff2b1..18334c20 100644
--- a/poezio/tabs/rostertab.py
+++ b/poezio/tabs/rostertab.py
@@ -14,7 +14,7 @@ import ssl
 from functools import partial
 from os import getenv, path
 from pathlib import Path
-from typing import Dict, Callable
+from typing import Dict, Callable, Union
 
 from slixmpp import JID, InvalidJID
 from slixmpp.exceptions import IqError, IqTimeout
@@ -199,7 +199,7 @@ class RosterInfoTab(Tab):
                 completion=self.completion_cert_fetch)
 
     @property
-    def selected_row(self):
+    def selected_row(self) -> Union[Contact, Resource]:
         return self.roster_win.get_selected_row()
 
     @command_args_parser.ignored