Philipp Hörist pushed to branch master at gajim / gajim
Commits:
fe1f2c01 by Philipp Hörist at 2017-07-27T03:33:19+02:00
Dont drop MAM Message on missing stanza-id
A missing stanza ID means, we will have to take some measures to make
sure we get no duplicates in the Database later on.
Also fix getting the origin-id. Third time is a charm.
- - - - -
1 changed file:
- gajim/common/connection_handlers_events.py
Changes:
=====================================
gajim/common/connection_handlers_events.py
=====================================
--- a/gajim/common/connection_handlers_events.py
+++ b/gajim/common/connection_handlers_events.py
@@ -1078,7 +1078,7 @@ class MamMessageReceivedEvent(nec.NetworkIncomingEvent,
HelperEvent):
self.stanza_id = self.msg_.getTag('origin-id',
namespace=nbxmpp.NS_SID)
if self.stanza_id:
- self.stanza_id.getID()
+ self.stanza_id = self.stanza_id.getID()
else:
self.stanza_id = self.msg_.getID()
@@ -1096,8 +1096,7 @@ class MamMessageReceivedEvent(nec.NetworkIncomingEvent,
HelperEvent):
self.resource = frm.getResource()
if not self.stanza_id:
- log.error('Could not retrieve stanza-id')
- return False
+ log.debug('Could not retrieve stanza-id')
# Use timestamp provided by archive,
# Fallback: Use timestamp provided by user and issue a warning
View it on GitLab:
https://dev.gajim.org/gajim/gajim/commit/fe1f2c010383e10496bde4eebc2195557eb2858b
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
