updated plugin ActivityPub
version 5.8.0
This commit is contained in:
@ -7,12 +7,13 @@
|
||||
|
||||
namespace Activitypub\Handler;
|
||||
|
||||
use Activitypub\Http;
|
||||
use Activitypub\Notification;
|
||||
use Activitypub\Activity\Activity;
|
||||
use Activitypub\Collection\Users;
|
||||
use Activitypub\Collection\Actors;
|
||||
use Activitypub\Collection\Followers;
|
||||
|
||||
use function Activitypub\add_to_outbox;
|
||||
|
||||
/**
|
||||
* Handle Follow requests.
|
||||
*/
|
||||
@ -28,7 +29,7 @@ class Follow {
|
||||
|
||||
\add_action(
|
||||
'activitypub_followers_post_follow',
|
||||
array( self::class, 'send_follow_response' ),
|
||||
array( self::class, 'queue_accept' ),
|
||||
10,
|
||||
4
|
||||
);
|
||||
@ -40,7 +41,7 @@ class Follow {
|
||||
* @param array $activity The activity object.
|
||||
*/
|
||||
public static function handle_follow( $activity ) {
|
||||
$user = Users::get_by_resource( $activity['object'] );
|
||||
$user = Actors::get_by_resource( $activity['object'] );
|
||||
|
||||
if ( ! $user || is_wp_error( $user ) ) {
|
||||
// If we can not find a user, we can not initiate a follow process.
|
||||
@ -55,13 +56,15 @@ class Follow {
|
||||
$activity['actor']
|
||||
);
|
||||
|
||||
do_action(
|
||||
'activitypub_followers_post_follow',
|
||||
$activity['actor'],
|
||||
$activity,
|
||||
$user_id,
|
||||
$follower
|
||||
);
|
||||
/**
|
||||
* Fires after a new follower has been added.
|
||||
*
|
||||
* @param string $actor The URL of the actor (follower) who initiated the follow.
|
||||
* @param array $activity The complete activity data of the follow request.
|
||||
* @param int $user_id The ID of the WordPress user being followed.
|
||||
* @param \Activitypub\Model\Follower|\WP_Error $follower The Follower object containing the new follower's data.
|
||||
*/
|
||||
do_action( 'activitypub_followers_post_follow', $activity['actor'], $activity, $user_id, $follower );
|
||||
|
||||
// Send notification.
|
||||
$notification = new Notification(
|
||||
@ -76,12 +79,12 @@ class Follow {
|
||||
/**
|
||||
* Send Accept response.
|
||||
*
|
||||
* @param string $actor The Actor URL.
|
||||
* @param array $activity_object The Activity object.
|
||||
* @param int $user_id The ID of the WordPress User.
|
||||
* @param \Activitypub\Model\Follower $follower The Follower object.
|
||||
* @param string $actor The Actor URL.
|
||||
* @param array $activity_object The Activity object.
|
||||
* @param int $user_id The ID of the WordPress User.
|
||||
* @param \Activitypub\Model\Follower|\WP_Error $follower The Follower object.
|
||||
*/
|
||||
public static function send_follow_response( $actor, $activity_object, $user_id, $follower ) {
|
||||
public static function queue_accept( $actor, $activity_object, $user_id, $follower ) {
|
||||
if ( \is_wp_error( $follower ) ) {
|
||||
// Impossible to send a "Reject" because we can not get the Remote-Inbox.
|
||||
return;
|
||||
@ -100,21 +103,12 @@ class Follow {
|
||||
)
|
||||
);
|
||||
|
||||
$user = Users::get_by_id( $user_id );
|
||||
|
||||
// Get inbox.
|
||||
$inbox = $follower->get_shared_inbox();
|
||||
|
||||
// Send "Accept" activity.
|
||||
$activity = new Activity();
|
||||
$activity->set_type( 'Accept' );
|
||||
$activity->set_actor( Actors::get_by_id( $user_id )->get_id() );
|
||||
$activity->set_object( $activity_object );
|
||||
$activity->set_actor( $user->get_id() );
|
||||
$activity->set_to( $actor );
|
||||
$activity->set_id( $user->get_id() . '#follow-' . \preg_replace( '~^https?://~', '', $actor ) . '-' . \time() );
|
||||
$activity->set_to( array( $actor ) );
|
||||
|
||||
$activity = $activity->to_json();
|
||||
|
||||
Http::post( $inbox, $activity, $user_id );
|
||||
add_to_outbox( $activity, null, $user_id, ACTIVITYPUB_CONTENT_VISIBILITY_PRIVATE );
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user