more consistent use of response content type (#529)

* more consistent use of response content type

* update readme

* fix typo

Author: pfefferle

README.md

@@ -114,6 +114,7 @@ Project maintained on GitHub at [automattic/wordpress-activitypub](https://githu
 * Improved: loading of shortcodes
 * Updated: caching of followers
 * Updated: Application-User is no longer "indexable"
+* Updated: more consistent usage of the `application/activity+json` Content-Type
 
 ### 1.0.7 ###
 

includes/rest/class-collection.php

@@ -117,7 +117,10 @@ public static function tags_get( $request ) {
 			);
 		}
 
-		return new WP_REST_Response( $response, 200 );
+		$rest_response = new WP_REST_Response( $response, 200 );
+		$rest_response->header( 'Content-Type', 'application/activity+json; charset=' . get_option( 'blog_charset' ) );
+
+		return $rest_response;
 	}
 
 	/**
@@ -168,7 +171,10 @@ public static function featured_get( $request ) {
 			$response['orderedItems'][] = Post::transform( $post )->to_object()->to_array();
 		}
 
-		return new WP_REST_Response( $response, 200 );
+		$rest_response = new WP_REST_Response( $response, 200 );
+		$rest_response->header( 'Content-Type', 'application/activity+json; charset=' . get_option( 'blog_charset' ) );
+
+		return $rest_response;
 	}
 
 	/**
@@ -192,7 +198,10 @@ public static function moderators_get( $request ) {
 			$response['orderedItems'][] = $user->get_url();
 		}
 
-		return new WP_REST_Response( $response, 200 );
+		$rest_response = new WP_REST_Response( $response, 200 );
+		$rest_response->header( 'Content-Type', 'application/activity+json; charset=' . get_option( 'blog_charset' ) );
+
+		return $rest_response;
 	}
 
 	/**

includes/rest/class-followers.php

@@ -103,10 +103,10 @@ function( $item ) use ( $context ) {
 			$data['followers']
 		);
 
-		$response = new WP_REST_Response( $json, 200 );
-		$response->header( 'Content-Type', 'application/activity+json' );
+		$rest_response = new WP_REST_Response( $json, 200 );
+		$rest_response->header( 'Content-Type', 'application/activity+json; charset=' . get_option( 'blog_charset' ) );
 
-		return $response;
+		return $rest_response;
 	}
 
 	/**

includes/rest/class-following.php

@@ -79,10 +79,10 @@ public static function get( $request ) {
 
 		$json->first = $json->partOf; // phpcs:ignore
 
-		$response = new \WP_REST_Response( $json, 200 );
-		$response->header( 'Content-Type', 'application/activity+json' );
+		$rest_response = new WP_REST_Response( $json, 200 );
+		$rest_response->header( 'Content-Type', 'application/activity+json; charset=' . get_option( 'blog_charset' ) );
 
-		return $response;
+		return $rest_response;
 	}
 
 	/**

includes/rest/class-inbox.php

@@ -109,11 +109,10 @@ public static function user_inbox_get( $request ) {
 		 */
 		\do_action( 'activitypub_inbox_post' );
 
-		$response = new WP_REST_Response( $json, 200 );
+		$rest_response = new WP_REST_Response( $json, 200 );
+		$rest_response->header( 'Content-Type', 'application/activity+json; charset=' . get_option( 'blog_charset' ) );
 
-		$response->header( 'Content-Type', 'application/activity+json' );
-
-		return $response;
+		return $rest_response;
 	}
 
 	/**
@@ -138,7 +137,10 @@ public static function user_inbox_post( $request ) {
 		\do_action( 'activitypub_inbox', $data, $user->get__id(), $type );
 		\do_action( "activitypub_inbox_{$type}", $data, $user->get__id() );
 
-		return new WP_REST_Response( array(), 202 );
+		$rest_response = new WP_REST_Response( array(), 202 );
+		$rest_response->header( 'Content-Type', 'application/activity+json; charset=' . get_option( 'blog_charset' ) );
+
+		return $rest_response;
 	}
 
 	/**
@@ -183,7 +185,10 @@ public static function shared_inbox_post( $request ) {
 			\do_action( "activitypub_inbox_{$type}", $data, $user->ID );
 		}
 
-		return new WP_REST_Response( array(), 202 );
+		$rest_response = new WP_REST_Response( array(), 202 );
+		$rest_response->header( 'Content-Type', 'application/activity+json; charset=' . get_option( 'blog_charset' ) );
+
+		return $rest_response;
 	}
 
 	/**

includes/rest/class-outbox.php

@@ -123,11 +123,10 @@ public static function user_outbox_get( $request ) {
 		 */
 		\do_action( 'activitypub_outbox_post' );
 
-		$response = new WP_REST_Response( $json, 200 );
+		$rest_response = new WP_REST_Response( $json, 200 );
+		$rest_response->header( 'Content-Type', 'application/activity+json; charset=' . get_option( 'blog_charset' ) );
 
-		$response->header( 'Content-Type', 'application/activity+json' );
-
-		return $response;
+		return $rest_response;
 	}
 
 	/**

includes/rest/class-server.php

@@ -54,11 +54,10 @@ public static function application_actor() {
 
 		$json = $user->to_array();
 
-		$response = new WP_REST_Response( $json, 200 );
+		$rest_response = new WP_REST_Response( $json, 200 );
+		$rest_response->header( 'Content-Type', 'application/activity+json; charset=' . get_option( 'blog_charset' ) );
 
-		$response->header( 'Content-Type', 'application/activity+json' );
-
-		return $response;
+		return $rest_response;
 	}
 
 	/**

includes/rest/class-users.php

@@ -95,10 +95,10 @@ public static function get( $request ) {
 
 		$json = $user->to_array();
 
-		$response = new WP_REST_Response( $json, 200 );
-		$response->header( 'Content-Type', 'application/activity+json' );
+		$rest_response = new WP_REST_Response( $json, 200 );
+		$rest_response->header( 'Content-Type', 'application/activity+json; charset=' . get_option( 'blog_charset' ) );
 
-		return $response;
+		return $rest_response;
 	}
 
 

readme.txt

@@ -114,6 +114,7 @@ Project maintained on GitHub at [automattic/wordpress-activitypub](https://githu
 * Improved: loading of shortcodes
 * Updated: caching of followers
 * Updated: Application-User is no longer "indexable"
+* Updated: more consistent usage of the `application/activity+json` Content-Type
 
 = 1.0.7 =