Event-Federation/wordpress-activitypub
Event-Federation/wordpress-activitypub
7
1
Fork 0
Code Issues 3 Pull requests Projects Releases Wiki Activity Actions

more consistent use of response content type (#529)

Browse source 
* more consistent use of response content type

* update readme

* fix typo
This commit is contained in:
Matthias Pfefferle 2023-10-23 14:57:58 +02:00 committed by GitHub
parent 9ac5d84f5c
commit b946ef3de1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 40 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

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

15
includes/rest/class-collection.php
View file

@ -117,7 +117,10 @@ class Collection {
); );
} }
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 @@ class Collection {
$response['orderedItems'][] = Post::transform( $post )->to_object()->to_array(); $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 @@ class Collection {
$response['orderedItems'][] = $user->get_url(); $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;
} }
/** /**

6
includes/rest/class-followers.php
View file

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

6
includes/rest/class-following.php
View file

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

17
includes/rest/class-inbox.php
View file

@ -109,11 +109,10 @@ class Inbox {
*/ */
\do_action( 'activitypub_inbox_post' ); \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 $rest_response;
return $response;
} }
/** /**
@ -138,7 +137,10 @@ class Inbox {
\do_action( 'activitypub_inbox', $data, $user->get__id(), $type ); \do_action( 'activitypub_inbox', $data, $user->get__id(), $type );
\do_action( "activitypub_inbox_{$type}", $data, $user->get__id() ); \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 @@ class Inbox {
\do_action( "activitypub_inbox_{$type}", $data, $user->ID ); \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;
} }
/** /**

7
includes/rest/class-outbox.php
View file

@ -123,11 +123,10 @@ class Outbox {
*/ */
\do_action( 'activitypub_outbox_post' ); \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 $rest_response;
return $response;
} }
/** /**

7
includes/rest/class-server.php
View file

@ -54,11 +54,10 @@ class Server {
$json = $user->to_array(); $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 $rest_response;
return $response;
} }
/** /**

6
includes/rest/class-users.php
View file

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

1
readme.txt
View file

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