Skip to content

Refactor hook registration and init order in ActivityPub #2087

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 3 commits into from
Aug 25, 2025
Merged

Refactor hook registration and init order in ActivityPub #2087

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bba02a0
Refactor hook registration and init order in ActivityPub
obenland Aug 21, 2025
89d9152
Fix tests
obenland Aug 21, 2025
941bf59
Merge branch 'trunk' into fix/ocd
obenland Aug 25, 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
29 changes: 5 additions & 24 deletions activitypub.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@

Autoloader::register_path( __NAMESPACE__, __DIR__ . '/includes' );

\register_activation_hook( __FILE__, array( Activitypub::class, 'activate' ) );
\register_deactivation_hook( __FILE__, array( Activitypub::class, 'deactivate' ) );
\register_uninstall_hook( __FILE__, array( Activitypub::class, 'uninstall' ) );

/**
* Initialize REST routes.
*/
Expand Down Expand Up @@ -68,6 +72,7 @@ function plugin_init() {
\add_action( 'init', array( __NAMESPACE__ . '\Activitypub', 'init' ) );
\add_action( 'init', array( __NAMESPACE__ . '\Comment', 'init' ) );
\add_action( 'init', array( __NAMESPACE__ . '\Dispatcher', 'init' ) );
\add_action( 'init', array( __NAMESPACE__ . '\Embed', 'init' ) );
\add_action( 'init', array( __NAMESPACE__ . '\Handler', 'init' ) );
\add_action( 'init', array( __NAMESPACE__ . '\Hashtag', 'init' ) );
\add_action( 'init', array( __NAMESPACE__ . '\Link', 'init' ) );
Expand Down Expand Up @@ -127,14 +132,6 @@ function plugin_admin_init() {
}
\add_action( 'plugins_loaded', __NAMESPACE__ . '\plugin_admin_init' );

\register_activation_hook(
__FILE__,
array(
__NAMESPACE__ . '\Activitypub',
'activate',
)
);

/**
* Redirect to the welcome page after plugin activation.
*
Expand All @@ -148,22 +145,6 @@ function activation_redirect( $plugin ) {
}
\add_action( 'activated_plugin', __NAMESPACE__ . '\activation_redirect' );

\register_deactivation_hook(
__FILE__,
array(
__NAMESPACE__ . '\Activitypub',
'deactivate',
)
);

\register_uninstall_hook(
__FILE__,
array(
__NAMESPACE__ . '\Activitypub',
'uninstall',
)
);

// Check for CLI env, to add the CLI commands.Add commentMore actions.
if ( defined( 'WP_CLI' ) && WP_CLI ) {
\WP_CLI::add_command(
Expand Down
33 changes: 13 additions & 20 deletions includes/class-activitypub.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@

use Activitypub\Activity\Activity;
use Activitypub\Collection\Actors;
use Activitypub\Collection\Extra_Fields;
use Activitypub\Collection\Followers;
use Activitypub\Collection\Inbox;
use Activitypub\Collection\Outbox;
use Activitypub\Collection\Followers;
use Activitypub\Collection\Extra_Fields;

/**
* ActivityPub Class.
Expand All @@ -24,41 +24,34 @@ class Activitypub {
* Initialize the class, registering WordPress hooks.
*/
public static function init() {
\add_action( 'init', array( self::class, 'add_rewrite_rules' ), 11 );
\add_action( 'init', array( self::class, 'theme_compat' ), 11 );
\add_action( 'init', array( self::class, 'register_user_meta' ), 11 );
\add_action( 'init', array( self::class, 'register_post_types' ), 11 );
\add_action( 'init', array( self::class, 'register_oembed_providers' ), 11 );

\add_filter( 'template_include', array( self::class, 'render_activitypub_template' ), 99 );
\add_action( 'template_redirect', array( self::class, 'template_redirect' ) );
\add_filter( 'redirect_canonical', array( self::class, 'redirect_canonical' ), 10, 2 );
\add_filter( 'redirect_canonical', array( self::class, 'no_trailing_redirect' ), 10, 2 );
\add_filter( 'query_vars', array( self::class, 'add_query_vars' ) );
\add_filter( 'pre_get_avatar_data', array( self::class, 'pre_get_avatar_data' ), 11, 2 );

// Add support for ActivityPub to custom post types.
$post_types = \get_option( 'activitypub_support_post_types', array( 'post' ) );

foreach ( $post_types as $post_type ) {
\add_post_type_support( $post_type, 'activitypub' );
}

\add_action( 'wp_trash_post', array( self::class, 'trash_post' ), 1 );
\add_action( 'untrash_post', array( self::class, 'untrash_post' ), 1 );

\add_action( 'init', array( self::class, 'add_rewrite_rules' ), 11 );
\add_action( 'init', array( self::class, 'theme_compat' ), 11 );

\add_action( 'user_register', array( self::class, 'user_register' ) );

\add_filter( 'activitypub_get_actor_extra_fields', array( Extra_Fields::class, 'default_actor_extra_fields' ), 10, 2 );

\add_filter( 'add_post_metadata', array( self::class, 'prevent_empty_post_meta' ), 10, 4 );
\add_filter( 'update_post_metadata', array( self::class, 'prevent_empty_post_meta' ), 10, 4 );
\add_filter( 'default_post_metadata', array( self::class, 'default_post_metadata' ), 10, 3 );

\add_action( 'init', array( self::class, 'register_user_meta' ), 11 );

// Register several post_types.
self::register_post_types();
\add_filter( 'activitypub_get_actor_extra_fields', array( Extra_Fields::class, 'default_actor_extra_fields' ), 10, 2 );

self::register_oembed_providers();
Embed::init();
// Add support for ActivityPub to custom post types.
foreach ( \get_option( 'activitypub_support_post_types', array( 'post' ) ) as $post_type ) {
\add_post_type_support( $post_type, 'activitypub' );
}
}

/**
Expand Down
Loading