From d1765b56dda78dda40b8b926114b697328c1348e Mon Sep 17 00:00:00 2001
From: Matthew Exon <git.mexon@spamgourmet.com>
Date: Sat, 7 Jan 2023 15:35:14 +0100
Subject: [PATCH 1/5] configuration item for number of images to attach

---
 activitypub.php               |  1 +
 includes/class-admin.php      |  9 +++++++++
 includes/model/class-post.php | 32 +++++++++++++++++---------------
 templates/settings.php        | 20 ++++++++++++++++++++
 4 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/activitypub.php b/activitypub.php
index fe7809e..263a5ae 100644
--- a/activitypub.php
+++ b/activitypub.php
@@ -19,6 +19,7 @@ namespace Activitypub;
  * Initialize plugin
  */
 function init() {
+	\defined( 'ACTIVITYPUB_NUMBER_IMAGES' ) || \define( 'ACTIVITYPUB_NUMBER_IMAGES', 3 );
 	\defined( 'ACTIVITYPUB_HASHTAGS_REGEXP' ) || \define( 'ACTIVITYPUB_HASHTAGS_REGEXP', '(?:(?<=\s)|(?<=<p>)|(?<=<br>)|^)#([A-Za-z0-9_]+)(?:(?=\s|[[:punct:]]|$))' );
 	\defined( 'ACTIVITYPUB_ALLOWED_HTML' ) || \define( 'ACTIVITYPUB_ALLOWED_HTML', '<strong><a><p><ul><ol><li><code><blockquote><pre><img>' );
 	\defined( 'ACTIVITYPUB_CUSTOM_POST_CONTENT' ) || \define( 'ACTIVITYPUB_CUSTOM_POST_CONTENT', "<p><strong>%title%</strong></p>\n\n%content%\n\n<p>%hashtags%</p>\n\n<p>%shortlink%</p>" );
diff --git a/includes/class-admin.php b/includes/class-admin.php
index 3354df1..ecb7f73 100644
--- a/includes/class-admin.php
+++ b/includes/class-admin.php
@@ -98,6 +98,15 @@ class Admin {
 				'default' => ACTIVITYPUB_CUSTOM_POST_CONTENT,
 			)
 		);
+		\register_setting(
+			'activitypub',
+			'activitypub_number_images',
+			array(
+				'type' => 'integer',
+				'description' => \__( 'Number of images to attach to posts.', 'activitypub' ),
+				'default' => ACTIVITYPUB_NUMBER_IMAGES,
+			)
+		);
 		\register_setting(
 			'activitypub',
 			'activitypub_object_type',
diff --git a/includes/model/class-post.php b/includes/model/class-post.php
index e885199..832f742 100644
--- a/includes/model/class-post.php
+++ b/includes/model/class-post.php
@@ -76,7 +76,7 @@ class Post {
 	}
 
 	public function generate_attachments() {
-		$max_images = \apply_filters( 'activitypub_max_images', 3 );
+		$max_images = intval( \apply_filters( 'activitypub_max_images', \get_option( 'activitypub_number_images', ACTIVITYPUB_NUMBER_IMAGES ) ) );
 
 		$images = array();
 
@@ -94,20 +94,22 @@ class Post {
 			$max_images--;
 		}
 		// then list any image attachments
-		$query = new \WP_Query(
-			array(
-				'post_parent' => $id,
-				'post_status' => 'inherit',
-				'post_type' => 'attachment',
-				'post_mime_type' => 'image',
-				'order' => 'ASC',
-				'orderby' => 'menu_order ID',
-				'posts_per_page' => $max_images,
-			)
-		);
-		foreach ( $query->get_posts() as $attachment ) {
-			if ( ! \in_array( $attachment->ID, $image_ids, true ) ) {
-				$image_ids[] = $attachment->ID;
+		if ( $max_images > 0 ) {
+			$query = new \WP_Query(
+				array(
+					'post_parent' => $id,
+					'post_status' => 'inherit',
+					'post_type' => 'attachment',
+					'post_mime_type' => 'image',
+					'order' => 'ASC',
+					'orderby' => 'menu_order ID',
+					'posts_per_page' => $max_images,
+				)
+			);
+			foreach ( $query->get_posts() as $attachment ) {
+				if ( ! \in_array( $attachment->ID, $image_ids, true ) ) {
+					$image_ids[] = $attachment->ID;
+				}
 			}
 		}
 
diff --git a/templates/settings.php b/templates/settings.php
index 4bcb358..90a1503 100644
--- a/templates/settings.php
+++ b/templates/settings.php
@@ -74,6 +74,26 @@
 						<p><?php echo \wp_kses( \__( '<a href="https://github.com/pfefferle/wordpress-activitypub/issues/new" target="_blank">Let me know</a> if you miss a template pattern.', 'activitypub' ), 'default' ); ?></p>
 					</td>
 				</tr>
+				<tr>
+					<th scope="row">
+						<?php \esc_html_e( 'Number of images', 'activitypub' ); ?>
+					</th>
+					<td>
+						<textarea name="activitypub_number_images" id="activitypub_number_images" rows="1" cols="50" class="large-text"><?php echo esc_html( \get_option( 'activitypub_number_images', ACTIVITYPUB_NUMBER_IMAGES ) ); ?></textarea>
+						<p class="description">
+							<?php
+							echo \wp_kses(
+								\sprintf(
+									// translators:
+									\__( 'The number of images to attach to posts. Default: <code>%s</code>', 'activitypub' ),
+									\esc_html( ACTIVITYPUB_NUMBER_IMAGES )
+								),
+								'default'
+							);
+							?>
+						</p>
+					</td>
+				</tr>
 				<tr>
 					<th scope="row">
 						<?php \esc_html_e( 'Activity-Object-Type', 'activitypub' ); ?>

From 1e7e6bba28ddff13ac54625d26b825e98c6a7a04 Mon Sep 17 00:00:00 2001
From: Matthew Exon <git.mexon@spamgourmet.com>
Date: Thu, 12 Jan 2023 21:29:21 +0100
Subject: [PATCH 2/5] standardise and improve name of attachment setting

---
 activitypub.php               | 2 +-
 includes/class-admin.php      | 4 ++--
 includes/model/class-post.php | 2 +-
 templates/settings.php        | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/activitypub.php b/activitypub.php
index 263a5ae..bd91ab3 100644
--- a/activitypub.php
+++ b/activitypub.php
@@ -19,7 +19,7 @@ namespace Activitypub;
  * Initialize plugin
  */
 function init() {
-	\defined( 'ACTIVITYPUB_NUMBER_IMAGES' ) || \define( 'ACTIVITYPUB_NUMBER_IMAGES', 3 );
+	\defined( 'ACTIVITYPUB_MAX_IMAGE_ATTACHMENTS' ) || \define( 'ACTIVITYPUB_MAX_IMAGE_ATTACHMENTS', 3 );
 	\defined( 'ACTIVITYPUB_HASHTAGS_REGEXP' ) || \define( 'ACTIVITYPUB_HASHTAGS_REGEXP', '(?:(?<=\s)|(?<=<p>)|(?<=<br>)|^)#([A-Za-z0-9_]+)(?:(?=\s|[[:punct:]]|$))' );
 	\defined( 'ACTIVITYPUB_ALLOWED_HTML' ) || \define( 'ACTIVITYPUB_ALLOWED_HTML', '<strong><a><p><ul><ol><li><code><blockquote><pre><img>' );
 	\defined( 'ACTIVITYPUB_CUSTOM_POST_CONTENT' ) || \define( 'ACTIVITYPUB_CUSTOM_POST_CONTENT', "<p><strong>%title%</strong></p>\n\n%content%\n\n<p>%hashtags%</p>\n\n<p>%shortlink%</p>" );
diff --git a/includes/class-admin.php b/includes/class-admin.php
index ecb7f73..0481cbb 100644
--- a/includes/class-admin.php
+++ b/includes/class-admin.php
@@ -100,11 +100,11 @@ class Admin {
 		);
 		\register_setting(
 			'activitypub',
-			'activitypub_number_images',
+			'activitypub_max_image_attachments',
 			array(
 				'type' => 'integer',
 				'description' => \__( 'Number of images to attach to posts.', 'activitypub' ),
-				'default' => ACTIVITYPUB_NUMBER_IMAGES,
+				'default' => ACTIVITYPUB_MAX_IMAGE_ATTACHMENTS,
 			)
 		);
 		\register_setting(
diff --git a/includes/model/class-post.php b/includes/model/class-post.php
index 832f742..91ff03b 100644
--- a/includes/model/class-post.php
+++ b/includes/model/class-post.php
@@ -76,7 +76,7 @@ class Post {
 	}
 
 	public function generate_attachments() {
-		$max_images = intval( \apply_filters( 'activitypub_max_images', \get_option( 'activitypub_number_images', ACTIVITYPUB_NUMBER_IMAGES ) ) );
+		$max_images = intval( \apply_filters( 'activitypub_max_image_attachments', \get_option( 'activitypub_max_image_attachments', ACTIVITYPUB_MAX_IMAGE_ATTACHMENTS ) ) );
 
 		$images = array();
 
diff --git a/templates/settings.php b/templates/settings.php
index 90a1503..1c453c8 100644
--- a/templates/settings.php
+++ b/templates/settings.php
@@ -79,14 +79,14 @@
 						<?php \esc_html_e( 'Number of images', 'activitypub' ); ?>
 					</th>
 					<td>
-						<textarea name="activitypub_number_images" id="activitypub_number_images" rows="1" cols="50" class="large-text"><?php echo esc_html( \get_option( 'activitypub_number_images', ACTIVITYPUB_NUMBER_IMAGES ) ); ?></textarea>
+						<textarea name="activitypub_max_image_attachments" id="activitypub_max_image_attachments" rows="1" cols="50" class="large-text"><?php echo esc_html( \get_option( 'activitypub_max_image_attachments', ACTIVITYPUB_MAX_IMAGE_ATTACHMENTS ) ); ?></textarea>
 						<p class="description">
 							<?php
 							echo \wp_kses(
 								\sprintf(
 									// translators:
 									\__( 'The number of images to attach to posts. Default: <code>%s</code>', 'activitypub' ),
-									\esc_html( ACTIVITYPUB_NUMBER_IMAGES )
+									\esc_html( ACTIVITYPUB_MAX_IMAGE_ATTACHMENTS )
 								),
 								'default'
 							);

From 6992fbbe226eb1753d34637cb50c10b9009d778c Mon Sep 17 00:00:00 2001
From: Matthias Pfefferle <pfefferle@users.noreply.github.com>
Date: Thu, 12 Jan 2023 21:55:33 +0100
Subject: [PATCH 3/5] simplified `ACTIVITYPUB_MAX_IMAGE_ATTACHMENTS`

---
 includes/model/class-post.php | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/includes/model/class-post.php b/includes/model/class-post.php
index 91ff03b..74b2469 100644
--- a/includes/model/class-post.php
+++ b/includes/model/class-post.php
@@ -82,7 +82,7 @@ class Post {
 
 		// max images can't be negative or zero
 		if ( $max_images <= 0 ) {
-			$max_images = 1;
+			return $images;
 		}
 
 		$id = $this->post->ID;
@@ -94,22 +94,20 @@ class Post {
 			$max_images--;
 		}
 		// then list any image attachments
-		if ( $max_images > 0 ) {
-			$query = new \WP_Query(
-				array(
-					'post_parent' => $id,
-					'post_status' => 'inherit',
-					'post_type' => 'attachment',
-					'post_mime_type' => 'image',
-					'order' => 'ASC',
-					'orderby' => 'menu_order ID',
-					'posts_per_page' => $max_images,
-				)
-			);
-			foreach ( $query->get_posts() as $attachment ) {
-				if ( ! \in_array( $attachment->ID, $image_ids, true ) ) {
-					$image_ids[] = $attachment->ID;
-				}
+		$query = new \WP_Query(
+			array(
+				'post_parent' => $id,
+				'post_status' => 'inherit',
+				'post_type' => 'attachment',
+				'post_mime_type' => 'image',
+				'order' => 'ASC',
+				'orderby' => 'menu_order ID',
+				'posts_per_page' => $max_images,
+			)
+		);
+		foreach ( $query->get_posts() as $attachment ) {
+			if ( ! \in_array( $attachment->ID, $image_ids, true ) ) {
+				$image_ids[] = $attachment->ID;
 			}
 		}
 

From c06a7d44cf72acc9c54922a59f6a47b8a8bf4d5f Mon Sep 17 00:00:00 2001
From: Matthias Pfefferle <pfefferle@users.noreply.github.com>
Date: Thu, 12 Jan 2023 22:21:48 +0100
Subject: [PATCH 4/5] re-added max_images check

props @mexon
---
 includes/model/class-post.php | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/includes/model/class-post.php b/includes/model/class-post.php
index 74b2469..512a003 100644
--- a/includes/model/class-post.php
+++ b/includes/model/class-post.php
@@ -88,26 +88,30 @@ class Post {
 		$id = $this->post->ID;
 
 		$image_ids = array();
+
 		// list post thumbnail first if this post has one
 		if ( \function_exists( 'has_post_thumbnail' ) && \has_post_thumbnail( $id ) ) {
 			$image_ids[] = \get_post_thumbnail_id( $id );
 			$max_images--;
 		}
-		// then list any image attachments
-		$query = new \WP_Query(
-			array(
-				'post_parent' => $id,
-				'post_status' => 'inherit',
-				'post_type' => 'attachment',
-				'post_mime_type' => 'image',
-				'order' => 'ASC',
-				'orderby' => 'menu_order ID',
-				'posts_per_page' => $max_images,
-			)
-		);
-		foreach ( $query->get_posts() as $attachment ) {
-			if ( ! \in_array( $attachment->ID, $image_ids, true ) ) {
-				$image_ids[] = $attachment->ID;
+
+		if ( $max_images > 0 ) {
+			// then list any image attachments
+			$query = new \WP_Query(
+				array(
+					'post_parent' => $id,
+					'post_status' => 'inherit',
+					'post_type' => 'attachment',
+					'post_mime_type' => 'image',
+					'order' => 'ASC',
+					'orderby' => 'menu_order ID',
+					'posts_per_page' => $max_images,
+				)
+			);
+			foreach ( $query->get_posts() as $attachment ) {
+				if ( ! \in_array( $attachment->ID, $image_ids, true ) ) {
+					$image_ids[] = $attachment->ID;
+				}
 			}
 		}
 

From 006b3eef3eae5c0de479617d0890da39741e9e31 Mon Sep 17 00:00:00 2001
From: Matthias Pfefferle <pfefferle@users.noreply.github.com>
Date: Fri, 13 Jan 2023 08:56:38 +0100
Subject: [PATCH 5/5] use number input field instead of textarea

---
 templates/settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/settings.php b/templates/settings.php
index 1c453c8..9450195 100644
--- a/templates/settings.php
+++ b/templates/settings.php
@@ -79,7 +79,7 @@
 						<?php \esc_html_e( 'Number of images', 'activitypub' ); ?>
 					</th>
 					<td>
-						<textarea name="activitypub_max_image_attachments" id="activitypub_max_image_attachments" rows="1" cols="50" class="large-text"><?php echo esc_html( \get_option( 'activitypub_max_image_attachments', ACTIVITYPUB_MAX_IMAGE_ATTACHMENTS ) ); ?></textarea>
+						<input value="<?php echo esc_attr( \get_option( 'activitypub_max_image_attachments', ACTIVITYPUB_MAX_IMAGE_ATTACHMENTS ) ); ?>" name="activitypub_max_image_attachments" id="activitypub_max_image_attachments" type="number" min="0" />
 						<p class="description">
 							<?php
 							echo \wp_kses(