From 0b7e5b490b05632528c22be5ff2c8a2e28e44f0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20H=C3=B6rist?= Date: Sun, 2 Jul 2023 09:09:47 +0200 Subject: cfix: Revert: Simplify determining remote jid --- nbxmpp/modules/message.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/nbxmpp/modules/message.py b/nbxmpp/modules/message.py index c653c15..2ca79bc 100644 --- a/nbxmpp/modules/message.py +++ b/nbxmpp/modules/message.py @@ -42,9 +42,16 @@ class BaseMessage(BaseModule): def _process_message_base(self, _client, stanza, properties): properties.type = self._parse_type(stanza) - own_jid = self._client.get_bound_jid() - if own_jid.bare_match(stanza.getFrom()): + if properties.is_carbon_message and properties.carbon.is_sent: properties.jid = stanza.getTo() + + elif properties.is_mam_message and not properties.type.is_groupchat: + own_jid = self._client.get_bound_jid() + if own_jid.bare_match(stanza.getFrom()): + properties.jid = stanza.getTo() + else: + properties.jid = stanza.getFrom() + else: properties.jid = stanza.getFrom() -- cgit v1.2.3