aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2024-01-14 10:11:20 +0000
committerMario <mario@mariovavti.com>2024-01-14 10:11:20 +0000
commit2bbecfe8dd44bd51a3425ee667859946f6ac0763 (patch)
tree833cca35c795563f3028328a43f0341562b0d8ac
parente078e133257aca1f1508382135ea342cc751c96d (diff)
downloadvolse-hubzilla-2bbecfe8dd44bd51a3425ee667859946f6ac0763.tar.gz
volse-hubzilla-2bbecfe8dd44bd51a3425ee667859946f6ac0763.tar.bz2
volse-hubzilla-2bbecfe8dd44bd51a3425ee667859946f6ac0763.zip
only attempt fetch if zotfinger actually returned something
-rw-r--r--Zotlabs/Lib/Activity.php2
-rw-r--r--Zotlabs/Lib/ActivityStreams.php7
2 files changed, 5 insertions, 4 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php
index f59992cc3..f4c395906 100644
--- a/Zotlabs/Lib/Activity.php
+++ b/Zotlabs/Lib/Activity.php
@@ -1767,7 +1767,7 @@ class Activity {
$am['type'] === 'Multikey' &&
str_starts_with($am['publicKeyMultibase'], 'z6Mk')
) {
- $epubkey = $person_obj['assertionMethod']['publicKeyMultibase'];
+ $epubkey = $am['publicKeyMultibase'];
}
}
}
diff --git a/Zotlabs/Lib/ActivityStreams.php b/Zotlabs/Lib/ActivityStreams.php
index 98fc73462..f0fb7c9ae 100644
--- a/Zotlabs/Lib/ActivityStreams.php
+++ b/Zotlabs/Lib/ActivityStreams.php
@@ -327,9 +327,10 @@ class ActivityStreams {
if ($x === null && strpos($url, '/channel/')) {
// look for other nomadic channels which might be alive
$zf = Zotfinger::exec($url, $channel);
-
- $url = $zf['signature']['signer'];
- $x = Activity::fetch($url, $channel);
+ if ($zf) {
+ $url = $zf['signature']['signer'];
+ $x = Activity::fetch($url, $channel);
+ }
}
}