libervia-backend: src/plugins/plugin_misc

comparison src/plugins/plugin_misc_groupblog.py @ 707:890fbf2d7fdd

plugin XEP-0277, groupblog: rich text management for receiving microblogs

author	Goffi <goffi@goffi.org>
date	Thu, 14 Nov 2013 18:36:02 +0100
parents	80e9d3ecb272
children	6aa71c853bf5

comparison

equal deleted inserted replaced

-:80e9d3ecb272
+:890fbf2d7fdd
 if (not (origin_host)
 or len(event_host) < len(origin_host)
 or event_host[-len(origin_host):] != origin_host):
 warning("Host incoherence between %s and %s (hack attempt ?)" % (unicode(event.sender),
 unicode(publisher)))
-return
+return False
 client = self.host.getClient(profile)
-for gbdata in self._itemsConstruction(event.items, publisher, client):
+def gbdataManagementMicroblog(gbdata):
-self.host.bridge.personalEvent(publisher.full(), "MICROBLOG", gbdata, profile)
+for gbdatum in gbdata:
+self.host.bridge.personalEvent(publisher.full(), "MICROBLOG", gbdatum, profile)
+d = self._itemsConstruction(event.items, publisher, client)
+d.addCallback(gbdataManagementMicroblog)
 return False
 elif event.nodeIdentifier.startswith(NS_COMMENT_PREFIX):
 # Comment
-for microblog_data in self._handleCommentsItems(event.items, event.sender, event.nodeIdentifier):
+def gbdataManagementComments(gbdata):
-publisher = None # FIXME: see below (_handleCommentsItems)
+for gbdatum in gbdata:
-self.host.bridge.personalEvent(publisher.full() if publisher else microblog_data["author"], "MICROBLOG", microblog_data, profile)
+publisher = None # FIXME: see below (_handleCommentsItems)
+self.host.bridge.personalEvent(publisher.full() if publisher else gbdatum["author"], "MICROBLOG", gbdatum, profile)
+d = self._handleCommentsItems(event.items, event.sender, event.nodeIdentifier)
+d.addCallback(gbdataManagementComments)
 return False
 return True
+@defer.inlineCallbacks
 def _handleCommentsItems(self, items, service, node_identifier):
 """ Convert comments items to groupblog data, and send them as signals
 @param items: comments items
 @param service: jid of the PubSub service used
 @param node_identifier: comments node
 ret = []
 for item in items:
 publisher = "" # FIXME: publisher attribute for item in SàT pubsub is not managed yet, so
 #        publisher is not checked and can be easily spoofed. This need to be fixed
 #        quickly.
-microblog_data = self.item2gbdata(item, "comment")
+microblog_data = yield self.item2gbdata(item, "comment")
 microblog_data["service"] = service.userhost()
 microblog_data["node"] = node_identifier
 microblog_data["verified_publisher"] = "true" if publisher else "false"
 ret.append(microblog_data)
-return ret
+defer.returnValue(ret)
 def _parseAccessData(self, microblog_data, item):
 P = self.host.plugins["XEP-0060"]
 form_elts = [child for child in item.elements() if child.name == "x"]
 for form_elt in form_elts:
 warning("No group found for roster access-model")
 microblog_data["groups"] = ''
 break
+@defer.inlineCallbacks
 def item2gbdata(self, item, _type="main_item"):
 """ Convert item to microblog data dictionary + add access data """
-microblog_data = self.host.plugins["XEP-0277"].item2mbdata(item)
+microblog_data = yield self.host.plugins["XEP-0277"].item2mbdata(item)
 microblog_data["type"] = _type
 self._parseAccessData(microblog_data, item)
-return microblog_data
+defer.returnValue(microblog_data)
 def getNodeName(self, publisher):
 """Retrieve the name of publisher's node
 @param publisher: publisher's jid
 @return: node's name (string)"""
 mblog_data = {'content': message}
 entry_d = self.host.plugins["XEP-0277"].data2entry(mblog_data, profile)
 entry_d.addCallback(lambda mblog_item: self.host.plugins["XEP-0060"].publish(service, node, items=[mblog_item], profile_key=profile))
 return entry_d
+@defer.inlineCallbacks
 def _itemsConstruction(self, items, pub_jid, client):
 """ Transforms items to group blog data and manage comments node
 @param items: iterable of items
 @param pub_jid: jid of the publisher or None to use items data
 @param client: SatXMPPClient instance
-@return: list of group blog data """
+@return: deferred which fire list of group blog data """
 # TODO: use items data when pub_jid is None
 ret = []
 for item in items:
-gbdata = self.item2gbdata(item)
+gbdata = yield self.item2gbdata(item)
 ret.append(gbdata)
 # if there is a comments node, we subscribe to it
 if "comments_node" in gbdata:
 try:
 # every comments node must be subscribed, except if we are the publisher (we are already subscribed in this case)
 if pub_jid.userhostJID() != client.jid.userhostJID():
 self.host.plugins["XEP-0060"].subscribe(jid.JID(gbdata["comments_service"]), gbdata["comments_node"],
 profile_key=client.profile)
 except KeyError:
 warning("Missing key for comments")
-return ret
+defer.returnValue(ret)
 def getLastGroupBlogs(self, pub_jid_s, max_items=10, profile_key='@NONE@'):
 """Get the last published microblogs
 @param pub_jid_s: jid of the publisher
 @param max_items: how many microblogs we want to get (see XEP-0060 #6.5.7)
 else:
 raise UnknownType
 mblogs = []
 for jid_s in jids:
 _jid = jid.JID(jid_s)
 d = self.host.plugins["XEP-0060"].getItems(client.item_access_pubsub, self.getNodeName(_jid),
 max_items=max_items, profile_key=profile_key)
-d.addCallback(lambda items, source_jid: (source_jid, self._itemsConstruction(items, _jid, client)), jid_s)
+d.addCallback(self._itemsConstruction, _jid, client)
+d.addCallback(lambda gbdata, source_jid: (source_jid, gbdata), jid_s)
 mblogs.append(d)
 dlist = defer.DeferredList(mblogs)
 dlist.addCallback(sendResult)

Mercurial > libervia-backend

comparison src/plugins/plugin_misc_groupblog.py @ 707:890fbf2d7fdd