Add "visibility" feature

activitypub.php

@@ -45,6 +45,12 @@
 \defined( 'ACTIVITYPUB_SEND_VARY_HEADER' ) || \define( 'ACTIVITYPUB_SEND_VARY_HEADER', false );
 \defined( 'ACTIVITYPUB_DEFAULT_OBJECT_TYPE' ) || \define( 'ACTIVITYPUB_DEFAULT_OBJECT_TYPE', 'note' );
 
+// Post visibility constants.
+\define( 'ACTIVITYPUB_POST_VISIBILITY_PUBLIC', 'public' );
+\define( 'ACTIVITYPUB_POST_VISIBILITY_QUIET_PUBLIC', 'quiet_public' );
+\define( 'ACTIVITYPUB_POST_VISIBILITY_LOCAL', 'local' );
+
+// Plugin related constants.
 \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__ ) );

build/editor-plugin/plugin.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'wp-components', 'wp-core-data', 'wp-data', 'wp-editor', 'wp-i18n', 'wp-plugins'), 'version' => '88603987940fec29730d');
+<?php return array('dependencies' => array('react', 'wp-components', 'wp-core-data', 'wp-data', 'wp-editor', 'wp-element', 'wp-i18n', 'wp-plugins', 'wp-primitives'), 'version' => 'df1915a4380fd2b2c441');

includes/class-activity-dispatcher.php

@@ -269,8 +269,20 @@ public static function add_inboxes_of_follower( $inboxes, $user_id ) {
 	 */
 	public static function add_inboxes_by_mentioned_actors( $inboxes, $user_id, $activity ) {
 		$cc = $activity->get_cc();
-		if ( $cc ) {
-			$mentioned_inboxes = Mention::get_inboxes( $cc );
+		$to = $activity->get_to();
+
+		$audience = array_merge( $cc, $to );
+
+		// Remove "public placeholder" and "same domain" from the audience.
+		$audience = array_filter(
+			$audience,
+			function ( $actor ) {
+				return 'https://www.w3.org/ns/activitystreams#Public' !== $actor && ! is_same_domain( $actor );
+			}
+		);
+
+		if ( $audience ) {
+			$mentioned_inboxes = Mention::get_inboxes( $audience );
 
 			return array_merge( $inboxes, $mentioned_inboxes );
 		}

includes/class-activitypub.php

@@ -98,7 +98,7 @@ public static function render_json_template( $template ) {
 			$json_template = ACTIVITYPUB_PLUGIN_DIR . '/templates/user-json.php';
 		} elseif ( is_comment() ) {
 			$json_template = ACTIVITYPUB_PLUGIN_DIR . '/templates/comment-json.php';
-		} elseif ( \is_singular() ) {
+		} elseif ( \is_singular() && ! is_post_disabled( \get_the_ID() ) ) {
 			$json_template = ACTIVITYPUB_PLUGIN_DIR . '/templates/post-json.php';
 		} elseif ( \is_home() && ! is_user_type_disabled( 'blog' ) ) {
 			$json_template = ACTIVITYPUB_PLUGIN_DIR . '/templates/blog-json.php';

includes/class-blocks.php

@@ -45,6 +45,16 @@ public static function register_postmeta() {
 					'sanitize_callback' => 'sanitize_text_field',
 				)
 			);
+			\register_post_meta(
+				$post_type,
+				'activitypub_content_visibility',
+				array(
+					'show_in_rest'      => true,
+					'single'            => true,
+					'type'              => 'string',
+					'sanitize_callback' => 'sanitize_text_field',
+				)
+			);
 		}
 	}
 

includes/class-scheduler.php

@@ -113,7 +113,7 @@ public static function deregister_schedules() {
 	public static function schedule_post_activity( $new_status, $old_status, $post ) {
 		$post = get_post( $post );
 
-		if ( ! $post ) {
+		if ( ! $post || is_post_disabled( $post ) ) {
 			return;
 		}
 

includes/functions.php

@@ -400,6 +400,31 @@ function is_activitypub_request() {
 	return false;
 }
 
+/**
+ * Check if a post is disabled for ActivityPub.
+ *
+ * @param mixed $post The post object or ID.
+ *
+ * @return boolean True if the post is disabled, false otherwise.
+ */
+function is_post_disabled( $post ) {
+	$post       = \get_post( $post );
+	$return     = false;
+	$visibility = \get_post_meta( $post->ID, 'activitypub_content_visibility', true );
+
+	if ( ACTIVITYPUB_POST_VISIBILITY_LOCAL === $visibility ) {
+		$return = true;
+	}
+
+	/*
+	 * Allow plugins to disable posts for ActivityPub.
+	 *
+	 * @param boolean  $return True if the post is disabled, false otherwise.
+	 * @param \WP_Post $post   The post object.
+	 */
+	return \apply_filters( 'activitypub_is_post_disabled', $return, $post );
+}
+
 /**
  * This function checks if a user is disabled for ActivityPub.
  *
@@ -1307,3 +1332,24 @@ function get_content_warning( $post_id ) {
 
 	return $warning;
 }
+
+/**
+ * Check if a URL is from the same domain as the site.
+ *
+ * @param string $url The URL to check.
+ *
+ * @return boolean True if the URL is from the same domain, false otherwise.
+ */
+function is_same_domain( $url ) {
+	$remote = \wp_parse_url( $url, PHP_URL_HOST );
+
+	if ( ! $remote ) {
+		return false;
+	}
+
+	$remote = normalize_host( $remote );
+	$self   = \wp_parse_url( \home_url(), PHP_URL_HOST );
+	$self   = normalize_host( $self );
+
+	return $remote === $self;
+}

includes/transformer/class-post.php

@@ -77,6 +77,12 @@ public function to_object() {
 			$object->set_summary_map( null );
 		}
 
+		// Change order if visibility is "Quiet public".
+		if ( ACTIVITYPUB_POST_VISIBILITY_QUIET_PUBLIC === \get_post_meta( $post->ID, 'activitypub_content_visibility', true ) ) {
+			$object->set_to( $this->get_cc() );
+			$object->set_cc( $this->get_to() );
+		}
+
 		return $object;
 	}
 
@@ -680,6 +686,19 @@ protected function get_type() {
 		return $object_type;
 	}
 
+	/**
+	 * Returns the recipient of the post.
+	 *
+	 * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-to
+	 *
+	 * @return array The recipient URLs of the post.
+	 */
+	public function get_to() {
+		return array(
+			'https://www.w3.org/ns/activitystreams#Public',
+		);
+	}
+
 	/**
 	 * Returns a list of Mentions, used in the Post.
 	 *
@@ -688,7 +707,9 @@ protected function get_type() {
 	 * @return array The list of Mentions.
 	 */
 	protected function get_cc() {
-		$cc = array();
+		$cc = array(
+			$this->get_actor_object()->get_followers(),
+		);
 
 		$mentions = $this->get_mentions();
 		if ( $mentions ) {
@@ -946,20 +967,6 @@ public function get_in_reply_to() {
 		return null;
 	}
 
-	/**
-	 * Returns the recipient of the post.
-	 *
-	 * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-to
-	 *
-	 * @return array The recipient URLs of the post.
-	 */
-	public function get_to() {
-		return array(
-			'https://www.w3.org/ns/activitystreams#Public',
-			$this->get_actor_object()->get_followers(),
-		);
-	}
-
 	/**
 	 * Returns the published date of the post.
 	 *

src/editor-plugin/block.json

@@ -6,4 +6,4 @@
 	"keywords": [
 	],
 	"editorScript": "file:./plugin.js"
-}
+}

src/editor-plugin/plugin.js

@@ -1,6 +1,7 @@
 import { PluginDocumentSettingPanel } from '@wordpress/editor';
 import { registerPlugin } from '@wordpress/plugins';
-import { TextControl } from '@wordpress/components';
+import { TextControl, RadioControl, __experimentalText as Text } from '@wordpress/components';
+import { Icon, notAllowed, globe, unseen } from '@wordpress/icons';
 import { useSelect } from '@wordpress/data';
 import { useEntityProp } from '@wordpress/core-data';
 import { __ } from '@wordpress/i18n';
@@ -13,10 +14,26 @@ const EditorPlugin = () => {
 	);
 	const [ meta, setMeta ] = useEntityProp( 'postType', postType, 'meta' );
 
+	const labelStyling = {
+		verticalAlign: "middle",
+		gap: "4px",
+		justifyContent:
+		"start", display:
+		"inline-flex",
+		alignItems: "center"
+	}
+
+	const labelWithIcon = ( text, icon ) => (
+		<Text style={labelStyling}>
+			<Icon icon={ icon } />
+			{text}
+		</Text>
+	);
+
 	return (
 		<PluginDocumentSettingPanel
 			name="activitypub"
-			title={ __( 'Fediverse', 'activitypub' ) }
+			title={ __( '⁂ Fediverse', 'activitypub' ) }
 		>
 			<TextControl
 				label={ __( 'Content Warning', 'activitypub' ) }
@@ -26,8 +43,22 @@ const EditorPlugin = () => {
 				} }
 				placeholder={ __( 'Optional content warning', 'activitypub' ) }
 			/>
+			<RadioControl
+				label={ __( 'Visibility', 'activitypub' ) }
+				help={ __( 'This adjusts the visibility of a post in the fediverse, but note that it won\'t affect how the post appears on the blog.', 'activitypub' ) }
+				selected={ meta.activitypub_content_visibility ? meta.activitypub_content_visibility : 'public' }
+				options={ [
+					{ label: labelWithIcon( __( 'Public', 'activitypub' ), globe ), value: 'public' },
+					{ label: labelWithIcon( __( 'Quiet public', 'activitypub' ), unseen ), value: 'quiet_public' },
+					{ label: labelWithIcon( __( 'Do not federate', 'activitypub' ), notAllowed ), value: 'local' },
+				] }
+				onChange={ ( value ) => {
+					setMeta( { ...meta, activitypub_content_visibility: value } );
+				} }
+				className="activitypub-visibility"
+			/>
 		</PluginDocumentSettingPanel>
 	);
 }
 
-registerPlugin( 'activitypub-editor-plugin', { render: EditorPlugin } );
+registerPlugin( 'activitypub-editor-plugin', { render: EditorPlugin } );

tests/test-class-activitypub-activity.php

@@ -25,7 +25,7 @@ function ( $mentions ) {
 		$activitypub_activity->set_type( 'Create' );
 		$activitypub_activity->set_object( $activitypub_post );
 
-		$this->assertContains( \Activitypub\get_rest_url_by_path( 'actors/1/followers' ), $activitypub_activity->get_to() );
+		$this->assertContains( \Activitypub\get_rest_url_by_path( 'actors/1/followers' ), $activitypub_activity->get_cc() );
 		$this->assertContains( 'https://example.com/alex', $activitypub_activity->get_cc() );
 
 		remove_all_filters( 'activitypub_extract_mentions' );