jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Match the sender JID as well as the queryid in MAM results

Browse Source
This commit is contained in:
mathieui 2019-09-10 23:13:04 +02:00
parent 5d5e5cda19
commit e58988484a
No known key found for this signature in database
GPG Key ID: C59F84CEEFD616E3
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
slixmpp/plugins/xep_0313/mam.py
View File

@ -14,7 +14,7 @@ from typing import Any, Dict, Callable, Optional, Awaitable
from slixmpp import JID from slixmpp import JID
from slixmpp.stanza import Message, Iq from slixmpp.stanza import Message, Iq
from slixmpp.xmlstream.handler import Collector from slixmpp.xmlstream.handler import Collector
from slixmpp.xmlstream.matcher import StanzaPath from slixmpp.xmlstream.matcher import MatchXMLMask
from slixmpp.xmlstream import register_stanza_plugin from slixmpp.xmlstream import register_stanza_plugin
from slixmpp.plugins import BasePlugin from slixmpp.plugins import BasePlugin
from slixmpp.plugins.xep_0313 import stanza from slixmpp.plugins.xep_0313 import stanza
@ -87,11 +87,21 @@ class XEP_0313(BasePlugin):
amount = value amount = value
cb_data = {} cb_data = {}
stanza_mask = self.xmpp.Message()
stanza_mask.xml.remove(stanza_mask.xml.find('{urn:xmpp:sid:0}origin-id'))
del stanza_mask['id']
del stanza_mask['lang']
stanza_mask['from'] = jid
stanza_mask['mam_result']['queryid'] = query_id
xml_mask = str(stanza_mask)
def pre_cb(query: Iq) -> None: def pre_cb(query: Iq) -> None:
stanza_mask['mam_result']['queryid'] = query['id']
xml_mask = str(stanza_mask)
query['mam']['queryid'] = query['id'] query['mam']['queryid'] = query['id']
collector = Collector( collector = Collector(
'MAM_Results_%s' % query_id, 'MAM_Results_%s' % query_id,
StanzaPath('message/mam_result@queryid=%s' % query['id'])) MatchXMLMask(xml_mask))
self.xmpp.register_handler(collector) self.xmpp.register_handler(collector)
cb_data['collector'] = collector cb_data['collector'] = collector
@ -107,7 +117,7 @@ class XEP_0313(BasePlugin):
collector = Collector( collector = Collector(
'MAM_Results_%s' % query_id, 'MAM_Results_%s' % query_id,
StanzaPath('message/mam_result@queryid=%s' % query_id)) MatchXMLMask(xml_mask))
self.xmpp.register_handler(collector) self.xmpp.register_handler(collector)
def wrapped_cb(iq: Iq) -> None: def wrapped_cb(iq: Iq) -> None: