sat_tmp: wokkel/mam.py comparison

comparison wokkel/mam.py @ 3:7eb4d15650dc

tmp: update wokkel MAM implementation

author	souliane <souliane@mailoo.org>
date	Thu, 15 Jan 2015 21:02:41 +0100
parents	4369549244e8
children	66a7586e49f8

comparison

equal deleted inserted replaced

-:4369549244e8
+:7eb4d15650dc
 This protocol is specified in
 U{XEP-0313<http://xmpp.org/extensions/xep-0313.html>}.
 """
 from dateutil.tz import tzutc
 from zope.interface import Interface, implements
 from twisted.words.protocols.jabber.xmlstream import IQ, toResponse
 from twisted.words.xish import domish
 from twisted.words.protocols.jabber import jid
+from twisted.python import log
 from wokkel.subprotocols import IQHandlerMixin, XMPPHandler
-from wokkel import disco, data_form
+from wokkel import disco, data_form, delay
 import rsm
 NS_MAM = 'urn:xmpp:mam:0'
+NS_FORWARD = 'urn:xmpp:forward:0'
 FIELDS_REQUEST = "/iq[@type='get']/query[@xmlns='%s']" % NS_MAM
 ARCHIVE_REQUEST = "/iq[@type='set']/query[@xmlns='%s']" % NS_MAM
 PREFS_GET_REQUEST = "/iq[@type='get']/prefs[@xmlns='%s']" % NS_MAM
 PREFS_SET_REQUEST = "/iq[@type='set']/prefs[@xmlns='%s']" % NS_MAM
 form = None
 rsm = None
 node = None
 def __init__(self, form=None, rsm=None, node=None):
+if form is not None:
+assert(form.formType == 'submit')
 self.form = form
 self.rsm = rsm
 self.node = node
 @classmethod
 return iq.send(to=service.full() if service else None)
 class IMAMResource(Interface):
-def onArchiveRequest(self, mam, rsm, requestor):
+def onArchiveRequest(self, mam, requestor):
 """
 @param mam: The MAM <query/> request.
 @type mam: L{MAMQueryReques<wokkel.mam.MAMQueryRequest>}
-@param rsm: The RSM request.
-@type rsm: L{RSMRequest<wokkel.rsm.RSMRequest>}
 @param requestor: JID of the requestor.
 @type requestor: L{JID<twisted.words.protocols.jabber.jid.JID>}
 @return: The RSM answer.
 'label': 'Entity',
 'desc': 'Entity against which to match message.',
 },
 }
-extra_filters = []
+extra_filters = {}
 def __init__(self, resource):
 """
 @param resource: instance implementing IMAMResource
 @type resource: L{object}
 @param field: dictionary specifying the attributes to build a
 wokkel.data_form.Field.
 @type field: C{dict}
 """
-self.extra_filters.append(field)
+self.extra_filters[field.var] = field
 def _onFieldsRequest(self, iq):
 """
 Called when a fields request has been received.
 """
 response = toResponse(iq, 'result')
 self.xmlstream.send(response)
 mam_ = MAMQueryRequest.parse(iq.query)
-try:
-rsm_ = rsm.RSMRequest.parse(iq.query)
-except rsm.RSMNotFoundError:
-rsm_ = None
 requestor = jid.JID(iq['from'])
-rsm_response = self.resource.onArchiveRequest(mam_, rsm_, requestor)
+# remove unsupported filters
-msg = domish.Element((None, 'message'))
+unsupported_fields = []
-fin = msg.addElement('fin', NS_MAM)
+if mam_.form:
-if iq.hasAttribute('queryid'):
+for key, field in mam_.form.fields.iteritems():
-fin['queryid'] = iq.query['queryid']
+if key not in self._legacyFilters and key not in self.extra_filters:
-if rsm_response is not None:
+log.msg('Ignored unsupported MAM filter: %s' % field)
-fin.addChild(rsm_response.toElement())
+unsupported_fields.append(key)
-self.xmlstream.send(msg)
+for key in unsupported_fields:
+del mam_.form.fields[key]
+def forward_message(id_, elt, date):
+msg = domish.Element((None, 'message'))
+msg['to'] = iq['from']
+result = msg.addElement('result', NS_MAM)
+if iq.hasAttribute('queryid'):
+result['queryid'] = iq.query['queryid']
+result['id'] = id_
+forward = result.addElement('forwarded', NS_FORWARD)
+forward.addChild(delay.Delay(date).toElement())
+forward.addChild(elt)
+self.xmlstream.send(msg)
+def cb(result):
+msg_data, rsm_elt = result
+for data in msg_data:
+forward_message(*data)
+msg = domish.Element((None, 'message'))
+msg['to'] = iq['from']
+fin = msg.addElement('fin', NS_MAM)
+if iq.hasAttribute('queryid'):
+fin['queryid'] = iq.query['queryid']
+if rsm_elt is not None:
+fin.addChild(rsm_elt)
+self.xmlstream.send(msg)
+self.resource.onArchiveRequest(mam_, requestor).addCallback(cb)
 iq.handled = True
 def _onPrefsGetRequest(self, iq):
 """
 Called when a prefs get request has been received.
 This immediately replies with a result response.
 """
 response = toResponse(iq, 'result')
 requestor = jid.JID(iq['from'])
-prefs = self.resource.onPrefsGetRequest(requestor)
+def cb(prefs):
 response.addChild(prefs.toElement())
 self.xmlstream.send(response)
+self.resource.onPrefsGetRequest(requestor).addCallback(cb)
 iq.handled = True
 def _onPrefsSetRequest(self, iq):
 """
 Called when a prefs get request has been received.
 """
 response = toResponse(iq, 'result')
 prefs = MAMPrefs.parse(iq.prefs)
 requestor = jid.JID(iq['from'])
-prefs = self.resource.onPrefsSetRequest(prefs, requestor)
+def cb(prefs):
 response.addChild(prefs.toElement())
 self.xmlstream.send(response)
+self.resource.onPrefsSetRequest(prefs, requestor).addCallback(cb)
 iq.handled = True
 def getDiscoInfo(self, requestor, target, nodeIdentifier=''):
 return [disco.DiscoFeature(NS_MAM)]

Mercurial > sat_tmp

comparison wokkel/mam.py @ 3:7eb4d15650dc