eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

[ActivityPub] Properly handle Actor URIs by using events correctly

Browse Source 
This should fix nulls on explorer lookups inputed by postman after generate_followers/getSubscribers, that I think were caused by calling common_profile_uri that, curiously, only handles local profiles
This commit is contained in:
Diogo Cordeiro
2019-12-10 22:27:32 +00:00
parent b730582336
commit 80ba2b3ccc
13 changed files with 37 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
plugins/ActivityPub/ActivityPubPlugin.php
View File

@@ -60,29 +60,22 @@ class ActivityPubPlugin extends Plugin
/**
* Returns a Actor's URI from its local $profile
* Works both for local and remote users.
* This is a discovery event but it seems more logical to have it separated.
* This ensures that Profile->getUri() will always return the intended for a remote AP profile.
*
* @param Profile $profile Actor's local profile
* @return string Actor's URI
* @throws Exception
* @param string &$uri I/O Actor's URI
* @author Diogo Cordeiro <diogo@fc.up.pt>
* @return bool event hook
*/
public static function actor_uri($profile)
public function onStartGetProfileUri(Profile $profile, &$uri): bool
{
return common_profile_uri($profile);
}
/**
* Returns a Actor's URL from its local $profile
* Works both for local and remote users.
*
* @param Profile $profile Actor's local profile
* @return string Actor's URL
* @throws Exception
* @author Diogo Cordeiro <diogo@fc.up.pt>
*/
public static function actor_url($profile)
{
return ActivityPubPlugin::actor_uri($profile)."/";
$aprofile = Activitypub_profile::getKV('profile_id', $profile->id);
if ($aprofile instanceof Activitypub_profile) {
$uri = $aprofile->getUri();
return false;
}
return true;
}
/**
@@ -621,7 +614,7 @@ class ActivityPubPlugin extends Plugin
if ($object->isPerson()) {
$link = new XML_XRD_Element_Link(
'self',
ActivityPubPlugin::actor_uri($object->getProfile()),
$object->getProfile()->getUri(),
'application/activity+json'
);
$xrd->links[] = clone($link);
@@ -743,25 +736,6 @@ class ActivityPubPlugin extends Plugin
* Discovery Events *
********************************************************/
/**
* Profile URI for remote profiles.
*
* @author GNU social
* @author Diogo Cordeiro <diogo@fc.up.pt>
* @param Profile $profile
* @param string $uri in/out
* @return mixed hook return code
*/
public function onStartGetProfileUri(Profile $profile, &$uri)
{
$aprofile = Activitypub_profile::getKV('profile_id', $profile->id);
if ($aprofile instanceof Activitypub_profile) {
$uri = $aprofile->getUri();
return false;
}
return true;
}
/**
* Profile from URI.
*