From 81ce08d2bedd8adf90e189ec87d0fdd4ac41db3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maxime=20=E2=80=9Cpep=E2=80=9D=20Buquet?= <pep@bouah.net>
Date: Thu, 24 Mar 2022 16:08:26 +0100
Subject: [PATCH] Let's actually wait that poezio is released to remove MUC
 workaround.

This reverts commit 91e52cb724b8d5c8633f2dc6106daf9cee74d505.
---
 poezio_omemo/__init__.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/poezio_omemo/__init__.py b/poezio_omemo/__init__.py
index 87fc9e5..af6dc93 100644
--- a/poezio_omemo/__init__.py
+++ b/poezio_omemo/__init__.py
@@ -155,6 +155,15 @@ class Plugin(E2EEPlugin):
             self.display_error('Unable to decrypt the message.')
             return None
 
+        # XXX: This is only needed to workaround a bug in poezio (fixed in
+        # 00a91774) that makes it not give us realjids. Remove when there is a
+        # poezio release including it.
+        # The realjid of the participant needs to be retrieved in a MUC.
+        if isinstance(tab, MucTab):
+            user = tab.get_user_by_name(jid.resource)
+            if user is not None and user.jid != JID(''):
+                jid = user.jid
+
         body = None
         try:
             encrypted = message['omemo_encrypted']