Philipp Hörist pushed to branch master at gajim / python-nbxmpp
Commits:
0b7e5b49 by Philipp Hörist at 2023-07-02T09:10:10+02:00
cfix: Revert: Simplify determining remote jid
- - - - -
1 changed file:
- nbxmpp/modules/message.py
Changes:
=====================================
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()
View it on GitLab:
https://dev.gajim.org/gajim/python-nbxmpp/-/commit/0b7e5b490b05632528c22be5ff2c8a2e28e44f0c
--
View it on GitLab:
https://dev.gajim.org/gajim/python-nbxmpp/-/commit/0b7e5b490b05632528c22be5ff2c8a2e28e44f0c
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
