From 9fcf30892d0bfe0a194e45d6e9f30f362902bad0 Mon Sep 17 00:00:00 2001
From: Marin Atanasov <tyxla@abv.bg>
Date: Tue, 11 Sep 2018 17:32:23 +0300
Subject: [PATCH 01/23] Add server rendering for Related Posts block

---
 .../related-posts/jetpack-related-posts.php   | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/modules/related-posts/jetpack-related-posts.php b/modules/related-posts/jetpack-related-posts.php
index fcbe23e771f0b..ab57af5fb0ec1 100644
--- a/modules/related-posts/jetpack-related-posts.php
+++ b/modules/related-posts/jetpack-related-posts.php
@@ -89,6 +89,44 @@ public function __construct( $blog_id_local, $blog_id_wpcom ) {
 	 * =================
 	 */
 
+	/**
+	 * Register the Related Posts Gutenberg block on server.
+	 *
+	 * @action init
+	 * @uses add_settings_field, __, register_setting, add_action
+	 * @return null
+	 */
+	public function register_block() {
+		register_block_type(
+			'jetpack/related-posts',
+			array(
+				'render_callback' => array( $this, 'render_block' ),
+			)
+		);
+	}
+
+	public function render_block( $attributes ) {
+		$shortcode_atts = array(
+			'enabled' => true,
+			'show_headline' => isset( $attributes['headline'] ) && strlen( $attributes['headline'] ) > 0,
+			'show_thumbnails' => ! empty( $attributes['displayThumbnails'] ),
+			'show_date' => ! empty( $attributes['displayDate'] ),
+			'show_context' => ! empty( $attributes['displayContext'] ),
+			'layout' => ! empty( $attributes['postLayout'] ) ? $attributes['postLayout'] : 'grid',
+			'headline' => isset( $attributes['headline'] ) ? $attributes['headline'] : '',
+			'size' => ! empty( $attributes['postsToShow'] ) ? $attributes['postsToShow'] : 3,
+		);
+
+		$parsed_atts = array();
+		foreach ( $shortcode_atts as $attribute => $value ) {
+			$parsed_atts[] = $attribute . '="' . esc_attr( $value ) . '"';
+		}
+
+		$string_atts = implode( ' ', $parsed_atts );
+
+		return '[' . self::SHORTCODE . ' ' . $string_atts . ']';
+	}
+
 	/**
 	 * Add a checkbox field to Settings > Reading for enabling related posts.
 	 *

From d88aaf7c62c9b51974c2fd4bb5bd7d60c5929b1f Mon Sep 17 00:00:00 2001
From: Marin Atanasov <tyxla@abv.bg>
Date: Wed, 12 Sep 2018 12:28:23 +0300
Subject: [PATCH 02/23] Setting block attributes properly

---
 .../related-posts/jetpack-related-posts.php   | 105 +++++++++++-------
 1 file changed, 67 insertions(+), 38 deletions(-)

diff --git a/modules/related-posts/jetpack-related-posts.php b/modules/related-posts/jetpack-related-posts.php
index ab57af5fb0ec1..c878b52de7dd2 100644
--- a/modules/related-posts/jetpack-related-posts.php
+++ b/modules/related-posts/jetpack-related-posts.php
@@ -53,6 +53,7 @@ public static function init_raw() {
 	protected $_convert_charset;
 	protected $_previous_post_id;
 	protected $_found_shortcode = false;
+	protected $block_attributes = array();
 
 	/**
 	 * Constructor for Jetpack_RelatedPosts.
@@ -89,44 +90,6 @@ public function __construct( $blog_id_local, $blog_id_wpcom ) {
 	 * =================
 	 */
 
-	/**
-	 * Register the Related Posts Gutenberg block on server.
-	 *
-	 * @action init
-	 * @uses add_settings_field, __, register_setting, add_action
-	 * @return null
-	 */
-	public function register_block() {
-		register_block_type(
-			'jetpack/related-posts',
-			array(
-				'render_callback' => array( $this, 'render_block' ),
-			)
-		);
-	}
-
-	public function render_block( $attributes ) {
-		$shortcode_atts = array(
-			'enabled' => true,
-			'show_headline' => isset( $attributes['headline'] ) && strlen( $attributes['headline'] ) > 0,
-			'show_thumbnails' => ! empty( $attributes['displayThumbnails'] ),
-			'show_date' => ! empty( $attributes['displayDate'] ),
-			'show_context' => ! empty( $attributes['displayContext'] ),
-			'layout' => ! empty( $attributes['postLayout'] ) ? $attributes['postLayout'] : 'grid',
-			'headline' => isset( $attributes['headline'] ) ? $attributes['headline'] : '',
-			'size' => ! empty( $attributes['postsToShow'] ) ? $attributes['postsToShow'] : 3,
-		);
-
-		$parsed_atts = array();
-		foreach ( $shortcode_atts as $attribute => $value ) {
-			$parsed_atts[] = $attribute . '="' . esc_attr( $value ) . '"';
-		}
-
-		$string_atts = implode( ' ', $parsed_atts );
-
-		return '[' . self::SHORTCODE . ' ' . $string_atts . ']';
-	}
-
 	/**
 	 * Add a checkbox field to Settings > Reading for enabling related posts.
 	 *
@@ -286,6 +249,72 @@ public function get_target_html_unsupported() {
 		return "\n\n<!-- Jetpack Related Posts is not supported in this context. -->\n\n";
 	}
 
+	/**
+	 * ===============
+	 * GUTENBERG BLOCK
+	 * ===============
+	 */
+
+	/**
+	 * Register the Related Posts Gutenberg block on server.
+	 *
+	 * @action init
+	 * @uses register_block_type
+	 * @return null
+	 */
+	public function register_block() {
+		register_block_type(
+			'a8c/related-posts',
+			array(
+				'render_callback' => array( $this, 'render_block' ),
+			)
+		);
+	}
+
+	/**
+	 * Overwrite the current related posts options and render the related posts shortcode.
+	 *
+	 * @return string
+	 */
+	public function render_block( $attributes ) {
+		$headline = isset( $attributes['headline'] ) ? $attributes['headline'] : esc_html__( 'Related', 'jetpack' );
+		$block_attributes = array(
+			'enabled' => true,
+			'show_headline' => strlen( $headline ) > 0,
+			'show_thumbnails' => isset( $attributes['displayThumbnails'] ) ? (bool) $attributes['displayThumbnails'] : false,
+			'show_date' => isset( $attributes['displayDate'] ) ? (bool) $attributes['displayDate'] : true,
+			'show_context' => isset( $attributes['displayContext'] ) ? (bool) $attributes['displayContext'] : true,
+			'layout' => ! empty( $attributes['postLayout'] ) ? $attributes['postLayout'] : 'grid',
+			'headline' => $headline,
+			'size' => ! empty( $attributes['postsToShow'] ) ? absint( $attributes['postsToShow'] ) : 3,
+		);
+
+		$this->set_block_attributes( $block_attributes );
+
+		add_filter( 'jetpack_relatedposts_filter_options', array( $this, 'get_block_attributes' ) );
+
+		return '[' . self::SHORTCODE . ']';
+	}
+
+	/**
+	 * Returns the current Gutenberg block attributes
+	 *
+	 * @return array
+	 */
+	public function get_block_attributes() {
+		return $this->block_attributes;
+	}
+
+	/**
+	 * Updates the current Gutenberg block attributes
+	 *
+	 * @param $attributes string
+	 * @return void
+	 */
+	public function set_block_attributes( $attributes = array() ) {
+		$this->block_attributes = $attributes;
+	}
+
 	/**
 	 * ========================
 	 * PUBLIC UTILITY FUNCTIONS

From 2222f298e859b31c6228158757a47e88d3b98d67 Mon Sep 17 00:00:00 2001
From: Marin Atanasov <tyxla@abv.bg>
Date: Wed, 12 Sep 2018 13:07:33 +0300
Subject: [PATCH 03/23] Use a custom block rendering markup

---
 .../related-posts/jetpack-related-posts.php   | 109 +++++++++++++-----
 1 file changed, 81 insertions(+), 28 deletions(-)

diff --git a/modules/related-posts/jetpack-related-posts.php b/modules/related-posts/jetpack-related-posts.php
index c878b52de7dd2..d3b5a21cda4c9 100644
--- a/modules/related-posts/jetpack-related-posts.php
+++ b/modules/related-posts/jetpack-related-posts.php
@@ -53,7 +53,6 @@ public static function init_raw() {
 	protected $_convert_charset;
 	protected $_previous_post_id;
 	protected $_found_shortcode = false;
-	protected $block_attributes = array();
 
 	/**
 	 * Constructor for Jetpack_RelatedPosts.
@@ -272,47 +271,101 @@ public function register_block() {
 	}
 
 	/**
-	 * Overwrite the current related posts options and render the related posts shortcode.
+	 * Render the related posts markup.
 	 *
 	 * @return string
 	 */
 	public function render_block( $attributes ) {
-		$headline = isset( $attributes['headline'] ) ? $attributes['headline'] : esc_html__( 'Related', 'jetpack' );
+		$headline = isset( $attributes['headline'] ) ? $attributes['headline'] : __( 'Related', 'jetpack' );
 		$block_attributes = array(
-			'enabled' => true,
-			'show_headline' => strlen( $headline ) > 0,
 			'show_thumbnails' => isset( $attributes['displayThumbnails'] ) ? (bool) $attributes['displayThumbnails'] : false,
 			'show_date' => isset( $attributes['displayDate'] ) ? (bool) $attributes['displayDate'] : true,
 			'show_context' => isset( $attributes['displayContext'] ) ? (bool) $attributes['displayContext'] : true,
-			'layout' => ! empty( $attributes['postLayout'] ) ? $attributes['postLayout'] : 'grid',
+			'layout' => isset( $attributes['postLayout'] ) && $attributes['postLayout'] === 'list' ? $attributes['postLayout'] : 'grid',
 			'headline' => $headline,
 			'size' => ! empty( $attributes['postsToShow'] ) ? absint( $attributes['postsToShow'] ) : 3,
 		);
 
-		$this->set_block_attributes( $block_attributes );
-
-		add_filter( 'jetpack_relatedposts_filter_options', array( $this, 'get_block_attributes' ) );
-
-		return '[' . self::SHORTCODE . ']';
-	}
+		$related_posts = $this->get_for_post_id( get_the_ID(), array(
+			'size' => $block_attributes['size'],
+		) );
 
-	/**
-	 * Returns the current Gutenberg block attributes
-	 *
-	 * @return array
-	 */
-	public function get_block_attributes() {
-		return $this->block_attributes;
-	}
+		if ( ! $related_posts ) {
+			return '';
+		}
 
-	/**
-	 * Updates the current Gutenberg block attributes
-	 *
-	 * @param $attributes string
-	 * @return void
-	 */
-	public function set_block_attributes( $attributes = array() ) {
-		$this->block_attributes = $attributes;
+		ob_start();
+		?>
+		<div id="jp-relatedposts" class="jp-relatedposts" style="display: block;">
+			<?php if ( strlen( $headline ) > 0 ): ?>
+				<h3 class="jp-relatedposts-headline">
+					<em><?php echo esc_html( $headline ); ?></em>
+				</h3>
+			<?php endif; ?>
+
+			<div class="jp-relatedposts-items jp-relatedposts-items-visual jp-relatedposts-<?php echo esc_attr( $block_attributes['layout'] ); ?>">
+				<?php foreach ( $related_posts as $index => $related_post ): 
+					$classes = array_filter( array(
+						'jp-relatedposts-post',
+						'jp-relatedposts-post' . $index,
+						! empty( $block_attributes['show_thumbnails'] ) ? 'jp-relatedposts-post-thumbs' : '',
+					) );
+					?>
+					<div
+						class="<?php echo esc_attr( implode( ' ', $classes ) ); ?>"
+						data-post-id="<?php echo esc_attr( $related_post['id'] ); ?>"
+						data-post-format="<?php echo esc_attr( ! empty( $related_post['format'] ) ? $related_post['format'] : 'false' ); ?>"
+					>
+						<?php if ( ! empty( $block_attributes['show_thumbnails'] ) && ! empty( $related_post['img']['src'] ) ): ?>
+							<a class="jp-relatedposts-post-a"
+								href="<?php echo esc_url( $related_post['url'] ) ?>"
+								title="<?php echo esc_attr( $related_post['title'] ) ?>"
+								rel="<?php echo esc_attr( $related_post['rel'] ); ?>"
+								data-origin="<?php echo esc_attr( $related_post['url_meta']['origin'] ); ?>"
+								data-position="<?php echo esc_attr( $related_post['url_meta']['position'] ); ?>"
+							>
+								<img class="jp-relatedposts-post-img"
+									src="<?php echo esc_url( $related_post['img']['src'] ) ?>"
+									width="<?php echo esc_attr( $related_post['img']['width'] ) ?>"
+									alt="<?php echo esc_attr( $related_post['title'] ) ?>"
+								/>
+							</a>
+						<?php endif; ?>
+
+						<h4 class="jp-relatedposts-post-title">
+							<a
+								class="jp-relatedposts-post-a"
+								href="<?php echo esc_url( $related_post['url'] ) ?>"
+								title="<?php echo esc_attr( $related_post['title'] ) ?>"
+								rel="<?php echo esc_attr( $related_post['rel'] ); ?>"
+								data-origin="<?php echo esc_attr( $related_post['url_meta']['origin'] ); ?>"
+								data-position="<?php echo esc_attr( $related_post['url_meta']['position'] ); ?>"
+							>
+								<?php echo esc_html( $related_post['title'] ); ?>
+							</a>
+						</h4>
+
+						<p class="jp-relatedposts-post-excerpt"><?php echo esc_html( $related_post['excerpt'] ); ?></p>
+
+						<?php if ( $block_attributes['show_date'] ): ?>
+							<p class="jp-relatedposts-post-date" style="display: block;">
+								<?php echo esc_html( $related_post['date'] ); ?>
+							</p>
+						<?php endif; ?>
+
+						<?php if ( $block_attributes['show_context'] ): ?>
+							<p class="jp-relatedposts-post-context">
+								<?php echo esc_html( $related_post['context'] ); ?>
+							</p>
+						<?php endif; ?>
+					</div>
+				<?php endforeach; ?>
+			</div>
+		</div>
+		<?php
+		$html = ob_get_clean();
+
+		return $html;
 	}
 
 	/**

From 57c0ac355cc325a915d502dcb3b1f80021520130 Mon Sep 17 00:00:00 2001
From: Marin Atanasov <tyxla@abv.bg>
Date: Wed, 12 Sep 2018 13:09:00 +0300
Subject: [PATCH 04/23] Add some semicolons

---
 modules/related-posts/jetpack-related-posts.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/related-posts/jetpack-related-posts.php b/modules/related-posts/jetpack-related-posts.php
index d3b5a21cda4c9..c718a099ebef8 100644
--- a/modules/related-posts/jetpack-related-posts.php
+++ b/modules/related-posts/jetpack-related-posts.php
@@ -318,16 +318,16 @@ class="<?php echo esc_attr( implode( ' ', $classes ) ); ?>"
 					>
 						<?php if ( ! empty( $block_attributes['show_thumbnails'] ) && ! empty( $related_post['img']['src'] ) ): ?>
 							<a class="jp-relatedposts-post-a"
-								href="<?php echo esc_url( $related_post['url'] ) ?>"
-								title="<?php echo esc_attr( $related_post['title'] ) ?>"
+								href="<?php echo esc_url( $related_post['url'] ); ?>"
+								title="<?php echo esc_attr( $related_post['title'] ); ?>"
 								rel="<?php echo esc_attr( $related_post['rel'] ); ?>"
 								data-origin="<?php echo esc_attr( $related_post['url_meta']['origin'] ); ?>"
 								data-position="<?php echo esc_attr( $related_post['url_meta']['position'] ); ?>"
 							>
 								<img class="jp-relatedposts-post-img"
-									src="<?php echo esc_url( $related_post['img']['src'] ) ?>"
-									width="<?php echo esc_attr( $related_post['img']['width'] ) ?>"
-									alt="<?php echo esc_attr( $related_post['title'] ) ?>"
+									src="<?php echo esc_url( $related_post['img']['src'] ); ?>"
+									width="<?php echo esc_attr( $related_post['img']['width'] ); ?>"
+									alt="<?php echo esc_attr( $related_post['title'] ); ?>"
 								/>
 							</a>
 						<?php endif; ?>
@@ -335,8 +335,8 @@ class="<?php echo esc_attr( implode( ' ', $classes ) ); ?>"
 						<h4 class="jp-relatedposts-post-title">
 							<a
 								class="jp-relatedposts-post-a"
-								href="<?php echo esc_url( $related_post['url'] ) ?>"
-								title="<?php echo esc_attr( $related_post['title'] ) ?>"
+								href="<?php echo esc_url( $related_post['url'] ); ?>"
+								title="<?php echo esc_attr( $related_post['title'] ); ?>"
 								rel="<?php echo esc_attr( $related_post['rel'] ); ?>"
 								data-origin="<?php echo esc_attr( $related_post['url_meta']['origin'] ); ?>"
 								data-position="<?php echo esc_attr( $related_post['url_meta']['position'] ); ?>"

From 0d77733faf5ae0f8ac800788251093ff79992d64 Mon Sep 17 00:00:00 2001
From: Marin Atanasov <tyxla@abv.bg>
Date: Wed, 17 Oct 2018 17:59:27 +0300
Subject: [PATCH 05/23] Remove headline from server side rendering

---
 modules/related-posts/jetpack-related-posts.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/modules/related-posts/jetpack-related-posts.php b/modules/related-posts/jetpack-related-posts.php
index c718a099ebef8..f7f9ff148c878 100644
--- a/modules/related-posts/jetpack-related-posts.php
+++ b/modules/related-posts/jetpack-related-posts.php
@@ -276,13 +276,11 @@ public function register_block() {
 	 * @return string
 	 */
 	public function render_block( $attributes ) {
-		$headline = isset( $attributes['headline'] ) ? $attributes['headline'] : __( 'Related', 'jetpack' );
 		$block_attributes = array(
 			'show_thumbnails' => isset( $attributes['displayThumbnails'] ) ? (bool) $attributes['displayThumbnails'] : false,
 			'show_date' => isset( $attributes['displayDate'] ) ? (bool) $attributes['displayDate'] : true,
 			'show_context' => isset( $attributes['displayContext'] ) ? (bool) $attributes['displayContext'] : true,
 			'layout' => isset( $attributes['postLayout'] ) && $attributes['postLayout'] === 'list' ? $attributes['postLayout'] : 'grid',
-			'headline' => $headline,
 			'size' => ! empty( $attributes['postsToShow'] ) ? absint( $attributes['postsToShow'] ) : 3,
 		);
 
@@ -297,12 +295,6 @@ public function render_block( $attributes ) {
 		ob_start();
 		?>
 		<div id="jp-relatedposts" class="jp-relatedposts" style="display: block;">
-			<?php if ( strlen( $headline ) > 0 ): ?>
-				<h3 class="jp-relatedposts-headline">
-					<em><?php echo esc_html( $headline ); ?></em>
-				</h3>
-			<?php endif; ?>
-
 			<div class="jp-relatedposts-items jp-relatedposts-items-visual jp-relatedposts-<?php echo esc_attr( $block_attributes['layout'] ); ?>">
 				<?php foreach ( $related_posts as $index => $related_post ): 
 					$classes = array_filter( array(

From bc188e62fd6ab0e2edef6d6a6882c659ba49f0d4 Mon Sep 17 00:00:00 2001
From: Jon Surrell <jon.surrell@automattic.com>
Date: Thu, 18 Oct 2018 13:26:04 +0200
Subject: [PATCH 06/23] Default to off for displayContext

Requires Calypso-side change:

https://github.com/Automattic/wp-calypso/pull/27924
---
 modules/related-posts/jetpack-related-posts.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/related-posts/jetpack-related-posts.php b/modules/related-posts/jetpack-related-posts.php
index f7f9ff148c878..138aa2c9482af 100644
--- a/modules/related-posts/jetpack-related-posts.php
+++ b/modules/related-posts/jetpack-related-posts.php
@@ -279,7 +279,7 @@ public function render_block( $attributes ) {
 		$block_attributes = array(
 			'show_thumbnails' => isset( $attributes['displayThumbnails'] ) ? (bool) $attributes['displayThumbnails'] : false,
 			'show_date' => isset( $attributes['displayDate'] ) ? (bool) $attributes['displayDate'] : true,
-			'show_context' => isset( $attributes['displayContext'] ) ? (bool) $attributes['displayContext'] : true,
+			'show_context' => isset( $attributes['displayContext'] ) ? (bool) $attributes['displayContext'] : false,
 			'layout' => isset( $attributes['postLayout'] ) && $attributes['postLayout'] === 'list' ? $attributes['postLayout'] : 'grid',
 			'size' => ! empty( $attributes['postsToShow'] ) ? absint( $attributes['postsToShow'] ) : 3,
 		);

From 5b0485f66aabbec2d4ff892ee0c3601846df1352 Mon Sep 17 00:00:00 2001
From: Marin Atanasov <tyxla@abv.bg>
Date: Thu, 13 Dec 2018 16:21:34 +0200
Subject: [PATCH 07/23] Pass render callback to jetpack_register_block()

---
 .../related-posts/jetpack-related-posts.php   | 20 +++----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/modules/related-posts/jetpack-related-posts.php b/modules/related-posts/jetpack-related-posts.php
index 138aa2c9482af..48267919610a3 100644
--- a/modules/related-posts/jetpack-related-posts.php
+++ b/modules/related-posts/jetpack-related-posts.php
@@ -80,7 +80,9 @@ public function __construct( $blog_id_local, $blog_id_wpcom ) {
 			add_action( 'rest_api_init',  array( $this, 'rest_register_related_posts' ) );
 		}
 
-		jetpack_register_block( 'related-posts' );
+		jetpack_register_block( 'related-posts', array(
+			'render_callback' => array( $this, 'render_block' ),
+		) );
 	}
 
 	/**
@@ -254,22 +256,6 @@ public function get_target_html_unsupported() {
 	 * ===============
 	 */
 
-	/**
-	 * Register the Related Posts Gutenberg block on server.
-	 *
-	 * @action init
-	 * @uses register_block_type
-	 * @return null
-	 */
-	public function register_block() {
-		register_block_type(
-			'a8c/related-posts',
-			array(
-				'render_callback' => array( $this, 'render_block' ),
-			)
-		);
-	}
-
 	/**
 	 * Render the related posts markup.
 	 *

From 83c982f8acd37f4d05d64253f765633a4c9e3599 Mon Sep 17 00:00:00 2001
From: Marin Atanasov <tyxla@abv.bg>
Date: Thu, 13 Dec 2018 19:57:44 +0200
Subject: [PATCH 08/23] Exclude previously visited post properly

---
 modules/related-posts/jetpack-related-posts.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/modules/related-posts/jetpack-related-posts.php b/modules/related-posts/jetpack-related-posts.php
index 48267919610a3..8b19002778556 100644
--- a/modules/related-posts/jetpack-related-posts.php
+++ b/modules/related-posts/jetpack-related-posts.php
@@ -270,8 +270,20 @@ public function render_block( $attributes ) {
 			'size' => ! empty( $attributes['postsToShow'] ) ? absint( $attributes['postsToShow'] ) : 3,
 		);
 
+		$excludes = array();
+		if ( isset( $_GET['relatedposts_origin'] ) ) {
+			if ( is_string( $_GET['relatedposts_origin'] ) ) {
+				$excludes = explode( ',', $_GET['relatedposts_origin'] );
+			} elseif ( is_array( $_GET['relatedposts_origin'] ) ) {
+				$excludes = array_values( $_GET['relatedposts_origin'] );
+			}
+
+			$excludes = array_unique( array_filter( array_map( 'absint', $excludes ) ) );
+		}
+
 		$related_posts = $this->get_for_post_id( get_the_ID(), array(
 			'size' => $block_attributes['size'],
+			'exclude_post_ids' => $excludes,
 		) );
 
 		if ( ! $related_posts ) {

From 6534728a37016487df9cc6d3ba6bcbd029718831 Mon Sep 17 00:00:00 2001
From: Marin Atanasov <tyxla@abv.bg>
Date: Thu, 13 Dec 2018 20:17:12 +0200
Subject: [PATCH 09/23] Do not load posts when they have loaded already

---
 .../related-posts/jetpack-related-posts.php    |  2 +-
 modules/related-posts/related-posts.js         | 18 +++++++++++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/modules/related-posts/jetpack-related-posts.php b/modules/related-posts/jetpack-related-posts.php
index 8b19002778556..b58ac2f0aa9ef 100644
--- a/modules/related-posts/jetpack-related-posts.php
+++ b/modules/related-posts/jetpack-related-posts.php
@@ -1,6 +1,6 @@
 <?php
 class Jetpack_RelatedPosts {
-	const VERSION = '20150408';
+	const VERSION = '20181213';
 	const SHORTCODE = 'jetpack-related-posts';
 	private static $instance = null;
 	private static $instance_raw = null;
diff --git a/modules/related-posts/related-posts.js b/modules/related-posts/related-posts.js
index ac2eb0d4f1ed4..a7cbcbb9fc4af 100644
--- a/modules/related-posts/related-posts.js
+++ b/modules/related-posts/related-posts.js
@@ -194,6 +194,13 @@
 		}
 	};
 
+	function afterPostsHaveLoaded() {
+		jprp.setVisualExcerptHeights();
+		$( '#jp-relatedposts a.jp-relatedposts-post-a' ).click(function() {
+			this.href = jprp.getTrackedUrl( this );
+		});
+	}
+
 	/**
 	 * Initialize Related Posts.
 	 */
@@ -203,6 +210,11 @@
 		var endpointURL = jprp.getEndpointURL(),
 			$relatedPosts = $( '#jp-relatedposts' );
 
+		if ( $( '#jp-relatedposts .jp-relatedposts-post' ).length ) {
+			afterPostsHaveLoaded();
+			return;
+		}
+
 		$.getJSON( endpointURL, function( response ) {
 			if ( 0 === response.items.length || 0 === $relatedPosts.length ) {
 				return;
@@ -229,15 +241,11 @@
 			html = ! showThumbnails ? jprp.generateMinimalHtml( response.items, options ) : jprp.generateVisualHtml( response.items, options );
 
 			$relatedPosts.append( html );
-			jprp.setVisualExcerptHeights();
 			if ( options.showDate ) {
 				$relatedPosts.find( '.jp-relatedposts-post-date' ).show();
 			}
 			$relatedPosts.show();
-
-			$( '#jp-relatedposts a.jp-relatedposts-post-a' ).click(function() {
-				this.href = jprp.getTrackedUrl( this );
-			});
+			afterPostsHaveLoaded();
 		} );
 	}
 

From 50710d4b1a8e2f723210173e4a110b730804148f Mon Sep 17 00:00:00 2001
From: Marin Atanasov <tyxla@abv.bg>
Date: Thu, 13 Dec 2018 20:47:16 +0200
Subject: [PATCH 10/23] Add excerpt to title attribute

---
 modules/related-posts/jetpack-related-posts.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/related-posts/jetpack-related-posts.php b/modules/related-posts/jetpack-related-posts.php
index b58ac2f0aa9ef..70136e1f0e1b5 100644
--- a/modules/related-posts/jetpack-related-posts.php
+++ b/modules/related-posts/jetpack-related-posts.php
@@ -300,6 +300,10 @@ public function render_block( $attributes ) {
 						'jp-relatedposts-post' . $index,
 						! empty( $block_attributes['show_thumbnails'] ) ? 'jp-relatedposts-post-thumbs' : '',
 					) );
+					$title_attr = $related_post['title'];
+					if ( $related_post['excerpt'] !== '' ) {
+						$title_attr .= "\n\n" . $related_post['excerpt'];
+					}
 					?>
 					<div
 						class="<?php echo esc_attr( implode( ' ', $classes ) ); ?>"
@@ -309,7 +313,7 @@ class="<?php echo esc_attr( implode( ' ', $classes ) ); ?>"
 						<?php if ( ! empty( $block_attributes['show_thumbnails'] ) && ! empty( $related_post['img']['src'] ) ): ?>
 							<a class="jp-relatedposts-post-a"
 								href="<?php echo esc_url( $related_post['url'] ); ?>"
-								title="<?php echo esc_attr( $related_post['title'] ); ?>"
+								title="<?php echo esc_attr( $title_attr ); ?>"
 								rel="<?php echo esc_attr( $related_post['rel'] ); ?>"
 								data-origin="<?php echo esc_attr( $related_post['url_meta']['origin'] ); ?>"
 								data-position="<?php echo esc_attr( $related_post['url_meta']['position'] ); ?>"
@@ -317,7 +321,7 @@ class="<?php echo esc_attr( implode( ' ', $classes ) ); ?>"
 								<img class="jp-relatedposts-post-img"
 									src="<?php echo esc_url( $related_post['img']['src'] ); ?>"
 									width="<?php echo esc_attr( $related_post['img']['width'] ); ?>"
-									alt="<?php echo esc_attr( $related_post['title'] ); ?>"
+									alt="<?php echo esc_attr( $title_attr ); ?>"
 								/>
 							</a>
 						<?php endif; ?>
@@ -326,7 +330,7 @@ class="<?php echo esc_attr( implode( ' ', $classes ) ); ?>"
 							<a
 								class="jp-relatedposts-post-a"
 								href="<?php echo esc_url( $related_post['url'] ); ?>"
-								title="<?php echo esc_attr( $related_post['title'] ); ?>"
+								title="<?php echo esc_attr( $title_attr ); ?>"
 								rel="<?php echo esc_attr( $related_post['rel'] ); ?>"
 								data-origin="<?php echo esc_attr( $related_post['url_meta']['origin'] ); ?>"
 								data-position="<?php echo esc_attr( $related_post['url_meta']['position'] ); ?>"

From c589430aa9d4da885fdc47200b336410a6196905 Mon Sep 17 00:00:00 2001
From: Marin Atanasov <tyxla@abv.bg>
Date: Thu, 13 Dec 2018 21:00:25 +0200
Subject: [PATCH 11/23] Prevent the customizer from modifying block output

---
 modules/related-posts/class.related-posts-customize.php | 2 +-
 modules/related-posts/jetpack-related-posts.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/related-posts/class.related-posts-customize.php b/modules/related-posts/class.related-posts-customize.php
index 8349b530043c4..d666dada27933 100644
--- a/modules/related-posts/class.related-posts-customize.php
+++ b/modules/related-posts/class.related-posts-customize.php
@@ -95,7 +95,7 @@ function customize_register( $wp_customize ) {
 		// If selective refresh is available, implement it.
 		if ( isset( $wp_customize->selective_refresh ) ) {
 			$wp_customize->selective_refresh->add_partial( "$this->prefix", array(
-				'selector'            => '.jp-relatedposts',
+				'selector'            => '.jp-relatedposts:not(.jp-relatedposts-block)',
 				'settings'            => $selective_options,
 				'render_callback'     => __CLASS__ . '::render_callback',
 				'container_inclusive' => false,
diff --git a/modules/related-posts/jetpack-related-posts.php b/modules/related-posts/jetpack-related-posts.php
index 70136e1f0e1b5..2ebd7b96384f5 100644
--- a/modules/related-posts/jetpack-related-posts.php
+++ b/modules/related-posts/jetpack-related-posts.php
@@ -292,7 +292,7 @@ public function render_block( $attributes ) {
 
 		ob_start();
 		?>
-		<div id="jp-relatedposts" class="jp-relatedposts" style="display: block;">
+		<div id="jp-relatedposts" class="jp-relatedposts jp-relatedposts-block" style="display: block;">
 			<div class="jp-relatedposts-items jp-relatedposts-items-visual jp-relatedposts-<?php echo esc_attr( $block_attributes['layout'] ); ?>">
 				<?php foreach ( $related_posts as $index => $related_post ): 
 					$classes = array_filter( array(

From 923bb27ec6f8e5d2b14fb2ec521353b5f89bd788 Mon Sep 17 00:00:00 2001
From: Marin Atanasov <tyxla@abv.bg>
Date: Thu, 13 Dec 2018 21:02:13 +0200
Subject: [PATCH 12/23] Remove legacy wrapper if we have a Related Posts block
 in the content

---
 modules/related-posts/jetpack-related-posts.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/related-posts/jetpack-related-posts.php b/modules/related-posts/jetpack-related-posts.php
index 2ebd7b96384f5..0c2a1414f0643 100644
--- a/modules/related-posts/jetpack-related-posts.php
+++ b/modules/related-posts/jetpack-related-posts.php
@@ -290,6 +290,8 @@ public function render_block( $attributes ) {
 			return '';
 		}
 
+		remove_filter( 'the_content', array( $this, 'filter_add_target_to_dom' ), 40 );
+
 		ob_start();
 		?>
 		<div id="jp-relatedposts" class="jp-relatedposts jp-relatedposts-block" style="display: block;">

From c1d13d8270f154d5b5d1ce7e5ed61aa6b5e82643 Mon Sep 17 00:00:00 2001
From: Marin Atanasov <tyxla@abv.bg>
Date: Thu, 13 Dec 2018 21:10:33 +0200
Subject: [PATCH 13/23] Conditionally add jp-relatedposts-items-visual class

---
 modules/related-posts/jetpack-related-posts.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/related-posts/jetpack-related-posts.php b/modules/related-posts/jetpack-related-posts.php
index 0c2a1414f0643..201a89c091810 100644
--- a/modules/related-posts/jetpack-related-posts.php
+++ b/modules/related-posts/jetpack-related-posts.php
@@ -295,7 +295,7 @@ public function render_block( $attributes ) {
 		ob_start();
 		?>
 		<div id="jp-relatedposts" class="jp-relatedposts jp-relatedposts-block" style="display: block;">
-			<div class="jp-relatedposts-items jp-relatedposts-items-visual jp-relatedposts-<?php echo esc_attr( $block_attributes['layout'] ); ?>">
+			<div class="jp-relatedposts-items <?php echo $block_attributes['show_thumbnails'] ? 'jp-relatedposts-items-visual ' : ''; ?>jp-relatedposts-<?php echo esc_attr( $block_attributes['layout'] ); ?>">
 				<?php foreach ( $related_posts as $index => $related_post ): 
 					$classes = array_filter( array(
 						'jp-relatedposts-post',

From 30a23e61286f409670dc036a93983f6c3be8e3a5 Mon Sep 17 00:00:00 2001
From: Marin Atanasov <tyxla@abv.bg>
Date: Thu, 13 Dec 2018 21:47:23 +0200
Subject: [PATCH 14/23] Some phpcs fixes

---
 .../related-posts/jetpack-related-posts.php   | 54 +++++++++++--------
 1 file changed, 32 insertions(+), 22 deletions(-)

diff --git a/modules/related-posts/jetpack-related-posts.php b/modules/related-posts/jetpack-related-posts.php
index 201a89c091810..0d6489c572c65 100644
--- a/modules/related-posts/jetpack-related-posts.php
+++ b/modules/related-posts/jetpack-related-posts.php
@@ -77,12 +77,15 @@ public function __construct( $blog_id_local, $blog_id_wpcom ) {
 
 		// Add Related Posts to the REST API Post response.
 		if ( function_exists( 'register_rest_field' ) ) {
-			add_action( 'rest_api_init',  array( $this, 'rest_register_related_posts' ) );
+			add_action( 'rest_api_init', array( $this, 'rest_register_related_posts' ) );
 		}
 
-		jetpack_register_block( 'related-posts', array(
-			'render_callback' => array( $this, 'render_block' ),
-		) );
+		jetpack_register_block(
+			'related-posts',
+			array(
+				'render_callback' => array( $this, 'render_block' ),
+			)
+		);
 	}
 
 	/**
@@ -259,15 +262,16 @@ public function get_target_html_unsupported() {
 	/**
 	 * Render the related posts markup.
 	 *
+	 * @param array $attributes Block attributes.
 	 * @return string
 	 */
 	public function render_block( $attributes ) {
 		$block_attributes = array(
 			'show_thumbnails' => isset( $attributes['displayThumbnails'] ) ? (bool) $attributes['displayThumbnails'] : false,
-			'show_date' => isset( $attributes['displayDate'] ) ? (bool) $attributes['displayDate'] : true,
-			'show_context' => isset( $attributes['displayContext'] ) ? (bool) $attributes['displayContext'] : false,
-			'layout' => isset( $attributes['postLayout'] ) && $attributes['postLayout'] === 'list' ? $attributes['postLayout'] : 'grid',
-			'size' => ! empty( $attributes['postsToShow'] ) ? absint( $attributes['postsToShow'] ) : 3,
+			'show_date'       => isset( $attributes['displayDate'] ) ? (bool) $attributes['displayDate'] : true,
+			'show_context'    => isset( $attributes['displayContext'] ) ? (bool) $attributes['displayContext'] : false,
+			'layout'          => isset( $attributes['postLayout'] ) && 'list' === $attributes['postLayout'] ? $attributes['postLayout'] : 'grid',
+			'size'            => ! empty( $attributes['postsToShow'] ) ? absint( $attributes['postsToShow'] ) : 3,
 		);
 
 		$excludes = array();
@@ -281,10 +285,13 @@ public function render_block( $attributes ) {
 			$excludes = array_unique( array_filter( array_map( 'absint', $excludes ) ) );
 		}
 
-		$related_posts = $this->get_for_post_id( get_the_ID(), array(
-			'size' => $block_attributes['size'],
-			'exclude_post_ids' => $excludes,
-		) );
+		$related_posts = $this->get_for_post_id(
+			get_the_ID(),
+			array(
+				'size'             => $block_attributes['size'],
+				'exclude_post_ids' => $excludes,
+			)
+		);
 
 		if ( ! $related_posts ) {
 			return '';
@@ -296,14 +303,17 @@ public function render_block( $attributes ) {
 		?>
 		<div id="jp-relatedposts" class="jp-relatedposts jp-relatedposts-block" style="display: block;">
 			<div class="jp-relatedposts-items <?php echo $block_attributes['show_thumbnails'] ? 'jp-relatedposts-items-visual ' : ''; ?>jp-relatedposts-<?php echo esc_attr( $block_attributes['layout'] ); ?>">
-				<?php foreach ( $related_posts as $index => $related_post ): 
-					$classes = array_filter( array(
-						'jp-relatedposts-post',
-						'jp-relatedposts-post' . $index,
-						! empty( $block_attributes['show_thumbnails'] ) ? 'jp-relatedposts-post-thumbs' : '',
-					) );
+				<?php
+				foreach ( $related_posts as $index => $related_post ) :
+					$classes = array_filter(
+						array(
+							'jp-relatedposts-post',
+							'jp-relatedposts-post' . $index,
+							! empty( $block_attributes['show_thumbnails'] ) ? 'jp-relatedposts-post-thumbs' : '',
+						)
+					);
 					$title_attr = $related_post['title'];
-					if ( $related_post['excerpt'] !== '' ) {
+					if ( '' !== $related_post['excerpt'] ) {
 						$title_attr .= "\n\n" . $related_post['excerpt'];
 					}
 					?>
@@ -312,7 +322,7 @@ class="<?php echo esc_attr( implode( ' ', $classes ) ); ?>"
 						data-post-id="<?php echo esc_attr( $related_post['id'] ); ?>"
 						data-post-format="<?php echo esc_attr( ! empty( $related_post['format'] ) ? $related_post['format'] : 'false' ); ?>"
 					>
-						<?php if ( ! empty( $block_attributes['show_thumbnails'] ) && ! empty( $related_post['img']['src'] ) ): ?>
+						<?php if ( ! empty( $block_attributes['show_thumbnails'] ) && ! empty( $related_post['img']['src'] ) ) : ?>
 							<a class="jp-relatedposts-post-a"
 								href="<?php echo esc_url( $related_post['url'] ); ?>"
 								title="<?php echo esc_attr( $title_attr ); ?>"
@@ -343,13 +353,13 @@ class="jp-relatedposts-post-a"
 
 						<p class="jp-relatedposts-post-excerpt"><?php echo esc_html( $related_post['excerpt'] ); ?></p>
 
-						<?php if ( $block_attributes['show_date'] ): ?>
+						<?php if ( $block_attributes['show_date'] ) : ?>
 							<p class="jp-relatedposts-post-date" style="display: block;">
 								<?php echo esc_html( $related_post['date'] ); ?>
 							</p>
 						<?php endif; ?>
 
-						<?php if ( $block_attributes['show_context'] ): ?>
+						<?php if ( $block_attributes['show_context'] ) : ?>
 							<p class="jp-relatedposts-post-context">
 								<?php echo esc_html( $related_post['context'] ); ?>
 							</p>

From 923107b5fc888c2352f0b032d93da8adda1db411 Mon Sep 17 00:00:00 2001
From: Marin Atanasov <tyxla@abv.bg>
Date: Fri, 14 Dec 2018 17:00:40 +0200
Subject: [PATCH 15/23] Simplify block attribute retrieval

---
 modules/related-posts/jetpack-related-posts.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/related-posts/jetpack-related-posts.php b/modules/related-posts/jetpack-related-posts.php
index 0d6489c572c65..68589f3b136d0 100644
--- a/modules/related-posts/jetpack-related-posts.php
+++ b/modules/related-posts/jetpack-related-posts.php
@@ -267,9 +267,9 @@ public function get_target_html_unsupported() {
 	 */
 	public function render_block( $attributes ) {
 		$block_attributes = array(
-			'show_thumbnails' => isset( $attributes['displayThumbnails'] ) ? (bool) $attributes['displayThumbnails'] : false,
+			'show_thumbnails' => isset( $attributes['displayThumbnails'] ) && $attributes['displayThumbnails'],
 			'show_date'       => isset( $attributes['displayDate'] ) ? (bool) $attributes['displayDate'] : true,
-			'show_context'    => isset( $attributes['displayContext'] ) ? (bool) $attributes['displayContext'] : false,
+			'show_context'    => isset( $attributes['displayContext'] ) && $attributes['displayContext'],
 			'layout'          => isset( $attributes['postLayout'] ) && 'list' === $attributes['postLayout'] ? $attributes['postLayout'] : 'grid',
 			'size'            => ! empty( $attributes['postsToShow'] ) ? absint( $attributes['postsToShow'] ) : 3,
 		);

From f3af2bddcb8090282da3131d8ce0729ebf847490 Mon Sep 17 00:00:00 2001
From: Marin Atanasov <tyxla@abv.bg>
Date: Fri, 14 Dec 2018 17:01:54 +0200
Subject: [PATCH 16/23] Add some spacing

---
 modules/related-posts/related-posts.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/related-posts/related-posts.js b/modules/related-posts/related-posts.js
index a7cbcbb9fc4af..c3cc1c53e1197 100644
--- a/modules/related-posts/related-posts.js
+++ b/modules/related-posts/related-posts.js
@@ -196,9 +196,9 @@
 
 	function afterPostsHaveLoaded() {
 		jprp.setVisualExcerptHeights();
-		$( '#jp-relatedposts a.jp-relatedposts-post-a' ).click(function() {
+		$( '#jp-relatedposts a.jp-relatedposts-post-a' ).click( function() {
 			this.href = jprp.getTrackedUrl( this );
-		});
+		} );
 	}
 
 	/**

From 6c2c3224eef38612ebb7ab771c01ab41de9b23ce Mon Sep 17 00:00:00 2001
From: Marin Atanasov <tyxla@abv.bg>
Date: Wed, 19 Dec 2018 14:44:42 +0200
Subject: [PATCH 17/23] Disable customize controls when content has a related
 posts block

---
 .../related-posts/class.related-posts-customize.php    | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/modules/related-posts/class.related-posts-customize.php b/modules/related-posts/class.related-posts-customize.php
index d666dada27933..bd9c82201a0f0 100644
--- a/modules/related-posts/class.related-posts-customize.php
+++ b/modules/related-posts/class.related-posts-customize.php
@@ -115,23 +115,33 @@ public static function render_callback() {
 
 	/**
 	 * Check that we're in a single post view.
+	 * Will return `false` if the current post contains a Related Posts block,
+	 * because in that case we want to hide the Customizer controls.
 	 *
 	 * @since 4.4.0
 	 *
 	 * @return bool
 	 */
 	public static function is_single() {
+		if ( has_block( 'jetpack/related-posts' ) ) {
+			return false;
+		}
 		return is_single();
 	}
 
 	/**
 	 * Check that we're not in a single post view.
+	 * Will return `false` if the current post contains a Related Posts block,
+	 * because in that case we want to hide the Customizer controls.
 	 *
 	 * @since 4.4.0
 	 *
 	 * @return bool
 	 */
 	public static function is_not_single() {
+		if ( has_block( 'jetpack/related-posts' ) ) {
+			return false;
+		}
 		return ! is_single();
 	}
 

From 5373b7b2aa26b4d8a40fa65f7830ec6393b169ec Mon Sep 17 00:00:00 2001
From: Marin Atanasov <tyxla@abv.bg>
Date: Wed, 19 Dec 2018 15:03:06 +0200
Subject: [PATCH 18/23] Add disclaimer that blocks are not affected to Settings

---
 modules/related-posts/jetpack-related-posts.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/related-posts/jetpack-related-posts.php b/modules/related-posts/jetpack-related-posts.php
index 68589f3b136d0..5081f2ee93f73 100644
--- a/modules/related-posts/jetpack-related-posts.php
+++ b/modules/related-posts/jetpack-related-posts.php
@@ -490,6 +490,7 @@ public function print_setting_html() {
 		$options = $this->get_options();
 
 		$ui_settings_template = <<<EOT
+<p class="description">%s</p>
 <ul id="settings-reading-relatedposts-customize">
 	<li>
 		<label><input name="jetpack_relatedposts[show_headline]" type="checkbox" value="1" %s /> %s</label>
@@ -511,6 +512,7 @@ public function print_setting_html() {
 EOT;
 		$ui_settings = sprintf(
 			$ui_settings_template,
+			esc_html__( 'The following settings will impact all related posts on your site, except for those you created via the block editor:', 'jetpack' ),
 			checked( $options['show_headline'], true, false ),
 			esc_html__( 'Highlight related content with a heading', 'jetpack' ),
 			checked( $options['show_thumbnails'], true, false ),

From 6f01b4adb039f8fc827e47b3790f81a17d882b57 Mon Sep 17 00:00:00 2001
From: Marin Atanasov <tyxla@abv.bg>
Date: Wed, 19 Dec 2018 15:03:29 +0200
Subject: [PATCH 19/23] Add disclaimer that blocks are not affected to Jetpack
 Traffic settings

---
 _inc/client/traffic/related-posts.jsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/_inc/client/traffic/related-posts.jsx b/_inc/client/traffic/related-posts.jsx
index 925f2d1e8f64c..f33671379ea88 100644
--- a/_inc/client/traffic/related-posts.jsx
+++ b/_inc/client/traffic/related-posts.jsx
@@ -66,6 +66,9 @@ class RelatedPostsComponent extends React.Component {
 						link: 'https://jetpack.com/support/related-posts/',
 					} }
 				>
+					<p className="jp-form-setting-explanation">
+						{ __( 'The following settings will impact all related posts on your site, except for those you created via the block editor:' ) }
+					</p>
 					<ModuleToggle
 						slug="related-posts"
 						disabled={ unavailableInDevMode }

From 814b7e34dd7268e9f18f120717c21d1c84bdb7dc Mon Sep 17 00:00:00 2001
From: Marin Atanasov <tyxla@abv.bg>
Date: Wed, 19 Dec 2018 15:25:52 +0200
Subject: [PATCH 20/23] Support for WP < 5.0

---
 .../class.related-posts-customize.php         | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/modules/related-posts/class.related-posts-customize.php b/modules/related-posts/class.related-posts-customize.php
index bd9c82201a0f0..e77d944b69c99 100644
--- a/modules/related-posts/class.related-posts-customize.php
+++ b/modules/related-posts/class.related-posts-customize.php
@@ -113,6 +113,27 @@ public static function render_callback() {
 		echo Jetpack_RelatedPosts::init()->get_headline();
 	}
 
+	/**
+	 * Check whether the current post contains a Related Posts block.
+	 * If we're on WP < 5.0, this automatically means it doesn't,
+	 * because block support is intrododuced in WP 5.0.
+	 *
+	 * @since 6.9.0
+	 *
+	 * @return bool
+	 */
+	public static function contains_related_posts_block() {
+		if ( ! function_exists( 'has_block' ) ) {
+			return false;
+		}
+
+		if ( has_block( 'jetpack/related-posts' ) ) {
+			return true;
+		}
+
+		return false;
+	}
+
 	/**
 	 * Check that we're in a single post view.
 	 * Will return `false` if the current post contains a Related Posts block,
@@ -123,7 +144,7 @@ public static function render_callback() {
 	 * @return bool
 	 */
 	public static function is_single() {
-		if ( has_block( 'jetpack/related-posts' ) ) {
+		if ( self::contains_related_posts_block() ) ) {
 			return false;
 		}
 		return is_single();
@@ -139,7 +160,7 @@ public static function is_single() {
 	 * @return bool
 	 */
 	public static function is_not_single() {
-		if ( has_block( 'jetpack/related-posts' ) ) {
+		if ( self::contains_related_posts_block() ) {
 			return false;
 		}
 		return ! is_single();

From 6b560e2abc256d41a7f35751d51e25f93469ae91 Mon Sep 17 00:00:00 2001
From: Marin Atanasov <tyxla@abv.bg>
Date: Wed, 19 Dec 2018 15:27:16 +0200
Subject: [PATCH 21/23] Improve how we disable the legacy widget when block is
 present in content

---
 modules/related-posts/jetpack-related-posts.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/related-posts/jetpack-related-posts.php b/modules/related-posts/jetpack-related-posts.php
index 5081f2ee93f73..1ca9f1657b989 100644
--- a/modules/related-posts/jetpack-related-posts.php
+++ b/modules/related-posts/jetpack-related-posts.php
@@ -177,13 +177,18 @@ public function get_headline() {
 
 	/**
 	 * Adds a target to the post content to load related posts into if a shortcode for it did not already exist.
+	 * Will skip adding the target if the post content contains a Related Posts block.
 	 *
 	 * @filter the_content
 	 * @param string $content
 	 * @returns string
 	 */
 	public function filter_add_target_to_dom( $content ) {
-		if ( !$this->_found_shortcode ) {
+		if ( function_exists( 'has_block' ) && has_block( 'jetpack/related-posts', $content ) ) {
+			return $content;
+		}
+
+		if ( ! $this->_found_shortcode ) {
 			$content .= "\n" . $this->get_target_html();
 		}
 
@@ -297,8 +302,6 @@ public function render_block( $attributes ) {
 			return '';
 		}
 
-		remove_filter( 'the_content', array( $this, 'filter_add_target_to_dom' ), 40 );
-
 		ob_start();
 		?>
 		<div id="jp-relatedposts" class="jp-relatedposts jp-relatedposts-block" style="display: block;">

From d73314b73c35316b9ac08e5e22c564c0f3c9c3aa Mon Sep 17 00:00:00 2001
From: Marin Atanasov <tyxla@abv.bg>
Date: Wed, 19 Dec 2018 15:34:53 +0200
Subject: [PATCH 22/23] Introduce a parse_numeric_get_arg helper

---
 .../related-posts/jetpack-related-posts.php   | 50 +++++++++++--------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/modules/related-posts/jetpack-related-posts.php b/modules/related-posts/jetpack-related-posts.php
index 1ca9f1657b989..7ae8a1e0de11e 100644
--- a/modules/related-posts/jetpack-related-posts.php
+++ b/modules/related-posts/jetpack-related-posts.php
@@ -130,17 +130,7 @@ public function action_frontend_init() {
 			return;
 
 		if ( isset( $_GET['relatedposts'] ) ) {
-			$excludes = array();
-			if ( isset( $_GET['relatedposts_exclude'] ) ) {
-				if ( is_string( $_GET['relatedposts_exclude'] ) ) {
-					$excludes = explode( ',', $_GET['relatedposts_exclude'] );
-				} elseif ( is_array( $_GET['relatedposts_exclude'] ) ) {
-					$excludes = array_values( $_GET['relatedposts_exclude'] );
-				}
-
-				$excludes = array_unique( array_filter( array_map( 'absint', $excludes ) ) );
-			}
-
+			$excludes = $this->parse_numeric_get_arg( 'relatedposts_exclude' );
 			$this->_action_frontend_init_ajax( $excludes );
 		} else {
 			if ( isset( $_GET['relatedposts_hit'], $_GET['relatedposts_origin'], $_GET['relatedposts_position'] ) ) {
@@ -279,17 +269,7 @@ public function render_block( $attributes ) {
 			'size'            => ! empty( $attributes['postsToShow'] ) ? absint( $attributes['postsToShow'] ) : 3,
 		);
 
-		$excludes = array();
-		if ( isset( $_GET['relatedposts_origin'] ) ) {
-			if ( is_string( $_GET['relatedposts_origin'] ) ) {
-				$excludes = explode( ',', $_GET['relatedposts_origin'] );
-			} elseif ( is_array( $_GET['relatedposts_origin'] ) ) {
-				$excludes = array_values( $_GET['relatedposts_origin'] );
-			}
-
-			$excludes = array_unique( array_filter( array_map( 'absint', $excludes ) ) );
-		}
-
+		$excludes = $this->parse_numeric_get_arg( 'relatedposts_origin' );
 		$related_posts = $this->get_for_post_id(
 			get_the_ID(),
 			array(
@@ -383,6 +363,32 @@ class="jp-relatedposts-post-a"
 	 * ========================
 	 */
 
+	/**
+	 * Parse a numeric GET variable to an array of values.
+	 *
+	 * @since 6.9.0
+	 *
+	 * @uses absint
+	 *
+	 * @param string $arg Name of the GET variable
+	 * @return array $result Parsed value(s)
+	 */
+	public function parse_numeric_get_arg( $arg ) {
+		$result = array();
+
+		if ( isset( $_GET[ $arg ] ) ) {
+			if ( is_string( $_GET[ $arg ] ) ) {
+				$result = explode( ',', $_GET[ $arg ] );
+			} elseif ( is_array( $_GET[ $arg ] ) ) {
+				$result = array_values( $_GET[ $arg ] );
+			}
+
+			$result = array_unique( array_filter( array_map( 'absint', $result ) ) );
+		}
+
+		return $result;
+	}
+
 	/**
 	 * Gets options set for Jetpack_RelatedPosts and merge with defaults.
 	 *

From 5434d3c04afe65b1e6dc1d9ef50d245e2bc6a528 Mon Sep 17 00:00:00 2001
From: Marin Atanasov <tyxla@abv.bg>
Date: Wed, 19 Dec 2018 16:04:23 +0200
Subject: [PATCH 23/23] Fixup

---
 modules/related-posts/class.related-posts-customize.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/related-posts/class.related-posts-customize.php b/modules/related-posts/class.related-posts-customize.php
index e77d944b69c99..f685395105f6e 100644
--- a/modules/related-posts/class.related-posts-customize.php
+++ b/modules/related-posts/class.related-posts-customize.php
@@ -144,7 +144,7 @@ public static function contains_related_posts_block() {
 	 * @return bool
 	 */
 	public static function is_single() {
-		if ( self::contains_related_posts_block() ) ) {
+		if ( self::contains_related_posts_block() ) {
 			return false;
 		}
 		return is_single();