Merge branch 'master' into Comments

.github/workflows/deploy.yml

@@ -10,7 +10,7 @@ jobs:
     steps:
     - uses: actions/checkout@master
     - name: WordPress Plugin Deploy
-      uses: 10up/action-wordpress-plugin-deploy@master
+      uses: 10up/action-wordpress-plugin-deploy@stable
       env:
         SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
         SVN_USERNAME: ${{ secrets.SVN_USERNAME }}

.github/workflows/phpunit.yml

@@ -15,7 +15,7 @@ jobs:
        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=10s --health-retries=10
     strategy:
       matrix:
-        php-versions: ['5.6', '7.2', '7.3', '7.4', '8.0', '8.1']
+        php-versions: ['5.6', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
     steps:
       - name: Checkout
         uses: actions/checkout@v2

.github/workflows/update-assets.yml

@@ -10,7 +10,7 @@ jobs:
     steps:
     - uses: actions/checkout@master
     - name: WordPress.org plugin asset/readme update
-      uses: 10up/action-wordpress-plugin-asset-update@master
+      uses: 10up/action-wordpress-plugin-asset-update@stable
       env:
         SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
         SVN_USERNAME: ${{ secrets.SVN_USERNAME }}

.gitignore

@@ -5,3 +5,5 @@ composer.lock
 .DS_Store
 .idea/
 .php_cs.cache
+.vscode/settings.json
+.phpunit.result.cache

README.md

@@ -1,10 +1,10 @@
 # ActivityPub #
-**Contributors:** [pfefferle](https://profiles.wordpress.org/pfefferle), [mediaformat](https://profiles.wordpress.org/mediaformat)  
+**Contributors:** [pfefferle](https://profiles.wordpress.org/pfefferle/), [mediaformat](https://profiles.wordpress.org/mediaformat/), [akirk](https://profiles.wordpress.org/akirk/)  
 **Donate link:** https://notiz.blog/donate/  
 **Tags:** OStatus, fediverse, activitypub, activitystream  
 **Requires at least:** 4.7  
-**Tested up to:** 6.0  
+**Tested up to:** 6.1  
-**Stable tag:** 0.13.4  
+**Stable tag:** 0.14.3  
 **Requires PHP:** 5.6  
 **License:** MIT  
 **License URI:** http://opensource.org/licenses/MIT  
@@ -88,6 +88,26 @@ Where 'blog' is the path to the subdirectory at which your blog resides.
 
 Project maintained on GitHub at [pfefferle/wordpress-activitypub](https://github.com/pfefferle/wordpress-activitypub).
 
+### 0.14.3 ###
+
+* Better error handling. props [@akirk](https://github.com/akirk)
+
+### 0.14.2 ###
+
+* Fix Critical error when using Friends Plugin and adding new URL to follow. props [@akirk](https://github.com/akirk)
+
+### 0.14.1 ###
+
+* Fix "WebFinger not compatible with PHP < 8.0". props [@mexon](https://github.com/mexon)
+
+### 0.14.0 ###
+
+* Friends support: https://wordpress.org/plugins/friends/ . props [@akirk](https://github.com/akirk)
+* Massive guidance improvements. props [mediaformat](https://github.com/mediaformat) & [@akirk](https://github.com/akirk)
+* Add Custom Post Type support to outbox API. props [blueset](https://github.com/blueset)
+* Better hash-tag support. props [bocops](https://github.com/bocops)
+* Fix user-count (NodeInfo). props [mediaformat](https://github.com/mediaformat)
+
 ### 0.13.4 ###
 
 * fix webfinger for email identifiers

activitypub.php

@@ -3,7 +3,7 @@
  * Plugin Name: ActivityPub
  * Plugin URI: https://github.com/pfefferle/wordpress-activitypub/
  * Description: The ActivityPub protocol is a decentralized social networking protocol based upon the ActivityStreams 2.0 data format.
- * Version: 0.14.0-RC1
+ * Version: 0.15.0
  * Author: Matthias Pfefferle
  * Author URI: https://notiz.blog/
  * License: MIT
@@ -22,12 +22,15 @@ function init() {
 	\defined( 'ACTIVITYPUB_HASHTAGS_REGEXP' ) || \define( 'ACTIVITYPUB_HASHTAGS_REGEXP', '(?:(?<=\s)|(?<=<p>)|(?<=<br>)|^)#([A-Za-z0-9_]+)(?:(?=\s|[[:punct:]]|$))' );
 	\defined( 'ACTIVITYPUB_ALLOWED_HTML' ) || \define( 'ACTIVITYPUB_ALLOWED_HTML', '<strong><a><p><ul><ol><li><code><blockquote><pre><img>' );
 	\defined( 'ACTIVITYPUB_CUSTOM_POST_CONTENT' ) || \define( 'ACTIVITYPUB_CUSTOM_POST_CONTENT', "<p><strong>%title%</strong></p>\n\n%content%\n\n<p>%hashtags%</p>\n\n<p>%shortlink%</p>" );
-	\defined( 'ACTIVITYPUB_PLUGIN' ) || \define( 'ACTIVITYPUB_PLUGIN', __FILE__ );
 	
+  \define( 'ACTIVITYPUB_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
+	\define( 'ACTIVITYPUB_PLUGIN_BASENAME', plugin_basename( __FILE__ ) );
+	\define( 'ACTIVITYPUB_PLUGIN_FILE', plugin_dir_path( __FILE__ ) . '/' . basename( __FILE__ ) );
 
 	require_once \dirname( __FILE__ ) . '/includes/table/followers-list.php';
 	require_once \dirname( __FILE__ ) . '/includes/table/migrate-list.php';
 	require_once \dirname( __FILE__ ) . '/includes/class-signature.php';
+	require_once \dirname( __FILE__ ) . '/includes/class-webfinger.php';
 	require_once \dirname( __FILE__ ) . '/includes/peer/class-followers.php';
 	require_once \dirname( __FILE__ ) . '/includes/functions.php';
 	require_once \dirname( __FILE__ ) . '/includes/class-tools.php';
@@ -115,7 +118,7 @@ function add_rewrite_rules() {
 		\add_rewrite_rule( '^.well-known/webfinger', 'index.php?rest_route=/activitypub/1.0/webfinger', 'top' );
 	}
 
-	if ( ! \class_exists( 'Nodeinfo' ) ) {
+	if ( ! \class_exists( 'Nodeinfo' ) || ! (bool) \get_option( 'blog_public', 1 ) ) {
 		\add_rewrite_rule( '^.well-known/nodeinfo', 'index.php?rest_route=/activitypub/1.0/nodeinfo/discovery', 'top' );
 		\add_rewrite_rule( '^.well-known/x-nodeinfo2', 'index.php?rest_route=/activitypub/1.0/nodeinfo2', 'top' );
 	}
@@ -153,3 +156,11 @@ function enable_buddypress_features() {
 	\Activitypub\Integration\Buddypress::init();
 }
 add_action( 'bp_include', '\Activitypub\enable_buddypress_features' );
+
+add_action(
+	'friends_load_parsers',
+	function( \Friends\Feed $friends_feed ) {
+		require_once __DIR__ . '/integration/class-friends-feed-parser-activitypub.php';
+		$friends_feed->register_parser( Friends_Feed_Parser_ActivityPub::SLUG, new Friends_Feed_Parser_ActivityPub( $friends_feed ) );
+	}
+);

assets/css/activitypub-admin.css

@@ -0,0 +1,140 @@
+.settings_page_activitypub .notice {
+	max-width: 800px;
+	margin: 0 auto;
+}
+
+.activitypub-settings-header {
+	text-align: center;
+	margin: 0 0 1rem;
+	background: #fff;
+	border-bottom: 1px solid #dcdcde;
+}
+
+.activitypub-settings-title-section {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	clear: both;
+	padding-top: 8px;
+}
+
+.settings_page_activitypub #wpcontent {
+	padding-left: 0;
+}
+
+.activitypub-settings-tabs-wrapper {
+	display: -ms-inline-grid;
+	-ms-grid-columns: 1fr 1fr;
+	vertical-align: top;
+	display: inline-grid;
+	grid-template-columns: 1fr 1fr;
+}
+
+.activitypub-settings-tab.active {
+	box-shadow: inset 0 -3px #3582c4;
+	font-weight: 600;
+}
+
+.activitypub-settings-tab {
+	display: block;
+	text-decoration: none;
+	color: inherit;
+	padding: .5rem 1rem 1rem;
+	margin: 0 1rem;
+	transition: box-shadow .5s ease-in-out;
+}
+
+.wp-header-end {
+	visibility: hidden;
+	margin: -2px 0 0;
+}
+
+summary {
+	cursor: pointer;
+	text-decoration: underline;
+	color: #2271b1;
+}
+
+.activitypub-settings-accordion {
+	border: 1px solid #c3c4c7;
+}
+
+.activitypub-settings-accordion-heading {
+	margin: 0;
+	border-top: 1px solid #c3c4c7;
+	font-size: inherit;
+	line-height: inherit;
+	font-weight: 600;
+	color: inherit;
+}
+
+.activitypub-settings-accordion-heading:first-child {
+	border-top: none;
+}
+
+.activitypub-settings-accordion-panel {
+	margin: 0;
+	padding: 1em 1.5em;
+	background: #fff;
+}
+
+.activitypub-settings-accordion-trigger {
+	background: #fff;
+	border: 0;
+	color: #2c3338;
+	cursor: pointer;
+	display: flex;
+	font-weight: 400;
+	margin: 0;
+	padding: 1em 3.5em 1em 1.5em;
+	min-height: 46px;
+	position: relative;
+	text-align: left;
+	width: 100%;
+	align-items: center;
+	justify-content: space-between;
+	-webkit-user-select: auto;
+	user-select: auto;
+}
+
+.activitypub-settings-accordion-trigger {
+	color: #2c3338;
+	cursor: pointer;
+	font-weight: 400;
+	text-align: left;
+}
+
+.activitypub-settings-accordion-trigger .title {
+	pointer-events: none;
+	font-weight: 600;
+	flex-grow: 1;
+}
+
+.activitypub-settings-accordion-trigger .icon, .activitypub-settings-accordion-viewed .icon {
+	border: solid #50575e medium;
+	border-width: 0 2px 2px 0;
+	height: .5rem;
+	pointer-events: none;
+	position: absolute;
+	right: 1.5em;
+	top: 50%;
+	transform: translateY(-70%) rotate(45deg);
+	width: .5rem;
+}
+
+.activitypub-settings-accordion-trigger[aria-expanded="true"] .icon {
+	transform: translateY(-30%) rotate(-135deg);
+}
+
+.activitypub-settings-accordion-trigger:active, .activitypub-settings-accordion-trigger:hover {
+	background: #f6f7f7;
+}
+
+.activitypub-settings-accordion-trigger:focus {
+	color: #1d2327;
+	border: none;
+	box-shadow: none;
+	outline-offset: -1px;
+	outline: 2px solid #2271b1;
+	background-color: #f6f7f7;
+}

assets/js/activitypub-admin.js

@@ -0,0 +1,20 @@
+jQuery( function( $ ) {
+	// Accordion handling in various areas.
+	$( '.activitypub-settings-accordion' ).on( 'click', '.activitypub-settings-accordion-trigger', function() {
+		var isExpanded = ( 'true' === $( this ).attr( 'aria-expanded' ) );
+
+		if ( isExpanded ) {
+			$( this ).attr( 'aria-expanded', 'false' );
+			$( '#' + $( this ).attr( 'aria-controls' ) ).attr( 'hidden', true );
+		} else {
+			$( this ).attr( 'aria-expanded', 'true' );
+			$( '#' + $( this ).attr( 'aria-controls' ) ).attr( 'hidden', false );
+		}
+	} );
+	
+	$(document).on( 'wp-plugin-install-success', function( event, response ) {
+		setTimeout( function() {
+			$( '.activate-now' ).removeClass( 'thickbox open-plugin-details-modal' );
+		}, 1200 );
+	} );	
+} );

includes/class-admin.php

@@ -15,10 +15,10 @@ class Admin {
 		\add_action( 'admin_init', array( '\Activitypub\Admin', 'register_settings' ) );
 		\add_action( 'admin_init', array( '\Activitypub\Admin', 'version_check' ), 1 );
 		\add_action( 'show_user_profile', array( '\Activitypub\Admin', 'add_fediverse_profile' ) );
-		\add_action( 'admin_enqueue_scripts', array( '\Activitypub\Admin', 'enqueue_script_actions' ), 10, 2 );
 		\add_action( 'wp_ajax_migrate_post', array( '\Activitypub\Admin', 'migrate_post_action' ) );
 		\add_filter( 'comment_row_actions', array( '\Activitypub\Admin', 'reply_comments_actions' ), 10, 2 );
 		\add_filter( 'views_tools_page_activitypub_tools', array( '\Activitypub\Table\Migrate_List', 'get_activitypub_tools_views' ), 10 );
+		\add_action( 'admin_enqueue_scripts', array( '\Activitypub\Admin', 'enqueue_scripts' ) );
 	}
 
 	/**
@@ -26,7 +26,7 @@ class Admin {
 	 */
 	public static function admin_menu() {
 		$settings_page = \add_options_page(
-			'ActivityPub',
+			'Welcome',
 			'ActivityPub',
 			'manage_options',
 			'activitypub',
@@ -46,7 +46,27 @@ class Admin {
 	 * Load settings page
 	 */
 	public static function settings_page() {
-		\load_template( \dirname( __FILE__ ) . '/../templates/settings.php' );
+		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
+		if ( empty( $_GET['tab'] ) ) {
+			$tab = 'welcome';
+		} else {
+			// phpcs:ignore WordPress.Security.NonceVerification.Recommended
+			$tab = sanitize_key( $_GET['tab'] );
+		}
+
+		switch ( $tab ) {
+			case 'settings':
+				\load_template( \dirname( __FILE__ ) . '/../templates/settings.php' );
+				break;
+			case 'welcome':
+			default:
+				wp_enqueue_script( 'plugin-install' );
+				add_thickbox();
+				wp_enqueue_script( 'updates' );
+
+				\load_template( \dirname( __FILE__ ) . '/../templates/welcome.php' );
+				break;
+		}
 	}
 
 	/**
@@ -157,23 +177,7 @@ class Admin {
 	}
 
 	public static function add_settings_help_tab() {
-		\get_current_screen()->add_help_tab(
+		require_once \dirname( __FILE__ ) . '/help.php';
-			array(
-				'id'      => 'overview',
-				'title'   => \__( 'Overview', 'activitypub' ),
-				'content' =>
-					'<p>' . \__( 'ActivityPub is a decentralized social networking protocol based on the ActivityStreams 2.0 data format. ActivityPub is an official W3C recommended standard published by the W3C Social Web Working Group. It provides a client to server API for creating, updating and deleting content, as well as a federated server to server API for delivering notifications and subscribing to content.', 'activitypub' ) . '</p>',
-			)
-		);
-
-		\get_current_screen()->set_help_sidebar(
-			'<p><strong>' . \__( 'For more information:', 'activitypub' ) . '</strong></p>' .
-			'<p>' . \__( '<a href="https://activitypub.rocks/">Test Suite</a>', 'activitypub' ) . '</p>' .
-			'<p>' . \__( '<a href="https://www.w3.org/TR/activitypub/">W3C Spec</a>', 'activitypub' ) . '</p>' .
-			'<p>' . \__( '<a href="https://github.com/pfefferle/wordpress-activitypub/issues">Give us feedback</a>', 'activitypub' ) . '</p>' .
-			'<hr />' .
-			'<p>' . \__( '<a href="https://notiz.blog/donate">Donate</a>', 'activitypub' ) . '</p>'
-		);
 	}
 
 	public static function add_followers_list_help_tab() {
@@ -182,23 +186,11 @@ class Admin {
 
 	public static function add_fediverse_profile( $user ) {
 		?>
-		<h2><?php \esc_html_e( 'Fediverse', 'activitypub' ); ?></h2>
+		<h2 id="activitypub"><?php \esc_html_e( 'ActivityPub', 'activitypub' ); ?></h2>
 		<?php
 		\Activitypub\get_identifier_settings( $user->ID );
 	}
 
-	public static function enqueue_script_actions( $hook ) {
-		if ( 'edit-comments.php' === $hook || 'tools_page_activitypub_tools' === $hook ) {
-			\wp_enqueue_script(
-				'activitypub_actions',
-				\plugin_dir_url( ACTIVITYPUB_PLUGIN ) . '/assets/js/activitypub.js',
-				array( 'jquery' ),
-				\filemtime( \plugin_dir_path( ACTIVITYPUB_PLUGIN ) . 'assets/js/activitypub.js' ),
-				true
-			);
-		}
-	}
-
 	/**
 	 * Migrate post (Ajax)
 	 */
@@ -234,4 +226,21 @@ class Admin {
 		);
 		return $actions;
 	}
+
+	public static function enqueue_scripts( $hook_suffix ) {
+		if ( false !== strpos( $hook_suffix, 'activitypub' ) ) {
+			wp_enqueue_style( 'activitypub-admin-styles', plugins_url( 'assets/css/activitypub-admin.css', ACTIVITYPUB_PLUGIN_FILE ), array(), '1.0.0' );
+			wp_enqueue_script( 'activitypub-admin-styles', plugins_url( 'assets/js/activitypub-admin.js', ACTIVITYPUB_PLUGIN_FILE ), array( 'jquery' ), '1.0.0', false );
+		}
+  
+    if ( 'edit-comments.php' === $hook_suffix || 'tools_page_activitypub_tools' === $hook_suffix ) {
+			\wp_enqueue_script(
+				'activitypub_actions',
+				\plugin_dir_url( ACTIVITYPUB_PLUGIN ) . '/assets/js/activitypub.js',
+				array( 'jquery' ),
+				\filemtime( \plugin_dir_path( ACTIVITYPUB_PLUGIN ) . 'assets/js/activitypub.js' ),
+				true
+			);
+		}
+	}
 }

includes/class-debug.php

@@ -17,13 +17,16 @@ class Debug {
 	}
 
 	public static function log_remote_post_responses( $response, $url, $body, $user_id ) {
+		// phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_error_log, WordPress.PHP.DevelopmentFunctions.error_log_print_r
 		\error_log( "Request to: {$url} with response: " . \print_r( $response, true ) );
 	}
 
 	public static function write_log( $log ) {
 		if ( \is_array( $log ) || \is_object( $log ) ) {
+			// phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_error_log, WordPress.PHP.DevelopmentFunctions.error_log_print_r
 			\error_log( \print_r( $log, true ) );
 		} else {
+			// phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_error_log
 			\error_log( $log );
 		}
 	}

includes/class-health-check.php

@@ -15,6 +15,7 @@ class Health_Check {
 	 */
 	public static function init() {
 		\add_filter( 'site_status_tests', array( '\Activitypub\Health_Check', 'add_tests' ) );
+		\add_filter( 'debug_information', array( '\Activitypub\Health_Check', 'debug_information' ) );
 	}
 
 	public static function add_tests( $tests ) {
@@ -198,58 +199,37 @@ class Health_Check {
 	 * @return boolean|WP_Error
 	 */
 	public static function is_webfinger_endpoint_accessible() {
-		$user      = \wp_get_current_user();
+		$user    = \wp_get_current_user();
-		$webfinger = \Activitypub\get_webfinger_resource( $user->ID );
+		$account = \Activitypub\get_webfinger_resource( $user->ID );
 
-		$url = \wp_parse_url( \home_url(), \PHP_URL_SCHEME ) . '://' . \wp_parse_url( \home_url(), \PHP_URL_HOST );
+		$url = \Activitypub\Webfinger::resolve( $account );
-
+		if ( \is_wp_error( $url ) ) {
-		if ( \wp_parse_url( \home_url(), \PHP_URL_PORT ) ) {
+			$health_messages = array(
-			$url .= ':' . \wp_parse_url( \home_url(), \PHP_URL_PORT );
+				'webfinger_url_not_accessible' => \sprintf(
-		}
-
-		$url = \trailingslashit( $url ) . '.well-known/webfinger';
-
-		$url = \add_query_arg( 'resource', 'acct:' . $webfinger, $url );
-
-		// try to access author URL
-		$response = \wp_remote_get(
-			$url,
-			array(
-				'headers' => array( 'Accept' => 'application/activity+json' ),
-				'redirection' => 0,
-			)
-		);
-
-		if ( \is_wp_error( $response ) ) {
-			return new \WP_Error(
-				'webfinger_url_not_accessible',
-				\sprintf(
 					// translators: %s: Author URL
 					\__(
 						'<p>Your WebFinger endpoint <code>%s</code> is not accessible. Please check your WordPress setup or permalink structure.</p>',
 						'activitypub'
 					),
-					$url
+					$url->get_error_data()
-				)
+				),
-			);
+				'webfinger_url_invalid_response' => \sprintf(
-		}
-
-		$response_code = \wp_remote_retrieve_response_code( $response );
-
-		// check if response is JSON
-		$body = \wp_remote_retrieve_body( $response );
-
-		if ( ! \is_string( $body ) || ! \is_array( \json_decode( $body, true ) ) ) {
-			return new \WP_Error(
-				'webfinger_url_not_accessible',
-				\sprintf(
 					// translators: %s: Author URL
 					\__(
 						'<p>Your WebFinger endpoint <code>%s</code> does not return valid JSON for <code>application/jrd+json</code>.</p>',
 						'activitypub'
 					),
-					$url
+					$url->get_error_data()
-				)
+				),
+			);
+			$message = null;
+			if ( isset( $health_messages[ $url->get_error_code() ] ) ) {
+				$message = $health_messages[ $url->get_error_code() ];
+			}
+			return new \WP_Error(
+				$url->get_error_code(),
+				$message,
+				$url->get_error_data()
 			);
 		}
 
@@ -287,4 +267,30 @@ class Health_Check {
 
 		return $link;
 	}
+
+	/**
+	 * Static function for generating site debug data when required.
+	 *
+	 * @param array $info The debug information to be added to the core information page.
+	 * @return array The filtered informations
+	 */
+	public static function debug_information( $info ) {
+		$info['activitypub'] = array(
+			'label'  => __( 'ActivityPub', 'activitypub' ),
+			'fields' => array(
+				'webfinger' => array(
+					'label'   => __( 'WebFinger Resource', 'activitypub' ),
+					'value'   => \Activitypub\Webfinger::get_user_resource( wp_get_current_user()->ID ),
+					'private' => true,
+				),
+				'author_url' => array(
+					'label'   => __( 'Author URL', 'activitypub' ),
+					'value'   => get_author_posts_url( wp_get_current_user()->ID ),
+					'private' => true,
+				),
+			),
+		);
+
+		return $info;
+	}
 }

includes/class-signature.php

@@ -70,7 +70,7 @@ class Signature {
 		\update_user_meta( $user_id, 'magic_sig_public_key', $detail['key'] );
 	}
 
-	public static function generate_signature( $user_id, $url, $date, $digest = null ) {
+	public static function generate_signature( $user_id, $http_method, $url, $date, $digest = null ) {
 		$key = self::get_private_key( $user_id );
 
 		$url_parts = \wp_parse_url( $url );
@@ -89,9 +89,9 @@ class Signature {
 		}
 
 		if ( ! empty( $digest ) ) {
-			$signed_string = "(request-target): post $path\nhost: $host\ndate: $date\ndigest: SHA-256=$digest";
+			$signed_string = "(request-target): $http_method $path\nhost: $host\ndate: $date\ndigest: SHA-256=$digest";
 		} else {
-			$signed_string = "(request-target): post $path\nhost: $host\ndate: $date";
+			$signed_string = "(request-target): $http_method $path\nhost: $host\ndate: $date";
 		}
 
 		$signature = null;

includes/class-webfinger.php

@@ -0,0 +1,69 @@
+<?php
+namespace Activitypub;
+
+/**
+ * ActivityPub WebFinger Class
+ *
+ * @author Matthias Pfefferle
+ *
+ * @see https://webfinger.net/
+ */
+class Webfinger {
+	/**
+	 * Returns a users WebFinger "resource"
+	 *
+	 * @param int $user_id
+	 *
+	 * @return string The user-resource
+	 */
+	public static function get_user_resource( $user_id ) {
+		// use WebFinger plugin if installed
+		if ( \function_exists( '\get_webfinger_resource' ) ) {
+			return \get_webfinger_resource( $user_id, false );
+		}
+
+		$user = \get_user_by( 'id', $user_id );
+
+		return $user->user_login . '@' . \wp_parse_url( \home_url(), \PHP_URL_HOST );
+	}
+
+	public static function resolve( $account ) {
+		if ( ! preg_match( '/^@?[^@]+@((?:[a-z0-9-]+\.)+[a-z]+)$/i', $account, $m ) ) {
+			return null;
+		}
+		$url = \add_query_arg( 'resource', 'acct:' . ltrim( $account, '@' ), 'https://' . $m[1] . '/.well-known/webfinger' );
+		if ( ! \wp_http_validate_url( $url ) ) {
+			return new \WP_Error( 'invalid_webfinger_url', null, $url );
+		}
+
+		// try to access author URL
+		$response = \wp_remote_get(
+			$url,
+			array(
+				'headers' => array( 'Accept' => 'application/activity+json' ),
+				'redirection' => 0,
+			)
+		);
+
+		if ( \is_wp_error( $response ) ) {
+			return new \WP_Error( 'webfinger_url_not_accessible', null, $url );
+		}
+
+		$response_code = \wp_remote_retrieve_response_code( $response );
+
+		$body = \wp_remote_retrieve_body( $response );
+		$body = \json_decode( $body, true );
+
+		if ( ! isset( $body['links'] ) ) {
+			return new \WP_Error( 'webfinger_url_invalid_response', null, $url );
+		}
+
+		foreach ( $body['links'] as $link ) {
+			if ( 'self' === $link['rel'] && 'application/activity+json' === $link['type'] ) {
+				return $link['href'];
+			}
+		}
+
+		return new \WP_Error( 'webfinger_url_no_activity_pub', null, $body );
+	}
+}

includes/functions.php

@@ -37,7 +37,7 @@ function get_context() {
 function safe_remote_post( $url, $body, $user_id ) {
 	$date = \gmdate( 'D, d M Y H:i:s T' );
 	$digest = \Activitypub\Signature::generate_digest( $body );
-	$signature = \Activitypub\Signature::generate_signature( $user_id, $url, $date, $digest );
+	$signature = \Activitypub\Signature::generate_signature( $user_id, 'post', $url, $date, $digest );
 
 	$wp_version = \get_bloginfo( 'version' );
 	$user_agent = \apply_filters( 'http_headers_useragent', 'WordPress/' . $wp_version . '; ' . \get_bloginfo( 'url' ) );
@@ -94,7 +94,7 @@ function forward_remote_post( $url, $body, $user_id ) {
 
 function safe_remote_get( $url, $user_id ) {
 	$date = \gmdate( 'D, d M Y H:i:s T' );
-	$signature = \Activitypub\Signature::generate_signature( $user_id, $url, $date );
+	$signature = \Activitypub\Signature::generate_signature( $user_id, 'get', $url, $date );
 
 	$wp_version = \get_bloginfo( 'version' );
 	$user_agent = \apply_filters( 'http_headers_useragent', 'WordPress/' . $wp_version . '; ' . \get_bloginfo( 'url' ) );
@@ -126,24 +126,33 @@ function safe_remote_get( $url, $user_id ) {
  * @return string The user-resource
  */
 function get_webfinger_resource( $user_id ) {
-	// use WebFinger plugin if installed
+	return \Activitypub\Webfinger::get_user_resource( $user_id );
-	if ( \function_exists( '\get_webfinger_resource' ) ) {
-		return \get_webfinger_resource( $user_id, false );
-	}
-
-	$user = \get_user_by( 'id', $user_id );
-
-	return $user->user_login . '@' . \wp_parse_url( \home_url(), \PHP_URL_HOST );
 }
 
 /**
  * [get_metadata_by_actor description]
  *
- * @param sting $actor
+ * @param string $actor
  *
  * @return array
  */
 function get_remote_metadata_by_actor( $actor ) {
+	$pre = apply_filters( 'pre_get_remote_metadata_by_actor', false, $actor );
+	if ( $pre ) {
+		return $pre;
+	}
+	if ( preg_match( '/^@?[^@]+@((?:[a-z0-9-]+\.)+[a-z]+)$/i', $actor ) ) {
+		$actor = \Activitypub\Webfinger::resolve( $actor );
+	}
+
+	if ( ! $actor ) {
+		return null;
+	}
+
+	if ( is_wp_error( $actor ) ) {
+		return $actor;
+	}
+
 	$metadata = \get_transient( 'activitypub_' . $actor );
 
 	if ( $metadata ) {
@@ -284,7 +293,7 @@ function get_identifier_settings( $user_id ) {
 			<td>
 				<p><code><?php echo \esc_html( \Activitypub\get_webfinger_resource( $user_id ) ); ?></code> or <code><?php echo \esc_url( \get_author_posts_url( $user_id ) ); ?></code></p>
 				<?php // translators: the webfinger resource ?>
-				<p class="description"><?php \printf( \esc_html__( 'Try to follow "@%s" in the Mastodon/Friendica search field.', 'activitypub' ), \esc_html( \Activitypub\get_webfinger_resource( $user_id ) ) ); ?></p>
+				<p class="description"><?php \printf( \esc_html__( 'Try to follow "@%s" by searching for it on Mastodon,Friendica & Co.', 'activitypub' ), \esc_html( \Activitypub\get_webfinger_resource( $user_id ) ) ); ?></p>
 			</td>
 		</tr>
 	</tbody>

includes/help.php

@@ -0,0 +1,55 @@
+<?php
+
+\get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'fediverse',
+		'title'   => \__( 'Fediverse', 'activitypub' ),
+		'content' =>
+			'<p><strong>' . \__( 'What is the Fediverse?', 'activitypub' ) . '</strong></p>' .
+			'<p>' . \__( 'The Fediverse is a new word made of two words: "federation" + "universe"', 'activitypub' ) . '</p>' .
+			'<p>' . \__( 'It is a federated social network running on free open software on a myriad of computers across the globe. Many independent servers are interconnected and allow people to interact with one another. There\'s no one central site: you choose a server to register. This ensures some decentralization and sovereignty of data. Fediverse (also called Fedi) has no built-in advertisements, no tricky algorithms, no one big corporation dictating the rules. Instead we have small cozy communities of like-minded people. Welcome!', 'activitypub' ) . '</p>' .
+			'<p>' . \__( 'For more informations please visit <a href="https://fediverse.party/" target="_blank">fediverse.party</a>', 'activitypub' ) . '</p>',
+	)
+);
+
+\get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'activitypub',
+		'title'   => \__( 'ActivityPub', 'activitypub' ),
+		'content' =>
+			'<p><strong>' . \__( 'What is ActivityPub?', 'activitypub' ) . '</strong></p>' .
+			'<p>' . \__( 'ActivityPub is a decentralized social networking protocol based on the ActivityStreams 2.0 data format. ActivityPub is an official W3C recommended standard published by the W3C Social Web Working Group. It provides a client to server API for creating, updating and deleting content, as well as a federated server to server API for delivering notifications and subscribing to content.', 'activitypub' ) . '</p>',
+	)
+);
+
+\get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'webfinger',
+		'title'   => \__( 'WebFinger', 'activitypub' ),
+		'content' =>
+			'<p><strong>' . \__( 'What is WebFinger?', 'activitypub' ) . '</strong></p>' .
+			'<p>' . \__( 'WebFinger is used to discover information about people or other entities on the Internet that are identified by a URI using standard Hypertext Transfer Protocol (HTTP) methods over a secure transport. A WebFinger resource returns a JavaScript Object Notation (JSON) object describing the entity that is queried. The JSON object is referred to as the JSON Resource Descriptor (JRD).', 'activitypub' ) . '</p>' .
+			'<p>' . \__( 'For a person, the type of information that might be discoverable via WebFinger includes a personal profile address, identity service, telephone number, or preferred avatar. For other entities on the Internet, a WebFinger resource might return JRDs containing link relations that enable a client to discover, for example, that a printer can print in color on A4 paper, the physical location of a server, or other static information.', 'activitypub' ) . '</p>' .
+			'<p>' . \__( 'On Mastodon [and other Plattforms], user profiles can be hosted either locally on the same website as yours, or remotely on a completely different website. The same username may be used on a different domain. Therefore, a Mastodon user\'s full mention consists of both the username and the domain, in the form <code>@username@domain</code>. In practical terms, <code>@user@example.com</code> is not the same as <code>@user@example.org</code>. If the domain is not included, Mastodon will try to find a local user named <code>@username</code>. However, in order to deliver to someone over ActivityPub, the <code>@username@domain</code> mention is not enough – mentions must be translated to an HTTPS URI first, so that the remote actor\'s inbox and outbox can be found. (This paragraph is copied from the <a href="https://docs.joinmastodon.org/spec/webfinger/" target="_blank">Mastodon Documentation</a>)', 'activitypub' ) . '</p>' .
+			'<p>' . \__( 'For more informations please visit <a href="https://webfinger.net/" target="_blank">webfinger.net</a>', 'activitypub' ) . '</p>',
+	)
+);
+
+\get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'nodeinfo',
+		'title'   => \__( 'NodeInfo', 'activitypub' ),
+		'content' =>
+			'<p><strong>' . \__( 'What is NodeInfo?', 'activitypub' ) . '</strong></p>' .
+			'<p>' . \__( 'NodeInfo is an effort to create a standardized way of exposing metadata about a server running one of the distributed social networks. The two key goals are being able to get better insights into the user base of distributed social networking and the ability to build tools that allow users to choose the best fitting software and server for their needs.', 'activitypub' ) . '</p>' .
+			'<p>' . \__( 'For more informations please visit <a href="http://nodeinfo.diaspora.software/" target="_blank">nodeinfo.diaspora.software</a>', 'activitypub' ) . '</p>',
+	)
+);
+
+\get_current_screen()->set_help_sidebar(
+	'<p><strong>' . \__( 'For more information:', 'activitypub' ) . '</strong></p>' .
+	'<p>' . \__( '<a href="https://wordpress.org/support/plugin/activitypub/">Get support</a>', 'activitypub' ) . '</p>' .
+	'<p>' . \__( '<a href="https://github.com/pfefferle/wordpress-activitypub/issues">Report an issue</a>', 'activitypub' ) . '</p>' .
+	'<hr />' .
+	'<p>' . \__( '<a href="https://notiz.blog/donate">Donate</a>', 'activitypub' ) . '</p>'
+);

includes/model/class-activity.php

@@ -86,7 +86,7 @@ class Activity {
 	}
 
 	public function to_array() {
-		$array = \get_object_vars( $this );
+		$array = array_filter( \get_object_vars( $this ) );
 
 		if ( $this->context ) {
 			$array = array( '@context' => $this->context ) + $array;

includes/rest/class-inbox.php

@@ -163,7 +163,6 @@ class Inbox {
 	public static function shared_inbox_post( $request ) {
 		$data = $request->get_params();
 		$type = $request->get_param( 'type' );
-
 		$users = self::extract_recipients( $data );
 
 		if ( ! $users ) {
@@ -473,7 +472,6 @@ class Inbox {
 
 			// re-add flood control
 			\add_action( 'check_comment_flood', 'check_comment_flood_db', 10, 4 );
-
 		}
 	}
 

includes/rest/class-nodeinfo.php

@@ -95,10 +95,6 @@ class Nodeinfo {
 			'outbound' => array(),
 		);
 
-		$nodeinfo['metadata'] = array(
-			'email' => \get_option( 'admin_email' ),
-		);
-
 		return new \WP_REST_Response( $nodeinfo, 200 );
 	}
 
@@ -120,13 +116,24 @@ class Nodeinfo {
 			'version' => \get_bloginfo( 'version' ),
 		);
 
-		$users = \count_users();
+		$users = \get_users(
+			array(
+				'capability__in' => array( 'publish_posts' ),
+			)
+		);
+
+		if ( is_array( $users ) ) {
+			$users = count( $users );
+		} else {
+			$users = 1;
+		}
+
 		$posts = \wp_count_posts();
 		$comments = \wp_count_comments();
 
 		$nodeinfo['usage'] = array(
 			'users' => array(
-				'total' => (int) $users['total_users'],
+				'total' => (int) $users,
 			),
 			'localPosts' => (int) $posts->publish,
 			'localComments' => (int) $comments->approved,
@@ -140,10 +147,6 @@ class Nodeinfo {
 			'outbound' => array(),
 		);
 
-		$nodeinfo['metadata'] = array(
-			'email' => \get_option( 'admin_email' ),
-		);
-
 		return new \WP_REST_Response( $nodeinfo, 200 );
 	}
 

includes/rest/class-outbox.php

@@ -73,8 +73,11 @@ class Outbox {
 		$json->actor = \get_author_posts_url( $user_id );
 		$json->type = 'OrderedCollectionPage';
 		$json->partOf = \get_rest_url( null, "/activitypub/1.0/users/$user_id/outbox" ); // phpcs:ignore
+		$json->totalItems = 0; // phpcs:ignore
 
+		// phpcs:ignore
 		$json->totalItems = 0;
+
 		foreach ( $post_types as $post_type ) {
 			$count_posts = \wp_count_posts( $post_type );
 			$json->totalItems += \intval( $count_posts->publish ); // phpcs:ignore

includes/rest/class-webfinger.php

@@ -46,9 +46,7 @@ class Webfinger {
 	public static function webfinger( $request ) {
 		$resource = $request->get_param( 'resource' );
 
-		$matched = \str_contains( $resource, '@' );
+		if ( \strpos( $resource, '@' ) === false ) {
-
-		if ( ! $matched ) {
 			return new \WP_Error( 'activitypub_unsupported_resource', \__( 'Resource is invalid', 'activitypub' ), array( 'status' => 400 ) );
 		}
 

integration/class-friends-feed-parser-activitypub.php

@@ -0,0 +1,409 @@
+<?php
+/**
+ * This is the class for integrating ActivityPub into the Friends Plugin.
+ *
+ * @since 0.14
+ *
+ * @package ActivityPub
+ * @author Alex Kirk
+ */
+namespace Activitypub;
+
+class Friends_Feed_Parser_ActivityPub extends \Friends\Feed_Parser {
+	const SLUG = 'activitypub';
+	const NAME = 'ActivityPub';
+	const URL = 'https://www.w3.org/TR/activitypub/';
+	private $friends_feed;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param      \Friends\Feed  $friends_feed  The friends feed
+	 */
+	public function __construct( \Friends\Feed $friends_feed ) {
+		$this->friends_feed = $friends_feed;
+
+		\add_action( 'activitypub_inbox', array( $this, 'handle_received_activity' ), 10, 3 );
+		\add_action( 'friends_user_feed_activated', array( $this, 'queue_follow_user' ), 10 );
+		\add_action( 'friends_user_feed_deactivated', array( $this, 'queue_unfollow_user' ), 10 );
+		\add_action( 'friends_feed_parser_activitypub_follow', array( $this, 'follow_user' ), 10, 2 );
+		\add_action( 'friends_feed_parser_activitypub_unfollow', array( $this, 'unfollow_user' ), 10, 2 );
+		\add_filter( 'friends_rewrite_incoming_url', array( $this, 'friends_rewrite_incoming_url' ), 10, 2 );
+	}
+
+	/**
+	 * Allow logging a message via an action.
+	 * @param string $message The message to log.
+	 * @param array $objects Optional objects as meta data.
+	 * @return void
+	 */
+	private function log( $message, $objects = array() ) {
+		do_action( 'friends_activitypub_log', $message, $objects );
+	}
+
+	/**
+	 * Determines if this is a supported feed and to what degree we feel it's supported.
+	 *
+	 * @param      string      $url        The url.
+	 * @param      string      $mime_type  The mime type.
+	 * @param      string      $title      The title.
+	 * @param      string|null $content    The content, it can't be assumed that it's always available.
+	 *
+	 * @return     int  Return 0 if unsupported, a positive value representing the confidence for the feed, use 10 if you're reasonably confident.
+	 */
+	public function feed_support_confidence( $url, $mime_type, $title, $content = null ) {
+		if ( preg_match( '/^@?[^@]+@((?:[a-z0-9-]+\.)+[a-z]+)$/i', $url ) ) {
+			return 10;
+		}
+
+		return 0;
+	}
+
+	/**
+	 * Format the feed title and autoselect the posts feed.
+	 *
+	 * @param      array $feed_details  The feed details.
+	 *
+	 * @return     array  The (potentially) modified feed details.
+	 */
+	public function update_feed_details( $feed_details ) {
+		$meta = \Activitypub\get_remote_metadata_by_actor( $feed_details['url'] );
+		if ( ! $meta || is_wp_error( $meta ) ) {
+			return $meta;
+		}
+
+		if ( isset( $meta['name'] ) ) {
+			$feed_details['title'] = $meta['name'];
+		} elseif ( isset( $meta['preferredUsername'] ) ) {
+			$feed_details['title'] = $meta['preferredUsername'];
+		}
+
+		if ( isset( $meta['id'] ) ) {
+			$feed_details['url'] = $meta['id'];
+		}
+
+		return $feed_details;
+	}
+
+	/**
+	 * Rewrite a Mastodon style URL @username@server to a URL via webfinger.
+	 *
+	 * @param      string  $url           The URL to filter.
+	 * @param      string  $incoming_url  Potentially a mastodon identifier.
+	 *
+	 * @return     <type>  ( description_of_the_return_value )
+	 */
+	public function friends_rewrite_incoming_url( $url, $incoming_url ) {
+		if ( preg_match( '/^@?[^@]+@((?:[a-z0-9-]+\.)+[a-z]+)$/i', $incoming_url ) ) {
+			$resolved_url = \Activitypub\Webfinger::resolve( $incoming_url );
+			if ( ! is_wp_error( $resolved_url ) ) {
+				return $resolved_url;
+			}
+		}
+		return $url;
+	}
+
+	/**
+	 * Discover the feeds available at the URL specified.
+	 *
+	 * @param      string $content  The content for the URL is already provided here.
+	 * @param      string $url      The url to search.
+	 *
+	 * @return     array  A list of supported feeds at the URL.
+	 */
+	public function discover_available_feeds( $content, $url ) {
+		$discovered_feeds = array();
+
+		$meta = \Activitypub\get_remote_metadata_by_actor( $url );
+		if ( $meta && ! is_wp_error( $meta ) ) {
+			$discovered_feeds[ $meta['id'] ] = array(
+				'type'        => 'application/activity+json',
+				'rel'         => 'self',
+				'post-format' => 'status',
+				'parser'      => self::SLUG,
+				'autoselect'  => true,
+			);
+		}
+		return $discovered_feeds;
+	}
+
+	/**
+	 * Fetches a feed and returns the processed items.
+	 *
+	 * @param      string $url        The url.
+	 *
+	 * @return     array            An array of feed items.
+	 */
+	public function fetch_feed( $url ) {
+		// There is no feed to fetch, we'll receive items via ActivityPub.
+		return array();
+	}
+
+	/**
+	 * Handles "Create" requests
+	 *
+	 * @param  array $object  The activity-object
+	 * @param  int   $user_id The id of the local blog-user
+	 * @param string $type  The type of the activity.
+	 */
+	public function handle_received_activity( $object, $user_id, $type ) {
+		if ( ! in_array(
+			$type,
+			array(
+				// We don't need to handle 'Accept' types since it's handled by the ActivityPub plugin itself.
+				'create',
+				'announce',
+			),
+			true
+		) ) {
+			return false;
+		}
+		$actor_url = $object['actor'];
+		$user_feed = false;
+		if ( \wp_http_validate_url( $actor_url ) ) {
+			// Let's check if we follow this actor. If not it might be a different URL representation.
+			$user_feed = $this->friends_feed->get_user_feed_by_url( $actor_url );
+		}
+
+		if ( is_wp_error( $user_feed ) || ! \wp_http_validate_url( $actor_url ) ) {
+			$meta = \Activitypub\get_remote_metadata_by_actor( $actor_url );
+			if ( ! $meta || ! isset( $meta['url'] ) ) {
+				$this->log( 'Received invalid meta for ' . $actor_url );
+				return false;
+			}
+
+			$actor_url = $meta['url'];
+			if ( ! \wp_http_validate_url( $actor_url ) ) {
+				$this->log( 'Received invalid meta url for ' . $actor_url );
+				return false;
+			}
+		}
+
+		$user_feed = $this->friends_feed->get_user_feed_by_url( $actor_url );
+		if ( ! $user_feed || is_wp_error( $user_feed ) ) {
+			$this->log( 'We\'re not following ' . $actor_url );
+			// We're not following this user.
+			return false;
+		}
+
+		switch ( $type ) {
+			case 'create':
+				return $this->handle_incoming_post( $object['object'], $user_feed );
+			case 'announce':
+				return $this->handle_incoming_announce( $object['object'], $user_feed, $user_id );
+
+		}
+
+		return true;
+	}
+
+	/**
+	 * Map the Activity type to a post fomat.
+	 *
+	 * @param      string  $type   The type.
+	 *
+	 * @return     string  The determined post format.
+	 */
+	private function map_type_to_post_format( $type ) {
+		return 'status';
+	}
+
+	/**
+	 * We received a post for a feed, handle it.
+	 *
+	 * @param      array               $object     The object from ActivityPub.
+	 * @param      \Friends\User_Feed  $user_feed  The user feed.
+	 */
+	private function handle_incoming_post( $object, \Friends\User_Feed $user_feed ) {
+		$permalink = $object['id'];
+		if ( isset( $object['url'] ) ) {
+			$permalink = $object['url'];
+		}
+
+		$data = array(
+			'permalink' => $permalink,
+			'content' => $object['content'],
+			'post_format' => $this->map_type_to_post_format( $object['type'] ),
+			'date' => $object['published'],
+		);
+
+		if ( isset( $object['attributedTo'] ) ) {
+			$meta = \Activitypub\get_remote_metadata_by_actor( $object['attributedTo'] );
+			$this->log( 'Attributed to ' . $object['attributedTo'], compact( 'meta' ) );
+			if ( isset( $meta['name'] ) ) {
+				$data['author'] = $meta['name'];
+			} elseif ( isset( $meta['preferredUsername'] ) ) {
+				$data['author'] = $meta['preferredUsername'];
+			}
+		}
+
+		if ( ! empty( $object['attachment'] ) ) {
+			foreach ( $object['attachment'] as $attachment ) {
+				if ( ! isset( $attachment['type'] ) || ! isset( $attachment['mediaType'] ) ) {
+					continue;
+				}
+				if ( 'Document' !== $attachment['type'] || strpos( $attachment['mediaType'], 'image/' ) !== 0 ) {
+					continue;
+				}
+
+				$data['content'] .= PHP_EOL;
+				$data['content'] .= '<!-- wp:image -->';
+				$data['content'] .= '<p><img src="' . esc_url( $attachment['url'] ) . '" width="' . esc_attr( $attachment['width'] ) . '"  height="' . esc_attr( $attachment['height'] ) . '" class="size-full" /></p>';
+				$data['content'] .= '<!-- /wp:image  -->';
+			}
+			$meta = \Activitypub\get_remote_metadata_by_actor( $object['attributedTo'] );
+			$this->log( 'Attributed to ' . $object['attributedTo'], compact( 'meta' ) );
+			if ( isset( $meta['name'] ) ) {
+				$data['author'] = $meta['name'];
+			} elseif ( isset( $meta['preferredUsername'] ) ) {
+				$data['author'] = $meta['preferredUsername'];
+			}
+		}
+
+		$this->log(
+			'Received feed item',
+			array(
+				'url' => $permalink,
+				'data' => $data,
+			)
+		);
+		$item = new \Friends\Feed_Item( $data );
+
+		$this->friends_feed->process_incoming_feed_items( array( $item ), $user_feed );
+
+		return true;
+	}
+
+	/**
+	 * We received an announced URL (boost) for a feed, handle it.
+	 *
+	 * @param      array               $url     The announced URL.
+	 * @param      \Friends\User_Feed  $user_feed  The user feed.
+	 */
+	private function handle_incoming_announce( $url, \Friends\User_Feed $user_feed, $user_id ) {
+		if ( ! \wp_http_validate_url( $url ) ) {
+			$this->log( 'Received invalid announce', compact( 'url' ) );
+			return false;
+		}
+		$this->log( 'Received announce for ' . $url );
+
+		$response = \Activitypub\safe_remote_get( $url, $user_id );
+		if ( \is_wp_error( $response ) ) {
+			return $response;
+		}
+		$json = \wp_remote_retrieve_body( $response );
+		$object = \json_decode( $json, true );
+		if ( ! $object ) {
+			$this->log( 'Received invalid json', compact( 'json' ) );
+			return false;
+		}
+		$this->log( 'Received response', compact( 'url', 'object' ) );
+
+		return $this->handle_incoming_post( $object, $user_feed );
+	}
+
+	/**
+	 * Prepare to follow the user via a scheduled event.
+	 *
+	 * @param      \Friends\User_Feed  $user_feed  The user feed.
+	 *
+	 * @return     bool|WP_Error              Whether the event was queued.
+	 */
+	public function queue_follow_user( \Friends\User_Feed $user_feed ) {
+		if ( self::SLUG !== $user_feed->get_parser() ) {
+			return;
+		}
+
+		$args = array( $user_feed->get_url(), get_current_user_id() );
+
+		$unfollow_timestamp = wp_next_scheduled( 'friends_feed_parser_activitypub_unfollow', $args );
+		if ( $unfollow_timestamp ) {
+			// If we just unfollowed, we don't want the event to potentially be executed after our follow event.
+			wp_unschedule_event( $unfollow_timestamp, $args );
+		}
+
+		if ( wp_next_scheduled( 'friends_feed_parser_activitypub_follow', $args ) ) {
+			return;
+		}
+
+		return \wp_schedule_single_event( \time(), 'friends_feed_parser_activitypub_follow', $args );
+	}
+
+	/**
+	 * Follow a user via ActivityPub at a URL.
+	 *
+	 * @param      string  $url    The url.
+	 * @param      int  $user_id   The current user id.
+	 */
+	public function follow_user( $url, $user_id ) {
+		$meta = \Activitypub\get_remote_metadata_by_actor( $url );
+		$to = $meta['id'];
+		$inbox = \Activitypub\get_inbox_by_actor( $to );
+		$actor = \get_author_posts_url( $user_id );
+
+		$activity = new \Activitypub\Model\Activity( 'Follow', \Activitypub\Model\Activity::TYPE_SIMPLE );
+		$activity->set_to( null );
+		$activity->set_cc( null );
+		$activity->set_actor( $actor );
+		$activity->set_object( $to );
+		$activity->set_id( $actor . '#follow-' . \preg_replace( '~^https?://~', '', $to ) );
+		$activity = $activity->to_json();
+		\Activitypub\safe_remote_post( $inbox, $activity, $user_id );
+	}
+
+	/**
+	 * Prepare to unfollow the user via a scheduled event.
+	 *
+	 * @param      \Friends\User_Feed  $user_feed  The user feed.
+	 *
+	 * @return     bool|WP_Error              Whether the event was queued.
+	 */
+	public function queue_unfollow_user( \Friends\User_Feed $user_feed ) {
+		if ( self::SLUG !== $user_feed->get_parser() ) {
+			return false;
+		}
+
+		$args = array( $user_feed->get_url(), get_current_user_id() );
+
+		$follow_timestamp = wp_next_scheduled( 'friends_feed_parser_activitypub_follow', $args );
+		if ( $follow_timestamp ) {
+			// If we just followed, we don't want the event to potentially be executed after our unfollow event.
+			wp_unschedule_event( $follow_timestamp, $args );
+		}
+
+		if ( wp_next_scheduled( 'friends_feed_parser_activitypub_unfollow', $args ) ) {
+			return true;
+		}
+
+		return \wp_schedule_single_event( \time(), 'friends_feed_parser_activitypub_unfollow', $args );
+	}
+
+	/**
+	 * Unfllow a user via ActivityPub at a URL.
+	 *
+	 * @param      string  $url    The url.
+	 * @param      int  $user_id   The current user id.
+	 */
+	public function unfollow_user( $url, $user_id ) {
+		$meta = \Activitypub\get_remote_metadata_by_actor( $url );
+		$to = $meta['id'];
+		$inbox = \Activitypub\get_inbox_by_actor( $to );
+		$actor = \get_author_posts_url( $user_id );
+
+		$activity = new \Activitypub\Model\Activity( 'Undo', \Activitypub\Model\Activity::TYPE_SIMPLE );
+		$activity->set_to( null );
+		$activity->set_cc( null );
+		$activity->set_actor( $actor );
+		$activity->set_object(
+			array(
+				'type' => 'Follow',
+				'actor' => $actor,
+				'object' => $to,
+				'id' => $to,
+			)
+		);
+		$activity->set_id( $actor . '#unfollow-' . \preg_replace( '~^https?://~', '', $to ) );
+		$activity = $activity->to_json();
+		\Activitypub\safe_remote_post( $inbox, $activity, $user_id );
+	}
+}

readme.txt

@@ -1,10 +1,10 @@
 === ActivityPub ===
-Contributors: pfefferle, mediaformat
+Contributors: pfefferle, mediaformat, akirk
 Donate link: https://notiz.blog/donate/
 Tags: OStatus, fediverse, activitypub, activitystream
 Requires at least: 4.7
-Tested up to: 6.0
+Tested up to: 6.1
-Stable tag: 0.13.4
+Stable tag: 0.15.0
 Requires PHP: 5.6
 License: MIT
 License URI: http://opensource.org/licenses/MIT
@@ -88,6 +88,26 @@ Where 'blog' is the path to the subdirectory at which your blog resides.
 
 Project maintained on GitHub at [pfefferle/wordpress-activitypub](https://github.com/pfefferle/wordpress-activitypub).
 
+= 0.14.3 =
+
+* Better error handling. props [@akirk](https://github.com/akirk)
+
+= 0.14.2 =
+
+* Fix Critical error when using Friends Plugin and adding new URL to follow. props [@akirk](https://github.com/akirk)
+
+= 0.14.1 =
+
+* Fix "WebFinger not compatible with PHP < 8.0". props [@mexon](https://github.com/mexon)
+
+= 0.14.0 =
+
+* Friends support: https://wordpress.org/plugins/friends/ . props [@akirk](https://github.com/akirk)
+* Massive guidance improvements. props [mediaformat](https://github.com/mediaformat) & [@akirk](https://github.com/akirk)
+* Add Custom Post Type support to outbox API. props [blueset](https://github.com/blueset)
+* Better hash-tag support. props [bocops](https://github.com/bocops)
+* Fix user-count (NodeInfo). props [mediaformat](https://github.com/mediaformat)
+
 = 0.13.4 =
 
 * fix webfinger for email identifiers

templates/admin-header.php

@@ -0,0 +1,16 @@
+<div class="activitypub-settings-header">
+	<div class="activitypub-settings-title-section">
+		<h1><?php \esc_html_e( 'ActivityPub', 'activitypub' ); ?></h1>
+	</div>
+
+	<nav class="activitypub-settings-tabs-wrapper hide-if-no-js" aria-label="<?php \esc_attr_e( 'Secondary menu', 'activitypub' ); ?>">
+		<a href="<?php echo \esc_url_raw( admin_url( 'options-general.php?page=activitypub' ) ); ?>" class="activitypub-settings-tab <?php echo \esc_attr( $args['welcome'] ); ?>">
+			<?php \esc_html_e( 'Welcome', 'activitypub' ); ?>
+		</a>
+
+		<a href="<?php echo \esc_url_raw( admin_url( 'options-general.php?page=activitypub&tab=settings' ) ); ?>" class="activitypub-settings-tab <?php echo \esc_attr( $args['settings'] ); ?>">
+			<?php \esc_html_e( 'Settings', 'activitypub' ); ?>
+		</a>
+	</nav>
+</div>
+<hr class="wp-header-end">

templates/author-json.php

@@ -75,12 +75,6 @@ if ( \get_the_author_meta( 'user_url', $author_id ) ) {
 	);
 }
 
-/*
-$json->endpoints = array(
-	'sharedInbox' => \get_rest_url( null, '/activitypub/1.0/inbox' ),
-);
-*/
-
 // filter output
 $json = \apply_filters( 'activitypub_json_author_array', $json, $author_id );
 

templates/blog-json.php

@@ -27,10 +27,10 @@ if ( \has_header_image() ) {
 	);
 }
 
-$json->inbox = \get_rest_url( null, "/activitypub/1.0/blog/inbox" );
+$json->inbox = \get_rest_url( null, '/activitypub/1.0/blog/inbox' );
-$json->outbox = \get_rest_url( null, "/activitypub/1.0/blog/outbox" );
+$json->outbox = \get_rest_url( null, '/activitypub/1.0/blog/outbox' );
-$json->followers = \get_rest_url( null, "/activitypub/1.0/blog/followers" );
+$json->followers = \get_rest_url( null, '/activitypub/1.0/blog/followers' );
-$json->following = \get_rest_url( null, "/activitypub/1.0/blog/following" );
+$json->following = \get_rest_url( null, '/activitypub/1.0/blog/following' );
 
 $json->manuallyApprovesFollowers = \apply_filters( 'activitypub_json_manually_approves_followers', \__return_false() ); // phpcs:ignore
 
@@ -54,12 +54,6 @@ $json->attachment[] = array(
 	),
 );
 
-/*
-$json->endpoints = array(
-	'sharedInbox' => \get_rest_url( null, '/activitypub/1.0/inbox' ),
-);
-*/
-
 // filter output
 $json = \apply_filters( 'activitypub_json_blog_array', $json );
 

templates/followers-list.php

@@ -1,7 +1,8 @@
 <div class="wrap">
 	<h1><?php \esc_html_e( 'Followers (Fediverse)', 'activitypub' ); ?></h1>
 
-	<p><?php \printf( \__( 'You currently have %s followers.', 'activitypub' ), \esc_attr( \Activitypub\Peer\Followers::count_followers( \get_current_user_id() ) ) ); ?></p>
+	<?php // translators: ?>
+	<p><?php \printf( \esc_html__( 'You currently have %s followers.', 'activitypub' ), \esc_attr( \Activitypub\Peer\Followers::count_followers( \get_current_user_id() ) ) ); ?></p>
 
 	<?php $token_table = new \Activitypub\Table\Followers_List(); ?>
 

templates/post-json.php

@@ -1,4 +1,5 @@
 <?php
+// phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
 $post = \get_post();
 
 $activitypub_post = new \Activitypub\Model\Post( $post );

templates/settings.php

@@ -1,12 +1,36 @@
-<div class="wrap">
+<?php
-	<h1><?php \esc_html_e( 'ActivityPub Settings', 'activitypub' ); ?></h1>
+\load_template(
+	\dirname( __FILE__ ) . '/admin-header.php',
+	true,
+	array(
+		'settings' => 'active',
+		'welcome' => '',
+	)
+);
+?>
 
-	<p><?php \esc_html_e( 'ActivityPub turns your blog into a federated social network. This means you can share and talk to everyone using the ActivityPub protocol, including users of Friendica, Pleroma and Mastodon.', 'activitypub' ); ?></p>
+<div class="privacy-settings-body hide-if-no-js">
+	<div class="notice notice-info">
+		<p>
+			<?php
+			echo \wp_kses(
+				\sprintf(
+					// translators:
+					\__( 'If you have problems using this plugin, please check the <a href="%s">Site Health</a> to ensure that your site is compatible and/or use the "Help" tab (in the top right of the settings pages).', 'activitypub' ),
+					\esc_url_raw( \admin_url( 'site-health.php' ) )
+				),
+				'default'
+			);
+			?>
+		</p>
+	</div>
+
+	<p><?php \esc_html_e( 'Customize your ActivityPub settings to suit your needs.', 'activitypub' ); ?></p>
 
 	<form method="post" action="options.php">
 		<?php \settings_fields( 'activitypub' ); ?>
 
-		<h2><?php \esc_html_e( 'Activities', 'activitypub' ); ?></h2>
+		<h3><?php \esc_html_e( 'Activities', 'activitypub' ); ?></h3>
 
 		<p><?php \esc_html_e( 'All activity related settings.', 'activitypub' ); ?></p>
 
@@ -30,19 +54,24 @@
 							<label><input type="radio" name="activitypub_post_content_type" id="activitypub_post_content_type_custom" value="custom" <?php echo \checked( 'custom', \get_option( 'activitypub_post_content_type', 'content' ) ); ?> /> <?php \esc_html_e( 'Custom', 'activitypub' ); ?></label> - <span class="description"><?php \esc_html_e( 'Use the text-area below, to customize your activities.', 'activitypub' ); ?></span>
 						</p>
 						<p>
-							<textarea name="activitypub_custom_post_content" id="activitypub_custom_post_content" rows="10" cols="50" class="large-text" placeholder="<?php echo ACTIVITYPUB_CUSTOM_POST_CONTENT; ?>"><?php echo \get_option( 'activitypub_custom_post_content', ACTIVITYPUB_CUSTOM_POST_CONTENT ); ?></textarea>
+							<textarea name="activitypub_custom_post_content" id="activitypub_custom_post_content" rows="10" cols="50" class="large-text" placeholder="<?php echo wp_kses( ACTIVITYPUB_CUSTOM_POST_CONTENT, 'post' ); ?>"><?php echo wp_kses( \get_option( 'activitypub_custom_post_content', ACTIVITYPUB_CUSTOM_POST_CONTENT ), 'post' ); ?></textarea>
-							<div class="description">
+							<details>
-								<ul>
+								<summary><?php esc_html_e( 'See the complete list of template patterns.', 'activitypub' ); ?></summary>
-									<li><code>%title%</code> - <?php \esc_html_e( 'The Post-Title.', 'activitypub' ); ?></li>
+								<div class="description">
-									<li><code>%content%</code> - <?php \esc_html_e( 'The Post-Content.', 'activitypub' ); ?></li>
+									<ul>
-									<li><code>%excerpt%</code> - <?php \esc_html_e( 'The Post-Excerpt (default 400 Chars).', 'activitypub' ); ?></li>
+										<li><code>%title%</code> - <?php \esc_html_e( 'The Post-Title.', 'activitypub' ); ?></li>
-									<li><code>%permalink%</code> - <?php \esc_html_e( 'The Post-Permalink.', 'activitypub' ); ?></li>
+										<li><code>%content%</code> - <?php \esc_html_e( 'The Post-Content.', 'activitypub' ); ?></li>
-									<li><code>%shortlink%</code> - <?php \printf( \esc_html( 'The Post-Shortlink. I can recommend %sHum%s, to prettify the Shortlinks', 'activitypub' ), '<a href="https://wordpress.org/plugins/hum/" target="_blank">', '</a>' ); ?></li>
+										<li><code>%excerpt%</code> - <?php \esc_html_e( 'The Post-Excerpt (default 400 Chars).', 'activitypub' ); ?></li>
-									<li><code>%hashtags%</code> - <?php \esc_html_e( 'The Tags as Hashtags.', 'activitypub' ); ?></li>
+										<li><code>%permalink%</code> - <?php \esc_html_e( 'The Post-Permalink.', 'activitypub' ); ?></li>
-								</ul>
+										<?php // translators: ?>
-								<?php \printf( \__( '%sLet me know%s if you miss a template placeholder.', 'activitypub' ), '<a href="https://github.com/pfefferle/wordpress-activitypub/issues/new" target="_blank">', '</a>' ); ?>
+										<li><code>%shortlink%</code> - <?php echo \wp_kses( \__( 'The Post-Shortlink. I can recommend <a href="https://wordpress.org/plugins/hum/" target="_blank">Hum</a>, to prettify the Shortlinks', 'activitypub' ), 'default' ); ?></li>
-							</div>
+										<li><code>%hashtags%</code> - <?php \esc_html_e( 'The Tags as Hashtags.', 'activitypub' ); ?></li>
+									</ul>
+								</div>
+							</details>
 						</p>
+						<?php // translators: ?>
+						<p><?php echo \wp_kses( \__( '<a href="https://github.com/pfefferle/wordpress-activitypub/issues/new" target="_blank">Let me know</a> if you miss a template pattern.', 'activitypub' ), 'default' ); ?></p>
 					</td>
 				</tr>
 				<tr>
@@ -70,6 +99,7 @@
 							<?php $post_types = \get_post_types( array( 'public' => true ), 'objects' ); ?>
 							<?php $support_post_types = \get_option( 'activitypub_support_post_types', array( 'post', 'page' ) ) ? \get_option( 'activitypub_support_post_types', array( 'post', 'page' ) ) : array(); ?>
 							<ul>
+							<?php // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited ?>
 							<?php foreach ( $post_types as $post_type ) { ?>
 								<li>
 									<input type="checkbox" id="activitypub_support_post_types" name="activitypub_support_post_types[]" value="<?php echo \esc_attr( $post_type->name ); ?>" <?php echo \checked( true, \in_array( $post_type->name, $support_post_types, true ) ); ?> />
@@ -86,17 +116,28 @@
 					</th>
 					<td>
 						<p>
-							<label><input type="checkbox" name="activitypub_use_hashtags" id="activitypub_use_hashtags" value="1" <?php echo \checked( '1', \get_option( 'activitypub_use_hashtags', '1' ) ); ?> /> <?php \_e( 'Add hashtags in the content as native tags and replace the <code>#tag</code> with the tag-link.', 'activitypub' ); ?></label>
+							<label><input type="checkbox" name="activitypub_use_hashtags" id="activitypub_use_hashtags" value="1" <?php echo \checked( '1', \get_option( 'activitypub_use_hashtags', '1' ) ); ?> /> <?php echo wp_kses( \__( 'Add hashtags in the content as native tags and replace the <code>#tag</code> with the tag-link.', 'activitypub' ), 'default' ); ?></label>
 						</p>
 					</td>
 				</tr>
 				<tr>
 					<th scope="row">
-						<?php \esc_html_e( 'HTML Whitelist', 'activitypub' ); ?>
+						<?php \esc_html_e( 'HTML Allowlist', 'activitypub' ); ?>
 					</th>
 					<td>
-						<textarea name="activitypub_allowed_html" id="activitypub_allowed_html" rows="3" cols="50" class="large-text"><?php echo \get_option( 'activitypub_allowed_html', ACTIVITYPUB_ALLOWED_HTML ); ?></textarea>
+						<textarea name="activitypub_allowed_html" id="activitypub_allowed_html" rows="3" cols="50" class="large-text"><?php echo esc_html( \get_option( 'activitypub_allowed_html', ACTIVITYPUB_ALLOWED_HTML ) ); ?></textarea>
-						<p class="description"><?php \_e( \sprintf( 'A list of HTML elements, you want to whitelist for your activities. <strong>Leave list empty to support all HTML elements.</strong> Default: <code>%s</code>.', \esc_html( ACTIVITYPUB_ALLOWED_HTML ) ), 'activitypub' ); ?></p>
+						<p class="description">
+							<?php
+							echo \wp_kses(
+								\sprintf(
+									// translators:
+									\__( 'A list of HTML elements, you want to allowlist for your activities. <strong>Leave list empty to support all HTML elements</strong>. Default: <code>%s</code>', 'activitypub' ),
+									\esc_html( ACTIVITYPUB_ALLOWED_HTML )
+								),
+								'default'
+							);
+							?>
+						</p>
 					</td>
 				</tr>
 			</tbody>
@@ -104,7 +145,7 @@
 
 		<?php \do_settings_fields( 'activitypub', 'activity' ); ?>
 
-		<h2><?php \esc_html_e( 'Server', 'activitypub' ); ?></h2>
+		<h3><?php \esc_html_e( 'Server', 'activitypub' ); ?></h3>
 
 		<p><?php \esc_html_e( 'Server related settings.', 'activitypub' ); ?></p>
 
@@ -115,7 +156,18 @@
 						<?php \esc_html_e( 'Blocklist', 'activitypub' ); ?>
 					</th>
 					<td>
-						<p class="description"><?php \printf( \__( 'To block servers, add the host of the server to the "<a href="%s">Disallowed Comment Keys</a>" list.', 'activitypub' ), admin_url( 'options-discussion.php#disallowed_keys' ) ); ?></p>
+						<p class="description">
+							<?php
+							echo \wp_kses(
+								\sprintf(
+									// translators: %s is a URL.
+									\__( 'To block servers, add the host of the server to the "<a href="%s">Disallowed Comment Keys</a>" list.', 'activitypub' ),
+									\esc_attr( \admin_url( 'options-discussion.php#disallowed_keys' ) )
+								),
+								'default'
+							);
+							?>
+						</p>
 					</td>
 				</tr>
 			</tbody>
@@ -127,8 +179,4 @@
 
 		<?php \submit_button(); ?>
 	</form>
-
-	<p>
-		<small><?php \_e( 'If you like this plugin, what about a small <a href="https://notiz.blog/donate">donation</a>?', 'activitypub' ); ?></small>
-	</p>
 </div>

templates/welcome.php

@@ -0,0 +1,96 @@
+<?php
+\load_template(
+	\dirname( __FILE__ ) . '/admin-header.php',
+	true,
+	array(
+		'settings' => '',
+		'welcome' => 'active',
+	)
+);
+?>
+
+<div class="privacy-settings-body hide-if-no-js">
+	<h2><?php \esc_html_e( 'Welcome', 'activitypub' ); ?></h2>
+
+	<p><?php \esc_html_e( 'With ActivityPub your blog becomes part of a federated social network. This means you can share and talk to everyone using the ActivityPub protocol, including users of Friendica, Pleroma and Mastodon.', 'activitypub' ); ?></p>
+	<p>
+		<?php
+		echo wp_kses(
+			\sprintf(
+				// translators:
+				\__(
+					'People can follow you by using the username <code>%1$s</code> or the URL <code>%2$s</code>. Users who can not access this settings page will find their username on the <a href="%3$s">Edit Profile</a> page.',
+					'activitypub'
+				),
+				\esc_attr( \Activitypub\get_webfinger_resource( wp_get_current_user()->ID ) ),
+				\esc_url_raw( \get_author_posts_url( wp_get_current_user()->ID ) ),
+				\esc_url_raw( \admin_url( 'profile.php#activitypub' ) )
+			),
+			'default'
+		);
+		?>
+	</p>
+	<p>
+		<?php
+		echo wp_kses(
+			\sprintf(
+				// translators:
+				\__( 'If you have problems using this plugin, please check the <a href="%s">Site Health</a> to ensure that your site is compatible and/or use the "Help" tab (in the top right of the settings pages).', 'activitypub' ),
+				\esc_url_raw( admin_url( 'site-health.php' ) )
+			),
+			'default'
+		);
+		?>
+	</p>
+
+	<hr />
+
+	<h3><?php \esc_html_e( 'Recommended Plugins', 'activitypub' ); ?></h3>
+
+	<p><?php \esc_html_e( 'ActivityPub works as is and there is no need for you to install additional plugins, nevertheless there are some plugins that extends the functionality of ActivityPub.', 'activitypub' ); ?></p>
+
+	<div class="activitypub-settings-accordion">
+		<h4 class="activitypub-settings-accordion-heading">
+			<button aria-expanded="true" class="activitypub-settings-accordion-trigger" aria-controls="activitypub-settings-accordion-block-friends-plugin" type="button">
+				<span class="title"><?php \esc_html_e( 'Following Others', 'activitypub' ); ?></span>
+				<span class="icon"></span>
+			</button>
+		</h4>
+		<div id="activitypub-settings-accordion-block-friends-plugin" class="activitypub-settings-accordion-panel plugin-card-friends">
+			<p><?php \esc_html_e( 'To follow people on Mastodon or similar platforms using your own WordPress, you can use the Friends Plugin for WordPress which uses this plugin to receive posts and display them on your own WordPress, thus making your own WordPress a Fediverse instance of its own.', 'activitypub' ); ?></p>
+			<p><a href="<?php echo \esc_url_raw( \admin_url( 'plugin-install.php?tab=plugin-information&plugin=friends&TB_iframe=true' ) ); ?>" class="thickbox open-plugin-details-modal button install-now" target="_blank"><?php \esc_html_e( 'Install the Friends Plugin for WordPress', 'activitypub' ); ?></a></p>
+		</div>
+		<h4 class="activitypub-settings-accordion-heading">
+			<button aria-expanded="false" class="activitypub-settings-accordion-trigger" aria-controls="activitypub-settings-accordion-block-activitypub-hum-plugin" type="button">
+				<span class="title"><?php \esc_html_e( 'Add a URL Shortener', 'activitypub' ); ?></span>
+				<span class="icon"></span>
+			</button>
+		</h4>
+		<div id="activitypub-settings-accordion-block-activitypub-hum-plugin" class="activitypub-settings-accordion-panel plugin-card-hum" hidden="hidden">
+			<p><?php \esc_html_e( 'Hum is a personal URL shortener for WordPress, designed to provide short URLs to your personal content, both hosted on WordPress and elsewhere.', 'activitypub' ); ?></p>
+			<p><a href="<?php echo \esc_url_raw( \admin_url( 'plugin-install.php?tab=plugin-information&plugin=hum&TB_iframe=true' ) ); ?>" class="thickbox open-plugin-details-modal button install-now" target="_blank"><?php \esc_html_e( 'Install Hum Plugin for WordPress', 'activitypub' ); ?></a></p>
+		</div>
+		<h4 class="activitypub-settings-accordion-heading">
+			<button aria-expanded="false" class="activitypub-settings-accordion-trigger" aria-controls="activitypub-settings-accordion-block-activitypub-webfinger-plugin" type="button">
+				<span class="title"><?php \esc_html_e( 'Advanced WebFinger Support', 'activitypub' ); ?></span>
+				<span class="icon"></span>
+			</button>
+		</h4>
+		<div id="activitypub-settings-accordion-block-activitypub-webfinger-plugin" class="activitypub-settings-accordion-panel plugin-card-webfinger" hidden="hidden">
+			<p><?php \esc_html_e( 'WebFinger is a protocol that allows for discovery of information about people and things identified by a URI. Information about a person might be discovered via an "acct:" URI, for example, which is a URI that looks like an email address.', 'activitypub' ); ?></p>
+			<p><?php \esc_html_e( 'The ActivityPub plugin comes with basic WebFinger support, if you need more configuration options and compatibility with other Fediverse/IndieWeb plugins, please install the WebFinger plugin.', 'activitypub' ); ?></p>
+			<p><a href="<?php echo \esc_url_raw( \admin_url( 'plugin-install.php?tab=plugin-information&plugin=webfinger&TB_iframe=true' ) ); ?>" class="thickbox open-plugin-details-modal button install-now" target="_blank"><?php \esc_html_e( 'Install WebFinger Plugin for WordPress', 'activitypub' ); ?></a></p>
+		</div>
+		<h4 class="activitypub-settings-accordion-heading">
+			<button aria-expanded="false" class="activitypub-settings-accordion-trigger" aria-controls="activitypub-settings-accordion-block-activitypub-nodeinfo-plugin" type="button">
+				<span class="title"><?php \esc_html_e( 'Provide Enhanced Information about Your Blog', 'activitypub' ); ?></span>
+				<span class="icon"></span>
+			</button>
+		</h4>
+		<div id="activitypub-settings-accordion-block-activitypub-nodeinfo-plugin" class="activitypub-settings-accordion-panel plugin-card-nodeinfo" hidden="hidden">
+			<p><?php \esc_html_e( 'NodeInfo is an effort to create a standardized way of exposing metadata about a server running one of the distributed social networks. The two key goals are being able to get better insights into the user base of distributed social networking and the ability to build tools that allow users to choose the best fitting software and server for their needs.', 'activitypub' ); ?></p>
+			<p><?php \esc_html_e( 'The ActivityPub plugin comes with a simple NodeInfo endpoint. If you need more configuration options and compatibility with other Fediverse plugins, please install the NodeInfo plugin.', 'activitypub' ); ?></p>
+			<p><a href="<?php echo \esc_url_raw( \admin_url( 'plugin-install.php?tab=plugin-information&plugin=nodeinfo&TB_iframe=true' ) ); ?>" class="thickbox open-plugin-details-modal button install-now" target="_blank"><?php \esc_html_e( 'Install NodeInfo Plugin for WordPress', 'activitypub' ); ?></a></p>
+		</div>
+	</div>
+</div>

tests/bootstrap.php

@@ -19,6 +19,12 @@ require_once $_tests_dir . '/includes/functions.php';
  */
 function _manually_load_plugin() {
 	require \dirname( \dirname( __FILE__ ) ) . '/activitypub.php';
+
+	// Load the Friends plugin if available to test the integrations.
+	$friends_plugin = \dirname( \dirname( \dirname( __FILE__ ) ) ) . '/friends/friends.php';
+	if ( file_exists( $friends_plugin ) ) {
+		require $friends_plugin;
+	}
 }
 \tests_add_filter( 'muplugins_loaded', '_manually_load_plugin' );
 

tests/test-class-friends-feed-parser-activitypub.php

@@ -0,0 +1,326 @@
+<?php
+
+class Test_Friends_Feed_Parser_ActivityPub extends \WP_UnitTestCase {
+	public static $users = array();
+	private $friend_id;
+	private $friend_name;
+	private $actor;
+
+	public function test_incoming_post() {
+		$now = time() - 10;
+		$status_id = 123;
+
+		$posts = get_posts(
+			array(
+				'post_type' => \Friends\Friends::CPT,
+				'author' => $this->friend_id,
+			)
+		);
+
+		$post_count = count( $posts );
+
+		// Let's post a new Note through the REST API.
+		$date = gmdate( \DATE_W3C, $now++ );
+		$id = 'test' . $status_id;
+		$content = 'Test ' . $date . ' ' . rand();
+
+		$request = new \WP_REST_Request( 'POST', '/activitypub/1.0/users/' . get_current_user_id() . '/inbox' );
+		$request->set_param( 'type', 'Create' );
+		$request->set_param( 'id', $id );
+		$request->set_param( 'actor', $this->actor );
+
+		$attachment_url = 'https://mastodon.local/files/original/1234.png';
+		$attachment_width = 400;
+		$attachment_height = 600;
+		$request->set_param(
+			'object',
+			array(
+				'type' => 'Note',
+				'id' => $id,
+				'attributedTo' => $this->actor,
+				'content' => $content,
+				'url' => 'https://mastodon.local/users/akirk/statuses/' . ( $status_id++ ),
+				'published' => $date,
+				'attachment' => array(
+					array(
+						'type' => 'Document',
+						'mediaType' => 'image/png',
+						'url' => $attachment_url,
+						'name' => '',
+						'blurhash' => '',
+						'width' => $attachment_width,
+						'height' => $attachment_height,
+
+					),
+				),
+			)
+		);
+
+		$response = $this->server->dispatch( $request );
+		$this->assertEquals( 202, $response->get_status() );
+
+		$posts = get_posts(
+			array(
+				'post_type' => \Friends\Friends::CPT,
+				'author' => $this->friend_id,
+			)
+		);
+
+		$this->assertEquals( $post_count + 1, count( $posts ) );
+		$this->assertStringStartsWith( $content, $posts[0]->post_content );
+		$this->assertStringContainsString( '<img src="' . esc_url( $attachment_url ) . '" width="' . esc_attr( $attachment_width ) . '" height="' . esc_attr( $attachment_height ) . '"', $posts[0]->post_content );
+		$this->assertEquals( $this->friend_id, $posts[0]->post_author );
+
+		// Do another test post, this time with a URL that has an @-id.
+		$date = gmdate( \DATE_W3C, $now++ );
+		$id = 'test' . $status_id;
+		$content = 'Test ' . $date . ' ' . rand();
+
+		$request = new \WP_REST_Request( 'POST', '/activitypub/1.0/users/' . get_current_user_id() . '/inbox' );
+		$request->set_param( 'type', 'Create' );
+		$request->set_param( 'id', $id );
+		$request->set_param( 'actor', 'https://mastodon.local/@akirk' );
+		$request->set_param(
+			'object',
+			array(
+				'type' => 'Note',
+				'id' => $id,
+				'attributedTo' => 'https://mastodon.local/@akirk',
+				'content' => $content,
+				'url' => 'https://mastodon.local/users/akirk/statuses/' . ( $status_id++ ),
+				'published' => $date,
+			)
+		);
+
+		$response = $this->server->dispatch( $request );
+		$this->assertEquals( 202, $response->get_status() );
+
+		$posts = get_posts(
+			array(
+				'post_type' => \Friends\Friends::CPT,
+				'author' => $this->friend_id,
+			)
+		);
+
+		$this->assertEquals( $post_count + 2, count( $posts ) );
+		$this->assertEquals( $content, $posts[0]->post_content );
+		$this->assertEquals( $this->friend_id, $posts[0]->post_author );
+		$this->assertEquals( $this->friend_name, get_post_meta( $posts[0]->ID, 'author', true ) );
+	}
+
+	public function test_incoming_announce() {
+		$now = time() - 10;
+		$status_id = 123;
+
+		self::$users['https://notiz.blog/author/matthias-pfefferle/'] = array(
+			'url' => 'https://notiz.blog/author/matthias-pfefferle/',
+			'name'  => 'Matthias Pfefferle',
+		);
+
+		$posts = get_posts(
+			array(
+				'post_type' => \Friends\Friends::CPT,
+				'author' => $this->friend_id,
+			)
+		);
+
+		$post_count = count( $posts );
+
+		$date = gmdate( \DATE_W3C, $now++ );
+		$id = 'test' . $status_id;
+
+		$object = 'https://notiz.blog/2022/11/14/the-at-protocol/';
+
+		$request = new \WP_REST_Request( 'POST', '/activitypub/1.0/users/' . get_current_user_id() . '/inbox' );
+		$request->set_param( 'type', 'Announce' );
+		$request->set_param( 'id', $id );
+		$request->set_param( 'actor', $this->actor );
+		$request->set_param( 'published', $date );
+		$request->set_param( 'object', $object );
+
+		$response = $this->server->dispatch( $request );
+		$this->assertEquals( 202, $response->get_status() );
+
+		$p = wp_parse_url( $object );
+		$cache = __DIR__ . '/fixtures/' . sanitize_title( $p['host'] . '-' . $p['path'] ) . '.response';
+		$this->assertFileExists( $cache );
+
+		$object = json_decode( wp_remote_retrieve_body( unserialize( file_get_contents( $cache ) ) ) );
+
+		$posts = get_posts(
+			array(
+				'post_type' => \Friends\Friends::CPT,
+				'author' => $this->friend_id,
+			)
+		);
+
+		$this->assertEquals( $post_count + 1, count( $posts ) );
+		$this->assertStringContainsString( 'Dezentrale Netzwerke', $posts[0]->post_content );
+		$this->assertEquals( $this->friend_id, $posts[0]->post_author );
+		$this->assertEquals( 'Matthias Pfefferle', get_post_meta( $posts[0]->ID, 'author', true ) );
+
+	}
+	public function set_up() {
+		if ( ! class_exists( '\Friends\Friends' ) ) {
+			return $this->markTestSkipped( 'The Friends plugin is not loaded.' );
+		}
+		parent::set_up();
+
+		// Manually activate the REST server.
+		global $wp_rest_server;
+		$wp_rest_server = new \Spy_REST_Server();
+		$this->server   = $wp_rest_server;
+		do_action( 'rest_api_init' );
+
+		add_filter(
+			'rest_url',
+			function() {
+				return get_option( 'home' ) . '/wp-json/';
+			}
+		);
+
+		add_filter( 'pre_http_request', array( get_called_class(), 'pre_http_request' ), 10, 3 );
+		add_filter( 'http_response', array( get_called_class(), 'http_response' ), 10, 3 );
+		add_filter( 'http_request_host_is_external', array( get_called_class(), 'http_request_host_is_external' ), 10, 2 );
+		add_filter( 'http_request_args', array( get_called_class(), 'http_request_args' ), 10, 2 );
+		add_filter( 'pre_get_remote_metadata_by_actor', array( get_called_class(), 'pre_get_remote_metadata_by_actor' ), 10, 2 );
+
+		$user_id = $this->factory->user->create(
+			array(
+				'role'       => 'administrator',
+			)
+		);
+		wp_set_current_user( $user_id );
+
+		$this->friend_name = 'Alex Kirk';
+		$this->actor = 'https://mastodon.local/users/akirk';
+
+		$user_feed = \Friends\User_Feed::get_by_url( $this->actor );
+		if ( is_wp_error( $user_feed ) ) {
+			$this->friend_id = $this->factory->user->create(
+				array(
+					'display_name' => $this->friend_name,
+					'role'       => 'friend',
+				)
+			);
+			\Friends\User_Feed::save(
+				new \Friends\User( $this->friend_id ),
+				$this->actor,
+				array(
+					'parser' => 'activitypub',
+				)
+			);
+		} else {
+			$this->friend_id = $user_feed->get_friend_user()->ID;
+		}
+
+		self::$users[ $this->actor ] = array(
+			'url' => $this->actor,
+			'name'  => $this->friend_name,
+		);
+		self::$users['https://mastodon.local/@akirk'] = self::$users[ $this->actor ];
+
+		_delete_all_posts();
+	}
+
+	public function tear_down() {
+		remove_filter( 'pre_http_request', array( get_called_class(), 'pre_http_request' ) );
+		remove_filter( 'http_response', array( get_called_class(), 'http_response' ) );
+		remove_filter( 'http_request_host_is_external', array( get_called_class(), 'http_request_host_is_external' ) );
+		remove_filter( 'http_request_args', array( get_called_class(), 'http_request_args' ) );
+		remove_filter( 'pre_get_remote_metadata_by_actor', array( get_called_class(), 'pre_get_remote_metadata_by_actor' ) );
+	}
+
+	public static function pre_get_remote_metadata_by_actor( $pre, $actor ) {
+		if ( isset( self::$users[ $actor ] ) ) {
+			return self::$users[ $actor ];
+		}
+		return $pre;
+	}
+	public static function http_request_host_is_external( $in, $host ) {
+		if ( in_array( $host, array( 'mastodon.local' ), true ) ) {
+			return true;
+		}
+		return $in;
+	}
+	public static function http_request_args( $args, $url ) {
+		if ( in_array( parse_url( $url, PHP_URL_HOST ), array( 'mastodon.local' ), true ) ) {
+			$args['reject_unsafe_urls'] = false;
+		}
+		return $args;
+	}
+	public static function pre_http_request( $preempt, $request, $url ) {
+		$p = wp_parse_url( $url );
+		$cache = __DIR__ . '/fixtures/' . sanitize_title( $p['host'] . '-' . $p['path'] ) . '.response';
+		if ( file_exists( $cache ) ) {
+			return apply_filters(
+				'fake_http_response',
+				unserialize( file_get_contents( $cache ) ),
+				$p['scheme'] . '://' . $p['host'],
+				$url,
+				$request
+			);
+		}
+
+		$home_url = home_url();
+
+		// Pretend the url now is the requested one.
+		update_option( 'home', $p['scheme'] . '://' . $p['host'] );
+		$rest_prefix = home_url() . '/wp-json';
+
+		if ( false === strpos( $url, $rest_prefix ) ) {
+			// Restore the old home_url.
+			update_option( 'home', $home_url );
+			return $preempt;
+		}
+
+		$url = substr( $url, strlen( $rest_prefix ) );
+		$r   = new \WP_REST_Request( $request['method'], $url );
+		if ( ! empty( $request['body'] ) ) {
+			foreach ( $request['body'] as $key => $value ) {
+				$r->set_param( $key, $value );
+			}
+		}
+		global $wp_rest_server;
+		$response = $wp_rest_server->dispatch( $r );
+		// Restore the old url.
+		update_option( 'home', $home_url );
+
+		return apply_filters(
+			'fake_http_response',
+			array(
+				'headers'  => array(
+					'content-type' => 'text/json',
+				),
+				'body'     => wp_json_encode( $response->data ),
+				'response' => array(
+					'code' => $response->status,
+				),
+			),
+			$p['scheme'] . '://' . $p['host'],
+			$url,
+			$request
+		);
+	}
+
+	public static function http_response( $response, $args, $url ) {
+		$p = wp_parse_url( $url );
+		$cache = __DIR__ . '/fixtures/' . sanitize_title( $p['host'] . '-' . $p['path'] ) . '.response';
+		if ( ! file_exists( $cache ) ) {
+			$headers = wp_remote_retrieve_headers( $response );
+			file_put_contents(
+				$cache,
+				serialize(
+					array(
+						'headers'  => $headers->getAll(),
+						'body'     => wp_remote_retrieve_body( $response ),
+						'response' => array(
+							'code' => wp_remote_retrieve_response_code( $response ),
+						),
+					)
+				)
+			);
+		}
+		return $response;
+	}
+}