updated plugin ActivityPub version 5.8.0

This commit is contained in:
2025-04-29 21:19:06 +00:00
committed by Gitium
parent 19dfd317cc
commit fdfbf76539
166 changed files with 14119 additions and 7163 deletions

View File

@ -7,7 +7,7 @@
namespace Activitypub\Integration;
use Activitypub\Collection\Users as User_Collection;
use Activitypub\Collection\Actors;
use function Activitypub\get_rest_url_by_path;
@ -35,7 +35,7 @@ class Webfinger {
* @return array The jrd array.
*/
public static function add_user_discovery( $jrd, $uri, $user ) {
$user = User_Collection::get_by_id( $user->ID );
$user = Actors::get_by_id( $user->ID );
if ( ! $user || is_wp_error( $user ) ) {
return $jrd;
@ -43,13 +43,16 @@ class Webfinger {
$jrd['subject'] = sprintf( 'acct:%s', $user->get_webfinger() );
$jrd['aliases'][] = $user->get_id();
$jrd['aliases'][] = $user->get_url();
$jrd['aliases'][] = $user->get_alternate_url();
$jrd['aliases'] = array_unique( $jrd['aliases'] );
$jrd['aliases'] = array_values( $jrd['aliases'] );
$jrd['links'][] = array(
'rel' => 'self',
'type' => 'application/activity+json',
'href' => $user->get_url(),
'href' => $user->get_id(),
);
$jrd['links'][] = array(
@ -69,32 +72,34 @@ class Webfinger {
* @return array|\WP_Error The jrd array or WP_Error.
*/
public static function add_pseudo_user_discovery( $jrd, $uri ) {
$user = User_Collection::get_by_resource( $uri );
$user = Actors::get_by_resource( $uri );
if ( \is_wp_error( $user ) ) {
return $user;
}
$aliases = array(
$user->get_id(),
$user->get_url(),
$user->get_alternate_url(),
);
$aliases = array_unique( $aliases );
$aliases = array_values( $aliases );
$profile = array(
'subject' => sprintf( 'acct:%s', $user->get_webfinger() ),
'aliases' => array_values( array_unique( $aliases ) ),
'aliases' => $aliases,
'links' => array(
array(
'rel' => 'self',
'type' => 'application/activity+json',
'href' => $user->get_url(),
'href' => $user->get_id(),
),
array(
'rel' => 'http://webfinger.net/rel/profile-page',
'type' => 'text/html',
'href' => $user->get_url(),
'href' => $user->get_id(),
),
array(
'rel' => 'http://ostatus.org/schema/1.0/subscribe',