plugin XEP-0060, XEP-0277: added getNodeURI method

This commit is contained in:
Goffi 2016-01-23 19:53:16 +01:00
commit 0815ee1576
2 changed files with 19 additions and 4 deletions

View file

@ -31,6 +31,7 @@ from wokkel import disco
from wokkel import data_form from wokkel import data_form
from zope.interface import implements from zope.interface import implements
from collections import namedtuple from collections import namedtuple
import urllib
import datetime import datetime
from dateutil import tz from dateutil import tz
# XXX: tmp.wokkel.pubsub is actually use instead of wokkel version # XXX: tmp.wokkel.pubsub is actually use instead of wokkel version
@ -400,6 +401,23 @@ class XEP_0060(object):
client = self.host.getClient(profile_key) client = self.host.getClient(profile_key)
return client.pubsub_client.subscriptions(service, nodeIdentifier) return client.pubsub_client.subscriptions(service, nodeIdentifier)
## misc tools ##
def getNodeURI(self, service, node, item=None):
"""Return XMPP URI of a PubSub node
@param service(jid.JID, None): PubSub service,
@param node(unicode): node
@return (unicode): URI of the node
"""
query_data = [('node', node.encode('utf-8'))]
if item is not None:
query_data.append(('item', item.encode('utf-8')))
return "xmpp:{service}?{query}".format(
service=service.userhost(),
query=urllib.urlencode(query_data)
).decode('utf-8')
## methods to manage several stanzas/jids at once ## ## methods to manage several stanzas/jids at once ##
# generic # # generic #

View file

@ -533,10 +533,7 @@ class XEP_0277(object):
if 'comments_node' in mb_data or 'comments_service' in mb_data: if 'comments_node' in mb_data or 'comments_service' in mb_data:
raise exceptions.DataError(u"You can't use comments_service/comments_node and comments at the same time") raise exceptions.DataError(u"You can't use comments_service/comments_node and comments at the same time")
else: else:
mb_data['comments'] = u"xmpp:%(service)s?%(query)s" % { mb_data['comments'] = self._p.getNodeURI(comments_service, comments_node)
'service': comments_service.userhost(),
'query': urllib.urlencode([('node', comments_node.encode('utf-8'))])
}
def _mbSend(self, service, node, data, profile_key): def _mbSend(self, service, node, data, profile_key):
service = jid.JID(service) if service else None service = jid.JID(service) if service else None