Require Shared-Inbox (#2359)

Author: pfefferle

.github/changelog/2359-from-description

@@ -0,0 +1,4 @@
+Significance: minor
+Type: changed
+
+Simplified configuration by always enabling the shared inbox and removing its separate setting, UI field, and related logic.

includes/class-options.php

@@ -18,7 +18,6 @@ class Options {
 	public static function init() {
 		\add_filter( 'pre_option_activitypub_actor_mode', array( self::class, 'pre_option_activitypub_actor_mode' ) );
 		\add_filter( 'pre_option_activitypub_authorized_fetch', array( self::class, 'pre_option_activitypub_authorized_fetch' ) );
-		\add_filter( 'pre_option_activitypub_shared_inbox', array( self::class, 'pre_option_activitypub_shared_inbox' ) );
 		\add_filter( 'pre_option_activitypub_vary_header', array( self::class, 'pre_option_activitypub_vary_header' ) );
 
 		\add_filter( 'pre_option_activitypub_allow_likes', array( self::class, 'maybe_disable_interactions' ) );
@@ -82,25 +81,6 @@ public static function pre_option_activitypub_authorized_fetch( $pre ) {
 		return '0';
 	}
 
-	/**
-	 * Pre-get option filter for the Shared Inbox.
-	 *
-	 * @param string $pre The pre-get option value.
-	 *
-	 * @return string If the constant is defined, return the value, otherwise return the pre-get option value.
-	 */
-	public static function pre_option_activitypub_shared_inbox( $pre ) {
-		if ( ! \defined( 'ACTIVITYPUB_SHARED_INBOX_FEATURE' ) ) {
-			return $pre;
-		}
-
-		if ( ACTIVITYPUB_SHARED_INBOX_FEATURE ) {
-			return '1';
-		}
-
-		return '0';
-	}
-
 	/**
 	 * Pre-get option filter for the Vary Header.
 	 *

includes/model/class-blog.php

@@ -391,15 +391,9 @@ public function get_following() {
 	 * @return string[]|null The endpoints.
 	 */
 	public function get_endpoints() {
-		$endpoints = null;
-
-		if ( \get_option( 'activitypub_shared_inbox' ) ) {
-			$endpoints = array(
-				'sharedInbox' => get_rest_url_by_path( 'inbox' ),
-			);
-		}
-
-		return $endpoints;
+		return array(
+			'sharedInbox' => get_rest_url_by_path( 'inbox' ),
+		);
 	}
 
 	/**

includes/model/class-user.php

@@ -317,15 +317,9 @@ public function get_featured_tags() {
 	 * @return string[]|null The endpoints.
 	 */
 	public function get_endpoints() {
-		$endpoints = null;
-
-		if ( \get_option( 'activitypub_shared_inbox' ) ) {
-			$endpoints = array(
-				'sharedInbox' => get_rest_url_by_path( 'inbox' ),
-			);
-		}
-
-		return $endpoints;
+		return array(
+			'sharedInbox' => get_rest_url_by_path( 'inbox' ),
+		);
 	}
 
 	/**

includes/wp-admin/class-advanced-settings-fields.php

@@ -79,17 +79,6 @@ public static function register_advanced_fields() {
 			array( 'label_for' => 'activitypub_following_ui' )
 		);
 
-		if ( ! defined( 'ACTIVITYPUB_SHARED_INBOX_FEATURE' ) ) {
-			\add_settings_field(
-				'activitypub_shared_inbox',
-				\__( 'Shared Inbox (beta)', 'activitypub' ),
-				array( self::class, 'render_shared_inbox_field' ),
-				'activitypub_advanced_settings',
-				'activitypub_advanced_settings',
-				array( 'label_for' => 'activitypub_shared_inbox' )
-			);
-		}
-
 		\add_settings_field(
 			'activitypub_persist_inbox',
 			\__( 'Inbox', 'activitypub' ),
@@ -224,24 +213,6 @@ public static function render_following_ui_field() {
 		<?php
 	}
 
-	/**
-	 * Render shared inbox field.
-	 */
-	public static function render_shared_inbox_field() {
-		$value = \get_option( 'activitypub_shared_inbox', '0' );
-		?>
-		<p>
-			<label>
-				<input type="checkbox" id="activitypub_shared_inbox" name="activitypub_shared_inbox" value="1" <?php checked( '1', $value ); ?> />
-				<?php \esc_html_e( 'Use a shared inbox for incoming messages.', 'activitypub' ); ?>
-			</label>
-		</p>
-		<p class="description">
-			<?php \esc_html_e( 'Allows your site to handle incoming ActivityPub messages more efficiently, especially helpful for busy or multi-user sites. This feature is still in beta and may encounter issues.', 'activitypub' ); ?>
-		</p>
-		<?php
-	}
-
 	/**
 	 * Render inbox collection persistence field.
 	 */

includes/wp-admin/class-health-check.php

@@ -355,12 +355,6 @@ public static function debug_information( $info ) {
 			'private' => false,
 		);
 
-		$info['activitypub']['fields']['shared_inbox'] = array(
-			'label'   => \__( 'Shared Inbox', 'activitypub' ),
-			'value'   => \esc_attr( (int) \get_option( 'activitypub_shared_inbox', '0' ) ),
-			'private' => false,
-		);
-
 		$constants = get_defined_constants( true );
 
 		if ( ! isset( $constants['user'] ) ) {

includes/wp-admin/class-settings.php

@@ -246,16 +246,6 @@ public static function register_settings() {
 			)
 		);
 
-		\register_setting(
-			'activitypub_advanced',
-			'activitypub_shared_inbox',
-			array(
-				'type'        => 'boolean',
-				'description' => \__( 'Enable the shared inbox.', 'activitypub' ),
-				'default'     => false,
-			)
-		);
-
 		\register_setting(
 			'activitypub_advanced',
 			'activitypub_persist_inbox',