Following: Add missing Outbox Activity (#1969)

Author: pfefferle

includes/class-cli.php

@@ -246,11 +246,11 @@ public function move( $args ) {
 	 * @param array $args The arguments.
 	 */
 	public function follow( $args ) {
-		$user_id   = \get_current_user_id();
-		$follow_id = follow( $args[0], $user_id );
+		$user_id = \get_current_user_id();
+		$follow  = follow( $args[0], $user_id );
 
-		if ( is_wp_error( $follow_id ) ) {
-			\WP_CLI::error( $follow_id->get_error_message() );
+		if ( is_wp_error( $follow ) ) {
+			\WP_CLI::error( $follow->get_error_message() );
 		} else {
 			\WP_CLI::success( 'Follow Scheduled.' );
 		}

includes/collection/class-following.php

@@ -7,8 +7,11 @@
 
 namespace Activitypub\Collection;
 
+use Activitypub\Activity\Activity;
 use Activitypub\Http;
 
+use function Activitypub\add_to_outbox;
+
 /**
  * ActivityPub Following Collection.
  */
@@ -51,6 +54,10 @@ class Following {
 	/**
 	 * Follow a user.
 	 *
+	 * Please do not use this method directly, use `Activitypub\follow` instead.
+	 *
+	 * @see Activitypub\follow
+	 *
 	 * @param \WP_Post|int $post    The ID of the remote Actor.
 	 * @param int          $user_id The ID of the WordPress User.
 	 *
@@ -68,7 +75,21 @@ public static function follow( $post, $user_id ) {
 		$pending   = $all_meta[ self::PENDING_META_KEY ] ?? array();
 
 		if ( ! \in_array( (string) $user_id, $following, true ) && ! \in_array( (string) $user_id, $pending, true ) ) {
+			$actor = Actors::get_by_id( $user_id );
+
+			if ( \is_wp_error( $actor ) ) {
+				return $actor;
+			}
+
 			\add_post_meta( $post->ID, self::PENDING_META_KEY, (string) $user_id );
+
+			$follow = new Activity();
+			$follow->set_type( 'Follow' );
+			$follow->set_actor( $actor->get_id() );
+			$follow->set_object( $post->guid );
+			$follow->set_to( array( $post->guid ) );
+
+			return add_to_outbox( $follow, null, $user_id );
 		}
 
 		return $post;
@@ -125,6 +146,10 @@ public static function reject( $post, $user_id ) {
 	/**
 	 * Remove a follow request.
 	 *
+	 * Please do not use this method directly, use `Activitypub\unfollow` instead.
+	 *
+	 * @see Activitypub\unfollow
+	 *
 	 * @param \WP_Post|int $post    The ID of the remote Actor.
 	 * @param int          $user_id The ID of the WordPress User.
 	 *

includes/functions.php

@@ -1529,12 +1529,16 @@ function add_to_outbox( $data, $activity_type = null, $user_id = 0, $content_vis
 /**
  * Follow a user.
  *
- * @param string $remote_actor The Actor URL or WebFinger Resource.
- * @param int    $user_id      The ID of the WordPress User.
+ * @param string|int $remote_actor The Actor URL, WebFinger Resource or Post-ID of the remote Actor.
+ * @param int        $user_id      The ID of the WordPress User.
  *
- * @return int|\WP_Error The ID of the Outbox item or a WP_Error.
+ * @return \WP_Post|\WP_Error The ID of the Outbox item or a WP_Error.
  */
 function follow( $remote_actor, $user_id ) {
+	if ( \is_numeric( $remote_actor ) ) {
+		return Following::follow( $remote_actor, $user_id );
+	}
+
 	if ( ! \filter_var( $remote_actor, FILTER_VALIDATE_URL ) ) {
 		$remote_actor = Webfinger::resolve( $remote_actor );
 	}
@@ -1549,24 +1553,37 @@ function follow( $remote_actor, $user_id ) {
 		return $remote_actor_post;
 	}
 
-	$actor = Actors::get_by_id( $user_id );
+	return Following::follow( $remote_actor_post, $user_id );
+}
+
+/**
+ * Unfollow a user.
+ *
+ * @param string|int $remote_actor The Actor URL, WebFinger Resource or Post-ID of the remote Actor.
+ * @param int        $user_id      The ID of the WordPress User.
+ *
+ * @return \WP_Post|\WP_Error The ID of the Outbox item or a WP_Error.
+ */
+function unfollow( $remote_actor, $user_id ) {
+	if ( \is_numeric( $remote_actor ) ) {
+		return Following::unfollow( $remote_actor, $user_id );
+	}
 
-	if ( \is_wp_error( $actor ) ) {
-		return $actor;
+	if ( ! \filter_var( $remote_actor, FILTER_VALIDATE_URL ) ) {
+		$remote_actor = Webfinger::resolve( $remote_actor );
 	}
 
-	$result = Following::follow( $remote_actor_post, $user_id );
-	if ( \is_wp_error( $result ) ) {
-		return $result;
+	if ( \is_wp_error( $remote_actor ) ) {
+		return $remote_actor;
 	}
 
-	$follow = new Activity();
-	$follow->set_type( 'Follow' );
-	$follow->set_actor( $actor->get_id() );
-	$follow->set_object( $remote_actor );
-	$follow->set_to( array( $remote_actor ) );
+	$remote_actor_post = Actors::fetch_remote_by_uri( $remote_actor );
+
+	if ( \is_wp_error( $remote_actor_post ) ) {
+		return $remote_actor_post;
+	}
 
-	return add_to_outbox( $follow, null, $user_id );
+	return Following::unfollow( $remote_actor_post, $user_id );
 }
 
 /**

includes/table/class-following.php

@@ -12,6 +12,7 @@
 use Activitypub\Sanitize;
 use Activitypub\Webfinger;
 
+use function Activitypub\follow;
 use function Activitypub\object_to_uri;
 
 if ( ! \class_exists( '\WP_List_Table' ) ) {
@@ -122,14 +123,7 @@ public function process_action() {
 				}
 
 				$profile = \sanitize_text_field( \wp_unslash( $_REQUEST['activitypub-profile'] ) );
-				$post    = Actors::fetch_remote_by_uri( $profile );
-
-				if ( \is_wp_error( $post ) ) {
-					\add_settings_error( 'activitypub', 'followed', $post->get_error_message() );
-					break;
-				}
-
-				$result = Following_Collection::follow( $post, $this->user_id );
+				$result  = follow( $profile, $this->user_id );
 				if ( \is_wp_error( $result ) ) {
 					\add_settings_error( 'activitypub', 'followed', $result->get_error_message() );
 				} else {