← All changes | activitypub.php +44 -25 1.2.0 → 3.2.4 View file →

		@@ -2,14 +2,14 @@
2	2	/**
3	3	* Plugin Name: ActivityPub
4	4	* Plugin URI: https://github.com/pfefferle/wordpress-activitypub/
5	5	* Description: The ActivityPub protocol is a decentralized social networking protocol based upon the ActivityStreams 2.0 data format.
6		- * Version: 1.2.0
	6	+ * Version: 3.2.4
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: 5.6
	11	+ * Requires PHP: 7.0
12	12	* Text Domain: activitypub
13	13	* Domain Path: /languages
14	14	*/
15	15
		@@ -14,8 +14,10 @@
14	14	*/
15	15
16	16	namespace Activitypub;
17	17
	18	+use WP_CLI;
	19	+
18	20	use function Activitypub\is_blog_public;
19	21	use function Activitypub\site_supports_blocks;
20	22
21	23	require_once __DIR__ . '/includes/compat.php';
		@@ -20,8 +22,10 @@
20	22
21	23	require_once __DIR__ . '/includes/compat.php';
22	24	require_once __DIR__ . '/includes/functions.php';
23	25
	26	+\define( 'ACTIVITYPUB_PLUGIN_VERSION', '3.2.4' );
	27	+
24	28	/**
25	29	* Initialize the plugin constants.
26	30	*/
27	31	\defined( 'ACTIVITYPUB_REST_NAMESPACE' ) || \define( 'ACTIVITYPUB_REST_NAMESPACE', 'activitypub/1.0' );
		@@ -28,12 +32,20 @@
28	32	\defined( 'ACTIVITYPUB_EXCERPT_LENGTH' ) || \define( 'ACTIVITYPUB_EXCERPT_LENGTH', 400 );
29	33	\defined( 'ACTIVITYPUB_SHOW_PLUGIN_RECOMMENDATIONS' ) || \define( 'ACTIVITYPUB_SHOW_PLUGIN_RECOMMENDATIONS', true );
30	34	\defined( 'ACTIVITYPUB_MAX_IMAGE_ATTACHMENTS' ) || \define( 'ACTIVITYPUB_MAX_IMAGE_ATTACHMENTS', 3 );
31	35	\defined( 'ACTIVITYPUB_HASHTAGS_REGEXP' ) || \define( 'ACTIVITYPUB_HASHTAGS_REGEXP', '(?:(?<=\s)|(?<=<p>)|(?<=<br>)|^)#([A-Za-z0-9_]+)(?:(?=\s|[[:punct:]]|$))' );
32		-\defined( 'ACTIVITYPUB_USERNAME_REGEXP' ) || \define( 'ACTIVITYPUB_USERNAME_REGEXP', '(?:([A-Za-z0-9_-]+)@((?:[A-Za-z0-9_-]+\.)+[A-Za-z]+))' );
33		-\defined( 'ACTIVITYPUB_CUSTOM_POST_CONTENT' ) || \define( 'ACTIVITYPUB_CUSTOM_POST_CONTENT', "<strong>[ap_title]</strong>\n\n[ap_content]\n\n[ap_hashtags]\n\n[ap_shortlink]" );
	36	+\defined( 'ACTIVITYPUB_USERNAME_REGEXP' ) || \define( 'ACTIVITYPUB_USERNAME_REGEXP', '(?:([A-Za-z0-9\._-]+)@((?:[A-Za-z0-9_-]+\.)+[A-Za-z]+))' );
	37	+\defined( 'ACTIVITYPUB_URL_REGEXP' ) || \define( 'ACTIVITYPUB_URL_REGEXP', '(www.|http:|https:)+[^\s]+[\w\/]' );
	38	+\defined( 'ACTIVITYPUB_CUSTOM_POST_CONTENT' ) || \define( 'ACTIVITYPUB_CUSTOM_POST_CONTENT', "<h2>[ap_title]</h2>\n\n[ap_content]\n\n[ap_hashtags]\n\n[ap_shortlink]" );
34	39	\defined( 'ACTIVITYPUB_AUTHORIZED_FETCH' ) || \define( 'ACTIVITYPUB_AUTHORIZED_FETCH', false );
35	40	\defined( 'ACTIVITYPUB_DISABLE_REWRITES' ) || \define( 'ACTIVITYPUB_DISABLE_REWRITES', false );
	41	+\defined( 'ACTIVITYPUB_DISABLE_INCOMING_INTERACTIONS' ) || \define( 'ACTIVITYPUB_DISABLE_INCOMING_INTERACTIONS', false );
	42	+// Disable reactions like `Like` and `Accounce` by default
	43	+\defined( 'ACTIVITYPUB_DISABLE_REACTIONS' ) || \define( 'ACTIVITYPUB_DISABLE_REACTIONS', true );
	44	+\defined( 'ACTIVITYPUB_DISABLE_OUTGOING_INTERACTIONS' ) || \define( 'ACTIVITYPUB_DISABLE_OUTGOING_INTERACTIONS', false );
	45	+\defined( 'ACTIVITYPUB_SHARED_INBOX_FEATURE' ) || \define( 'ACTIVITYPUB_SHARED_INBOX_FEATURE', false );
	46	+\defined( 'ACTIVITYPUB_SEND_VARY_HEADER' ) || \define( 'ACTIVITYPUB_SEND_VARY_HEADER', false );
	47	+\defined( 'ACTIVITYPUB_DEFAULT_OBJECT_TYPE' ) || \define( 'ACTIVITYPUB_DEFAULT_OBJECT_TYPE', 'note' );
36	48
37	49	\define( 'ACTIVITYPUB_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
38	50	\define( 'ACTIVITYPUB_PLUGIN_BASENAME', plugin_basename( __FILE__ ) );
39	51	\define( 'ACTIVITYPUB_PLUGIN_FILE', plugin_dir_path( __FILE__ ) . '/' . basename( __FILE__ ) );
		@@ -42,16 +54,18 @@
42	54	/**
43	55	* Initialize REST routes.
44	56	*/
45	57	function rest_init() {
46		- Rest\Users::init();
	58	+ Rest\Actors::init();
47	59	Rest\Outbox::init();
48	60	Rest\Inbox::init();
49	61	Rest\Followers::init();
50	62	Rest\Following::init();
51	63	Rest\Webfinger::init();
	64	+ Rest\Comment::init();
52	65	Rest\Server::init();
53	66	Rest\Collection::init();
	67	+ Rest\Interaction::init();
54	68
55	69	// load NodeInfo endpoints only if blog is public
56	70	if ( is_blog_public() ) {
57	71	Rest\NodeInfo::init();
		@@ -65,14 +79,16 @@
65	79	function plugin_init() {
66	80	\add_action( 'init', array( __NAMESPACE__ . '\Migration', 'init' ) );
67	81	\add_action( 'init', array( __NAMESPACE__ . '\Activitypub', 'init' ) );
68	82	\add_action( 'init', array( __NAMESPACE__ . '\Activity_Dispatcher', 'init' ) );
69		- \add_action( 'init', array( __NAMESPACE__ . '\Collection\Followers', 'init' ) );
	83	+ \add_action( 'init', array( __NAMESPACE__ . '\Handler', 'init' ) );
70	84	\add_action( 'init', array( __NAMESPACE__ . '\Admin', 'init' ) );
71	85	\add_action( 'init', array( __NAMESPACE__ . '\Hashtag', 'init' ) );
72	86	\add_action( 'init', array( __NAMESPACE__ . '\Mention', 'init' ) );
73	87	\add_action( 'init', array( __NAMESPACE__ . '\Health_Check', 'init' ) );
74	88	\add_action( 'init', array( __NAMESPACE__ . '\Scheduler', 'init' ) );
	89	+ \add_action( 'init', array( __NAMESPACE__ . '\Comment', 'init' ) );
	90	+ \add_action( 'init', array( __NAMESPACE__ . '\Link', 'init' ) );
75	91
76	92	if ( site_supports_blocks() ) {
77	93	\add_action( 'init', array( __NAMESPACE__ . '\Blocks', 'init' ) );
78	94	}
		@@ -81,17 +97,12 @@
81	97	if ( \WP_DEBUG && file_exists( $debug_file ) && is_readable( $debug_file ) ) {
82	98	require_once $debug_file;
83	99	Debug::init();
84	100	}
85		-
86		- require_once __DIR__ . '/integration/class-webfinger.php';
87		- Integration\Webfinger::init();
88		-
89		- require_once __DIR__ . '/integration/class-nodeinfo.php';
90		- Integration\Nodeinfo::init();
91	101	}
92	102	\add_action( 'plugins_loaded', __NAMESPACE__ . '\plugin_init' );
93	103
	104	+
94	105	/**
95	106	* Class Autoloader
96	107	*/
97	108	\spl_autoload_register(
		@@ -109,9 +120,9 @@
109	120
110	121	if ( false !== strpos( $class, '\\' ) ) {
111	122	$parts = explode( '\\', $class );
112	123	$class = array_pop( $parts );
113		- $sub_dir = implode( '/', $parts );
	124	+ $sub_dir = strtr( implode( '/', $parts ), '_', '-' );
114	125	$base_dir = $base_dir . $sub_dir . '/';
115	126	}
116	127
117	128	$filename = 'class-' . strtr( $class, '_', '-' );
		@@ -120,9 +131,11 @@
120	131	if ( file_exists( $file ) && is_readable( $file ) ) {
121	132	require_once $file;
122	133	} else {
123	134	// translators: %s is the class name
124		- \wp_die( sprintf( esc_html__( 'Required class not found or not readable: %s', 'activitypub' ), esc_html( $full_class ) ) );
	135	+ $message = sprintf( esc_html__( 'Required class not found or not readable: %s', 'activitypub' ), esc_html( $full_class ) );
	136	+ Debug::write_log( $message );
	137	+ \wp_die( $message ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
125	138	}
126	139	}
127	140	}
128	141	);
		@@ -165,19 +178,10 @@
165	178	'uninstall',
166	179	)
167	180	);
168	181
169		-/**
170		- * Only load code that needs BuddyPress to run once BP is loaded and initialized.
171		- */
172		-add_action(
173		- 'bp_include',
174		- function() {
175		- require_once __DIR__ . '/integration/class-buddypress.php';
176		- Integration\Buddypress::init();
177		- },
178		- 0
179		-);
	182	+// Load integrations
	183	+require_once __DIR__ . '/integration/load.php';
180	184
181	185	/**
182	186	* `get_plugin_data` wrapper
183	187	*
		@@ -207,8 +211,23 @@
207	211	/**
208	212	* Plugin Version Number used for caching.
209	213	*/
210	214	function get_plugin_version() {
	215	+ if ( \defined( 'ACTIVITYPUB_PLUGIN_VERSION' ) ) {
	216	+ return ACTIVITYPUB_PLUGIN_VERSION;
	217	+ }
	218	+
211	219	$meta = get_plugin_meta( array( 'Version' => 'Version' ) );
212	220
213	221	return $meta['Version'];
	222	+}
	223	+
	224	+// Check for CLI env, to add the CLI commands
	225	+if ( defined( 'WP_CLI' ) && WP_CLI ) {
	226	+ WP_CLI::add_command(
	227	+ 'activitypub',
	228	+ '\Activitypub\Cli',
	229	+ array(
	230	+ 'shortdesc' => __( 'ActivityPub related commands: Meta-Infos, Delete and soon Self-Destruct.', 'activitypub' ),
	231	+ )
	232	+ );
214	233	}