Fix Accept handling for outgoing Follow requests (#1931)

Author: pfefferle

.github/changelog/1931-from-description

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Fixed a bug in how follow requests were accepted to ensure they work correctly.

includes/collection/class-outbox.php

@@ -196,8 +196,8 @@ public static function get_by_guid( $guid ) {
 		$post_id = $wpdb->get_var(
 			$wpdb->prepare(
 				"SELECT ID FROM $wpdb->posts WHERE guid=%s AND post_type=%s",
-				esc_sql( $guid ),
-				esc_sql( self::POST_TYPE )
+				\esc_url( $guid ),
+				self::POST_TYPE
 			)
 		);
 

includes/handler/class-accept.php

@@ -54,7 +54,7 @@ public static function handle_accept( $accept, $user_id ) {
 			return;
 		}
 
-		$actor_post = Actors::get_remote_by_uri( object_to_uri( $accept['object']['actor'] ) );
+		$actor_post = Actors::get_remote_by_uri( object_to_uri( $accept['object']['object'] ) );
 
 		if ( \is_wp_error( $actor_post ) ) {
 			return;

tests/includes/collection/class-test-following.php

@@ -360,32 +360,32 @@ public function test_unfollow() {
 
 		$accept_1 = array(
 			'object' => array(
-				'id'    => $outbox_item_1->guid,
-				'actor' => 'https://example.com/actor/1',
+				'id'     => $outbox_item_1->guid,
+				'object' => 'https://example.com/actor/1',
 			),
 		);
 		$accept_2 = array(
 			'object' => array(
-				'id'    => $outbox_item_2->guid,
-				'actor' => 'https://example.com/actor/1',
+				'id'     => $outbox_item_2->guid,
+				'object' => 'https://example.com/actor/1',
 			),
 		);
 		$accept_3 = array(
 			'object' => array(
-				'id'    => $outbox_item_3->guid,
-				'actor' => 'https://example.com/actor/1',
+				'id'     => $outbox_item_3->guid,
+				'object' => 'https://example.com/actor/1',
 			),
 		);
 		$accept_4 = array(
 			'object' => array(
-				'id'    => $outbox_item_4->guid,
-				'actor' => 'https://example.com/actor/1',
+				'id'     => $outbox_item_4->guid,
+				'object' => 'https://example.com/actor/1',
 			),
 		);
 		$accept_5 = array(
 			'object' => array(
-				'id'    => $outbox_item_5->guid,
-				'actor' => 'https://example.com/actor/1',
+				'id'     => $outbox_item_5->guid,
+				'object' => 'https://example.com/actor/1',
 			),
 		);