Have better checks if audience should be set or not (#1002)

Automattic · Nov 20, 2024 · ace8e4a · ace8e4a
1 parent 6ec77cc
commit ace8e4a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/includes/class-admin.php b/includes/class-admin.php
@@ -277,7 +277,7 @@ public static function register_settings() {
 			array(
 				'type'        => 'integer',
 				'description' => \__( 'Choose your preferred Actor-Mode.', 'activitypub' ),
-				'default'     => '1',
+				'default'     => ACTIVITYPUB_ACTOR_MODE,
 			)
 		);
 

diff --git a/includes/transformer/class-post.php b/includes/transformer/class-post.php
@@ -798,12 +798,14 @@ protected function get_cc() {
 	 * @return string|null The audience.
 	 */
 	public function get_audience() {
-		if ( is_single_user() ) {
-			return null;
-		} else {
+		$actor_mode = \get_option( 'activitypub_actor_mode', ACTIVITYPUB_ACTOR_MODE );
+
+		if ( ACTIVITYPUB_ACTOR_AND_BLOG_MODE === $actor_mode ) {
 			$blog = new Blog();
 			return $blog->get_id();
 		}
+
+		return null;
 	}
 
 	/**