fixes from upstream

This commit is contained in:
Mike Macgirvin 2024-08-03 06:46:13 +10:00
parent bdf0ed938b
commit e50952a0a2
2 changed files with 2 additions and 2 deletions

View file

@ -1805,7 +1805,7 @@ class Activity
$actor->setIndexable(true);
}
elseif (in_array($searchPerm, [ PERMS_SPECIFIC, PERMS_CONTACTS])) {
$actor->setCanSearch([z_root() . '/followers/' . $channel['channel_address']]);
$actor->setCanSearch([($nomadic) ? Channel::getDidResolver($channel) . 'actor/followers' : z_root() . '/followers/' . $channel['channel_address']]);
$actor->setIndexable(false);
}
else {

View file

@ -16,7 +16,7 @@ class Apgateway extends Controller
public function init()
{
App::$originalRequest = '/' . $_REQUEST['req'];
App::$originalRequest = '/' . $_SERVER['REQUEST_URI'];
// Concatenate path components starting with argv(1)
// to isolate the DID URL.
$url = null;