diff options
| author | Maxime Buquet <pep@bouah.net> | 2019-08-23 00:03:07 +0200 |
|---|---|---|
| committer | Maxime Buquet <pep@bouah.net> | 2019-08-23 00:03:07 +0200 |
| commit | 2249d878d1f9786cd86a859baad27261d1351ded (patch) | |
| tree | 7aa52d7b526fe1be590dd54ab8cb1a85cf0cfdb9 | |
| parent | d618f55dea4d3b421373ec24782ebfdbd75ef223 (diff) | |
| parent | 89fa9dc1dd1907e3af58bf8988971b670520eb3a (diff) | |
| download | slixmpp-2249d878d1f9786cd86a859baad27261d1351ded.tar.gz slixmpp-2249d878d1f9786cd86a859baad27261d1351ded.tar.bz2 slixmpp-2249d878d1f9786cd86a859baad27261d1351ded.tar.xz slixmpp-2249d878d1f9786cd86a859baad27261d1351ded.zip | |
Merge branch 'mam' into 'master'
Removed assigning 'reverse' value to the 'before' tag
See merge request poezio/slixmpp!25
| -rw-r--r-- | slixmpp/plugins/xep_0059/rsm.py | 1 | ||||
| -rw-r--r-- | slixmpp/plugins/xep_0313/mam.py | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/slixmpp/plugins/xep_0059/rsm.py b/slixmpp/plugins/xep_0059/rsm.py index 0729c966..00241cbb 100644 --- a/slixmpp/plugins/xep_0059/rsm.py +++ b/slixmpp/plugins/xep_0059/rsm.py @@ -79,7 +79,6 @@ class ResultIterator: """ if self._stop: raise StopAsyncIteration - self.query[self.interface]['rsm']['before'] = self.reverse self.query['id'] = self.query.stream.new_id() self.query[self.interface]['rsm']['max'] = str(self.amount) diff --git a/slixmpp/plugins/xep_0313/mam.py b/slixmpp/plugins/xep_0313/mam.py index 8abd6b7e..f78b62fa 100644 --- a/slixmpp/plugins/xep_0313/mam.py +++ b/slixmpp/plugins/xep_0313/mam.py @@ -41,7 +41,7 @@ class XEP_0313(BasePlugin): register_stanza_plugin(stanza.MAM, self.xmpp['xep_0059'].stanza.Set) register_stanza_plugin(stanza.Fin, self.xmpp['xep_0059'].stanza.Set) - def retrieve(self, jid=None, start=None, end=None, before=None, with_jid=None, ifrom=None, + def retrieve(self, jid=None, start=None, end=None, with_jid=None, ifrom=None, reverse=False, timeout=None, callback=None, iterator=False, rsm=None): iq = self.xmpp.Iq() query_id = iq['id'] @@ -52,7 +52,6 @@ class XEP_0313(BasePlugin): iq['mam']['queryid'] = query_id iq['mam']['start'] = start iq['mam']['end'] = end - iq['mam']['rsm']['before'] = before iq['mam']['with'] = with_jid if rsm: for key, value in rsm.items(): |