Merge pull request #39 from jeremyfelt/release/1.6.0

Release 1.6.0

README.md

@@ -4,7 +4,7 @@ Add a notes post type to WordPress. For your short notes.
 
 ## Description
 
-Shortnotes adds a custom post type, **Notes**, intended for use when publishing short pieces of content, similar to that found on Twitter, Instagram, and other social networks.
+Shortnotes adds a custom post type, **Notes**, used to publish short pieces of content on your website, similar to social networks like Mastodon, Twitter, or Instagram.
 
 ### No titles
 
@@ -16,7 +16,7 @@ A title **is** generated automatically from note content and is used as the note
 
 ### Limited blocks
 
-The **Notes** post type uses only basic content blocks like paragraph, image, gallery, video, and embed. Using a defined list of relatively simple blocks helps to keep notes simple.
+The **Notes** post type supports basic content blocks like paragraph, list, quote, image, preformatted text, gallery, video, and embed. Using a defined list of relatively simple blocks helps to keep notes simple.
 
 ### Webmention support
 
@@ -55,6 +55,16 @@ Those adjustments (a) remove the display of a title for the note post type and (
 
 ## Changelog
 
+### 1.6.0
+
+* Improve title generation when a note starts with a quote.
+* Improve text formatting of notes posted to Mastodon through [Share on Mastodon](https://wordpress.org/plugins/share-on-mastodon/):
+  * Avoid duplicate dashes when a note with a quote is transformed for Mastodon.
+  * Remove leading and trailing double quotes of all flavors when a note with a quote is transformed for Mastodon.
+  * Ensure persisting line breaks for preformatted blocks with `<br>` tags.
+  * Improve handling of lists and list items when transforming content for Mastodon.
+* Update `@wordpress/scripts` dependency to 26.8.0.
+
 ### 1.5.0
 
 * Improve text formatting of notes posted to Mastodon through [Share on Mastodon](https://wordpress.org/plugins/share-on-mastodon/):

build/index.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-components', 'wp-data', 'wp-edit-post', 'wp-element', 'wp-i18n', 'wp-plugins'), 'version' => 'ccbee4ae86a23daf7f60');
+<?php return array('dependencies' => array('wp-components', 'wp-data', 'wp-edit-post', 'wp-element', 'wp-i18n', 'wp-plugins'), 'version' => '508f05b7a61d9b3980de');

includes/post-type-note.php

@@ -174,6 +174,7 @@ function filter_allowed_block_types( $allowed_block_types, \WP_Post $post ) {
 			'core/gallery',
 			'core/image',
 			'core/list',
+			'core/list-item',
 			'core/paragraph',
 			'core/preformatted',
 			'core/pullquote',
@@ -207,6 +208,9 @@ function get_placeholder_title() {
 function generate_sub_title( string $html ): string {
 	$sub_title = wp_strip_all_tags( $html );
 
+	// Stripe newline characters.
+	$sub_title = str_replace( array( "\r", "\n" ), '', $sub_title );
+
 	// At the risk of being complicated, determine the length of the translated "Note" pretext so
 	// that we can build a maximum string of 50 characters.
 	$string_lenth = 50 - strlen( get_placeholder_title() );
@@ -242,7 +246,7 @@ function get_formatted_title( array $post_data ): string {
 			// A paragraph has been found, we're moving on and using it for the title.
 			break;
 		} elseif ( 'core/quote' === $block['blockName'] ) {
-			$sub_title = transform_content( $post_data['post_content'] );
+			$sub_title = generate_sub_title( '“' . trim( $post_data['post_content'] ) );
 
 			// A quote has been found, use its plain text equivalent and move on.
 			break;
@@ -453,14 +457,47 @@ function transform_block( array $block ): string {
 		$content .= '“';
 
 		foreach ( $block['innerBlocks'] as $inner_block ) {
-			$content .= transform_block( $inner_block );
+			// Strip leading and trailing double quotation marks.
+			$content .= html_entity_decode(
+				preg_replace(
+					'/^("|“|”)|("|“|”)$/',
+					'',
+					htmlentities(
+						transform_block( $inner_block )
+					)
+				),
+			);
 		}
 
-		// Quotes use a dash before the citation is appended.
-		$content .= '” - ';
-		$content .= strip_html( trim( $block['innerHTML'] ) );
+		$citation = trim( ltrim( trim( strip_html( $block['innerHTML'] ) ), '-' ) );
+
+		if ( '' !== $citation ) {
+			$content .= '” - ' . $citation;
+		} else {
+			$content .= '”';
+		}
 	} elseif ( 'core/embed' === $block['blockName'] ) {
 		$content .= $block['attrs']['url'] ?? '';
+	} elseif ( 'core/preformatted' === $block['blockName'] ) {
+		// We should expect preservation of line breaks in preformatted blocks
+		// and some may appear as <br> tags by accident.
+		$content .= strip_html(
+			str_replace(
+				'<br>',
+				"\n",
+				trim( $block['innerHTML'] )
+			)
+		);
+	} elseif ( 'core/list' === $block['blockName'] ) {
+		$list_content = '';
+
+		foreach ( $block['innerBlocks'] as $inner_block ) {
+			$list_content .= transform_block( $inner_block );
+		}
+
+		$content .= rtrim( $list_content, "\n" );
+	} elseif ( 'core/list-item' === $block['blockName'] ) {
+		$content .= '- ' . strip_html( trim( $block['innerHTML'] ) ) . "\n";
 	} else {
 		$content .= strip_html( trim( $block['innerHTML'] ) );
 	}