Philipp Hörist pushed to branch master at gajim / gajim
Commits:
6fc27014 by Philipp Hörist at 2024-04-12T23:53:04+02:00
cfix: ChatBanner: Don’t fail if there is no resource set
- - - - -
3b5f46b9 by Philipp Hörist at 2024-04-12T23:54:20+02:00
cfix: Message: Accept messages without id
- - - - -
2 changed files:
- gajim/common/modules/message.py
- gajim/gtk/chat_banner.py
Changes:
=====================================
gajim/common/modules/message.py
=====================================
@@ -23,6 +23,7 @@
from gajim.common.events import MessageReceived
from gajim.common.events import MessageSent
from gajim.common.events import RawMessageReceived
+from gajim.common.helpers import get_uuid
from gajim.common.modules.base import BaseModule
from gajim.common.modules.contacts import GroupchatParticipant
from gajim.common.modules.misc import parse_oob
@@ -135,7 +136,9 @@ def _message_received(self,
if message_id is None:
self._log.warning('Received message without message id')
self._log.warning(stanza)
- return
+ # TODO: Make Gajim not depend on a message_id being present
+ message_id = get_uuid()
+ self._log.warning('Generating id')
stanza_id = self._get_stanza_id(properties)
=====================================
gajim/gtk/chat_banner.py
=====================================
@@ -234,7 +234,9 @@ def _on_message_received(self, event: MessageReceived) ->
None:
if message.direction == ChatDirection.OUTGOING:
return
- assert message.resource is not None
+ if message.resource is None:
+ return
+
assert isinstance(self._contact, BareContact)
resource_contact = self._contact.get_resource(message.resource)
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/f1dbec4ff5bb89f8524584841d9827030c180729...3b5f46b95d41063885800187212ca35b6dc026ef
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/f1dbec4ff5bb89f8524584841d9827030c180729...3b5f46b95d41063885800187212ca35b6dc026ef
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]
