Skip to content

Consolidate custom post type and meta registrations into Post_Types class #2215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Sep 24, 2025
Merged

Consolidate custom post type and meta registrations into Post_Types class #2215

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
72167b4
Consolidate custom post type and meta registrations into Post_Types c…
obenland Sep 19, 2025
6088b0a
Remove extra blank line in Activitypub class
obenland Sep 19, 2025
710e0c3
Fix regex pattern in coverage warning detection for escaped backslashes
obenland Sep 19, 2025
81fc691
Simplify warning detection to just look for WARNINGS! marker
obenland Sep 19, 2025
bd3bf56
Fix invalid @covers annotations in tests
obenland Sep 19, 2025
0d4b8ad
Deduplicate coverage warning annotations for dataProvider tests
obenland Sep 19, 2025
911afe3
Move post meta logic to Post_Types and add tests
obenland Sep 22, 2025
1cd303f
Refactor Post_Types meta registration to use helper methods
obenland Sep 22, 2025
fe8f7b7
Update sanitize_callback to use sanitize_text_field
obenland Sep 22, 2025
d7ef4d5
Revert phpunit.yml changes to match trunk
obenland Sep 22, 2025
1d85a3b
Merge branch 'trunk' into consolidate-post-type-registrations
obenland Sep 22, 2025
36ec110
Revert "Refactor Post_Types meta registration to use helper methods"
obenland Sep 22, 2025
065e47e
Use same activitypub_content_visibility args everywhere
obenland Sep 22, 2025
2f05e62
Merge branch 'consolidate-post-type-registrations' of https://github.…
obenland Sep 22, 2025
8ad9410
Move post meta filters to Post_Types class
obenland Sep 22, 2025
fefb757
Move register_ap_actor_rest_field to Post_Types class
obenland Sep 22, 2025
28e0c4a
Move ActivityPub post type and extra fields hooks
obenland Sep 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
248 changes: 104 additions & 144 deletions includes/class-post-types.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,61 +119,19 @@ public static function register_inbox_post_type() {
\register_post_meta(
Inbox::POST_TYPE,
'_activitypub_object_id',
array(
'type' => 'string',
'single' => true,
'description' => 'The ID (ActivityPub URI) of the object that the inbox item is about.',
'sanitize_callback' => 'sanitize_url',
)
self::get_object_id_meta_args()
);

\register_post_meta(
Inbox::POST_TYPE,
'_activitypub_activity_type',
array(
'type' => 'string',
'description' => 'The type of the activity',
'single' => true,
'show_in_rest' => true,
'sanitize_callback' => function ( $value ) {
$value = ucfirst( strtolower( $value ) );
$schema = array(
'type' => 'string',
'enum' => Activity::TYPES,
'default' => 'Create',
);

if ( \is_wp_error( \rest_validate_enum( $value, $schema, '' ) ) ) {
return $schema['default'];
}

return $value;
},
)
self::get_activity_type_meta_args( 'Create' )
);

\register_post_meta(
Inbox::POST_TYPE,
'_activitypub_activity_actor',
array(
'type' => 'string',
'single' => true,
'description' => 'The type of the local actor that received the activity.',
'show_in_rest' => true,
'sanitize_callback' => function ( $value ) {
$schema = array(
'type' => 'string',
'enum' => array( 'application', 'blog', 'user' ),
'default' => 'user',
);

if ( \is_wp_error( \rest_validate_enum( $value, $schema, '' ) ) ) {
return $schema['default'];
}

return $value;
},
)
self::get_activity_actor_meta_args()
);

\register_post_meta(
Expand All @@ -190,25 +148,7 @@ public static function register_inbox_post_type() {
\register_post_meta(
Inbox::POST_TYPE,
'activitypub_content_visibility',
array(
'type' => 'string',
'single' => true,
'description' => 'The visibility of the content.',
'show_in_rest' => true,
'sanitize_callback' => function ( $value ) {
$schema = array(
'type' => 'string',
'enum' => array( 'public', 'unlisted', 'private', 'direct' ),
'default' => 'public',
);

if ( \is_wp_error( \rest_validate_enum( $value, $schema, '' ) ) ) {
return $schema['default'];
}

return $value;
},
)
self::get_content_visibility_meta_args()
);
}

Expand Down Expand Up @@ -247,49 +187,13 @@ public static function register_outbox_post_type() {
\register_post_meta(
Outbox::POST_TYPE,
'_activitypub_activity_type',
array(
'type' => 'string',
'description' => 'The type of the activity',
'single' => true,
'show_in_rest' => true,
'sanitize_callback' => function ( $value ) {
$value = ucfirst( strtolower( $value ) );
$schema = array(
'type' => 'string',
'enum' => Activity::TYPES,
'default' => 'Announce',
);

if ( \is_wp_error( \rest_validate_enum( $value, $schema, '' ) ) ) {
return $schema['default'];
}

return $value;
},
)
self::get_activity_type_meta_args( 'Announce' )
);

\register_post_meta(
Outbox::POST_TYPE,
'_activitypub_activity_actor',
array(
'type' => 'string',
'single' => true,
'show_in_rest' => true,
'sanitize_callback' => function ( $value ) {
$schema = array(
'type' => 'string',
'enum' => array( 'application', 'blog', 'user' ),
'default' => 'user',
);

if ( \is_wp_error( \rest_validate_enum( $value, $schema, '' ) ) ) {
return $schema['default'];
}

return $value;
},
)
self::get_activity_actor_meta_args()
);

\register_post_meta(
Expand All @@ -307,35 +211,13 @@ public static function register_outbox_post_type() {
\register_post_meta(
Outbox::POST_TYPE,
'_activitypub_object_id',
array(
'type' => 'string',
'single' => true,
'description' => 'The ID (ActivityPub URI) of the object that the outbox item is about.',
'sanitize_callback' => 'sanitize_url',
)
self::get_object_id_meta_args()
);

\register_post_meta(
Outbox::POST_TYPE,
'activitypub_content_visibility',
array(
'type' => 'string',
'single' => true,
'show_in_rest' => true,
'sanitize_callback' => function ( $value ) {
$schema = array(
'type' => 'string',
'enum' => array( ACTIVITYPUB_CONTENT_VISIBILITY_PUBLIC, ACTIVITYPUB_CONTENT_VISIBILITY_QUIET_PUBLIC, ACTIVITYPUB_CONTENT_VISIBILITY_PRIVATE, ACTIVITYPUB_CONTENT_VISIBILITY_LOCAL ),
'default' => ACTIVITYPUB_CONTENT_VISIBILITY_PUBLIC,
);

if ( \is_wp_error( \rest_validate_enum( $value, $schema, '' ) ) ) {
return $schema['default'];
}

return $value;
},
)
self::get_content_visibility_meta_args()
);
}

Expand Down Expand Up @@ -398,24 +280,7 @@ public static function register_activitypub_post_meta() {
\register_post_meta(
$post_type,
'activitypub_content_visibility',
array(
'type' => 'string',
'single' => true,
'show_in_rest' => true,
'sanitize_callback' => function ( $value ) {
$schema = array(
'type' => 'string',
'enum' => array( ACTIVITYPUB_CONTENT_VISIBILITY_PUBLIC, ACTIVITYPUB_CONTENT_VISIBILITY_QUIET_PUBLIC, ACTIVITYPUB_CONTENT_VISIBILITY_PRIVATE, ACTIVITYPUB_CONTENT_VISIBILITY_LOCAL ),
'default' => ACTIVITYPUB_CONTENT_VISIBILITY_PUBLIC,
);

if ( \is_wp_error( \rest_validate_enum( $value, $schema, '' ) ) ) {
return $schema['default'];
}

return $value;
},
)
self::get_content_visibility_meta_args()
);

\register_post_meta(
Expand Down Expand Up @@ -513,4 +378,99 @@ public static function default_post_meta_data( $meta_value, $object_id, $meta_ke

return null;
}

/**
* Get common args for _activitypub_object_id meta.
*
* @return array The meta args.
*/
private static function get_object_id_meta_args() {
return array(
'type' => 'string',
'single' => true,
'description' => 'The ID (ActivityPub URI) of the object that the inbox/outbox item is about.',
'sanitize_callback' => 'sanitize_url',
);
}

/**
* Get common args for _activitypub_activity_actor meta.
*
* @return array The meta args.
*/
private static function get_activity_actor_meta_args() {
return array(
'type' => 'string',
'single' => true,
'show_in_rest' => true,
'sanitize_callback' => function ( $value ) {
$schema = array(
'type' => 'string',
'enum' => array( 'application', 'blog', 'user' ),
'default' => 'user',
);

if ( \is_wp_error( \rest_validate_enum( $value, $schema, '' ) ) ) {
return $schema['default'];
}

return $value;
},
);
}

/**
* Get common args for _activitypub_activity_type meta.
*
* @param string $default_type The default activity type.
* @return array The meta args.
*/
private static function get_activity_type_meta_args( $default_type = 'Create' ) {
return array(
'type' => 'string',
'description' => 'The type of the activity',
'single' => true,
'show_in_rest' => true,
'sanitize_callback' => function ( $value ) use ( $default_type ) {
$value = ucfirst( strtolower( $value ) );
$schema = array(
'type' => 'string',
'enum' => Activity::TYPES,
'default' => $default_type,
);

if ( \is_wp_error( \rest_validate_enum( $value, $schema, '' ) ) ) {
return $schema['default'];
}

return $value;
},
);
}

/**
* Get common args for activitypub_content_visibility meta.
*
* @return array The meta args.
*/
private static function get_content_visibility_meta_args() {
return array(
'type' => 'string',
'single' => true,
'show_in_rest' => true,
'sanitize_callback' => function ( $value ) {
$schema = array(
'type' => 'string',
'enum' => array( ACTIVITYPUB_CONTENT_VISIBILITY_PUBLIC, ACTIVITYPUB_CONTENT_VISIBILITY_QUIET_PUBLIC, ACTIVITYPUB_CONTENT_VISIBILITY_PRIVATE, ACTIVITYPUB_CONTENT_VISIBILITY_LOCAL ),
'default' => ACTIVITYPUB_CONTENT_VISIBILITY_PUBLIC,
);

if ( \is_wp_error( \rest_validate_enum( $value, $schema, '' ) ) ) {
return $schema['default'];
}

return $value;
},
);
}
}