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] 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'
 							);