From 00a91774fc93a6555120ed61946194d0499063bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20=E2=80=9Cpep=E2=80=9D=20Buquet?= Date: Sat, 17 Jul 2021 02:06:01 +0200 Subject: plugin_e2ee: correctly pass realjid to decrypt call in MUC MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maxime “pep” Buquet --- poezio/plugin_e2ee.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/poezio/plugin_e2ee.py b/poezio/plugin_e2ee.py index c0c2b865..c35e9935 100644 --- a/poezio/plugin_e2ee.py +++ b/poezio/plugin_e2ee.py @@ -378,17 +378,18 @@ class E2EEPlugin(BasePlugin): # fine with this so let them handle it. jid = message['from'] - muctab = None + muctab: Optional[MucTab] = None if isinstance(tab, PrivateTab): muctab = tab.parent_muc jid = None - if isinstance(muctab, MucTab): + if muctab is not None or isinstance(tab, MucTab): + if muctab is None: + muctab = tab # type: ignore nick = message['from'].resource - for user in muctab.users: - if user.nick == nick: - jid = user.jid or None - break + user = muctab.get_user_by_name(nick) # type: ignore + if user is not None: + jid = user.jid or None self.decrypt(message, jid, tab) -- cgit v1.2.3