From afaee7e7ec180f5f0b4c151bf1f0a51fa16f84e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20=E2=80=9Cpep=E2=80=9D=20Buquet?= Date: Thu, 17 Mar 2022 00:13:44 +0100 Subject: plugins/b64: specify supported_tab_types; Fix type in plugin_e2ee MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maxime “pep” Buquet --- plugins/b64.py | 16 +++++++++++++++- poezio/plugin_e2ee.py | 2 +- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/plugins/b64.py b/plugins/b64.py index 3557229c..9b4c4ab3 100644 --- a/plugins/b64.py +++ b/plugins/b64.py @@ -27,7 +27,13 @@ from typing import List, Optional from slixmpp import Message, JID from poezio.plugin_e2ee import E2EEPlugin -from poezio.tabs import ChatTab +from poezio.tabs import ( + ChatTab, + MucTab, + PrivateTab, + DynamicConversationTab, + StaticConversationTab, +) class Plugin(E2EEPlugin): @@ -40,6 +46,14 @@ class Plugin(E2EEPlugin): # This encryption mechanism is using as a container replace_body_with_eme = False + # In what tab is it ok to use this plugin. Here we want all of them + supported_tab_types = ( + MucTab, + PrivateTab, + DynamicConversationTab, + StaticConversationTab, + ) + async def decrypt(self, message: Message, jid: Optional[JID], _tab: Optional[ChatTab]) -> None: """ Decrypt base64 diff --git a/poezio/plugin_e2ee.py b/poezio/plugin_e2ee.py index a6ad6bcd..9381fe76 100644 --- a/poezio/plugin_e2ee.py +++ b/poezio/plugin_e2ee.py @@ -131,7 +131,7 @@ class E2EEPlugin(BasePlugin): _enabled_tabs: Dict[JID, Callable] = {} # Tabs that support this encryption mechanism - supported_tab_types: Tuple[Type[ChatTabs], ...] = tuple() + supported_tab_types: Tuple[Type[ChatTab], ...] = tuple() # States for each remote entity trust_states: Dict[str, Set[str]] = {'accepted': set(), 'rejected': set()} -- cgit v1.2.3