← All changes | activitypub.php +23 -38 8.2.0 → 7.8.2 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: 8.2.0
	6	+ * Version: 7.8.2
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', '8.2.0' );
	20	+\define( 'ACTIVITYPUB_PLUGIN_VERSION', '7.8.2' );
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
		@@ -52,24 +44,16 @@
52	44	Rest\Server::init();
53	45	( new Rest\Actors_Controller() )->register_routes();
54	46	( new Rest\Actors_Inbox_Controller() )->register_routes();
55	47	( new Rest\Admin\Actions_Controller() )->register_routes();
56		- ( new Rest\Admin\Statistics_Controller() )->register_routes();
57	48	( new Rest\Application_Controller() )->register_routes();
58		- ( new Rest\Stats_Image_Controller() )->register_routes();
59	49	( new Rest\Collections_Controller() )->register_routes();
60	50	( new Rest\Comments_Controller() )->register_routes();
61	51	( new Rest\Followers_Controller() )->register_routes();
62	52	( new Rest\Following_Controller() )->register_routes();
63		- ( new Rest\Liked_Controller() )->register_routes();
64	53	( new Rest\Inbox_Controller() )->register_routes();
65	54	( new Rest\Interaction_Controller() )->register_routes();
66	55	( new Rest\Moderators_Controller() )->register_routes();
67		- if ( \get_option( 'activitypub_api', false ) ) {
68		- ( new Rest\OAuth\Authorization_Controller() )->register_routes();
69		- ( new Rest\OAuth\Clients_Controller() )->register_routes();
70		- ( new Rest\OAuth\Token_Controller() )->register_routes();
71		- }
72	56	( new Rest\Outbox_Controller() )->register_routes();
73	57	( new Rest\Post_Controller() )->register_routes();
74	58	( new Rest\Replies_Controller() )->register_routes();
75	59	( new Rest\Webfinger_Controller() )->register_routes();
		@@ -77,9 +61,8 @@
77	61	// Load NodeInfo endpoints only if blog is public.
78	62	if ( is_blog_public() ) {
79	63	( new Rest\Nodeinfo_Controller() )->register_routes();
80	64	}
81		- ( new Rest\Proxy_Controller() )->register_routes();
82	65	}
83	66	\add_action( 'rest_api_init', __NAMESPACE__ . '\rest_init' );
84	67
85	68	/**
		@@ -86,16 +69,13 @@
86	69	* Initialize plugin.
87	70	*/
88	71	function plugin_init() {
89	72	\add_action( 'init', array( __NAMESPACE__ . '\Activitypub', 'init' ) );
	73	+ \add_action( 'init', array( __NAMESPACE__ . '\Attachments', 'init' ) );
90	74	\add_action( 'init', array( __NAMESPACE__ . '\Avatars', 'init' ) );
91		- \add_action( 'init', array( __NAMESPACE__ . '\Cache', 'init' ) );
92	75	\add_action( 'init', array( __NAMESPACE__ . '\Comment', 'init' ) );
93	76	\add_action( 'init', array( __NAMESPACE__ . '\Dispatcher', 'init' ) );
94	77	\add_action( 'init', array( __NAMESPACE__ . '\Embed', 'init' ) );
95		- if ( \get_option( 'activitypub_api', false ) ) {
96		- \add_action( 'init', array( __NAMESPACE__ . '\Event_Stream', 'init' ) );
97		- }
98	78	\add_action( 'init', array( __NAMESPACE__ . '\Handler', 'init' ) );
99	79	\add_action( 'init', array( __NAMESPACE__ . '\Hashtag', 'init' ) );
100	80	\add_action( 'init', array( __NAMESPACE__ . '\Link', 'init' ) );
101	81	\add_action( 'init', array( __NAMESPACE__ . '\Mailer', 'init' ) );
		@@ -104,16 +84,11 @@
104	84	\add_action( 'init', array( __NAMESPACE__ . '\Move', 'init' ) );
105	85	\add_action( 'init', array( __NAMESPACE__ . '\Options', 'init' ) );
106	86	\add_action( 'init', array( __NAMESPACE__ . '\Post_Types', 'init' ) );
107	87	\add_action( 'init', array( __NAMESPACE__ . '\Router', 'init' ) );
108		- // Priority 0 ensures Scheduler hooks are registered before Migration (priority 1) runs.
109		- \add_action( 'init', array( __NAMESPACE__ . '\Scheduler', 'init' ), 0 );
	88	+ \add_action( 'init', array( __NAMESPACE__ . '\Scheduler', 'init' ) );
110	89	\add_action( 'init', array( __NAMESPACE__ . '\Search', 'init' ) );
111	90	\add_action( 'init', array( __NAMESPACE__ . '\Signature', 'init' ) );
112		- // Only load OAuth Server if the ActivityPub API is enabled.
113		- if ( \get_option( 'activitypub_api', false ) ) {
114		- \add_action( 'init', array( __NAMESPACE__ . '\OAuth\Server', 'init' ) );
115		- }
116	91
117	92	if ( site_supports_blocks() ) {
118	93	\add_action( 'init', array( __NAMESPACE__ . '\Blocks', 'init' ) );
119	94	}
		@@ -129,8 +104,16 @@
129	104	if ( \file_exists( $loader_file ) && \is_readable( $loader_file ) ) {
130	105	require_once $loader_file;
131	106	}
132	107	}
	108	+
	109	+ if ( \defined( 'WP_DEBUG' ) && WP_DEBUG ) {
	110	+ $debug_file = __DIR__ . '/includes/debug.php';
	111	+ if ( \file_exists( $debug_file ) && \is_readable( $debug_file ) ) {
	112	+ require_once $debug_file;
	113	+ Debug::init();
	114	+ }
	115	+ }
133	116	}
134	117	\add_action( 'plugins_loaded', __NAMESPACE__ . '\plugin_init' );
135	118
136	119	/**
		@@ -139,9 +122,9 @@
139	122	function plugin_admin_init() {
140	123	// Screen Options and Menus are set before `admin_init`.
141	124	\add_action( 'init', array( __NAMESPACE__ . '\WP_Admin\Heartbeat', 'init' ), 9 ); // Before script loader.
142	125	\add_filter( 'init', array( __NAMESPACE__ . '\WP_Admin\Screen_Options', 'init' ) );
143		- \add_action( 'init', array( __NAMESPACE__ . '\WP_Admin\Menu', 'init' ) );
	126	+ \add_action( 'admin_menu', array( __NAMESPACE__ . '\WP_Admin\Menu', 'admin_menu' ) );
144	127
145	128	\add_action( 'admin_init', array( __NAMESPACE__ . '\WP_Admin\Admin', 'init' ) );
146	129	\add_action( 'admin_init', array( __NAMESPACE__ . '\WP_Admin\Advanced_Settings_Fields', 'init' ) );
147	130	\add_action( 'admin_init', array( __NAMESPACE__ . '\WP_Admin\App', 'init' ), 0 ); // Before admin bar init.
		@@ -148,9 +131,8 @@
148	131	\add_action( 'admin_init', array( __NAMESPACE__ . '\WP_Admin\Blog_Settings_Fields', 'init' ) );
149	132	\add_action( 'admin_init', array( __NAMESPACE__ . '\WP_Admin\Health_Check', 'init' ) );
150	133	\add_action( 'admin_init', array( __NAMESPACE__ . '\WP_Admin\Settings', 'init' ) );
151	134	\add_action( 'admin_init', array( __NAMESPACE__ . '\WP_Admin\Settings_Fields', 'init' ) );
152		- \add_action( 'admin_init', array( __NAMESPACE__ . '\WP_Admin\Dashboard', 'init' ) );
153	135	\add_action( 'admin_init', array( __NAMESPACE__ . '\WP_Admin\User_Settings_Fields', 'init' ) );
154	136	\add_action( 'admin_init', array( __NAMESPACE__ . '\WP_Admin\Welcome_Fields', 'init' ) );
155	137
156	138	if ( defined( 'WP_LOAD_IMPORTERS' ) && WP_LOAD_IMPORTERS ) {
		@@ -172,11 +154,14 @@
172	154	}
173	155	}
174	156	\add_action( 'activated_plugin', __NAMESPACE__ . '\activation_redirect' );
175	157
176		-// Check for CLI env, to add the CLI commands.
	158	+// Check for CLI env, to add the CLI commands.Add commentMore actions.
177	159	if ( defined( 'WP_CLI' ) && WP_CLI ) {
178		- Cli::register();
	160	+ \WP_CLI::add_command(
	161	+ 'activitypub',
	162	+ '\Activitypub\Cli',
	163	+ array(
	164	+ 'shortdesc' => 'ActivityPub related commands to manage plugin functionality and the federation of posts and comments.',
	165	+ )
	166	+ );
179	167	}
180		-
181		-// Register OAuth login form handler early (before wp-login.php processes).
182		-\add_action( 'login_form_activitypub_authorize', array( __NAMESPACE__ . '\OAuth\Server', 'login_form_authorize' ) );