diff options
| author | Philipp Hörist <philipp@hoerist.com> | 2023-07-02 10:09:47 +0300 |
|---|---|---|
| committer | Philipp Hörist <philipp@hoerist.com> | 2023-07-02 10:10:10 +0300 |
| commit | 0b7e5b490b05632528c22be5ff2c8a2e28e44f0c (patch) | |
| tree | 0662ac5ee14d4b5b59629bee2011c47edb7a0fca | |
| parent | 5d3d2d609f456029bb3419e085fdd29314120b47 (diff) | |
cfix: Revert: Simplify determining remote jid
| -rw-r--r-- | nbxmpp/modules/message.py | 11 |
1 files 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() |