diff src/plugins/plugin_xep_0277.py @ 1741:cc31dd72526d

plugin misc_extra_pep: use a user parameter (jids_list) instead of a general configuration value
author souliane <souliane@mailoo.org>
date Fri, 11 Dec 2015 09:12:11 +0100
parents 56fa4e7e158c
children 6fd0881fe1fc
line wrap: on
line diff
--- a/src/plugins/plugin_xep_0277.py	Tue Dec 15 14:12:19 2015 +0100
+++ b/src/plugins/plugin_xep_0277.py	Fri Dec 11 09:12:11 2015 +0100
@@ -654,12 +654,13 @@
             jids_set = client.roster.getJidsSet(publishers_type, publishers)
             if publishers_type == C.ALL:
                 try:  # display messages from salut-a-toi@libervia.org or other PEP services
-                    services = self.host.plugins["EXTRA-PEP"].getConfig("get_items_from_list")
+                    services = self.host.plugins["EXTRA-PEP"].getFollowedEntities(profile_key)
                 except KeyError:
-                    pass
+                    pass  # plugin is not loaded
                 else:
-                    log.debug("Items from the following extra PEP services will be requested as well: %s" % ", ".join(services))
-                    jids_set.update([jid.JID(service) for service in services])
+                    if services:
+                        log.debug("Extra PEP followed entities: %s" % ", ".join([unicode(service) for service in services]))
+                        jids_set.update(services)
 
         node_data = []
         for jid_ in jids_set: