aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Daemon
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2021-09-05 11:11:51 +0000
committerMario <mario@mariovavti.com>2021-09-05 11:11:51 +0000
commit18cd3926d7a0875e5dcc1f2a1bc49db9eefbeed3 (patch)
tree9d73273cadd311104c12da9af5efa414208df306 /Zotlabs/Daemon
parent0e1e1cda7ab78baff4f960580c2a0fa92f97c0eb (diff)
downloadvolse-hubzilla-18cd3926d7a0875e5dcc1f2a1bc49db9eefbeed3.tar.gz
volse-hubzilla-18cd3926d7a0875e5dcc1f2a1bc49db9eefbeed3.tar.bz2
volse-hubzilla-18cd3926d7a0875e5dcc1f2a1bc49db9eefbeed3.zip
omit deleted hublocs in get_actor_hublocs() and use Activity::get_actor_collections() to get collections. Fallback to xconfig->collections if Activity::get_actor_collections() does not return anything yet.
Diffstat (limited to 'Zotlabs/Daemon')
-rw-r--r--Zotlabs/Daemon/Onepoll.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/Zotlabs/Daemon/Onepoll.php b/Zotlabs/Daemon/Onepoll.php
index 4aebf64b0..5374f49d5 100644
--- a/Zotlabs/Daemon/Onepoll.php
+++ b/Zotlabs/Daemon/Onepoll.php
@@ -126,7 +126,10 @@ class Onepoll {
$max = intval(get_config('system', 'max_imported_posts', 30));
if (intval($max)) {
- $cl = get_xconfig($contact['abook_xchan'], 'activitypub', 'collections');
+ $cl = Activity::get_actor_collections($contact['abook_xchan']);
+ if(empty($cl)) {
+ $cl = get_xconfig($contact['abook_xchan'], 'activitypub', 'collections');
+ }
if (is_array($cl) && array_key_exists('outbox', $cl)) {
$url = $cl['outbox'];