plugin misc_extra_pep: use a user parameter (jids_list) instead of a general configuration value
This commit is contained in:
parent
9e0b24a4a5
commit
3b84fc1765
1 changed files with 31 additions and 12 deletions
|
|
@ -654,12 +654,13 @@ class XEP_0277(object):
|
|||
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:
|
||||
|
|
|
|||
Loading…
Reference in a new issue