← All changes | activitypub.php +23 -49 9.3.0 → 7.7.0 View file →

		@@ -2,14 +2,14 @@
2	2	/**
3	3	* Plugin Name: ActivityPub
4	4	* Plugin URI: https://github.com/Automattic/wordpress-activitypub
5	5	* Description: The ActivityPub protocol is a decentralized social networking protocol based upon the ActivityStreams 2.0 data format.
6		- * Version: 9.3.0
	6	+ * Version: 7.7.0
7	7	* Author: Matthias Pfefferle & Automattic
8	8	* Author URI: https://automattic.com/
9	9	* License: MIT
10	10	* License URI: http://opensource.org/licenses/MIT
11		- * Requires PHP: 7.4
	11	+ * Requires PHP: 7.2
12	12	* Text Domain: activitypub
13	13	* Domain Path: /languages
14	14	*
15	15	* @package Activitypub
		@@ -16,9 +16,9 @@
16	16	*/
17	17
18	18	namespace Activitypub;
19	19
20		-\define( 'ACTIVITYPUB_PLUGIN_VERSION', '9.3.0' );
	20	+\define( 'ACTIVITYPUB_PLUGIN_VERSION', '7.7.0' );
21	21
22	22	// Plugin related constants.
23	23	\define( 'ACTIVITYPUB_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
24	24	\define( 'ACTIVITYPUB_PLUGIN_BASENAME', plugin_basename( __FILE__ ) );
		@@ -26,18 +26,10 @@
26	26	\define( 'ACTIVITYPUB_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
27	27
28	28	require_once __DIR__ . '/includes/class-autoloader.php';
29	29	require_once __DIR__ . '/includes/compat.php';
	30	+require_once __DIR__ . '/includes/functions.php';
30	31	require_once __DIR__ . '/includes/constants.php';
31		-require_once __DIR__ . '/includes/functions.php';
32		-require_once __DIR__ . '/includes/functions-activity.php';
33		-require_once __DIR__ . '/includes/functions-comment.php';
34		-require_once __DIR__ . '/includes/functions-federation.php';
35		-require_once __DIR__ . '/includes/functions-media.php';
36		-require_once __DIR__ . '/includes/functions-post.php';
37		-require_once __DIR__ . '/includes/functions-request.php';
38		-require_once __DIR__ . '/includes/functions-url.php';
39		-require_once __DIR__ . '/includes/functions-user.php';
40	32	require_once __DIR__ . '/integration/load.php';
41	33
42	34	Autoloader::register_path( __NAMESPACE__, __DIR__ . '/includes' );
43	35
		@@ -51,26 +43,16 @@
51	43	function rest_init() {
52	44	Rest\Server::init();
53	45	( new Rest\Actors_Controller() )->register_routes();
54	46	( new Rest\Actors_Inbox_Controller() )->register_routes();
55		- ( new Rest\Admin\Actions_Controller() )->register_routes();
56		- ( new Rest\Admin\Statistics_Controller() )->register_routes();
57	47	( new Rest\Application_Controller() )->register_routes();
58		- ( new Rest\Stats_Image_Controller() )->register_routes();
59	48	( new Rest\Collections_Controller() )->register_routes();
60	49	( new Rest\Comments_Controller() )->register_routes();
61	50	( new Rest\Followers_Controller() )->register_routes();
62	51	( new Rest\Following_Controller() )->register_routes();
63		- ( new Rest\Liked_Controller() )->register_routes();
64	52	( new Rest\Inbox_Controller() )->register_routes();
65	53	( new Rest\Interaction_Controller() )->register_routes();
66	54	( new Rest\Moderators_Controller() )->register_routes();
67		- if ( \get_option( 'activitypub_api', false ) ) {
68		- ( new Rest\Actor_Autocomplete_Controller() )->register_routes();
69		- ( new Rest\OAuth\Authorization_Controller() )->register_routes();
70		- ( new Rest\OAuth\Clients_Controller() )->register_routes();
71		- ( new Rest\OAuth\Token_Controller() )->register_routes();
72		- }
73	55	( new Rest\Outbox_Controller() )->register_routes();
74	56	( new Rest\Post_Controller() )->register_routes();
75	57	( new Rest\Replies_Controller() )->register_routes();
76	58	( new Rest\Webfinger_Controller() )->register_routes();
		@@ -78,9 +60,8 @@
78	60	// Load NodeInfo endpoints only if blog is public.
79	61	if ( is_blog_public() ) {
80	62	( new Rest\Nodeinfo_Controller() )->register_routes();
81	63	}
82		- ( new Rest\Proxy_Controller() )->register_routes();
83	64	}
84	65	\add_action( 'rest_api_init', __NAMESPACE__ . '\rest_init' );
85	66
86	67	/**
		@@ -87,21 +68,15 @@
87	68	* Initialize plugin.
88	69	*/
89	70	function plugin_init() {
90	71	\add_action( 'init', array( __NAMESPACE__ . '\Activitypub', 'init' ) );
91		- \add_action( 'init', array( __NAMESPACE__ . '\Application', 'init' ) );
	72	+ \add_action( 'init', array( __NAMESPACE__ . '\Attachments', 'init' ) );
92	73	\add_action( 'init', array( __NAMESPACE__ . '\Avatars', 'init' ) );
93		- \add_action( 'init', array( __NAMESPACE__ . '\Blurhash', 'init' ) );
94		- \add_action( 'init', array( __NAMESPACE__ . '\Cache', 'init' ) );
95	74	\add_action( 'init', array( __NAMESPACE__ . '\Comment', 'init' ) );
96	75	\add_action( 'init', array( __NAMESPACE__ . '\Dispatcher', 'init' ) );
97	76	\add_action( 'init', array( __NAMESPACE__ . '\Embed', 'init' ) );
98		- if ( \get_option( 'activitypub_api', false ) ) {
99		- \add_action( 'init', array( __NAMESPACE__ . '\Event_Stream', 'init' ) );
100		- }
101	77	\add_action( 'init', array( __NAMESPACE__ . '\Handler', 'init' ) );
102	78	\add_action( 'init', array( __NAMESPACE__ . '\Hashtag', 'init' ) );
103		- \add_action( 'init', array( __NAMESPACE__ . '\Icons', 'init' ) );
104	79	\add_action( 'init', array( __NAMESPACE__ . '\Link', 'init' ) );
105	80	\add_action( 'init', array( __NAMESPACE__ . '\Mailer', 'init' ) );
106	81	\add_action( 'init', array( __NAMESPACE__ . '\Mention', 'init' ) );
107	82	\add_action( 'init', array( __NAMESPACE__ . '\Migration', 'init' ), 1 );
		@@ -108,26 +83,16 @@
108	83	\add_action( 'init', array( __NAMESPACE__ . '\Move', 'init' ) );
109	84	\add_action( 'init', array( __NAMESPACE__ . '\Options', 'init' ) );
110	85	\add_action( 'init', array( __NAMESPACE__ . '\Post_Types', 'init' ) );
111	86	\add_action( 'init', array( __NAMESPACE__ . '\Router', 'init' ) );
112		- // Priority 0 ensures Scheduler hooks are registered before Migration (priority 1) runs.
113		- \add_action( 'init', array( __NAMESPACE__ . '\Scheduler', 'init' ), 0 );
	87	+ \add_action( 'init', array( __NAMESPACE__ . '\Scheduler', 'init' ) );
114	88	\add_action( 'init', array( __NAMESPACE__ . '\Search', 'init' ) );
115	89	\add_action( 'init', array( __NAMESPACE__ . '\Signature', 'init' ) );
116		- // Only load OAuth Server if the ActivityPub API is enabled.
117		- if ( \get_option( 'activitypub_api', false ) ) {
118		- \add_action( 'init', array( __NAMESPACE__ . '\OAuth\Server', 'init' ) );
119		- }
120	90
121	91	if ( site_supports_blocks() ) {
122	92	\add_action( 'init', array( __NAMESPACE__ . '\Blocks', 'init' ) );
123	93	}
124	94
125		- // Only load relay if relay mode is enabled.
126		- if ( \get_option( 'activitypub_relay_mode', false ) ) {
127		- \add_action( 'init', array( __NAMESPACE__ . '\Relay', 'init' ) );
128		- }
129		-
130	95	// Load development tools.
131	96	if ( 'local' === wp_get_environment_type() ) {
132	97	$loader_file = __DIR__ . '/local/load.php';
133	98	if ( \file_exists( $loader_file ) && \is_readable( $loader_file ) ) {
		@@ -133,8 +98,16 @@
133	98	if ( \file_exists( $loader_file ) && \is_readable( $loader_file ) ) {
134	99	require_once $loader_file;
135	100	}
136	101	}
	102	+
	103	+ if ( \defined( 'WP_DEBUG' ) && WP_DEBUG ) {
	104	+ $debug_file = __DIR__ . '/includes/debug.php';
	105	+ if ( \file_exists( $debug_file ) && \is_readable( $debug_file ) ) {
	106	+ require_once $debug_file;
	107	+ Debug::init();
	108	+ }
	109	+ }
137	110	}
138	111	\add_action( 'plugins_loaded', __NAMESPACE__ . '\plugin_init' );
139	112
140	113	/**
		@@ -143,18 +116,16 @@
143	116	function plugin_admin_init() {
144	117	// Screen Options and Menus are set before `admin_init`.
145	118	\add_action( 'init', array( __NAMESPACE__ . '\WP_Admin\Heartbeat', 'init' ), 9 ); // Before script loader.
146	119	\add_filter( 'init', array( __NAMESPACE__ . '\WP_Admin\Screen_Options', 'init' ) );
147		- \add_action( 'init', array( __NAMESPACE__ . '\WP_Admin\Menu', 'init' ) );
	120	+ \add_action( 'admin_menu', array( __NAMESPACE__ . '\WP_Admin\Menu', 'admin_menu' ) );
148	121
149	122	\add_action( 'admin_init', array( __NAMESPACE__ . '\WP_Admin\Admin', 'init' ) );
150	123	\add_action( 'admin_init', array( __NAMESPACE__ . '\WP_Admin\Advanced_Settings_Fields', 'init' ) );
151		- \add_action( 'admin_init', array( __NAMESPACE__ . '\WP_Admin\App', 'init' ), 0 ); // Before admin bar init.
152	124	\add_action( 'admin_init', array( __NAMESPACE__ . '\WP_Admin\Blog_Settings_Fields', 'init' ) );
153	125	\add_action( 'admin_init', array( __NAMESPACE__ . '\WP_Admin\Health_Check', 'init' ) );
154	126	\add_action( 'admin_init', array( __NAMESPACE__ . '\WP_Admin\Settings', 'init' ) );
155	127	\add_action( 'admin_init', array( __NAMESPACE__ . '\WP_Admin\Settings_Fields', 'init' ) );
156		- \add_action( 'admin_init', array( __NAMESPACE__ . '\WP_Admin\Dashboard', 'init' ) );
157	128	\add_action( 'admin_init', array( __NAMESPACE__ . '\WP_Admin\User_Settings_Fields', 'init' ) );
158	129	\add_action( 'admin_init', array( __NAMESPACE__ . '\WP_Admin\Welcome_Fields', 'init' ) );
159	130
160	131	if ( defined( 'WP_LOAD_IMPORTERS' ) && WP_LOAD_IMPORTERS ) {
		@@ -176,11 +147,14 @@
176	147	}
177	148	}
178	149	\add_action( 'activated_plugin', __NAMESPACE__ . '\activation_redirect' );
179	150
180		-// Check for CLI env, to add the CLI commands.
	151	+// Check for CLI env, to add the CLI commands.Add commentMore actions.
181	152	if ( defined( 'WP_CLI' ) && WP_CLI ) {
182		- Cli::register();
	153	+ \WP_CLI::add_command(
	154	+ 'activitypub',
	155	+ '\Activitypub\Cli',
	156	+ array(
	157	+ 'shortdesc' => 'ActivityPub related commands to manage plugin functionality and the federation of posts and comments.',
	158	+ )
	159	+ );
183	160	}
184		-
185		-// Register OAuth login form handler early (before wp-login.php processes).
186		-\add_action( 'login_form_activitypub_authorize', array( __NAMESPACE__ . '\OAuth\Server', 'login_form_authorize' ) );