From 8307022a66e8871f7c0ead38036ccd4876300316 Mon Sep 17 00:00:00 2001
From: Angus McLeod <angus@mcleod.org.au>
Date: Fri, 22 Mar 2024 16:51:45 +0100
Subject: [PATCH 1/2] Convert HTML entities in titles before sending to
 Discourse

---
 lib/discourse-publish.php                |  4 +--
 tests/phpunit/test-discourse-publish.php | 40 ++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/lib/discourse-publish.php b/lib/discourse-publish.php
index c8c242a3..6370819a 100644
--- a/lib/discourse-publish.php
+++ b/lib/discourse-publish.php
@@ -839,14 +839,14 @@ protected function get_excluded_tag_slugs() {
 	}
 
 	/**
-	 * Strip html tags from titles before passing them to Discourse.
+	 * Strip html tags and convert HTML entities before passing them to Discourse.
 	 *
 	 * @param string $title The title of the post.
 	 *
 	 * @return string
 	 */
 	protected function sanitize_title( $title ) {
-		return wp_strip_all_tags( $title );
+		return wp_specialchars_decode( wp_strip_all_tags( $title ) );
 	}
 
 	/**
diff --git a/tests/phpunit/test-discourse-publish.php b/tests/phpunit/test-discourse-publish.php
index 09b00c8e..3631274e 100644
--- a/tests/phpunit/test-discourse-publish.php
+++ b/tests/phpunit/test-discourse-publish.php
@@ -854,6 +854,46 @@ public function test_force_publish_max_age_prevents_older_posts_from_being_publi
 		wp_delete_post( $post_id );
 	}
 
+  /**
+	 * Test that HTML entities are converted to their special characters.
+	 */
+  public function test_conversion_of_html_entities_in_title() {
+    $title_with_entities = "Title with &amp;";
+    $title_with_decoded_entities = "Title with &";
+    self::$post_atts['post_title'] = $title_with_entities;
+
+	  $response         = $this->build_response( 'success' );
+		$response['body'] = $this->response_body_json( 'post_create' );
+
+    add_filter(
+			'pre_http_request',
+			function( $prempt, $args, $url ) use ( $response, $title_with_decoded_entities ) {
+				$body = json_decode( $args['body'] );
+
+				if ( $body->title !== $title_with_decoded_entities ) {
+						return new \WP_Error( 'http_request_failed', 'Failed to decode title' );
+				} else {
+					return $response;
+				}
+			},
+			10,
+			3
+		);
+
+		// Setup post.
+		$post_id = wp_insert_post( self::$post_atts, false, false );
+
+		// Run the publication.
+		$post = get_post( $post_id );
+		$this->publish->publish_post_after_save( $post_id, $post );
+
+		// Ensure publication occurs.
+		$this->assertEquals( get_post_meta( $post_id, 'wpdc_publishing_response', true ), 'success' );
+
+		// Cleanup.
+		wp_delete_post( $post_id );
+  }
+
 	/**
 	 * Posts can only be published via XMLRPC by hooking into the wp_discourse_before_xmlrpc_publish filter with a function
 	 * that returns `true`.

From 29798fae558d58caa3c214ba7483ee72b7b2221e Mon Sep 17 00:00:00 2001
From: Angus McLeod <angus@mcleod.org.au>
Date: Fri, 22 Mar 2024 16:57:48 +0100
Subject: [PATCH 2/2] Fix linting

---
 tests/phpunit/test-discourse-publish.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/phpunit/test-discourse-publish.php b/tests/phpunit/test-discourse-publish.php
index 3631274e..14722a48 100644
--- a/tests/phpunit/test-discourse-publish.php
+++ b/tests/phpunit/test-discourse-publish.php
@@ -855,17 +855,17 @@ public function test_force_publish_max_age_prevents_older_posts_from_being_publi
 	}
 
   /**
-	 * Test that HTML entities are converted to their special characters.
-	 */
+   * Test that HTML entities are converted to their special characters.
+   */
   public function test_conversion_of_html_entities_in_title() {
-    $title_with_entities = "Title with &amp;";
-    $title_with_decoded_entities = "Title with &";
-    self::$post_atts['post_title'] = $title_with_entities;
+		$title_with_entities = 'Title with &amp;';
+		$title_with_decoded_entities = 'Title with &';
+		self::$post_atts['post_title'] = $title_with_entities;
 
-	  $response         = $this->build_response( 'success' );
+		$response         = $this->build_response( 'success' );
 		$response['body'] = $this->response_body_json( 'post_create' );
 
-    add_filter(
+		add_filter(
 			'pre_http_request',
 			function( $prempt, $args, $url ) use ( $response, $title_with_decoded_entities ) {
 				$body = json_decode( $args['body'] );
@@ -875,7 +875,7 @@ function( $prempt, $args, $url ) use ( $response, $title_with_decoded_entities )
 				} else {
 					return $response;
 				}
-			},
+				},
 			10,
 			3
 		);