From e7d3cf9d68cc01f65911f6a69a3b4644ece2f1ca Mon Sep 17 00:00:00 2001
From: Greg <greg@toolstack.com>
Date: Fri, 13 Jan 2023 15:47:13 -0500
Subject: [PATCH 01/25] Convert template codes to shortcodes.

As well as add new shortcodes for:

[ap_hashcats] - The post's categories as hashtags
[ap_image] - The URL for the post's featured image, full size
[ap_thumbnail] - The URL for the post's featured image thumbnail size
[ap_author] - The author's name
[ap_authorurl] - The URL to the author's profile page
[ap_date] - The post's date
[ap_time] - The post's time
[ap_datetime] - The post's date/time formated as "date @ time"
[ap_blogurl] - The URL to the site
[ap_blogname] - The name of the site
[ap_blogdesc] - The description of the site
---
 activitypub.php               |   2 +-
 includes/model/class-post.php | 232 +++++++++++++++++++++++++++++++---
 templates/settings.php        |  30 ++++-
 3 files changed, 239 insertions(+), 25 deletions(-)

diff --git a/activitypub.php b/activitypub.php
index d9f2a61..b347814 100644
--- a/activitypub.php
+++ b/activitypub.php
@@ -22,7 +22,7 @@ function init() {
 	\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>" );
+	\defined( 'ACTIVITYPUB_CUSTOM_POST_CONTENT' ) || \define( 'ACTIVITYPUB_CUSTOM_POST_CONTENT', "<p><strong>[ap_title]</strong></p>\n\n[ap_content]\n\n<p>[ap_hashtags]</p>\n\n<p>[ap_shortlink]</p>" );
 	\define( 'ACTIVITYPUB_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
 	\define( 'ACTIVITYPUB_PLUGIN_BASENAME', plugin_basename( __FILE__ ) );
 	\define( 'ACTIVITYPUB_PLUGIN_FILE', plugin_dir_path( __FILE__ ) . '/' . basename( __FILE__ ) );
diff --git a/includes/model/class-post.php b/includes/model/class-post.php
index 80c4d25..a062829 100644
--- a/includes/model/class-post.php
+++ b/includes/model/class-post.php
@@ -26,6 +26,12 @@ class Post {
 		$this->attachments = $this->generate_attachments();
 		$this->tags        = $this->generate_tags();
 		$this->object_type = $this->generate_object_type();
+
+		$shortcodes = array( 'ap_title', 'ap_excerpt', 'ap_content', 'ap_permalink', 'ap_shortlink', 'ap_hashtags', 'ap_thumbnail', 'ap_image', 'ap_hashcats', 'ap_author', 'ap_authorurl', 'ap_blogurl', 'ap_blogname', 'ap_blogdesc', 'ap_date', 'ap_time', 'ap_datetime' );
+
+		foreach( $shortcodes as $tag ) {
+			add_shortcode( $tag, [ $this, 'shortcode_content' ] );
+		}
 	}
 
 	public function __call( $method, $params ) {
@@ -226,18 +232,88 @@ class Post {
 		return $object_type;
 	}
 
+	public function shortcode_content( $atts, $content, $tag ) {
+		$tag = strtolower( $tag );
+		$post = $this->post;
+
+		switch( $tag ) {
+			case 'ap_title':
+				echo \get_the_title( $post->ID );
+
+				break;
+			case 'ap_excerpt':
+				echo $this->get_the_post_excerpt();
+
+				break;
+			case 'ap_content':
+				echo $this->get_the_post_content();
+
+				break;
+			case 'ap_permalink':
+				echo $this->get_the_post_link( 'permalink' );
+
+				break;
+			case 'ap_shortlink':
+				echo $this->get_the_post_link( 'shortlink' );
+
+				break;
+			case 'ap_hashtags':
+				echo $this->get_the_post_hashtags();
+
+				break;
+			case 'ap_thumbnail':
+				echo $this->get_the_post_image( 'thumbnail' );
+
+				break;
+			case 'ap_image':
+				echo $this->get_the_post_image();
+
+				break;
+			case 'ap_hashcats':
+				echo $this->get_the_post_categories();
+
+				break;
+			case 'ap_author':
+				echo $this->get_the_post_author();
+
+				break;
+			case 'ap_authorurl':
+				echo $this->get_the_post_author_url();
+
+				break;
+			case 'ap_blogurl':
+				echo \get_bloginfo('url');
+
+				break;
+			case 'ap_blogname':
+				echo \get_bloginfo('name');
+
+				break;
+			case 'ap_blogdesc':
+				echo \get_bloginfo('description');
+
+				break;
+			case 'ap_date':
+				echo  $this->get_the_post_date( 'time' );
+
+				break;
+			case 'ap_time':
+				echo $this->get_the_post_date( 'date' );
+
+				break;
+			case 'ap_datetime':
+				echo $this->get_the_post_date( 'both' );
+
+				break;
+		}
+	}
+
 	public function generate_the_content() {
 		$post = $this->post;
 		$content = $this->get_post_content_template();
 
-		$content = \str_replace( '%title%', \get_the_title( $post->ID ), $content );
-		$content = \str_replace( '%excerpt%', $this->get_the_post_excerpt(), $content );
-		$content = \str_replace( '%content%', $this->get_the_post_content(), $content );
-		$content = \str_replace( '%permalink%', $this->get_the_post_link( 'permalink' ), $content );
-		$content = \str_replace( '%shortlink%', $this->get_the_post_link( 'shortlink' ), $content );
-		$content = \str_replace( '%hashtags%', $this->get_the_post_hashtags(), $content );
-		// backwards compatibility
-		$content = \str_replace( '%tags%', $this->get_the_post_hashtags(), $content );
+		// Fill in the shortcodes.
+		$content = do_shortcode( $content );
 
 		$content = \trim( \preg_replace( '/[\r\n]{2,}/', '', $content ) );
 
@@ -255,18 +331,36 @@ class Post {
 
 	public function get_post_content_template() {
 		if ( 'excerpt' === \get_option( 'activitypub_post_content_type', 'content' ) ) {
-			return "%excerpt%\n\n<p>%permalink%</p>";
+			return "[ap_excerpt]\n\n<p>[ap_permalink]</p>";
 		}
 
 		if ( 'title' === \get_option( 'activitypub_post_content_type', 'content' ) ) {
-			return "<p><strong>%title%</strong></p>\n\n<p>%permalink%</p>";
+			return "<p><strong>[ap_title]</strong></p>\n\n<p>[ap_permalink]</p>";
 		}
 
 		if ( 'content' === \get_option( 'activitypub_post_content_type', 'content' ) ) {
-			return "%content%\n\n<p>%hashtags%</p>\n\n<p>%permalink%</p>";
+			return "[ap_content]\n\n<p>[ap_hashtags]</p>\n\n<p>[ap_permalink]</p>";
 		}
 
-		return \get_option( 'activitypub_custom_post_content', ACTIVITYPUB_CUSTOM_POST_CONTENT );
+		// Get the custom template.
+		$content = \get_option( 'activitypub_custom_post_content', ACTIVITYPUB_CUSTOM_POST_CONTENT );
+		$old_content = $content;
+
+		// Backwards compatibility, templates are now deprecated convert to shortcodes instead.
+		$content = \str_replace( '%title%', '[ap_title]', $content );
+		$content = \str_replace( '%excerpt%', '[ap_excerpt]', $content );
+		$content = \str_replace( '%content%', '[ap_content]', $content );
+		$content = \str_replace( '%permalink%', '[ap_permalink]', $content );
+		$content = \str_replace( '%shortlink%', '[ap_shortlink]', $content );
+		$content = \str_replace( '%hashtags%', '[ap_hashtags]', $content );
+		$content = \str_replace( '%tags%', '[ap_hashtags]', $content );
+
+		// Store the new template if required.
+		if( $content != $old_content ) {
+			\update_option( 'activitypub_custom_post_content', $content );
+		}
+
+		return $content;
 	}
 
 	/**
@@ -322,8 +416,7 @@ class Post {
 	/**
 	 * Adds a backlink to the post/summary content
 	 *
-	 * @param string  $content
-	 * @param WP_Post $post
+	 * @param string  $type
 	 *
 	 * @return string
 	 */
@@ -344,9 +437,6 @@ class Post {
 	/**
 	 * Adds all tags as hashtags to the post/summary content
 	 *
-	 * @param string  $content
-	 * @param WP_Post $post
-	 *
 	 * @return string
 	 */
 	public function get_the_post_hashtags() {
@@ -365,4 +455,112 @@ class Post {
 
 		return \implode( ' ', $hash_tags );
 	}
+
+	/**
+	 * Adds the featured image url to the post/summary content
+	 *
+	 * @param string  $size
+	 *
+	 * @return string
+	 */
+	public function get_the_post_image( $size = 'full' ) {
+		$post = $this->post;
+
+		if( $size == '' ) { $size = 'full'; }
+
+		$image = \get_the_post_thumbnail_url( $post->ID, $size );
+
+		if ( ! $image ) {
+			return '';
+		}
+
+		return $image;
+	}
+
+	/**
+	 * Adds all categories as hashtags to the post/summary content
+	 *
+	 * @return string
+	 */
+	public function get_the_post_categories() {
+		$post = $this->post;
+		$categories = \get_the_category( $post->ID );
+
+		if ( ! $categories ) {
+			return '';
+		}
+
+		$hash_tags = array();
+
+		foreach ( $categories as $category ) {
+			$hash_tags[] = \sprintf( '<a rel="tag" class="u-tag u-category" href="%s">#%s</a>', \get_category_link( $category ), $category->slug );
+		}
+
+		return \implode( ' ', $hash_tags );
+	}
+
+	/**
+	 * Adds author to the post/summary content
+	 *
+	 * @return string
+	 */
+	public function get_the_post_author() {
+		$post = $this->post;
+		$name = \get_the_author_meta( 'display_name', $post->post_author );
+
+		if ( ! $name ) {
+			return '';
+		}
+
+		return $name;
+	}
+
+	/**
+	 * Adds author's url to the post/summary content
+	 *
+	 * @return string
+	 */
+	public function get_the_post_profile_url() {
+		$post = $this->post;
+		$url = \get_the_author_meta( 'user_url', $post->post_author );
+
+		if ( ! $url ) {
+			return '';
+		}
+
+		return $url;
+	}
+
+	/**
+	 * Adds the post date/time to the post/summary content
+	 *
+	 * @param string display
+	 *
+	 * @return string
+	 */
+	public function get_the_post_date( $display = 'both' ) {
+		$post = $this->post;
+		$datetime = \get_post_datetime( $post );
+		$dateformat = \get_option( 'date_format' );
+		$timeformat = \get_option( 'time_format' );
+
+		switch( $display ) {
+			case 'date':
+				$date = $datetime->format( $dateformat );
+				break;
+			case 'time':
+				$date = $datetime->format( $timeformat );
+				break;
+			default:
+				$date = $datetime->format( $dateformat . ' @ ' . $timeformat );
+				break;
+		}
+
+		if ( ! $date ) {
+			return '';
+		}
+
+		return $date;
+	}
+
 }
diff --git a/templates/settings.php b/templates/settings.php
index 9450195..e8d6529 100644
--- a/templates/settings.php
+++ b/templates/settings.php
@@ -7,6 +7,10 @@
 		'welcome' => '',
 	)
 );
+
+$image_sizes = wp_get_registered_image_subsizes();
+$thumnail_size = $image_sizes['thumbnail']['width'] . 'x' . $image_sizes['thumbnail']['height'] . ' px';
+
 ?>
 
 <div class="privacy-settings-body hide-if-no-js">
@@ -56,17 +60,29 @@
 						<p>
 							<textarea name="activitypub_custom_post_content" id="activitypub_custom_post_content" rows="10" cols="50" class="large-text" placeholder="<?php echo wp_kses( ACTIVITYPUB_CUSTOM_POST_CONTENT, 'post' ); ?>"><?php echo wp_kses( \get_option( 'activitypub_custom_post_content', ACTIVITYPUB_CUSTOM_POST_CONTENT ), 'post' ); ?></textarea>
 							<details>
-								<summary><?php esc_html_e( 'See the complete list of template patterns.', 'activitypub' ); ?></summary>
+								<summary><?php esc_html_e( 'See the complete list of activitypub shortcodes.', 'activitypub' ); ?></summary>
 								<div class="description">
 									<ul>
-										<li><code>%title%</code> - <?php \esc_html_e( 'The Post-Title.', 'activitypub' ); ?></li>
-										<li><code>%content%</code> - <?php \esc_html_e( 'The Post-Content.', 'activitypub' ); ?></li>
-										<li><code>%excerpt%</code> - <?php \esc_html_e( 'The Post-Excerpt (default 400 Chars).', 'activitypub' ); ?></li>
-										<li><code>%permalink%</code> - <?php \esc_html_e( 'The Post-Permalink.', 'activitypub' ); ?></li>
+										<li><code>[ap_title]</code> - <?php \esc_html_e( 'The Post-Title.', 'activitypub' ); ?></li>
+										<li><code>[ap_content]</code> - <?php \esc_html_e( 'The Post-Content.', 'activitypub' ); ?></li>
+										<li><code>[ap_excerpt]</code> - <?php \esc_html_e( 'The Post-Excerpt (default 400 Chars).', 'activitypub' ); ?></li>
+										<li><code>[ap_permalink]</code> - <?php \esc_html_e( 'The Post-Permalink.', 'activitypub' ); ?></li>
 										<?php // translators: ?>
-										<li><code>%shortlink%</code> - <?php echo \wp_kses( \__( 'The Post-Shortlink. I can recommend <a href="https://wordpress.org/plugins/hum/" target="_blank">Hum</a>, to prettify the Shortlinks', 'activitypub' ), 'default' ); ?></li>
-										<li><code>%hashtags%</code> - <?php \esc_html_e( 'The Tags as Hashtags.', 'activitypub' ); ?></li>
+										<li><code>[ap_shortlink]</code> - <?php echo \wp_kses( \__( 'The Post-Shortlink. I can recommend <a href="https://wordpress.org/plugins/hum/" target="_blank">Hum</a>, to prettify the Shortlinks', 'activitypub' ), 'default' ); ?></li>
+										<li><code>[ap_hashtags]</code> - <?php \esc_html_e( 'The Tags as Hashtags.', 'activitypub' ); ?></li>
+										<li><code>[ap_hashcats]</code> - <?php \esc_html_e( 'The post\'s categories as hashtags.', 'activitypub' ); ?></li>
+										<li><code>[ap_image]</code> - <?php \esc_html_e( 'The URL for the post\'s featured image, full size.', 'activitypub' ); ?></li>
+										<li><code>[ap_thumbnail]</code> - <?php echo \wp_kses( sprintf( __( 'The URL for the post\'s featured image thumbnail size (%s).', 'activitypub'), $thumnail_size ), 'default' ); ?></li>
+										<li><code>[ap_author]</code> - <?php \esc_html_e( 'The author\'s name.', 'activitypub' ); ?></li>
+										<li><code>[ap_authorurl]</code> - <?php \esc_html_e( 'The URL to the author\'s profile page.', 'activitypub' ); ?></li>
+										<li><code>[ap_date]</code> - <?php \esc_html_e( 'The post\'s date.', 'activitypub' ); ?></li>
+										<li><code>[ap_time]</code> - <?php \esc_html_e( 'The post\'s time.', 'activitypub' ); ?></li>
+										<li><code>[ap_datetime]</code> - <?php \esc_html_e( 'The post\'s date/time formated as "date @ time".', 'activitypub' ); ?></li>
+										<li><code>[ap_blogurl]</code> - <?php \esc_html_e( 'The URL to the site.', 'activitypub' ); ?></li>
+										<li><code>[ap_blogname]</code> - <?php \esc_html_e( 'The name of the site.', 'activitypub' ); ?></li>
+										<li><code>[ap_blogdesc]</code> - <?php \esc_html_e( 'The description of the site.', 'activitypub' ); ?></li>
 									</ul>
+									<p><?php esc_html_e( 'Note: the old template codes are now deprecated and automatically converted to the new shortcodes.'); ?>
 								</div>
 							</details>
 						</p>

From bf6cf24b17c00fdde493fdbf3b1cc3448b3c65d1 Mon Sep 17 00:00:00 2001
From: Greg <greg@toolstack.com>
Date: Fri, 13 Jan 2023 16:11:52 -0500
Subject: [PATCH 02/25] Add length to excerpt shortcode.

---
 activitypub.php               |  1 +
 includes/model/class-post.php | 12 ++++++++++--
 templates/settings.php        | 14 ++++++++------
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/activitypub.php b/activitypub.php
index b347814..6ae9dbc 100644
--- a/activitypub.php
+++ b/activitypub.php
@@ -19,6 +19,7 @@ namespace Activitypub;
  * Initialize plugin
  */
 function init() {
+	\defined( 'ACTIVITYPUB_EXCERPT_LENGTH' ) || \define( 'ACTIVITYPUB_EXCERPT_LENGTH', 400 );
 	\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>' );
diff --git a/includes/model/class-post.php b/includes/model/class-post.php
index a062829..f9bde0d 100644
--- a/includes/model/class-post.php
+++ b/includes/model/class-post.php
@@ -242,7 +242,15 @@ class Post {
 
 				break;
 			case 'ap_excerpt':
-				echo $this->get_the_post_excerpt();
+				$length = ACTIVITYPUB_EXCERPT_LENGTH;
+
+				if( is_array( $atts ) && array_key_exists( 'length', $atts ) ) {
+					$length = intval( $atts['length'] );
+				}
+
+				if( $length == 0 ) { $length = ACTIVITYPUB_EXCERPT_LENGTH; }
+
+				echo $this->get_the_post_excerpt( $length );
 
 				break;
 			case 'ap_content':
@@ -370,7 +378,7 @@ class Post {
 	 *
 	 * @return string The excerpt.
 	 */
-	public function get_the_post_excerpt( $excerpt_length = 400 ) {
+	public function get_the_post_excerpt( $excerpt_length = ACTIVITYPUB_EXCERPT_LENGTH ) {
 		$post = $this->post;
 
 		$excerpt = \get_post_field( 'post_excerpt', $post );
diff --git a/templates/settings.php b/templates/settings.php
index e8d6529..23242ae 100644
--- a/templates/settings.php
+++ b/templates/settings.php
@@ -62,14 +62,16 @@ $thumnail_size = $image_sizes['thumbnail']['width'] . 'x' . $image_sizes['thumbn
 							<details>
 								<summary><?php esc_html_e( 'See the complete list of activitypub shortcodes.', 'activitypub' ); ?></summary>
 								<div class="description">
+									<p><?php esc_html_e( 'You may use any shortcode normally available to you on your site, however be aware that shortcodes may significantly increase the size of your content depending on what they do. '); ?>
+									<p><?php esc_html_e( 'In addition, the following shortcodes are available during an activitypub post:'); ?>
 									<ul>
-										<li><code>[ap_title]</code> - <?php \esc_html_e( 'The Post-Title.', 'activitypub' ); ?></li>
-										<li><code>[ap_content]</code> - <?php \esc_html_e( 'The Post-Content.', 'activitypub' ); ?></li>
-										<li><code>[ap_excerpt]</code> - <?php \esc_html_e( 'The Post-Excerpt (default 400 Chars).', 'activitypub' ); ?></li>
-										<li><code>[ap_permalink]</code> - <?php \esc_html_e( 'The Post-Permalink.', 'activitypub' ); ?></li>
+										<li><code>[ap_title]</code> - <?php \esc_html_e( 'The post\'s title.', 'activitypub' ); ?></li>
+										<li><code>[ap_content]</code> - <?php \esc_html_e( 'The post\'s content.', 'activitypub' ); ?></li>
+										<li><code>[ap_excerpt <i>lenght=nnn</i>]</code> - <?php \esc_html_e( 'The post\'s excerpt (default 400 chars). length parameter is optional.', 'activitypub' ); ?></li>
+										<li><code>[ap_permalink]</code> - <?php \esc_html_e( 'The post\'s permalink.', 'activitypub' ); ?></li>
 										<?php // translators: ?>
-										<li><code>[ap_shortlink]</code> - <?php echo \wp_kses( \__( 'The Post-Shortlink. I can recommend <a href="https://wordpress.org/plugins/hum/" target="_blank">Hum</a>, to prettify the Shortlinks', 'activitypub' ), 'default' ); ?></li>
-										<li><code>[ap_hashtags]</code> - <?php \esc_html_e( 'The Tags as Hashtags.', 'activitypub' ); ?></li>
+										<li><code>[ap_shortlink]</code> - <?php echo \wp_kses( \__( 'The post\'s shortlink. I can recommend <a href="https://wordpress.org/plugins/hum/" target="_blank">Hum</a>, to prettify the Shortlinks', 'activitypub' ), 'default' ); ?></li>
+										<li><code>[ap_hashtags]</code> - <?php \esc_html_e( 'The post\'s tags as hashtags.', 'activitypub' ); ?></li>
 										<li><code>[ap_hashcats]</code> - <?php \esc_html_e( 'The post\'s categories as hashtags.', 'activitypub' ); ?></li>
 										<li><code>[ap_image]</code> - <?php \esc_html_e( 'The URL for the post\'s featured image, full size.', 'activitypub' ); ?></li>
 										<li><code>[ap_thumbnail]</code> - <?php echo \wp_kses( sprintf( __( 'The URL for the post\'s featured image thumbnail size (%s).', 'activitypub'), $thumnail_size ), 'default' ); ?></li>

From caea1ecbed39f6d77144ebc26c6ff633f0e7cda6 Mon Sep 17 00:00:00 2001
From: Greg <greg@toolstack.com>
Date: Mon, 16 Jan 2023 10:26:38 -0500
Subject: [PATCH 03/25] Make sure we have a post before using it to set class
 variables with.

---
 includes/model/class-post.php | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/includes/model/class-post.php b/includes/model/class-post.php
index f9bde0d..ef998bd 100644
--- a/includes/model/class-post.php
+++ b/includes/model/class-post.php
@@ -17,15 +17,17 @@ class Post {
 	private $object_type;
 
 	public function __construct( $post = null ) {
-		$this->post = \get_post( $post );
+		if( $post ) {
+			$this->post = \get_post( $post );
 
-		$this->post_author = $this->post->post_author;
-		$this->id          = $this->generate_id();
-		$this->summary     = $this->generate_the_title();
-		$this->content     = $this->generate_the_content();
-		$this->attachments = $this->generate_attachments();
-		$this->tags        = $this->generate_tags();
-		$this->object_type = $this->generate_object_type();
+			$this->post_author = $this->post->post_author;
+			$this->id          = $this->generate_id();
+			$this->summary     = $this->generate_the_title();
+			$this->content     = $this->generate_the_content();
+			$this->attachments = $this->generate_attachments();
+			$this->tags        = $this->generate_tags();
+			$this->object_type = $this->generate_object_type();
+		}
 
 		$shortcodes = array( 'ap_title', 'ap_excerpt', 'ap_content', 'ap_permalink', 'ap_shortlink', 'ap_hashtags', 'ap_thumbnail', 'ap_image', 'ap_hashcats', 'ap_author', 'ap_authorurl', 'ap_blogurl', 'ap_blogname', 'ap_blogdesc', 'ap_date', 'ap_time', 'ap_datetime' );
 

From 4a17bb4ea7eb891ea0e3d1e45c21fda7e11ea100 Mon Sep 17 00:00:00 2001
From: Greg <greg@toolstack.com>
Date: Mon, 16 Jan 2023 10:27:27 -0500
Subject: [PATCH 04/25] Separate the shortcode upgrade function and call it in
 the settings.

---
 includes/class-admin.php      |  3 +++
 includes/model/class-post.php | 49 +++++++++++++++++++++++++++++++----
 2 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/includes/class-admin.php b/includes/class-admin.php
index 0481cbb..df79d0b 100644
--- a/includes/class-admin.php
+++ b/includes/class-admin.php
@@ -50,6 +50,9 @@ class Admin {
 
 		switch ( $tab ) {
 			case 'settings':
+				$post_model = new \Activitypub\Model\Post();
+				$post_model->upgrade_post_content_template();
+
 				\load_template( \dirname( __FILE__ ) . '/../templates/settings.php' );
 				break;
 			case 'welcome':
diff --git a/includes/model/class-post.php b/includes/model/class-post.php
index ef998bd..b2bf2d1 100644
--- a/includes/model/class-post.php
+++ b/includes/model/class-post.php
@@ -234,6 +234,14 @@ class Post {
 		return $object_type;
 	}
 
+	/**
+	 * Outputs the shortcode content.
+	 *
+	 * @param array $atts the attributes of the shortcode
+	 * @param string $content the content between opening and closing shortcodes
+	 * @param string $tag the name of the shortcode being processed
+	 *
+	 */
 	public function shortcode_content( $atts, $content, $tag ) {
 		$tag = strtolower( $tag );
 		$post = $this->post;
@@ -318,6 +326,11 @@ class Post {
 		}
 	}
 
+	/**
+	 * Generates the content for the activitypub item.
+	 *
+	 * @return string the content
+	 */
 	public function generate_the_content() {
 		$post = $this->post;
 		$content = $this->get_post_content_template();
@@ -339,6 +352,11 @@ class Post {
 		return $decoded_content;
 	}
 
+	/**
+	 * Gets the template to use to generate the content of the activitypub item.
+	 *
+	 * @return string the template
+	 */
 	public function get_post_content_template() {
 		if ( 'excerpt' === \get_option( 'activitypub_post_content_type', 'content' ) ) {
 			return "[ap_excerpt]\n\n<p>[ap_permalink]</p>";
@@ -352,11 +370,32 @@ class Post {
 			return "[ap_content]\n\n<p>[ap_hashtags]</p>\n\n<p>[ap_permalink]</p>";
 		}
 
-		// Get the custom template.
-		$content = \get_option( 'activitypub_custom_post_content', ACTIVITYPUB_CUSTOM_POST_CONTENT );
-		$old_content = $content;
+		// Upgrade from old template codes to shortcodes.
+		$content = $this->upgrade_post_content_template();
 
-		// Backwards compatibility, templates are now deprecated convert to shortcodes instead.
+		return $content;
+	}
+
+	/**
+	 * Updates the custom template to use shortcodes instead of the deprecated templates.
+	 *
+	 * @return string the updated template content
+	 */
+	public function upgrade_post_content_template() {
+		// Get the custom template.
+		$old_content = \get_option( 'activitypub_custom_post_content', ACTIVITYPUB_CUSTOM_POST_CONTENT );
+
+		// If the old content exists but is a blank string, we're going to need a flag to updated it even
+		// after setting it to the default contents.
+		$need_update = false;
+
+		// If the old contents is blank, use the defaults.
+		if( $old_content == "" ) { $old_content = ACTIVITYPUB_CUSTOM_POST_CONTENT; $need_update = true; }
+
+		// Set the new content to be the old content.
+		$content = $old_content;
+
+		// Convert old templates to shortcodes.
 		$content = \str_replace( '%title%', '[ap_title]', $content );
 		$content = \str_replace( '%excerpt%', '[ap_excerpt]', $content );
 		$content = \str_replace( '%content%', '[ap_content]', $content );
@@ -366,7 +405,7 @@ class Post {
 		$content = \str_replace( '%tags%', '[ap_hashtags]', $content );
 
 		// Store the new template if required.
-		if( $content != $old_content ) {
+		if( $content != $old_content || $need_update ) {
 			\update_option( 'activitypub_custom_post_content', $content );
 		}
 

From bc8e46e1215929b932dbf20fffb157b316f67d79 Mon Sep 17 00:00:00 2001
From: Greg <greg@toolstack.com>
Date: Mon, 16 Jan 2023 12:51:18 -0500
Subject: [PATCH 05/25] Fix shortcode output.

---
 includes/model/class-post.php | 49 +++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/includes/model/class-post.php b/includes/model/class-post.php
index b2bf2d1..919b511 100644
--- a/includes/model/class-post.php
+++ b/includes/model/class-post.php
@@ -29,11 +29,6 @@ class Post {
 			$this->object_type = $this->generate_object_type();
 		}
 
-		$shortcodes = array( 'ap_title', 'ap_excerpt', 'ap_content', 'ap_permalink', 'ap_shortlink', 'ap_hashtags', 'ap_thumbnail', 'ap_image', 'ap_hashcats', 'ap_author', 'ap_authorurl', 'ap_blogurl', 'ap_blogname', 'ap_blogdesc', 'ap_date', 'ap_time', 'ap_datetime' );
-
-		foreach( $shortcodes as $tag ) {
-			add_shortcode( $tag, [ $this, 'shortcode_content' ] );
-		}
 	}
 
 	public function __call( $method, $params ) {
@@ -246,9 +241,11 @@ class Post {
 		$tag = strtolower( $tag );
 		$post = $this->post;
 
+		$text = '';
+
 		switch( $tag ) {
 			case 'ap_title':
-				echo \get_the_title( $post->ID );
+				$text = \get_the_title( $post->ID );
 
 				break;
 			case 'ap_excerpt':
@@ -260,70 +257,72 @@ class Post {
 
 				if( $length == 0 ) { $length = ACTIVITYPUB_EXCERPT_LENGTH; }
 
-				echo $this->get_the_post_excerpt( $length );
+				$text = $this->get_the_post_excerpt( $length );
 
 				break;
 			case 'ap_content':
-				echo $this->get_the_post_content();
+				$text = $this->get_the_post_content();
 
 				break;
 			case 'ap_permalink':
-				echo $this->get_the_post_link( 'permalink' );
+				$text = $this->get_the_post_link( 'permalink' );
 
 				break;
 			case 'ap_shortlink':
-				echo $this->get_the_post_link( 'shortlink' );
+				$text = $this->get_the_post_link( 'shortlink' );
 
 				break;
 			case 'ap_hashtags':
-				echo $this->get_the_post_hashtags();
+				$text = $this->get_the_post_hashtags();
 
 				break;
 			case 'ap_thumbnail':
-				echo $this->get_the_post_image( 'thumbnail' );
+				$text = $this->get_the_post_image( 'thumbnail' );
 
 				break;
 			case 'ap_image':
-				echo $this->get_the_post_image();
+				$text = $this->get_the_post_image();
 
 				break;
 			case 'ap_hashcats':
-				echo $this->get_the_post_categories();
+				$text = $this->get_the_post_categories();
 
 				break;
 			case 'ap_author':
-				echo $this->get_the_post_author();
+				$text = $this->get_the_post_author();
 
 				break;
 			case 'ap_authorurl':
-				echo $this->get_the_post_author_url();
+				$text = $this->get_the_post_author_url();
 
 				break;
 			case 'ap_blogurl':
-				echo \get_bloginfo('url');
+				$text = \get_bloginfo('url');
 
 				break;
 			case 'ap_blogname':
-				echo \get_bloginfo('name');
+				$text = \get_bloginfo('name');
 
 				break;
 			case 'ap_blogdesc':
-				echo \get_bloginfo('description');
+				$text = \get_bloginfo('description');
 
 				break;
 			case 'ap_date':
-				echo  $this->get_the_post_date( 'time' );
+				$text =  $this->get_the_post_date( 'time' );
 
 				break;
 			case 'ap_time':
-				echo $this->get_the_post_date( 'date' );
+				$text = $this->get_the_post_date( 'date' );
 
 				break;
 			case 'ap_datetime':
-				echo $this->get_the_post_date( 'both' );
+				$text = $this->get_the_post_date( 'both' );
 
 				break;
 		}
+
+		return $text;
 	}
 
 	/**
@@ -335,6 +334,12 @@ class Post {
 		$post = $this->post;
 		$content = $this->get_post_content_template();
 
+		$shortcodes = array( 'ap_title', 'ap_excerpt', 'ap_content', 'ap_permalink', 'ap_shortlink', 'ap_hashtags', 'ap_thumbnail', 'ap_image', 'ap_hashcats', 'ap_author', 'ap_authorurl', 'ap_blogurl', 'ap_blogname', 'ap_blogdesc', 'ap_date', 'ap_time', 'ap_datetime' );
+
+		foreach( $shortcodes as $tag ) {
+			add_shortcode( $tag, [ $this, 'shortcode_content' ] );
+		}
+
 		// Fill in the shortcodes.
 		$content = do_shortcode( $content );
 

From b5fa16b464d238111db0323bd060b187b2f1db86 Mon Sep 17 00:00:00 2001
From: Greg <greg@toolstack.com>
Date: Sun, 22 Jan 2023 01:13:46 -0500
Subject: [PATCH 06/25] Move the shortcodes to their own class.

---
 activitypub.php               |   1 +
 includes/class-shortcodes.php | 464 ++++++++++++++++++++++++++++++++++
 includes/model/class-post.php | 352 +-------------------------
 3 files changed, 466 insertions(+), 351 deletions(-)
 create mode 100644 includes/class-shortcodes.php

diff --git a/activitypub.php b/activitypub.php
index f02c054..f590c34 100644
--- a/activitypub.php
+++ b/activitypub.php
@@ -28,6 +28,7 @@ function init() {
 	\define( 'ACTIVITYPUB_PLUGIN_BASENAME', plugin_basename( __FILE__ ) );
 	\define( 'ACTIVITYPUB_PLUGIN_FILE', plugin_dir_path( __FILE__ ) . '/' . basename( __FILE__ ) );
 
+	require_once \dirname( __FILE__ ) . '/includes/class-shortcodes.php';
 	require_once \dirname( __FILE__ ) . '/includes/table/followers-list.php';
 	require_once \dirname( __FILE__ ) . '/includes/class-signature.php';
 	require_once \dirname( __FILE__ ) . '/includes/class-webfinger.php';
diff --git a/includes/class-shortcodes.php b/includes/class-shortcodes.php
new file mode 100644
index 0000000..7b25128
--- /dev/null
+++ b/includes/class-shortcodes.php
@@ -0,0 +1,464 @@
+<?php
+namespace Activitypub;
+
+class Shortcodes {
+	private $post;
+
+	public function __construct( $post = null ) {
+		if( $post == null ) {
+			$post = \get_post();
+		}
+
+		if( \is_object( $post ) && ! $post instanceof WP_POST ) {
+			$this->post = $post;
+		} else {
+			$this->post = false;
+		}
+
+		foreach( get_class_methods( $this ) as $shortcode ) {
+			if( $shortcode != 'init' && strpos( $shortcode, '__' ) !== 0 ) {
+				add_shortcode( 'ap_' . $shortcode, array( $this, $shortcode ) );
+			}
+		}
+	}
+
+	/**
+	 * Generates output for the ap_hashtags shortcode
+	 *
+	 * @param array  $atts 		shortcode attributes
+	 * @param string $content 	shortcode content
+	 * @param string $tag 		shortcode tag name
+	 *
+	 * @return string
+	 */
+	public function hashtags( $atts, $content, $tag ) {
+		if( $this->post === false ) {
+			return '';
+		}
+
+		$tags = \get_the_tags( $this->post->ID );
+
+		if ( ! $tags ) {
+			return '';
+		}
+
+		$hash_tags = array();
+
+		foreach ( $tags as $tag ) {
+			$hash_tags[] = \sprintf( '<a rel="tag" class="u-tag u-category" href="%s">#%s</a>', \get_tag_link( $tag ), $tag->slug );
+		}
+
+		return \implode( ' ', $hash_tags );
+	}
+
+	/**
+	 * Generates output for the ap_title shortcode
+	 *
+	 * @param array  $atts 		shortcode attributes
+	 * @param string $content 	shortcode content
+	 * @param string $tag 		shortcode tag name
+	 *
+	 * @return string
+	 */
+	public function title( $atts, $content, $tag ) {
+		if( $this->post === false ) {
+			return '';
+		}
+
+		return \get_the_title( $this->post->ID );;
+	}
+
+	/**
+	 * Generates output for the ap_excerpt shortcode
+	 *
+	 * @param array  $atts 		shortcode attributes
+	 * @param string $content 	shortcode content
+	 * @param string $tag 		shortcode tag name
+	 *
+	 * @return string
+	 */
+	public function excerpt( $atts, $content, $tag ) {
+		if( $this->post === false ) {
+			return '';
+		}
+
+		$length = ACTIVITYPUB_EXCERPT_LENGTH;
+
+		if( is_array( $atts ) && array_key_exists( 'length', $atts ) ) {
+			$length = intval( $atts['length'] );
+		}
+
+		if( $length == 0 ) { $length = ACTIVITYPUB_EXCERPT_LENGTH; }
+
+		$excerpt = \get_post_field( 'post_excerpt', $this->post );
+
+		if ( '' === $excerpt ) {
+
+			$content = \get_post_field( 'post_content', $this->post );
+
+			// An empty string will make wp_trim_excerpt do stuff we do not want.
+			if ( '' !== $content ) {
+
+				$excerpt = \strip_shortcodes( $content );
+
+				/** This filter is documented in wp-includes/post-template.php */
+				$excerpt = \apply_filters( 'the_content', $excerpt );
+				$excerpt = \str_replace( ']]>', ']]>', $excerpt );
+
+			}
+		}
+
+		// Strip out any remaining tags.
+		$excerpt = \wp_strip_all_tags( $excerpt );
+
+		/** This filter is documented in wp-includes/formatting.php */
+		$excerpt_more = \apply_filters( 'excerpt_more', ' [...]' );
+		$excerpt_more_len = strlen( $excerpt_more );
+
+		// We now have a excerpt, but we need to check it's length, it may be longer than we want for two reasons:
+		//
+		//   * The user has entered a manual excerpt which is longer that what we want.
+		//   * No manual excerpt exists so we've used the content which might be longer than we want.
+		//
+		// Either way, let's trim it up if we need too.  Also, don't forget to take into account the more indicator
+		// as part of the total length.
+		//
+
+		// Setup a variable to hold the current excerpts length.
+		$current_excerpt_length = strlen( $excerpt );
+
+		// Setup a variable to keep track of our target length.
+		$target_excerpt_length = $excerpt_length - $excerpt_more_len;
+
+		// Setup a variable to keep track of the current max length.
+		$current_excerpt_max = $target_excerpt_length;
+
+		// This is a loop since we can't calculate word break the string after 'the_excpert' filter has run (we would break
+		// all kinds of html tags), so we have to cut the excerpt down a bit at a time until we hit our target length.
+		while ( $current_excerpt_length > $target_excerpt_length && $current_excerpt_max > 0 ) {
+			// Trim the excerpt based on wordwrap() positioning.
+			// Note: we're using <br> as the linebreak just in case there are any newlines existing in the excerpt from the user.
+			//       There won't be any <br> left after we've run wp_strip_all_tags() in the code above, so they're
+			//       safe to use here.  It won't be included in the final excerpt as the substr() will trim it off.
+			$excerpt = substr( $excerpt, 0, strpos( wordwrap( $excerpt, $current_excerpt_max, '<br>' ), '<br>' ) );
+
+			// If something went wrong, or we're in a language that wordwrap() doesn't understand,
+			// just chop it off and don't worry about breaking in the middle of a word.
+			if ( strlen( $excerpt ) > $excerpt_length - $excerpt_more_len ) {
+				$excerpt = substr( $excerpt, 0, $current_excerpt_max );
+			}
+
+			// Add in the more indicator.
+			$excerpt = $excerpt . $excerpt_more;
+
+			// Run it through the excerpt filter which will add some html tags back in.
+			$excerpt_filtered = apply_filters( 'the_excerpt', $excerpt );
+
+			// Now set the current excerpt length to this new filtered length.
+			$current_excerpt_length = strlen( $excerpt_filtered );
+
+			// Check to see if we're over the target length.
+			if ( $current_excerpt_length > $target_excerpt_length ) {
+				// If so, remove 20 characters from the current max and run the loop again.
+				$current_excerpt_max = $current_excerpt_max - 20;
+			}
+		}
+
+		return \apply_filters( 'the_excerpt', $excerpt );
+	}
+
+	/**
+	 * Generates output for the ap_content shortcode
+	 *
+	 * @param array  $atts 		shortcode attributes
+	 * @param string $content 	shortcode content
+	 * @param string $tag 		shortcode tag name
+	 *
+	 * @return string
+	 */
+	public function content( $atts, $content, $tag ) {
+		if( $this->post === false ) {
+			return '';
+		}
+
+		$content = \get_post_field( 'post_content', $this->post );
+
+		return \apply_filters( 'the_content', $content );
+	}
+
+	/**
+	 * Generates output for the ap_permalink shortcode
+	 *
+	 * @param array  $atts 		shortcode attributes
+	 * @param string $content 	shortcode content
+	 * @param string $tag 		shortcode tag name
+	 *
+	 * @return string
+	 */
+	public function permalink( $atts, $content, $tag ) {
+		if( $this->post === false ) {
+			return '';
+		}
+
+		return \sprintf( '<a href="%1$s">%1$s</a>', \esc_url( \get_permalink( $this->post->ID ) ) );
+	}
+
+	/**
+	 * Generates output for the ap_shortlink shortcode
+	 *
+	 * @param array  $atts 		shortcode attributes
+	 * @param string $content 	shortcode content
+	 * @param string $tag 		shortcode tag name
+	 *
+	 * @return string
+	 */
+	public function shortlink( $atts, $content, $tag ) {
+		if( $this->post === false ) {
+			return '';
+		}
+
+		return \sprintf( '<a href="%1$s">%1$s</a>', \esc_url( \wp_get_shortlink( $this->post->ID ) ) );
+	}
+
+	/**
+	 * Generates output for the ap_thumbnail shortcode
+	 *
+	 * @param array  $atts 		shortcode attributes
+	 * @param string $content 	shortcode content
+	 * @param string $tag 		shortcode tag name
+	 *
+	 * @return string
+	 */
+	public function thumbnail( $atts, $content, $tag ) {
+		if( $this->post === false ) {
+			return '';
+		}
+
+		$image = \get_the_post_thumbnail_url( $this->post->ID, 'thumbnail' );
+
+		if ( ! $image ) {
+			return '';
+		}
+
+		return $image;
+	}
+
+	/**
+	 * Generates output for the ap_image shortcode
+	 *
+	 * @param array  $atts 		shortcode attributes
+	 * @param string $content 	shortcode content
+	 * @param string $tag 		shortcode tag name
+	 *
+	 * @return string
+	 */
+	public function image( $atts, $content, $tag ) {
+		if( $this->post === false ) {
+			return '';
+		}
+
+		$image = \get_the_post_thumbnail_url( $this->post->ID, 'full' );
+
+		if ( ! $image ) {
+			return '';
+		}
+
+		return $image;
+	}
+
+	/**
+	 * Generates output for the ap_hashcats shortcode
+	 *
+	 * @param array  $atts 		shortcode attributes
+	 * @param string $content 	shortcode content
+	 * @param string $tag 		shortcode tag name
+	 *
+	 * @return string
+	 */
+	public function hashcats( $atts, $content, $tag ) {
+		if( $this->post === false ) {
+			return '';
+		}
+
+		$categories = \get_the_category( $this->post->ID );
+
+		if ( ! $categories ) {
+			return '';
+		}
+
+		$hash_tags = array();
+
+		foreach ( $categories as $category ) {
+			$hash_tags[] = \sprintf( '<a rel="tag" class="u-tag u-category" href="%s">#%s</a>', \get_category_link( $category ), $category->slug );
+		}
+
+		return \implode( ' ', $hash_tags );
+	}
+
+	/**
+	 * Generates output for the ap_author shortcode
+	 *
+	 * @param array  $atts 		shortcode attributes
+	 * @param string $content 	shortcode content
+	 * @param string $tag 		shortcode tag name
+	 *
+	 * @return string
+	 */
+	public function author( $atts, $content, $tag ) {
+		if( $this->post === false ) {
+			return '';
+		}
+
+		$name = \get_the_author_meta( 'display_name', $this->post->post_author );
+
+		if ( ! $name ) {
+			return '';
+		}
+
+		return $name;
+	}
+
+	/**
+	 * Generates output for the ap_authorurl shortcode
+	 *
+	 * @param array  $atts 		shortcode attributes
+	 * @param string $content 	shortcode content
+	 * @param string $tag 		shortcode tag name
+	 *
+	 * @return string
+	 */
+	public function authorurl( $atts, $content, $tag ) {
+		if( $this->post === false ) {
+			return '';
+		}
+
+		$url = \get_the_author_meta( 'user_url', $this->post->post_author );
+
+		if ( ! $url ) {
+			return '';
+		}
+
+		return $url;
+	}
+
+	/**
+	 * Generates output for the ap_blogurl shortcode
+	 *
+	 * @param array  $atts 		shortcode attributes
+	 * @param string $content 	shortcode content
+	 * @param string $tag 		shortcode tag name
+	 *
+	 * @return string
+	 */
+	public function blogurl( $atts, $content, $tag ) {
+		return \get_bloginfo('url');
+	}
+
+	/**
+	 * Generates output for the ap_blogname shortcode
+	 *
+	 * @param array  $atts 		shortcode attributes
+	 * @param string $content 	shortcode content
+	 * @param string $tag 		shortcode tag name
+	 *
+	 * @return string
+	 */
+	public function blogname( $atts, $content, $tag ) {
+		return \get_bloginfo('name');
+	}
+
+	/**
+	 * Generates output for the ap_blogdesc shortcode
+	 *
+	 * @param array  $atts 		shortcode attributes
+	 * @param string $content 	shortcode content
+	 * @param string $tag 		shortcode tag name
+	 *
+	 * @return string
+	 */
+	public function blogdesc( $atts, $content, $tag ) {
+		return \get_bloginfo('description');
+	}
+
+	/**
+	 * Generates output for the ap_date shortcode
+	 *
+	 * @param array  $atts 		shortcode attributes
+	 * @param string $content 	shortcode content
+	 * @param string $tag 		shortcode tag name
+	 *
+	 * @return string
+	 */
+	public function date( $atts, $content, $tag ) {
+		if( $this->post === false ) {
+			return '';
+		}
+
+		$datetime = \get_post_datetime( $this->post );
+		$dateformat = \get_option( 'date_format' );
+		$timeformat = \get_option( 'time_format' );
+
+		$date = $datetime->format( $dateformat );
+
+		if ( ! $date ) {
+			return '';
+		}
+
+		return $date;
+	}
+
+	/**
+	 * Generates output for the ap_time shortcode
+	 *
+	 * @param array  $atts 		shortcode attributes
+	 * @param string $content 	shortcode content
+	 * @param string $tag 		shortcode tag name
+	 *
+	 * @return string
+	 */
+	public function time( $atts, $content, $tag ) {
+		if( $this->post === false ) {
+			return '';
+		}
+
+		$datetime = \get_post_datetime( $this->post );
+		$dateformat = \get_option( 'date_format' );
+		$timeformat = \get_option( 'time_format' );
+
+		$date = $datetime->format( $timeformat );
+
+		if ( ! $date ) {
+			return '';
+		}
+
+		return $date;
+	}
+
+	/**
+	 * Generates output for the ap_datetime shortcode
+	 *
+	 * @param array  $atts 		shortcode attributes
+	 * @param string $content 	shortcode content
+	 * @param string $tag 		shortcode tag name
+	 *
+	 * @return string
+	 */
+	public function datetime( $atts, $content, $tag ) {
+		if( $this->post === false ) {
+			return '';
+		}
+
+		$datetime = \get_post_datetime( $this->post );
+		$dateformat = \get_option( 'date_format' );
+		$timeformat = \get_option( 'time_format' );
+
+		$date = $datetime->format( $dateformat . ' @ ' . $timeformat );
+
+		if ( ! $date ) {
+			return '';
+		}
+
+		return $date;
+	}
+
+}
\ No newline at end of file
diff --git a/includes/model/class-post.php b/includes/model/class-post.php
index c881e75..d528be6 100644
--- a/includes/model/class-post.php
+++ b/includes/model/class-post.php
@@ -229,102 +229,6 @@ class Post {
 		return $object_type;
 	}
 
-	/**
-	 * Outputs the shortcode content.
-	 *
-	 * @param array $atts the attributes of the shortcode
-	 * @param string $content the content between opening and closing shortcodes
-	 * @param string $tag the name of the shortcode being processed
-	 *
-	 */
-	public function shortcode_content( $atts, $content, $tag ) {
-		$tag = strtolower( $tag );
-		$post = $this->post;
-
-		$text = '';
-
-		switch( $tag ) {
-			case 'ap_title':
-				$text = \get_the_title( $post->ID );
-
-				break;
-			case 'ap_excerpt':
-				$length = ACTIVITYPUB_EXCERPT_LENGTH;
-
-				if( is_array( $atts ) && array_key_exists( 'length', $atts ) ) {
-					$length = intval( $atts['length'] );
-				}
-
-				if( $length == 0 ) { $length = ACTIVITYPUB_EXCERPT_LENGTH; }
-
-				$text = $this->get_the_post_excerpt( $length );
-
-				break;
-			case 'ap_content':
-				$text = $this->get_the_post_content();
-
-				break;
-			case 'ap_permalink':
-				$text = $this->get_the_post_link( 'permalink' );
-
-				break;
-			case 'ap_shortlink':
-				$text = $this->get_the_post_link( 'shortlink' );
-
-				break;
-			case 'ap_hashtags':
-				$text = $this->get_the_post_hashtags();
-
-				break;
-			case 'ap_thumbnail':
-				$text = $this->get_the_post_image( 'thumbnail' );
-
-				break;
-			case 'ap_image':
-				$text = $this->get_the_post_image();
-
-				break;
-			case 'ap_hashcats':
-				$text = $this->get_the_post_categories();
-
-				break;
-			case 'ap_author':
-				$text = $this->get_the_post_author();
-
-				break;
-			case 'ap_authorurl':
-				$text = $this->get_the_post_author_url();
-
-				break;
-			case 'ap_blogurl':
-				$text = \get_bloginfo('url');
-
-				break;
-			case 'ap_blogname':
-				$text = \get_bloginfo('name');
-
-				break;
-			case 'ap_blogdesc':
-				$text = \get_bloginfo('description');
-
-				break;
-			case 'ap_date':
-				$text =  $this->get_the_post_date( 'time' );
-
-				break;
-			case 'ap_time':
-				$text = $this->get_the_post_date( 'date' );
-
-				break;
-			case 'ap_datetime':
-				$text = $this->get_the_post_date( 'both' );
-
-				break;
-		}
-
-		return $text;
-	}
-
 	/**
 	 * Generates the content for the activitypub item.
 	 *
@@ -334,11 +238,7 @@ class Post {
 		$post = $this->post;
 		$content = $this->get_post_content_template();
 
-		$shortcodes = array( 'ap_title', 'ap_excerpt', 'ap_content', 'ap_permalink', 'ap_shortlink', 'ap_hashtags', 'ap_thumbnail', 'ap_image', 'ap_hashcats', 'ap_author', 'ap_authorurl', 'ap_blogurl', 'ap_blogname', 'ap_blogdesc', 'ap_date', 'ap_time', 'ap_datetime' );
-
-		foreach( $shortcodes as $tag ) {
-			add_shortcode( $tag, [ $this, 'shortcode_content' ] );
-		}
+		$shortcodes = new \Activitypub\Shortcodes( $post );
 
 		// Fill in the shortcodes.
 		$content = do_shortcode( $content );
@@ -417,254 +317,4 @@ class Post {
 		return $content;
 	}
 
-	/**
-	 * Get the excerpt for a post for use outside of the loop.
-	 *
-	 * @param int     Optional excerpt length.
-	 *
-	 * @return string The excerpt.
-	 */
-	public function get_the_post_excerpt( $excerpt_length = ACTIVITYPUB_EXCERPT_LENGTH ) {
-		$post = $this->post;
-
-		$excerpt = \get_post_field( 'post_excerpt', $post );
-
-		if ( '' === $excerpt ) {
-
-			$content = \get_post_field( 'post_content', $post );
-
-			// An empty string will make wp_trim_excerpt do stuff we do not want.
-			if ( '' !== $content ) {
-
-				$excerpt = \strip_shortcodes( $content );
-
-				/** This filter is documented in wp-includes/post-template.php */
-				$excerpt = \apply_filters( 'the_content', $excerpt );
-				$excerpt = \str_replace( ']]>', ']]>', $excerpt );
-
-			}
-		}
-
-		// Strip out any remaining tags.
-		$excerpt = \wp_strip_all_tags( $excerpt );
-
-		/** This filter is documented in wp-includes/formatting.php */
-		$excerpt_more = \apply_filters( 'excerpt_more', ' [...]' );
-		$excerpt_more_len = strlen( $excerpt_more );
-
-		// We now have a excerpt, but we need to check it's length, it may be longer than we want for two reasons:
-		//
-		//   * The user has entered a manual excerpt which is longer that what we want.
-		//   * No manual excerpt exists so we've used the content which might be longer than we want.
-		//
-		// Either way, let's trim it up if we need too.  Also, don't forget to take into account the more indicator
-		// as part of the total length.
-		//
-
-		// Setup a variable to hold the current excerpts length.
-		$current_excerpt_length = strlen( $excerpt );
-
-		// Setup a variable to keep track of our target length.
-		$target_excerpt_length = $excerpt_length - $excerpt_more_len;
-
-		// Setup a variable to keep track of the current max length.
-		$current_excerpt_max = $target_excerpt_length;
-
-		// This is a loop since we can't calculate word break the string after 'the_excpert' filter has run (we would break
-		// all kinds of html tags), so we have to cut the excerpt down a bit at a time until we hit our target length.
-		while ( $current_excerpt_length > $target_excerpt_length && $current_excerpt_max > 0 ) {
-			// Trim the excerpt based on wordwrap() positioning.
-			// Note: we're using <br> as the linebreak just in case there are any newlines existing in the excerpt from the user.
-			//       There won't be any <br> left after we've run wp_strip_all_tags() in the code above, so they're
-			//       safe to use here.  It won't be included in the final excerpt as the substr() will trim it off.
-			$excerpt = substr( $excerpt, 0, strpos( wordwrap( $excerpt, $current_excerpt_max, '<br>' ), '<br>' ) );
-
-			// If something went wrong, or we're in a language that wordwrap() doesn't understand,
-			// just chop it off and don't worry about breaking in the middle of a word.
-			if ( strlen( $excerpt ) > $excerpt_length - $excerpt_more_len ) {
-				$excerpt = substr( $excerpt, 0, $current_excerpt_max );
-			}
-
-			// Add in the more indicator.
-			$excerpt = $excerpt . $excerpt_more;
-
-			// Run it through the excerpt filter which will add some html tags back in.
-			$excerpt_filtered = apply_filters( 'the_excerpt', $excerpt );
-
-			// Now set the current excerpt length to this new filtered length.
-			$current_excerpt_length = strlen( $excerpt_filtered );
-
-			// Check to see if we're over the target length.
-			if ( $current_excerpt_length > $target_excerpt_length ) {
-				// If so, remove 20 characters from the current max and run the loop again.
-				$current_excerpt_max = $current_excerpt_max - 20;
-			}
-		}
-
-		return \apply_filters( 'the_excerpt', $excerpt );
-	}
-
-	/**
-	 * Get the content for a post for use outside of the loop.
-	 *
-	 * @return string The content.
-	 */
-	public function get_the_post_content() {
-		$post = $this->post;
-
-		$content = \get_post_field( 'post_content', $post );
-
-		return \apply_filters( 'the_content', $content );
-	}
-
-	/**
-	 * Adds a backlink to the post/summary content
-	 *
-	 * @param string  $type
-	 *
-	 * @return string
-	 */
-	public function get_the_post_link( $type = 'permalink' ) {
-		$post = $this->post;
-
-		if ( 'shortlink' === $type ) {
-			$link = \esc_url( \wp_get_shortlink( $post->ID ) );
-		} elseif ( 'permalink' === $type ) {
-			$link = \esc_url( \get_permalink( $post->ID ) );
-		} else {
-			return '';
-		}
-
-		return \sprintf( '<a href="%1$s">%1$s</a>', $link );
-	}
-
-	/**
-	 * Adds all tags as hashtags to the post/summary content
-	 *
-	 * @return string
-	 */
-	public function get_the_post_hashtags() {
-		$post = $this->post;
-		$tags = \get_the_tags( $post->ID );
-
-		if ( ! $tags ) {
-			return '';
-		}
-
-		$hash_tags = array();
-
-		foreach ( $tags as $tag ) {
-			$hash_tags[] = \sprintf( '<a rel="tag" class="u-tag u-category" href="%s">#%s</a>', \get_tag_link( $tag ), $tag->slug );
-		}
-
-		return \implode( ' ', $hash_tags );
-	}
-
-	/**
-	 * Adds the featured image url to the post/summary content
-	 *
-	 * @param string  $size
-	 *
-	 * @return string
-	 */
-	public function get_the_post_image( $size = 'full' ) {
-		$post = $this->post;
-
-		if( $size == '' ) { $size = 'full'; }
-
-		$image = \get_the_post_thumbnail_url( $post->ID, $size );
-
-		if ( ! $image ) {
-			return '';
-		}
-
-		return $image;
-	}
-
-	/**
-	 * Adds all categories as hashtags to the post/summary content
-	 *
-	 * @return string
-	 */
-	public function get_the_post_categories() {
-		$post = $this->post;
-		$categories = \get_the_category( $post->ID );
-
-		if ( ! $categories ) {
-			return '';
-		}
-
-		$hash_tags = array();
-
-		foreach ( $categories as $category ) {
-			$hash_tags[] = \sprintf( '<a rel="tag" class="u-tag u-category" href="%s">#%s</a>', \get_category_link( $category ), $category->slug );
-		}
-
-		return \implode( ' ', $hash_tags );
-	}
-
-	/**
-	 * Adds author to the post/summary content
-	 *
-	 * @return string
-	 */
-	public function get_the_post_author() {
-		$post = $this->post;
-		$name = \get_the_author_meta( 'display_name', $post->post_author );
-
-		if ( ! $name ) {
-			return '';
-		}
-
-		return $name;
-	}
-
-	/**
-	 * Adds author's url to the post/summary content
-	 *
-	 * @return string
-	 */
-	public function get_the_post_profile_url() {
-		$post = $this->post;
-		$url = \get_the_author_meta( 'user_url', $post->post_author );
-
-		if ( ! $url ) {
-			return '';
-		}
-
-		return $url;
-	}
-
-	/**
-	 * Adds the post date/time to the post/summary content
-	 *
-	 * @param string display
-	 *
-	 * @return string
-	 */
-	public function get_the_post_date( $display = 'both' ) {
-		$post = $this->post;
-		$datetime = \get_post_datetime( $post );
-		$dateformat = \get_option( 'date_format' );
-		$timeformat = \get_option( 'time_format' );
-
-		switch( $display ) {
-			case 'date':
-				$date = $datetime->format( $dateformat );
-				break;
-			case 'time':
-				$date = $datetime->format( $timeformat );
-				break;
-			default:
-				$date = $datetime->format( $dateformat . ' @ ' . $timeformat );
-				break;
-		}
-
-		if ( ! $date ) {
-			return '';
-		}
-
-		return $date;
-	}
-
 }

From 740a73b00fd806eba0167a97142cd1ff99541552 Mon Sep 17 00:00:00 2001
From: Greg <greg@toolstack.com>
Date: Sun, 22 Jan 2023 01:25:50 -0500
Subject: [PATCH 07/25] Add size attribute to the image shortcode.

---
 includes/class-shortcodes.php | 14 +++++++++++++-
 templates/settings.php        | 14 +++++++++++---
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/includes/class-shortcodes.php b/includes/class-shortcodes.php
index 7b25128..7091106 100644
--- a/includes/class-shortcodes.php
+++ b/includes/class-shortcodes.php
@@ -257,7 +257,19 @@ class Shortcodes {
 			return '';
 		}
 
-		$image = \get_the_post_thumbnail_url( $this->post->ID, 'full' );
+		$size = 'full';
+
+		if( is_array( $atts ) && array_key_exists( 'size', $atts ) ) {
+			$registered_sizes = wp_get_registered_image_subsizes();
+
+			if( array_key_exists( $atts['size'], $registered_sizes ) ) {
+				$size = intval( $atts['size'] );
+			}
+		}
+
+		if( ! $size ) { $size = 'full'; }
+
+		$image = \get_the_post_thumbnail_url( $this->post->ID, $size );
 
 		if ( ! $image ) {
 			return '';
diff --git a/templates/settings.php b/templates/settings.php
index 498c2ac..6e81b94 100644
--- a/templates/settings.php
+++ b/templates/settings.php
@@ -9,7 +9,15 @@
 );
 
 $image_sizes = wp_get_registered_image_subsizes();
-$thumnail_size = $image_sizes['thumbnail']['width'] . 'x' . $image_sizes['thumbnail']['height'] . ' px';
+$thumbnail_size = $image_sizes['thumbnail']['width'] . 'x' . $image_sizes['thumbnail']['height'] . ' px';
+$registered_sizes = '';
+
+foreach( $image_sizes as $name => $size ) {
+	$registered_sizes .= $name . ', ';
+}
+
+$registered_sizes = trim( $registered_sizes, ', ' );
+$registered_sizes .= '.';
 
 ?>
 
@@ -73,8 +81,8 @@ $thumnail_size = $image_sizes['thumbnail']['width'] . 'x' . $image_sizes['thumbn
 										<li><code>[ap_shortlink]</code> - <?php echo \wp_kses( \__( 'The post\'s shortlink. I can recommend <a href="https://wordpress.org/plugins/hum/" target="_blank">Hum</a>, to prettify the Shortlinks', 'activitypub' ), 'default' ); ?></li>
 										<li><code>[ap_hashtags]</code> - <?php \esc_html_e( 'The post\'s tags as hashtags.', 'activitypub' ); ?></li>
 										<li><code>[ap_hashcats]</code> - <?php \esc_html_e( 'The post\'s categories as hashtags.', 'activitypub' ); ?></li>
-										<li><code>[ap_image]</code> - <?php \esc_html_e( 'The URL for the post\'s featured image, full size.', 'activitypub' ); ?></li>
-										<li><code>[ap_thumbnail]</code> - <?php echo \wp_kses( sprintf( __( 'The URL for the post\'s featured image thumbnail size (%s).', 'activitypub'), $thumnail_size ), 'default' ); ?></li>
+										<li><code>[ap_image <i>size=xxx</i>]</code> - <?php \esc_html_e( 'The URL for the post\'s featured image, defaults to full size.  The size attribute can be any of the following: ', 'activitypub' ); echo esc_html( $registered_sizes ); ?></li>
+										<li><code>[ap_thumbnail]</code> - <?php echo \wp_kses( sprintf( __( 'The URL for the post\'s featured image thumbnail size (%s).', 'activitypub'), $thumbnail_size ), 'default' ); ?></li>
 										<li><code>[ap_author]</code> - <?php \esc_html_e( 'The author\'s name.', 'activitypub' ); ?></li>
 										<li><code>[ap_authorurl]</code> - <?php \esc_html_e( 'The URL to the author\'s profile page.', 'activitypub' ); ?></li>
 										<li><code>[ap_date]</code> - <?php \esc_html_e( 'The post\'s date.', 'activitypub' ); ?></li>

From 3a8289194845302814e74016cb7b2bd13089a575 Mon Sep 17 00:00:00 2001
From: Greg <greg@toolstack.com>
Date: Sun, 22 Jan 2023 11:27:13 -0500
Subject: [PATCH 08/25] Minor cleanups.

---
 includes/class-shortcodes.php | 12 +++++++++++-
 includes/model/class-post.php |  1 +
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/includes/class-shortcodes.php b/includes/class-shortcodes.php
index 7091106..093adde 100644
--- a/includes/class-shortcodes.php
+++ b/includes/class-shortcodes.php
@@ -2,8 +2,18 @@
 namespace Activitypub;
 
 class Shortcodes {
+	/**
+	 * The post object we're currently working on
+	 *
+	 * @var WP_Post  $post    A WordPress Post Object
+	 */
 	private $post;
 
+	/**
+	 * Class constructor, registering WordPress then shortcodes
+	 *
+	 * @param WP_Post  $post    A WordPress Post Object
+	 */
 	public function __construct( $post = null ) {
 		if( $post == null ) {
 			$post = \get_post();
@@ -16,7 +26,7 @@ class Shortcodes {
 		}
 
 		foreach( get_class_methods( $this ) as $shortcode ) {
-			if( $shortcode != 'init' && strpos( $shortcode, '__' ) !== 0 ) {
+			if( strpos( $shortcode, '__' ) !== 0 ) {
 				add_shortcode( 'ap_' . $shortcode, array( $this, $shortcode ) );
 			}
 		}
diff --git a/includes/model/class-post.php b/includes/model/class-post.php
index d528be6..bf9c65c 100644
--- a/includes/model/class-post.php
+++ b/includes/model/class-post.php
@@ -238,6 +238,7 @@ class Post {
 		$post = $this->post;
 		$content = $this->get_post_content_template();
 
+		// Register the shortcodes.
 		$shortcodes = new \Activitypub\Shortcodes( $post );
 
 		// Fill in the shortcodes.

From efa62ac4cbaeed66a5c8aa7002091fcabdc0512e Mon Sep 17 00:00:00 2001
From: Matthias Pfefferle <pfefferle@users.noreply.github.com>
Date: Mon, 23 Jan 2023 09:37:40 +0100
Subject: [PATCH 09/25] Add missing text domain

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

diff --git a/templates/settings.php b/templates/settings.php
index 6e81b94..eb7a176 100644
--- a/templates/settings.php
+++ b/templates/settings.php
@@ -92,7 +92,7 @@ $registered_sizes .= '.';
 										<li><code>[ap_blogname]</code> - <?php \esc_html_e( 'The name of the site.', 'activitypub' ); ?></li>
 										<li><code>[ap_blogdesc]</code> - <?php \esc_html_e( 'The description of the site.', 'activitypub' ); ?></li>
 									</ul>
-									<p><?php esc_html_e( 'Note: the old template codes are now deprecated and automatically converted to the new shortcodes.'); ?>
+									<p><?php esc_html_e( 'Note: the old template codes are now deprecated and automatically converted to the new shortcodes.', 'activitypub' ); ?>
 								</div>
 							</details>
 						</p>

From 71f3a475895142cf69ccbce36345611f3dbc746e Mon Sep 17 00:00:00 2001
From: Greg <greg@toolstack.com>
Date: Mon, 23 Jan 2023 11:59:13 -0500
Subject: [PATCH 10/25] Converted shortcode class to static.

And added options for shortlink/permalink type.
---
 activitypub.php               |   4 +-
 includes/class-shortcodes.php | 185 +++++++++++++++++++++-------------
 includes/model/class-post.php |   2 +
 templates/settings.php        |   4 +-
 4 files changed, 120 insertions(+), 75 deletions(-)

diff --git a/activitypub.php b/activitypub.php
index f590c34..d855d9f 100644
--- a/activitypub.php
+++ b/activitypub.php
@@ -28,7 +28,6 @@ function init() {
 	\define( 'ACTIVITYPUB_PLUGIN_BASENAME', plugin_basename( __FILE__ ) );
 	\define( 'ACTIVITYPUB_PLUGIN_FILE', plugin_dir_path( __FILE__ ) . '/' . basename( __FILE__ ) );
 
-	require_once \dirname( __FILE__ ) . '/includes/class-shortcodes.php';
 	require_once \dirname( __FILE__ ) . '/includes/table/followers-list.php';
 	require_once \dirname( __FILE__ ) . '/includes/class-signature.php';
 	require_once \dirname( __FILE__ ) . '/includes/class-webfinger.php';
@@ -72,6 +71,9 @@ function init() {
 	require_once \dirname( __FILE__ ) . '/includes/class-hashtag.php';
 	\Activitypub\Hashtag::init();
 
+	require_once \dirname( __FILE__ ) . '/includes/class-shortcodes.php';
+	\Activitypub\Shortcodes::init();
+
 	require_once \dirname( __FILE__ ) . '/includes/class-debug.php';
 	\Activitypub\Debug::init();
 
diff --git a/includes/class-shortcodes.php b/includes/class-shortcodes.php
index 093adde..a36f99c 100644
--- a/includes/class-shortcodes.php
+++ b/includes/class-shortcodes.php
@@ -2,32 +2,15 @@
 namespace Activitypub;
 
 class Shortcodes {
-	/**
-	 * The post object we're currently working on
-	 *
-	 * @var WP_Post  $post    A WordPress Post Object
-	 */
-	private $post;
-
 	/**
 	 * Class constructor, registering WordPress then shortcodes
 	 *
 	 * @param WP_Post  $post    A WordPress Post Object
 	 */
-	public function __construct( $post = null ) {
-		if( $post == null ) {
-			$post = \get_post();
-		}
-
-		if( \is_object( $post ) && ! $post instanceof WP_POST ) {
-			$this->post = $post;
-		} else {
-			$this->post = false;
-		}
-
-		foreach( get_class_methods( $this ) as $shortcode ) {
-			if( strpos( $shortcode, '__' ) !== 0 ) {
-				add_shortcode( 'ap_' . $shortcode, array( $this, $shortcode ) );
+	public static function init() {
+		foreach( get_class_methods( 'Activitypub\Shortcodes' ) as $shortcode ) {
+			if( $shortcode != 'init' ) {
+				add_shortcode( 'ap_' . $shortcode, array( 'Activitypub\Shortcodes', $shortcode ) );
 			}
 		}
 	}
@@ -41,12 +24,14 @@ class Shortcodes {
 	 *
 	 * @return string
 	 */
-	public function hashtags( $atts, $content, $tag ) {
-		if( $this->post === false ) {
+	public static function hashtags( $atts, $content, $tag ) {
+		$post = get_post();
+
+		if( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
 			return '';
 		}
 
-		$tags = \get_the_tags( $this->post->ID );
+		$tags = \get_the_tags( $post->ID );
 
 		if ( ! $tags ) {
 			return '';
@@ -70,12 +55,14 @@ class Shortcodes {
 	 *
 	 * @return string
 	 */
-	public function title( $atts, $content, $tag ) {
-		if( $this->post === false ) {
+	public static function title( $atts, $content, $tag ) {
+		$post = get_post();
+
+		if( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
 			return '';
 		}
 
-		return \get_the_title( $this->post->ID );;
+		return \get_the_title( $post->ID );;
 	}
 
 	/**
@@ -87,24 +74,24 @@ class Shortcodes {
 	 *
 	 * @return string
 	 */
-	public function excerpt( $atts, $content, $tag ) {
-		if( $this->post === false ) {
+	public static function excerpt( $atts, $content, $tag ) {
+		$post = get_post();
+
+		if( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
 			return '';
 		}
 
-		$length = ACTIVITYPUB_EXCERPT_LENGTH;
+		$atts = shortcode_atts( array( 'length' => ACTIVITYPUB_EXCERPT_LENGTH ), $atts, $tag );
 
-		if( is_array( $atts ) && array_key_exists( 'length', $atts ) ) {
-			$length = intval( $atts['length'] );
-		}
+		$length = intval( $atts['length'] );
 
 		if( $length == 0 ) { $length = ACTIVITYPUB_EXCERPT_LENGTH; }
 
-		$excerpt = \get_post_field( 'post_excerpt', $this->post );
+		$excerpt = \get_post_field( 'post_excerpt', $post );
 
 		if ( '' === $excerpt ) {
 
-			$content = \get_post_field( 'post_content', $this->post );
+			$content = \get_post_field( 'post_content', $post );
 
 			// An empty string will make wp_trim_excerpt do stuff we do not want.
 			if ( '' !== $content ) {
@@ -186,12 +173,14 @@ class Shortcodes {
 	 *
 	 * @return string
 	 */
-	public function content( $atts, $content, $tag ) {
-		if( $this->post === false ) {
+	public static function content( $atts, $content, $tag ) {
+		$post = get_post();
+
+		if( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
 			return '';
 		}
 
-		$content = \get_post_field( 'post_content', $this->post );
+		$content = \get_post_field( 'post_content', $post );
 
 		return \apply_filters( 'the_content', $content );
 	}
@@ -205,12 +194,30 @@ class Shortcodes {
 	 *
 	 * @return string
 	 */
-	public function permalink( $atts, $content, $tag ) {
-		if( $this->post === false ) {
+	public static function permalink( $atts, $content, $tag ) {
+		$post = get_post();
+
+		if( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
 			return '';
 		}
 
-		return \sprintf( '<a href="%1$s">%1$s</a>', \esc_url( \get_permalink( $this->post->ID ) ) );
+		$atts = shortcode_atts( array( 'type' => 'html' ), $atts, $tag );
+
+		if( is_array( $atts ) && array_key_exists( 'type', $atts ) ) {
+			if( $atts['type'] == 'raw' ) {
+				return \get_permalink( $post->ID );
+			}
+
+			if( $atts['type'] == 'esc' ) {
+				return \esc_url( \get_permalink( $post->ID ) );
+			}
+
+			if( $atts['type'] == 'blank' ) {
+				return \sprintf( '<a href="%1$s" target="_blank">%1$s</a>', \esc_url( \get_permalink( $post->ID ) ) );
+			}
+		}
+
+		return \sprintf( '<a href="%1$s">%1$s</a>', \esc_url( \get_permalink( $post->ID ) ) );
 	}
 
 	/**
@@ -222,12 +229,30 @@ class Shortcodes {
 	 *
 	 * @return string
 	 */
-	public function shortlink( $atts, $content, $tag ) {
-		if( $this->post === false ) {
+	public static function shortlink( $atts, $content, $tag ) {
+		$post = get_post();
+
+		if( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
 			return '';
 		}
 
-		return \sprintf( '<a href="%1$s">%1$s</a>', \esc_url( \wp_get_shortlink( $this->post->ID ) ) );
+		$atts = shortcode_atts( array( 'type' => 'html' ), $atts, $tag );
+
+		if( is_array( $atts ) && array_key_exists( 'type', $atts ) ) {
+			if( $atts['type'] == 'raw' ) {
+				return \wp_get_shortlink( $post->ID );
+			}
+
+			if( $atts['type'] == 'esc' ) {
+				return \esc_url( \wp_get_shortlink( $post->ID ) );
+			}
+
+			if( $atts['type'] == 'blank' ) {
+				return \sprintf( '<a href="%1$s" target="_blank">%1$s</a>', \esc_url( \wp_get_shortlink( $post->ID ) ) );
+			}
+		}
+
+		return \sprintf( '<a href="%1$s">%1$s</a>', \esc_url( \wp_get_shortlink( $post->ID ) ) );
 	}
 
 	/**
@@ -239,12 +264,14 @@ class Shortcodes {
 	 *
 	 * @return string
 	 */
-	public function thumbnail( $atts, $content, $tag ) {
-		if( $this->post === false ) {
+	public static function thumbnail( $atts, $content, $tag ) {
+		$post = get_post();
+
+		if( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
 			return '';
 		}
 
-		$image = \get_the_post_thumbnail_url( $this->post->ID, 'thumbnail' );
+		$image = \get_the_post_thumbnail_url( $post->ID, 'thumbnail' );
 
 		if ( ! $image ) {
 			return '';
@@ -262,12 +289,14 @@ class Shortcodes {
 	 *
 	 * @return string
 	 */
-	public function image( $atts, $content, $tag ) {
-		if( $this->post === false ) {
+	public static function image( $atts, $content, $tag ) {
+		$post = get_post();
+
+		if( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
 			return '';
 		}
 
-		$size = 'full';
+		$atts = shortcode_atts( array( 'size' => 'full' ), $atts, $tag );
 
 		if( is_array( $atts ) && array_key_exists( 'size', $atts ) ) {
 			$registered_sizes = wp_get_registered_image_subsizes();
@@ -279,7 +308,7 @@ class Shortcodes {
 
 		if( ! $size ) { $size = 'full'; }
 
-		$image = \get_the_post_thumbnail_url( $this->post->ID, $size );
+		$image = \get_the_post_thumbnail_url( $post->ID, $size );
 
 		if ( ! $image ) {
 			return '';
@@ -297,12 +326,14 @@ class Shortcodes {
 	 *
 	 * @return string
 	 */
-	public function hashcats( $atts, $content, $tag ) {
-		if( $this->post === false ) {
+	public static function hashcats( $atts, $content, $tag ) {
+		$post = get_post();
+
+		if( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
 			return '';
 		}
 
-		$categories = \get_the_category( $this->post->ID );
+		$categories = \get_the_category( $post->ID );
 
 		if ( ! $categories ) {
 			return '';
@@ -326,12 +357,14 @@ class Shortcodes {
 	 *
 	 * @return string
 	 */
-	public function author( $atts, $content, $tag ) {
-		if( $this->post === false ) {
+	public static function author( $atts, $content, $tag ) {
+		$post = get_post();
+
+		if( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
 			return '';
 		}
 
-		$name = \get_the_author_meta( 'display_name', $this->post->post_author );
+		$name = \get_the_author_meta( 'display_name', $post->post_author );
 
 		if ( ! $name ) {
 			return '';
@@ -349,12 +382,14 @@ class Shortcodes {
 	 *
 	 * @return string
 	 */
-	public function authorurl( $atts, $content, $tag ) {
-		if( $this->post === false ) {
+	public static function authorurl( $atts, $content, $tag ) {
+		$post = get_post();
+
+		if( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
 			return '';
 		}
 
-		$url = \get_the_author_meta( 'user_url', $this->post->post_author );
+		$url = \get_the_author_meta( 'user_url', $post->post_author );
 
 		if ( ! $url ) {
 			return '';
@@ -372,7 +407,7 @@ class Shortcodes {
 	 *
 	 * @return string
 	 */
-	public function blogurl( $atts, $content, $tag ) {
+	public static function blogurl( $atts, $content, $tag ) {
 		return \get_bloginfo('url');
 	}
 
@@ -385,7 +420,7 @@ class Shortcodes {
 	 *
 	 * @return string
 	 */
-	public function blogname( $atts, $content, $tag ) {
+	public static function blogname( $atts, $content, $tag ) {
 		return \get_bloginfo('name');
 	}
 
@@ -398,7 +433,7 @@ class Shortcodes {
 	 *
 	 * @return string
 	 */
-	public function blogdesc( $atts, $content, $tag ) {
+	public static function blogdesc( $atts, $content, $tag ) {
 		return \get_bloginfo('description');
 	}
 
@@ -411,12 +446,14 @@ class Shortcodes {
 	 *
 	 * @return string
 	 */
-	public function date( $atts, $content, $tag ) {
-		if( $this->post === false ) {
+	public static function date( $atts, $content, $tag ) {
+		$post = get_post();
+
+		if( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
 			return '';
 		}
 
-		$datetime = \get_post_datetime( $this->post );
+		$datetime = \get_post_datetime( $post );
 		$dateformat = \get_option( 'date_format' );
 		$timeformat = \get_option( 'time_format' );
 
@@ -438,12 +475,14 @@ class Shortcodes {
 	 *
 	 * @return string
 	 */
-	public function time( $atts, $content, $tag ) {
-		if( $this->post === false ) {
+	public static function time( $atts, $content, $tag ) {
+		$post = get_post();
+
+		if( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
 			return '';
 		}
 
-		$datetime = \get_post_datetime( $this->post );
+		$datetime = \get_post_datetime( $post );
 		$dateformat = \get_option( 'date_format' );
 		$timeformat = \get_option( 'time_format' );
 
@@ -465,12 +504,14 @@ class Shortcodes {
 	 *
 	 * @return string
 	 */
-	public function datetime( $atts, $content, $tag ) {
-		if( $this->post === false ) {
+	public static function datetime( $atts, $content, $tag ) {
+		$post = get_post();
+
+		if( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
 			return '';
 		}
 
-		$datetime = \get_post_datetime( $this->post );
+		$datetime = \get_post_datetime( $post );
 		$dateformat = \get_option( 'date_format' );
 		$timeformat = \get_option( 'time_format' );
 
diff --git a/includes/model/class-post.php b/includes/model/class-post.php
index bf9c65c..7ca2b6b 100644
--- a/includes/model/class-post.php
+++ b/includes/model/class-post.php
@@ -242,7 +242,9 @@ class Post {
 		$shortcodes = new \Activitypub\Shortcodes( $post );
 
 		// Fill in the shortcodes.
+		setup_postdata( $post );
 		$content = do_shortcode( $content );
+		wp_reset_postdata();
 
 		$content = \trim( \preg_replace( '/[\r\n]{2,}/', '', $content ) );
 
diff --git a/templates/settings.php b/templates/settings.php
index eb7a176..cebae11 100644
--- a/templates/settings.php
+++ b/templates/settings.php
@@ -76,9 +76,9 @@ $registered_sizes .= '.';
 										<li><code>[ap_title]</code> - <?php \esc_html_e( 'The post\'s title.', 'activitypub' ); ?></li>
 										<li><code>[ap_content]</code> - <?php \esc_html_e( 'The post\'s content.', 'activitypub' ); ?></li>
 										<li><code>[ap_excerpt <i>lenght=nnn</i>]</code> - <?php \esc_html_e( 'The post\'s excerpt (default 400 chars). length parameter is optional.', 'activitypub' ); ?></li>
-										<li><code>[ap_permalink]</code> - <?php \esc_html_e( 'The post\'s permalink.', 'activitypub' ); ?></li>
+										<li><code>[ap_permalink <i>type=xxx</i>]</code> - <?php \esc_html_e( 'The post\'s permalink. Type can be either: raw (the raw url, no escaping), esc (the html escaped url), html (default, an a tag to the url), blank (an a tag to the url that opens in a new window).', 'activitypub' ); ?></li>
 										<?php // translators: ?>
-										<li><code>[ap_shortlink]</code> - <?php echo \wp_kses( \__( 'The post\'s shortlink. I can recommend <a href="https://wordpress.org/plugins/hum/" target="_blank">Hum</a>, to prettify the Shortlinks', 'activitypub' ), 'default' ); ?></li>
+										<li><code>[ap_shortlink <i>type=xxx</i>]</code> - <?php echo \wp_kses( \__( 'The post\'s shortlink. I can recommend <a href="https://wordpress.org/plugins/hum/" target="_blank">Hum</a>, to prettify the Shortlinks. Type can be either: raw (the raw url, no escaping), esc (the html escaped url), html (default, an a tag to the url), blank (an a tag to the url that opens in a new window).', 'activitypub' ), 'default' ); ?></li>
 										<li><code>[ap_hashtags]</code> - <?php \esc_html_e( 'The post\'s tags as hashtags.', 'activitypub' ); ?></li>
 										<li><code>[ap_hashcats]</code> - <?php \esc_html_e( 'The post\'s categories as hashtags.', 'activitypub' ); ?></li>
 										<li><code>[ap_image <i>size=xxx</i>]</code> - <?php \esc_html_e( 'The URL for the post\'s featured image, defaults to full size.  The size attribute can be any of the following: ', 'activitypub' ); echo esc_html( $registered_sizes ); ?></li>

From 16b52c0940e72ed0e0ed5d01568a1c36069ceb4f Mon Sep 17 00:00:00 2001
From: Matthias Pfefferle <pfefferle@users.noreply.github.com>
Date: Mon, 23 Jan 2023 19:41:30 +0100
Subject: [PATCH 11/25] run also on PR

---
 .github/workflows/phpcs.yml   | 6 ++++--
 .github/workflows/phpunit.yml | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/phpcs.yml b/.github/workflows/phpcs.yml
index 870b0ee..b7392e1 100644
--- a/.github/workflows/phpcs.yml
+++ b/.github/workflows/phpcs.yml
@@ -1,5 +1,7 @@
 name: PHP_CodeSniffer
-on: push
+on:
+  push:
+  pull_request:
 jobs:
   phpcs:
     runs-on: ubuntu-latest
@@ -19,7 +21,7 @@ jobs:
         uses: pat-s/always-upload-cache@v1.1.4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
-          # Use the hash of composer.json as the key for your cache if you do not commit composer.lock. 
+          # Use the hash of composer.json as the key for your cache if you do not commit composer.lock.
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           #key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index 0756e1f..4c70a1e 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -1,7 +1,7 @@
 name: Unit Testing
 on:
-    push:
-    pull_request:
+  push:
+  pull_request:
 jobs:
   phpunit:
     runs-on: ubuntu-latest

From aec21a489ccee23de8fd304c7dab24ce110e5bce Mon Sep 17 00:00:00 2001
From: Matthias Pfefferle <pfefferle@users.noreply.github.com>
Date: Mon, 23 Jan 2023 19:43:34 +0100
Subject: [PATCH 12/25] coding standards

---
 includes/class-shortcodes.php | 171 +++++++++++++++++-----------------
 includes/model/class-post.php |   8 +-
 2 files changed, 92 insertions(+), 87 deletions(-)

diff --git a/includes/class-shortcodes.php b/includes/class-shortcodes.php
index a36f99c..8255dbf 100644
--- a/includes/class-shortcodes.php
+++ b/includes/class-shortcodes.php
@@ -8,8 +8,8 @@ class Shortcodes {
 	 * @param WP_Post  $post    A WordPress Post Object
 	 */
 	public static function init() {
-		foreach( get_class_methods( 'Activitypub\Shortcodes' ) as $shortcode ) {
-			if( $shortcode != 'init' ) {
+		foreach ( get_class_methods( 'Activitypub\Shortcodes' ) as $shortcode ) {
+			if ( $shortcode != 'init' ) {
 				add_shortcode( 'ap_' . $shortcode, array( 'Activitypub\Shortcodes', $shortcode ) );
 			}
 		}
@@ -18,16 +18,16 @@ class Shortcodes {
 	/**
 	 * Generates output for the ap_hashtags shortcode
 	 *
-	 * @param array  $atts 		shortcode attributes
-	 * @param string $content 	shortcode content
-	 * @param string $tag 		shortcode tag name
+	 * @param array  $atts      shortcode attributes
+	 * @param string $content   shortcode content
+	 * @param string $tag       shortcode tag name
 	 *
 	 * @return string
 	 */
 	public static function hashtags( $atts, $content, $tag ) {
 		$post = get_post();
 
-		if( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
+		if ( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
 			return '';
 		}
 
@@ -49,35 +49,36 @@ class Shortcodes {
 	/**
 	 * Generates output for the ap_title shortcode
 	 *
-	 * @param array  $atts 		shortcode attributes
-	 * @param string $content 	shortcode content
-	 * @param string $tag 		shortcode tag name
+	 * @param array  $atts      shortcode attributes
+	 * @param string $content   shortcode content
+	 * @param string $tag       shortcode tag name
 	 *
 	 * @return string
 	 */
 	public static function title( $atts, $content, $tag ) {
 		$post = get_post();
 
-		if( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
+		if ( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
 			return '';
 		}
 
-		return \get_the_title( $post->ID );;
+		return \get_the_title( $post->ID );
+
 	}
 
 	/**
 	 * Generates output for the ap_excerpt shortcode
 	 *
-	 * @param array  $atts 		shortcode attributes
-	 * @param string $content 	shortcode content
-	 * @param string $tag 		shortcode tag name
+	 * @param array  $atts      shortcode attributes
+	 * @param string $content   shortcode content
+	 * @param string $tag       shortcode tag name
 	 *
 	 * @return string
 	 */
 	public static function excerpt( $atts, $content, $tag ) {
 		$post = get_post();
 
-		if( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
+		if ( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
 			return '';
 		}
 
@@ -85,7 +86,8 @@ class Shortcodes {
 
 		$length = intval( $atts['length'] );
 
-		if( $length == 0 ) { $length = ACTIVITYPUB_EXCERPT_LENGTH; }
+		if ( $length == 0 ) {
+			$length = ACTIVITYPUB_EXCERPT_LENGTH; }
 
 		$excerpt = \get_post_field( 'post_excerpt', $post );
 
@@ -167,16 +169,16 @@ class Shortcodes {
 	/**
 	 * Generates output for the ap_content shortcode
 	 *
-	 * @param array  $atts 		shortcode attributes
-	 * @param string $content 	shortcode content
-	 * @param string $tag 		shortcode tag name
+	 * @param array  $atts      shortcode attributes
+	 * @param string $content   shortcode content
+	 * @param string $tag       shortcode tag name
 	 *
 	 * @return string
 	 */
 	public static function content( $atts, $content, $tag ) {
 		$post = get_post();
 
-		if( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
+		if ( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
 			return '';
 		}
 
@@ -188,31 +190,31 @@ class Shortcodes {
 	/**
 	 * Generates output for the ap_permalink shortcode
 	 *
-	 * @param array  $atts 		shortcode attributes
-	 * @param string $content 	shortcode content
-	 * @param string $tag 		shortcode tag name
+	 * @param array  $atts      shortcode attributes
+	 * @param string $content   shortcode content
+	 * @param string $tag       shortcode tag name
 	 *
 	 * @return string
 	 */
 	public static function permalink( $atts, $content, $tag ) {
 		$post = get_post();
 
-		if( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
+		if ( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
 			return '';
 		}
 
 		$atts = shortcode_atts( array( 'type' => 'html' ), $atts, $tag );
 
-		if( is_array( $atts ) && array_key_exists( 'type', $atts ) ) {
-			if( $atts['type'] == 'raw' ) {
+		if ( is_array( $atts ) && array_key_exists( 'type', $atts ) ) {
+			if ( $atts['type'] == 'raw' ) {
 				return \get_permalink( $post->ID );
 			}
 
-			if( $atts['type'] == 'esc' ) {
+			if ( $atts['type'] == 'esc' ) {
 				return \esc_url( \get_permalink( $post->ID ) );
 			}
 
-			if( $atts['type'] == 'blank' ) {
+			if ( $atts['type'] == 'blank' ) {
 				return \sprintf( '<a href="%1$s" target="_blank">%1$s</a>', \esc_url( \get_permalink( $post->ID ) ) );
 			}
 		}
@@ -223,31 +225,31 @@ class Shortcodes {
 	/**
 	 * Generates output for the ap_shortlink shortcode
 	 *
-	 * @param array  $atts 		shortcode attributes
-	 * @param string $content 	shortcode content
-	 * @param string $tag 		shortcode tag name
+	 * @param array  $atts      shortcode attributes
+	 * @param string $content   shortcode content
+	 * @param string $tag       shortcode tag name
 	 *
 	 * @return string
 	 */
 	public static function shortlink( $atts, $content, $tag ) {
 		$post = get_post();
 
-		if( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
+		if ( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
 			return '';
 		}
 
 		$atts = shortcode_atts( array( 'type' => 'html' ), $atts, $tag );
 
-		if( is_array( $atts ) && array_key_exists( 'type', $atts ) ) {
-			if( $atts['type'] == 'raw' ) {
+		if ( is_array( $atts ) && array_key_exists( 'type', $atts ) ) {
+			if ( $atts['type'] == 'raw' ) {
 				return \wp_get_shortlink( $post->ID );
 			}
 
-			if( $atts['type'] == 'esc' ) {
+			if ( $atts['type'] == 'esc' ) {
 				return \esc_url( \wp_get_shortlink( $post->ID ) );
 			}
 
-			if( $atts['type'] == 'blank' ) {
+			if ( $atts['type'] == 'blank' ) {
 				return \sprintf( '<a href="%1$s" target="_blank">%1$s</a>', \esc_url( \wp_get_shortlink( $post->ID ) ) );
 			}
 		}
@@ -258,16 +260,16 @@ class Shortcodes {
 	/**
 	 * Generates output for the ap_thumbnail shortcode
 	 *
-	 * @param array  $atts 		shortcode attributes
-	 * @param string $content 	shortcode content
-	 * @param string $tag 		shortcode tag name
+	 * @param array  $atts      shortcode attributes
+	 * @param string $content   shortcode content
+	 * @param string $tag       shortcode tag name
 	 *
 	 * @return string
 	 */
 	public static function thumbnail( $atts, $content, $tag ) {
 		$post = get_post();
 
-		if( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
+		if ( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
 			return '';
 		}
 
@@ -283,30 +285,31 @@ class Shortcodes {
 	/**
 	 * Generates output for the ap_image shortcode
 	 *
-	 * @param array  $atts 		shortcode attributes
-	 * @param string $content 	shortcode content
-	 * @param string $tag 		shortcode tag name
+	 * @param array  $atts      shortcode attributes
+	 * @param string $content   shortcode content
+	 * @param string $tag       shortcode tag name
 	 *
 	 * @return string
 	 */
 	public static function image( $atts, $content, $tag ) {
 		$post = get_post();
 
-		if( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
+		if ( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
 			return '';
 		}
 
 		$atts = shortcode_atts( array( 'size' => 'full' ), $atts, $tag );
 
-		if( is_array( $atts ) && array_key_exists( 'size', $atts ) ) {
+		if ( is_array( $atts ) && array_key_exists( 'size', $atts ) ) {
 			$registered_sizes = wp_get_registered_image_subsizes();
 
-			if( array_key_exists( $atts['size'], $registered_sizes ) ) {
+			if ( array_key_exists( $atts['size'], $registered_sizes ) ) {
 				$size = intval( $atts['size'] );
 			}
 		}
 
-		if( ! $size ) { $size = 'full'; }
+		if ( ! $size ) {
+			$size = 'full'; }
 
 		$image = \get_the_post_thumbnail_url( $post->ID, $size );
 
@@ -320,16 +323,16 @@ class Shortcodes {
 	/**
 	 * Generates output for the ap_hashcats shortcode
 	 *
-	 * @param array  $atts 		shortcode attributes
-	 * @param string $content 	shortcode content
-	 * @param string $tag 		shortcode tag name
+	 * @param array  $atts      shortcode attributes
+	 * @param string $content   shortcode content
+	 * @param string $tag       shortcode tag name
 	 *
 	 * @return string
 	 */
 	public static function hashcats( $atts, $content, $tag ) {
 		$post = get_post();
 
-		if( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
+		if ( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
 			return '';
 		}
 
@@ -351,16 +354,16 @@ class Shortcodes {
 	/**
 	 * Generates output for the ap_author shortcode
 	 *
-	 * @param array  $atts 		shortcode attributes
-	 * @param string $content 	shortcode content
-	 * @param string $tag 		shortcode tag name
+	 * @param array  $atts      shortcode attributes
+	 * @param string $content   shortcode content
+	 * @param string $tag       shortcode tag name
 	 *
 	 * @return string
 	 */
 	public static function author( $atts, $content, $tag ) {
 		$post = get_post();
 
-		if( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
+		if ( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
 			return '';
 		}
 
@@ -376,16 +379,16 @@ class Shortcodes {
 	/**
 	 * Generates output for the ap_authorurl shortcode
 	 *
-	 * @param array  $atts 		shortcode attributes
-	 * @param string $content 	shortcode content
-	 * @param string $tag 		shortcode tag name
+	 * @param array  $atts      shortcode attributes
+	 * @param string $content   shortcode content
+	 * @param string $tag       shortcode tag name
 	 *
 	 * @return string
 	 */
 	public static function authorurl( $atts, $content, $tag ) {
 		$post = get_post();
 
-		if( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
+		if ( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
 			return '';
 		}
 
@@ -401,55 +404,55 @@ class Shortcodes {
 	/**
 	 * Generates output for the ap_blogurl shortcode
 	 *
-	 * @param array  $atts 		shortcode attributes
-	 * @param string $content 	shortcode content
-	 * @param string $tag 		shortcode tag name
+	 * @param array  $atts      shortcode attributes
+	 * @param string $content   shortcode content
+	 * @param string $tag       shortcode tag name
 	 *
 	 * @return string
 	 */
 	public static function blogurl( $atts, $content, $tag ) {
-		return \get_bloginfo('url');
+		return \get_bloginfo( 'url' );
 	}
 
 	/**
 	 * Generates output for the ap_blogname shortcode
 	 *
-	 * @param array  $atts 		shortcode attributes
-	 * @param string $content 	shortcode content
-	 * @param string $tag 		shortcode tag name
+	 * @param array  $atts      shortcode attributes
+	 * @param string $content   shortcode content
+	 * @param string $tag       shortcode tag name
 	 *
 	 * @return string
 	 */
 	public static function blogname( $atts, $content, $tag ) {
-		return \get_bloginfo('name');
+		return \get_bloginfo( 'name' );
 	}
 
 	/**
 	 * Generates output for the ap_blogdesc shortcode
 	 *
-	 * @param array  $atts 		shortcode attributes
-	 * @param string $content 	shortcode content
-	 * @param string $tag 		shortcode tag name
+	 * @param array  $atts      shortcode attributes
+	 * @param string $content   shortcode content
+	 * @param string $tag       shortcode tag name
 	 *
 	 * @return string
 	 */
 	public static function blogdesc( $atts, $content, $tag ) {
-		return \get_bloginfo('description');
+		return \get_bloginfo( 'description' );
 	}
 
 	/**
 	 * Generates output for the ap_date shortcode
 	 *
-	 * @param array  $atts 		shortcode attributes
-	 * @param string $content 	shortcode content
-	 * @param string $tag 		shortcode tag name
+	 * @param array  $atts      shortcode attributes
+	 * @param string $content   shortcode content
+	 * @param string $tag       shortcode tag name
 	 *
 	 * @return string
 	 */
 	public static function date( $atts, $content, $tag ) {
 		$post = get_post();
 
-		if( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
+		if ( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
 			return '';
 		}
 
@@ -469,16 +472,16 @@ class Shortcodes {
 	/**
 	 * Generates output for the ap_time shortcode
 	 *
-	 * @param array  $atts 		shortcode attributes
-	 * @param string $content 	shortcode content
-	 * @param string $tag 		shortcode tag name
+	 * @param array  $atts      shortcode attributes
+	 * @param string $content   shortcode content
+	 * @param string $tag       shortcode tag name
 	 *
 	 * @return string
 	 */
 	public static function time( $atts, $content, $tag ) {
 		$post = get_post();
 
-		if( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
+		if ( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
 			return '';
 		}
 
@@ -498,16 +501,16 @@ class Shortcodes {
 	/**
 	 * Generates output for the ap_datetime shortcode
 	 *
-	 * @param array  $atts 		shortcode attributes
-	 * @param string $content 	shortcode content
-	 * @param string $tag 		shortcode tag name
+	 * @param array  $atts      shortcode attributes
+	 * @param string $content   shortcode content
+	 * @param string $tag       shortcode tag name
 	 *
 	 * @return string
 	 */
 	public static function datetime( $atts, $content, $tag ) {
 		$post = get_post();
 
-		if( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
+		if ( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
 			return '';
 		}
 
@@ -524,4 +527,4 @@ class Shortcodes {
 		return $date;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/model/class-post.php b/includes/model/class-post.php
index 7ca2b6b..6006315 100644
--- a/includes/model/class-post.php
+++ b/includes/model/class-post.php
@@ -17,7 +17,7 @@ class Post {
 	private $object_type;
 
 	public function __construct( $post = null ) {
-		if( $post ) {
+		if ( $post ) {
 			$this->post = \get_post( $post );
 
 			$this->post_author = $this->post->post_author;
@@ -298,7 +298,9 @@ class Post {
 		$need_update = false;
 
 		// If the old contents is blank, use the defaults.
-		if( $old_content == "" ) { $old_content = ACTIVITYPUB_CUSTOM_POST_CONTENT; $need_update = true; }
+		if ( $old_content == '' ) {
+			$old_content = ACTIVITYPUB_CUSTOM_POST_CONTENT;
+			$need_update = true; }
 
 		// Set the new content to be the old content.
 		$content = $old_content;
@@ -313,7 +315,7 @@ class Post {
 		$content = \str_replace( '%tags%', '[ap_hashtags]', $content );
 
 		// Store the new template if required.
-		if( $content != $old_content || $need_update ) {
+		if ( $content != $old_content || $need_update ) {
 			\update_option( 'activitypub_custom_post_content', $content );
 		}
 

From 75cc35c66ec8042a27085daf2544794302bfb2a8 Mon Sep 17 00:00:00 2001
From: Matthias Pfefferle <pfefferle@users.noreply.github.com>
Date: Mon, 23 Jan 2023 20:08:06 +0100
Subject: [PATCH 13/25] I think it is enough to check if $post or $post_id is
 set

---
 includes/class-shortcodes.php | 59 ++++++++++++++++++-----------------
 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git a/includes/class-shortcodes.php b/includes/class-shortcodes.php
index 8255dbf..96c6caf 100644
--- a/includes/class-shortcodes.php
+++ b/includes/class-shortcodes.php
@@ -9,7 +9,7 @@ class Shortcodes {
 	 */
 	public static function init() {
 		foreach ( get_class_methods( 'Activitypub\Shortcodes' ) as $shortcode ) {
-			if ( $shortcode != 'init' ) {
+			if ( 'init' !== $shortcode ) {
 				add_shortcode( 'ap_' . $shortcode, array( 'Activitypub\Shortcodes', $shortcode ) );
 			}
 		}
@@ -25,13 +25,13 @@ class Shortcodes {
 	 * @return string
 	 */
 	public static function hashtags( $atts, $content, $tag ) {
-		$post = get_post();
+		$post_id = get_the_ID();
 
-		if ( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
+		if ( ! $post_id ) {
 			return '';
 		}
 
-		$tags = \get_the_tags( $post->ID );
+		$tags = \get_the_tags( $post_id );
 
 		if ( ! $tags ) {
 			return '';
@@ -56,13 +56,13 @@ class Shortcodes {
 	 * @return string
 	 */
 	public static function title( $atts, $content, $tag ) {
-		$post = get_post();
+		$post_id = get_the_ID();
 
-		if ( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
+		if ( ! $post_id ) {
 			return '';
 		}
 
-		return \get_the_title( $post->ID );
+		return \get_the_title( $post_id );
 
 	}
 
@@ -78,7 +78,7 @@ class Shortcodes {
 	public static function excerpt( $atts, $content, $tag ) {
 		$post = get_post();
 
-		if ( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
+		if ( ! $post ) {
 			return '';
 		}
 
@@ -86,7 +86,7 @@ class Shortcodes {
 
 		$length = intval( $atts['length'] );
 
-		if ( $length == 0 ) {
+		if ( 0 === $length ) {
 			$length = ACTIVITYPUB_EXCERPT_LENGTH; }
 
 		$excerpt = \get_post_field( 'post_excerpt', $post );
@@ -178,7 +178,7 @@ class Shortcodes {
 	public static function content( $atts, $content, $tag ) {
 		$post = get_post();
 
-		if ( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
+		if ( ! $post ) {
 			return '';
 		}
 
@@ -199,11 +199,12 @@ class Shortcodes {
 	public static function permalink( $atts, $content, $tag ) {
 		$post = get_post();
 
-		if ( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
+		if ( ! $post ) {
 			return '';
 		}
 
-		$atts = shortcode_atts( array( 'type' => 'html' ), $atts, $tag );
+		$atts = shortcode_atts(
+			array( 'type' => 'html' ), $atts, $tag );
 
 		if ( is_array( $atts ) && array_key_exists( 'type', $atts ) ) {
 			if ( $atts['type'] == 'raw' ) {
@@ -234,7 +235,7 @@ class Shortcodes {
 	public static function shortlink( $atts, $content, $tag ) {
 		$post = get_post();
 
-		if ( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
+		if ( ! $post ) {
 			return '';
 		}
 
@@ -267,13 +268,13 @@ class Shortcodes {
 	 * @return string
 	 */
 	public static function thumbnail( $atts, $content, $tag ) {
-		$post = get_post();
+		$post_id = get_the_ID();
 
-		if ( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
+		if ( ! $post_id ) {
 			return '';
 		}
 
-		$image = \get_the_post_thumbnail_url( $post->ID, 'thumbnail' );
+		$image = \get_the_post_thumbnail_url( $post_id, 'thumbnail' );
 
 		if ( ! $image ) {
 			return '';
@@ -292,9 +293,9 @@ class Shortcodes {
 	 * @return string
 	 */
 	public static function image( $atts, $content, $tag ) {
-		$post = get_post();
+		$post_id = get_the_ID();
 
-		if ( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
+		if ( ! $post_id ) {
 			return '';
 		}
 
@@ -309,9 +310,10 @@ class Shortcodes {
 		}
 
 		if ( ! $size ) {
-			$size = 'full'; }
+			$size = 'full';
+		}
 
-		$image = \get_the_post_thumbnail_url( $post->ID, $size );
+		$image = \get_the_post_thumbnail_url( $post_id, $size );
 
 		if ( ! $image ) {
 			return '';
@@ -330,13 +332,13 @@ class Shortcodes {
 	 * @return string
 	 */
 	public static function hashcats( $atts, $content, $tag ) {
-		$post = get_post();
+		$post_id = get_the_ID();
 
-		if ( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
+		if ( ! $post_id ) {
 			return '';
 		}
 
-		$categories = \get_the_category( $post->ID );
+		$categories = \get_the_category( $post_id );
 
 		if ( ! $categories ) {
 			return '';
@@ -363,7 +365,7 @@ class Shortcodes {
 	public static function author( $atts, $content, $tag ) {
 		$post = get_post();
 
-		if ( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
+		if ( ! $post ) {
 			return '';
 		}
 
@@ -388,7 +390,7 @@ class Shortcodes {
 	public static function authorurl( $atts, $content, $tag ) {
 		$post = get_post();
 
-		if ( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
+		if ( ! $post ) {
 			return '';
 		}
 
@@ -452,7 +454,7 @@ class Shortcodes {
 	public static function date( $atts, $content, $tag ) {
 		$post = get_post();
 
-		if ( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
+		if ( ! $post ) {
 			return '';
 		}
 
@@ -481,7 +483,7 @@ class Shortcodes {
 	public static function time( $atts, $content, $tag ) {
 		$post = get_post();
 
-		if ( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
+		if ( ! $post ) {
 			return '';
 		}
 
@@ -510,7 +512,7 @@ class Shortcodes {
 	public static function datetime( $atts, $content, $tag ) {
 		$post = get_post();
 
-		if ( ! \is_object( $post ) || ( \is_object( $post ) && get_class( $post ) != 'WP_Post' ) ) {
+		if ( ! $post ) {
 			return '';
 		}
 
@@ -526,5 +528,4 @@ class Shortcodes {
 
 		return $date;
 	}
-
 }

From 3666f89f6ec9b55e9f66127c9dc8f945dc0c87a4 Mon Sep 17 00:00:00 2001
From: Matthias Pfefferle <pfefferle@users.noreply.github.com>
Date: Mon, 23 Jan 2023 20:11:18 +0100
Subject: [PATCH 14/25] with `shortcode_atts` there is no need to check if attr
 is set

---
 includes/class-shortcodes.php | 51 ++++++++++++++++++++---------------
 1 file changed, 29 insertions(+), 22 deletions(-)

diff --git a/includes/class-shortcodes.php b/includes/class-shortcodes.php
index 96c6caf..8c7377d 100644
--- a/includes/class-shortcodes.php
+++ b/includes/class-shortcodes.php
@@ -204,20 +204,23 @@ class Shortcodes {
 		}
 
 		$atts = shortcode_atts(
-			array( 'type' => 'html' ), $atts, $tag );
+			array(
+				'type' => 'html',
+			),
+			$atts,
+			$tag
+		);
 
-		if ( is_array( $atts ) && array_key_exists( 'type', $atts ) ) {
-			if ( $atts['type'] == 'raw' ) {
-				return \get_permalink( $post->ID );
-			}
+		if ( 'raw' === $atts['type'] ) {
+			return \get_permalink( $post->ID );
+		}
 
-			if ( $atts['type'] == 'esc' ) {
-				return \esc_url( \get_permalink( $post->ID ) );
-			}
+		if ( 'esc' === $atts['type'] ) {
+			return \esc_url( \get_permalink( $post->ID ) );
+		}
 
-			if ( $atts['type'] == 'blank' ) {
-				return \sprintf( '<a href="%1$s" target="_blank">%1$s</a>', \esc_url( \get_permalink( $post->ID ) ) );
-			}
+		if ( 'blank' === $atts['type'] ) {
+			return \sprintf( '<a href="%1$s" target="_blank">%1$s</a>', \esc_url( \get_permalink( $post->ID ) ) );
 		}
 
 		return \sprintf( '<a href="%1$s">%1$s</a>', \esc_url( \get_permalink( $post->ID ) ) );
@@ -239,20 +242,24 @@ class Shortcodes {
 			return '';
 		}
 
-		$atts = shortcode_atts( array( 'type' => 'html' ), $atts, $tag );
+		$atts = shortcode_atts(
+			array(
+				'type' => 'html',
+			),
+			$atts,
+			$tag
+		);
 
-		if ( is_array( $atts ) && array_key_exists( 'type', $atts ) ) {
-			if ( $atts['type'] == 'raw' ) {
-				return \wp_get_shortlink( $post->ID );
-			}
+		if ( 'raw' === $atts['type'] ) {
+			return \wp_get_shortlink( $post->ID );
+		}
 
-			if ( $atts['type'] == 'esc' ) {
-				return \esc_url( \wp_get_shortlink( $post->ID ) );
-			}
+		if ( 'esc' === $atts['type'] ) {
+			return \esc_url( \wp_get_shortlink( $post->ID ) );
+		}
 
-			if ( $atts['type'] == 'blank' ) {
-				return \sprintf( '<a href="%1$s" target="_blank">%1$s</a>', \esc_url( \wp_get_shortlink( $post->ID ) ) );
-			}
+		if ( 'blank' === $atts['type'] ) {
+			return \sprintf( '<a href="%1$s" target="_blank">%1$s</a>', \esc_url( \wp_get_shortlink( $post->ID ) ) );
 		}
 
 		return \sprintf( '<a href="%1$s">%1$s</a>', \esc_url( \wp_get_shortlink( $post->ID ) ) );

From b458cc6b88ec73eed5815c4db48d473a3a692556 Mon Sep 17 00:00:00 2001
From: Matthias Pfefferle <pfefferle@users.noreply.github.com>
Date: Mon, 23 Jan 2023 20:13:56 +0100
Subject: [PATCH 15/25] coding standard

---
 includes/model/class-post.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/includes/model/class-post.php b/includes/model/class-post.php
index 6006315..c796035 100644
--- a/includes/model/class-post.php
+++ b/includes/model/class-post.php
@@ -298,7 +298,7 @@ class Post {
 		$need_update = false;
 
 		// If the old contents is blank, use the defaults.
-		if ( $old_content == '' ) {
+		if ( '' === $old_content ) {
 			$old_content = ACTIVITYPUB_CUSTOM_POST_CONTENT;
 			$need_update = true; }
 
@@ -315,7 +315,7 @@ class Post {
 		$content = \str_replace( '%tags%', '[ap_hashtags]', $content );
 
 		// Store the new template if required.
-		if ( $content != $old_content || $need_update ) {
+		if ( $content !== $old_content || $need_update ) {
 			\update_option( 'activitypub_custom_post_content', $content );
 		}
 

From d4b88f228dd8107b5ff3507cd9e62c67337ced44 Mon Sep 17 00:00:00 2001
From: Matthias Pfefferle <pfefferle@users.noreply.github.com>
Date: Mon, 23 Jan 2023 20:24:03 +0100
Subject: [PATCH 16/25] mastodon sadly does not support target on links

See https://github.com/mastodon/mastodon/blob/main/lib/sanitize_ext/sanitize_config.rb#L77
---
 includes/class-shortcodes.php | 23 ++++++++++++-----------
 templates/settings.php        |  4 ++--
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/includes/class-shortcodes.php b/includes/class-shortcodes.php
index 8c7377d..280c10a 100644
--- a/includes/class-shortcodes.php
+++ b/includes/class-shortcodes.php
@@ -40,7 +40,11 @@ class Shortcodes {
 		$hash_tags = array();
 
 		foreach ( $tags as $tag ) {
-			$hash_tags[] = \sprintf( '<a rel="tag" class="u-tag u-category" href="%s">#%s</a>', \get_tag_link( $tag ), $tag->slug );
+			$hash_tags[] = \sprintf(
+				'<a rel="tag" class="u-tag u-category" href="%s">#%s</a>',
+				\get_tag_link( $tag ),
+				$tag->slug
+			);
 		}
 
 		return \implode( ' ', $hash_tags );
@@ -82,12 +86,17 @@ class Shortcodes {
 			return '';
 		}
 
-		$atts = shortcode_atts( array( 'length' => ACTIVITYPUB_EXCERPT_LENGTH ), $atts, $tag );
+		$atts = shortcode_atts(
+			array( 'length' => ACTIVITYPUB_EXCERPT_LENGTH ),
+			$atts,
+			$tag
+		);
 
 		$length = intval( $atts['length'] );
 
 		if ( 0 === $length ) {
-			$length = ACTIVITYPUB_EXCERPT_LENGTH; }
+			$length = ACTIVITYPUB_EXCERPT_LENGTH;
+		}
 
 		$excerpt = \get_post_field( 'post_excerpt', $post );
 
@@ -219,10 +228,6 @@ class Shortcodes {
 			return \esc_url( \get_permalink( $post->ID ) );
 		}
 
-		if ( 'blank' === $atts['type'] ) {
-			return \sprintf( '<a href="%1$s" target="_blank">%1$s</a>', \esc_url( \get_permalink( $post->ID ) ) );
-		}
-
 		return \sprintf( '<a href="%1$s">%1$s</a>', \esc_url( \get_permalink( $post->ID ) ) );
 	}
 
@@ -258,10 +263,6 @@ class Shortcodes {
 			return \esc_url( \wp_get_shortlink( $post->ID ) );
 		}
 
-		if ( 'blank' === $atts['type'] ) {
-			return \sprintf( '<a href="%1$s" target="_blank">%1$s</a>', \esc_url( \wp_get_shortlink( $post->ID ) ) );
-		}
-
 		return \sprintf( '<a href="%1$s">%1$s</a>', \esc_url( \wp_get_shortlink( $post->ID ) ) );
 	}
 
diff --git a/templates/settings.php b/templates/settings.php
index cebae11..d563cc5 100644
--- a/templates/settings.php
+++ b/templates/settings.php
@@ -76,9 +76,9 @@ $registered_sizes .= '.';
 										<li><code>[ap_title]</code> - <?php \esc_html_e( 'The post\'s title.', 'activitypub' ); ?></li>
 										<li><code>[ap_content]</code> - <?php \esc_html_e( 'The post\'s content.', 'activitypub' ); ?></li>
 										<li><code>[ap_excerpt <i>lenght=nnn</i>]</code> - <?php \esc_html_e( 'The post\'s excerpt (default 400 chars). length parameter is optional.', 'activitypub' ); ?></li>
-										<li><code>[ap_permalink <i>type=xxx</i>]</code> - <?php \esc_html_e( 'The post\'s permalink. Type can be either: raw (the raw url, no escaping), esc (the html escaped url), html (default, an a tag to the url), blank (an a tag to the url that opens in a new window).', 'activitypub' ); ?></li>
+										<li><code>[ap_permalink <i>type=xxx</i>]</code> - <?php \esc_html_e( 'The post\'s permalink. Type can be either: raw (the raw url, no escaping), esc (the html escaped url), html (default, an a tag to the url).', 'activitypub' ); ?></li>
 										<?php // translators: ?>
-										<li><code>[ap_shortlink <i>type=xxx</i>]</code> - <?php echo \wp_kses( \__( 'The post\'s shortlink. I can recommend <a href="https://wordpress.org/plugins/hum/" target="_blank">Hum</a>, to prettify the Shortlinks. Type can be either: raw (the raw url, no escaping), esc (the html escaped url), html (default, an a tag to the url), blank (an a tag to the url that opens in a new window).', 'activitypub' ), 'default' ); ?></li>
+										<li><code>[ap_shortlink <i>type=xxx</i>]</code> - <?php echo \wp_kses( \__( 'The post\'s shortlink. I can recommend <a href="https://wordpress.org/plugins/hum/" target="_blank">Hum</a>, to prettify the Shortlinks. Type can be either: raw (the raw url, no escaping), esc (the html escaped url), html (default, an a tag to the url).', 'activitypub' ), 'default' ); ?></li>
 										<li><code>[ap_hashtags]</code> - <?php \esc_html_e( 'The post\'s tags as hashtags.', 'activitypub' ); ?></li>
 										<li><code>[ap_hashcats]</code> - <?php \esc_html_e( 'The post\'s categories as hashtags.', 'activitypub' ); ?></li>
 										<li><code>[ap_image <i>size=xxx</i>]</code> - <?php \esc_html_e( 'The URL for the post\'s featured image, defaults to full size.  The size attribute can be any of the following: ', 'activitypub' ); echo esc_html( $registered_sizes ); ?></li>

From cb1c26a365d371746fe6341a1e989f70e066aa76 Mon Sep 17 00:00:00 2001
From: Matthias Pfefferle <pfefferle@users.noreply.github.com>
Date: Mon, 23 Jan 2023 20:31:14 +0100
Subject: [PATCH 17/25] use static method to upgrade post content to shortcodes

---
 includes/class-admin.php      |  3 +--
 includes/model/class-post.php | 23 ++++++++++-------------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/includes/class-admin.php b/includes/class-admin.php
index df79d0b..872ceea 100644
--- a/includes/class-admin.php
+++ b/includes/class-admin.php
@@ -50,8 +50,7 @@ class Admin {
 
 		switch ( $tab ) {
 			case 'settings':
-				$post_model = new \Activitypub\Model\Post();
-				$post_model->upgrade_post_content_template();
+				\Activitypub\Model\Post::upgrade_post_content_template();
 
 				\load_template( \dirname( __FILE__ ) . '/../templates/settings.php' );
 				break;
diff --git a/includes/model/class-post.php b/includes/model/class-post.php
index c796035..1eccf4d 100644
--- a/includes/model/class-post.php
+++ b/includes/model/class-post.php
@@ -16,19 +16,16 @@ class Post {
 	private $tags;
 	private $object_type;
 
-	public function __construct( $post = null ) {
-		if ( $post ) {
-			$this->post = \get_post( $post );
-
-			$this->post_author = $this->post->post_author;
-			$this->id          = $this->generate_id();
-			$this->summary     = $this->generate_the_title();
-			$this->content     = $this->generate_the_content();
-			$this->attachments = $this->generate_attachments();
-			$this->tags        = $this->generate_tags();
-			$this->object_type = $this->generate_object_type();
-		}
+	public function __construct( $post ) {
+		$this->post = \get_post( $post );
 
+		$this->post_author = $this->post->post_author;
+		$this->id          = $this->generate_id();
+		$this->summary     = $this->generate_the_title();
+		$this->content     = $this->generate_the_content();
+		$this->attachments = $this->generate_attachments();
+		$this->tags        = $this->generate_tags();
+		$this->object_type = $this->generate_object_type();
 	}
 
 	public function __call( $method, $params ) {
@@ -289,7 +286,7 @@ class Post {
 	 *
 	 * @return string the updated template content
 	 */
-	public function upgrade_post_content_template() {
+	public static function upgrade_post_content_template() {
 		// Get the custom template.
 		$old_content = \get_option( 'activitypub_custom_post_content', ACTIVITYPUB_CUSTOM_POST_CONTENT );
 

From 092a6bd3ca7968260d78e111447d56d8c6e0e8f6 Mon Sep 17 00:00:00 2001
From: Matthias Pfefferle <pfefferle@users.noreply.github.com>
Date: Mon, 23 Jan 2023 20:31:38 +0100
Subject: [PATCH 18/25] coding standards

---
 templates/settings.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/templates/settings.php b/templates/settings.php
index d563cc5..8163808 100644
--- a/templates/settings.php
+++ b/templates/settings.php
@@ -12,7 +12,7 @@ $image_sizes = wp_get_registered_image_subsizes();
 $thumbnail_size = $image_sizes['thumbnail']['width'] . 'x' . $image_sizes['thumbnail']['height'] . ' px';
 $registered_sizes = '';
 
-foreach( $image_sizes as $name => $size ) {
+foreach ( $image_sizes as $name => $size ) {
 	$registered_sizes .= $name . ', ';
 }
 
@@ -70,18 +70,18 @@ $registered_sizes .= '.';
 							<details>
 								<summary><?php esc_html_e( 'See the complete list of activitypub shortcodes.', 'activitypub' ); ?></summary>
 								<div class="description">
-									<p><?php esc_html_e( 'You may use any shortcode normally available to you on your site, however be aware that shortcodes may significantly increase the size of your content depending on what they do. '); ?>
-									<p><?php esc_html_e( 'In addition, the following shortcodes are available during an activitypub post:'); ?>
+									<p><?php esc_html_e( 'You may use any shortcode normally available to you on your site, however be aware that shortcodes may significantly increase the size of your content depending on what they do.', 'activitypub' ); ?>
+									<p><?php esc_html_e( 'In addition, the following shortcodes are available during an activitypub post:', 'activitypub' ); ?>
 									<ul>
 										<li><code>[ap_title]</code> - <?php \esc_html_e( 'The post\'s title.', 'activitypub' ); ?></li>
 										<li><code>[ap_content]</code> - <?php \esc_html_e( 'The post\'s content.', 'activitypub' ); ?></li>
-										<li><code>[ap_excerpt <i>lenght=nnn</i>]</code> - <?php \esc_html_e( 'The post\'s excerpt (default 400 chars). length parameter is optional.', 'activitypub' ); ?></li>
+										<li><code>[ap_excerpt <i>lenght=400</i>]</code> - <?php \esc_html_e( 'The post\'s excerpt (default 400 chars). length parameter is optional.', 'activitypub' ); ?></li>
 										<li><code>[ap_permalink <i>type=xxx</i>]</code> - <?php \esc_html_e( 'The post\'s permalink. Type can be either: raw (the raw url, no escaping), esc (the html escaped url), html (default, an a tag to the url).', 'activitypub' ); ?></li>
 										<?php // translators: ?>
 										<li><code>[ap_shortlink <i>type=xxx</i>]</code> - <?php echo \wp_kses( \__( 'The post\'s shortlink. I can recommend <a href="https://wordpress.org/plugins/hum/" target="_blank">Hum</a>, to prettify the Shortlinks. Type can be either: raw (the raw url, no escaping), esc (the html escaped url), html (default, an a tag to the url).', 'activitypub' ), 'default' ); ?></li>
 										<li><code>[ap_hashtags]</code> - <?php \esc_html_e( 'The post\'s tags as hashtags.', 'activitypub' ); ?></li>
 										<li><code>[ap_hashcats]</code> - <?php \esc_html_e( 'The post\'s categories as hashtags.', 'activitypub' ); ?></li>
-										<li><code>[ap_image <i>size=xxx</i>]</code> - <?php \esc_html_e( 'The URL for the post\'s featured image, defaults to full size.  The size attribute can be any of the following: ', 'activitypub' ); echo esc_html( $registered_sizes ); ?></li>
+										<li><code>[ap_image <i>size=xxx</i>]</code> - <?php \esc_html_e( 'The URL for the post\'s featured image, defaults to full size. The size attribute can be any of the following:', 'activitypub' ); echo esc_html( $registered_sizes ); ?></li>
 										<li><code>[ap_thumbnail]</code> - <?php echo \wp_kses( sprintf( __( 'The URL for the post\'s featured image thumbnail size (%s).', 'activitypub'), $thumbnail_size ), 'default' ); ?></li>
 										<li><code>[ap_author]</code> - <?php \esc_html_e( 'The author\'s name.', 'activitypub' ); ?></li>
 										<li><code>[ap_authorurl]</code> - <?php \esc_html_e( 'The URL to the author\'s profile page.', 'activitypub' ); ?></li>
@@ -97,7 +97,7 @@ $registered_sizes .= '.';
 							</details>
 						</p>
 						<?php // translators: ?>
-						<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>
+						<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' ), 'activitypub' ); ?></p>
 					</td>
 				</tr>
 				<tr>

From fe4e0961c82f996d63fa180e78c55d9f453691f2 Mon Sep 17 00:00:00 2001
From: Matthias Pfefferle <pfefferle@users.noreply.github.com>
Date: Mon, 23 Jan 2023 20:47:02 +0100
Subject: [PATCH 19/25] I would keep it simple for now

---
 includes/class-shortcodes.php | 49 ++++++++++-------------------------
 templates/settings.php        | 15 +----------
 2 files changed, 15 insertions(+), 49 deletions(-)

diff --git a/includes/class-shortcodes.php b/includes/class-shortcodes.php
index 280c10a..f1dd53d 100644
--- a/includes/class-shortcodes.php
+++ b/includes/class-shortcodes.php
@@ -266,31 +266,6 @@ class Shortcodes {
 		return \sprintf( '<a href="%1$s">%1$s</a>', \esc_url( \wp_get_shortlink( $post->ID ) ) );
 	}
 
-	/**
-	 * Generates output for the ap_thumbnail shortcode
-	 *
-	 * @param array  $atts      shortcode attributes
-	 * @param string $content   shortcode content
-	 * @param string $tag       shortcode tag name
-	 *
-	 * @return string
-	 */
-	public static function thumbnail( $atts, $content, $tag ) {
-		$post_id = get_the_ID();
-
-		if ( ! $post_id ) {
-			return '';
-		}
-
-		$image = \get_the_post_thumbnail_url( $post_id, 'thumbnail' );
-
-		if ( ! $image ) {
-			return '';
-		}
-
-		return $image;
-	}
-
 	/**
 	 * Generates output for the ap_image shortcode
 	 *
@@ -307,18 +282,22 @@ class Shortcodes {
 			return '';
 		}
 
-		$atts = shortcode_atts( array( 'size' => 'full' ), $atts, $tag );
+		$atts = shortcode_atts(
+			array(
+				'type' => 'full',
+			),
+			$atts,
+			$tag
+		);
 
-		if ( is_array( $atts ) && array_key_exists( 'size', $atts ) ) {
-			$registered_sizes = wp_get_registered_image_subsizes();
+		$size = 'full';
 
-			if ( array_key_exists( $atts['size'], $registered_sizes ) ) {
-				$size = intval( $atts['size'] );
-			}
-		}
-
-		if ( ! $size ) {
-			$size = 'full';
+		if ( in_array(
+			$atts['type'],
+			array( 'thumbnail', 'medium', 'large', 'full' ),
+			true
+		) ) {
+			$size = $atts['type'];
 		}
 
 		$image = \get_the_post_thumbnail_url( $post_id, $size );
diff --git a/templates/settings.php b/templates/settings.php
index 8163808..8761179 100644
--- a/templates/settings.php
+++ b/templates/settings.php
@@ -7,18 +7,6 @@
 		'welcome' => '',
 	)
 );
-
-$image_sizes = wp_get_registered_image_subsizes();
-$thumbnail_size = $image_sizes['thumbnail']['width'] . 'x' . $image_sizes['thumbnail']['height'] . ' px';
-$registered_sizes = '';
-
-foreach ( $image_sizes as $name => $size ) {
-	$registered_sizes .= $name . ', ';
-}
-
-$registered_sizes = trim( $registered_sizes, ', ' );
-$registered_sizes .= '.';
-
 ?>
 
 <div class="privacy-settings-body hide-if-no-js">
@@ -81,8 +69,7 @@ $registered_sizes .= '.';
 										<li><code>[ap_shortlink <i>type=xxx</i>]</code> - <?php echo \wp_kses( \__( 'The post\'s shortlink. I can recommend <a href="https://wordpress.org/plugins/hum/" target="_blank">Hum</a>, to prettify the Shortlinks. Type can be either: raw (the raw url, no escaping), esc (the html escaped url), html (default, an a tag to the url).', 'activitypub' ), 'default' ); ?></li>
 										<li><code>[ap_hashtags]</code> - <?php \esc_html_e( 'The post\'s tags as hashtags.', 'activitypub' ); ?></li>
 										<li><code>[ap_hashcats]</code> - <?php \esc_html_e( 'The post\'s categories as hashtags.', 'activitypub' ); ?></li>
-										<li><code>[ap_image <i>size=xxx</i>]</code> - <?php \esc_html_e( 'The URL for the post\'s featured image, defaults to full size. The size attribute can be any of the following:', 'activitypub' ); echo esc_html( $registered_sizes ); ?></li>
-										<li><code>[ap_thumbnail]</code> - <?php echo \wp_kses( sprintf( __( 'The URL for the post\'s featured image thumbnail size (%s).', 'activitypub'), $thumbnail_size ), 'default' ); ?></li>
+										<li><code>[ap_image <i>type=full</i>]</code> - <?php \esc_html_e( 'The URL for the post\'s featured image, defaults to full size. The type attribute can be any of the following: thumbnail, medium, large, full', 'activitypub' ); ?></li>
 										<li><code>[ap_author]</code> - <?php \esc_html_e( 'The author\'s name.', 'activitypub' ); ?></li>
 										<li><code>[ap_authorurl]</code> - <?php \esc_html_e( 'The URL to the author\'s profile page.', 'activitypub' ); ?></li>
 										<li><code>[ap_date]</code> - <?php \esc_html_e( 'The post\'s date.', 'activitypub' ); ?></li>

From c93f02615d7e68e4f9fcf5cb6881e65b94db4d47 Mon Sep 17 00:00:00 2001
From: Matthias Pfefferle <pfefferle@users.noreply.github.com>
Date: Mon, 23 Jan 2023 20:59:39 +0100
Subject: [PATCH 20/25] always escape output

---
 includes/class-shortcodes.php | 22 +++++++---------------
 includes/model/class-post.php |  4 ++--
 readme.txt                    |  1 +
 templates/settings.php        |  4 ++--
 4 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/includes/class-shortcodes.php b/includes/class-shortcodes.php
index f1dd53d..ea803f8 100644
--- a/includes/class-shortcodes.php
+++ b/includes/class-shortcodes.php
@@ -214,17 +214,13 @@ class Shortcodes {
 
 		$atts = shortcode_atts(
 			array(
-				'type' => 'html',
+				'type' => 'url',
 			),
 			$atts,
 			$tag
 		);
 
-		if ( 'raw' === $atts['type'] ) {
-			return \get_permalink( $post->ID );
-		}
-
-		if ( 'esc' === $atts['type'] ) {
+		if ( 'url' === $atts['type'] ) {
 			return \esc_url( \get_permalink( $post->ID ) );
 		}
 
@@ -249,17 +245,13 @@ class Shortcodes {
 
 		$atts = shortcode_atts(
 			array(
-				'type' => 'html',
+				'type' => 'url',
 			),
 			$atts,
 			$tag
 		);
 
-		if ( 'raw' === $atts['type'] ) {
-			return \wp_get_shortlink( $post->ID );
-		}
-
-		if ( 'esc' === $atts['type'] ) {
+		if ( 'url' === $atts['type'] ) {
 			return \esc_url( \wp_get_shortlink( $post->ID ) );
 		}
 
@@ -306,7 +298,7 @@ class Shortcodes {
 			return '';
 		}
 
-		return $image;
+		return \esc_url( $image );
 	}
 
 	/**
@@ -387,7 +379,7 @@ class Shortcodes {
 			return '';
 		}
 
-		return $url;
+		return \esc_url( $url );
 	}
 
 	/**
@@ -400,7 +392,7 @@ class Shortcodes {
 	 * @return string
 	 */
 	public static function blogurl( $atts, $content, $tag ) {
-		return \get_bloginfo( 'url' );
+		return \esc_url( \get_bloginfo( 'url' ) );
 	}
 
 	/**
diff --git a/includes/model/class-post.php b/includes/model/class-post.php
index 1eccf4d..cdf5d51 100644
--- a/includes/model/class-post.php
+++ b/includes/model/class-post.php
@@ -306,8 +306,8 @@ class Post {
 		$content = \str_replace( '%title%', '[ap_title]', $content );
 		$content = \str_replace( '%excerpt%', '[ap_excerpt]', $content );
 		$content = \str_replace( '%content%', '[ap_content]', $content );
-		$content = \str_replace( '%permalink%', '[ap_permalink]', $content );
-		$content = \str_replace( '%shortlink%', '[ap_shortlink]', $content );
+		$content = \str_replace( '%permalink%', '[ap_permalink type="html"]', $content );
+		$content = \str_replace( '%shortlink%', '[ap_shortlink type="html"]', $content );
 		$content = \str_replace( '%hashtags%', '[ap_hashtags]', $content );
 		$content = \str_replace( '%tags%', '[ap_hashtags]', $content );
 
diff --git a/readme.txt b/readme.txt
index 7ef54de..bf786ca 100644
--- a/readme.txt
+++ b/readme.txt
@@ -91,6 +91,7 @@ Project maintained on GitHub at [pfefferle/wordpress-activitypub](https://github
 = v.next =
 
 * Add configuration item for number of images to attach. props [@mexon](https://github.com/mexon)
+* Use shortcodes instead of custom templates, to setup the Activity Post-Content. props [@toolstack](https://github.com/toolstack)
 
 = 0.15.0 =
 
diff --git a/templates/settings.php b/templates/settings.php
index 8761179..d50a68a 100644
--- a/templates/settings.php
+++ b/templates/settings.php
@@ -64,9 +64,9 @@
 										<li><code>[ap_title]</code> - <?php \esc_html_e( 'The post\'s title.', 'activitypub' ); ?></li>
 										<li><code>[ap_content]</code> - <?php \esc_html_e( 'The post\'s content.', 'activitypub' ); ?></li>
 										<li><code>[ap_excerpt <i>lenght=400</i>]</code> - <?php \esc_html_e( 'The post\'s excerpt (default 400 chars). length parameter is optional.', 'activitypub' ); ?></li>
-										<li><code>[ap_permalink <i>type=xxx</i>]</code> - <?php \esc_html_e( 'The post\'s permalink. Type can be either: raw (the raw url, no escaping), esc (the html escaped url), html (default, an a tag to the url).', 'activitypub' ); ?></li>
+										<li><code>[ap_permalink <i>type=url</i>]</code> - <?php \esc_html_e( 'The post\'s permalink. Type can be either: url (default, the escaped url), html (an a tag to the url).', 'activitypub' ); ?></li>
 										<?php // translators: ?>
-										<li><code>[ap_shortlink <i>type=xxx</i>]</code> - <?php echo \wp_kses( \__( 'The post\'s shortlink. I can recommend <a href="https://wordpress.org/plugins/hum/" target="_blank">Hum</a>, to prettify the Shortlinks. Type can be either: raw (the raw url, no escaping), esc (the html escaped url), html (default, an a tag to the url).', 'activitypub' ), 'default' ); ?></li>
+										<li><code>[ap_shortlink <i>type=url</i>]</code> - <?php echo \wp_kses( \__( 'The post\'s shortlink. I can recommend <a href="https://wordpress.org/plugins/hum/" target="_blank">Hum</a>, to prettify the Shortlinks. Type can be either: url (default, the escaped url), html (an a tag to the url).', 'activitypub' ), 'default' ); ?></li>
 										<li><code>[ap_hashtags]</code> - <?php \esc_html_e( 'The post\'s tags as hashtags.', 'activitypub' ); ?></li>
 										<li><code>[ap_hashcats]</code> - <?php \esc_html_e( 'The post\'s categories as hashtags.', 'activitypub' ); ?></li>
 										<li><code>[ap_image <i>type=full</i>]</code> - <?php \esc_html_e( 'The URL for the post\'s featured image, defaults to full size. The type attribute can be any of the following: thumbnail, medium, large, full', 'activitypub' ); ?></li>

From 4d75ade22b57d43aece91bf4bbc50eb262d1b2f7 Mon Sep 17 00:00:00 2001
From: Matthias Pfefferle <pfefferle@users.noreply.github.com>
Date: Mon, 23 Jan 2023 21:08:59 +0100
Subject: [PATCH 21/25] strong is not supported

---
 includes/model/class-post.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/model/class-post.php b/includes/model/class-post.php
index cdf5d51..6586388 100644
--- a/includes/model/class-post.php
+++ b/includes/model/class-post.php
@@ -268,7 +268,7 @@ class Post {
 		}
 
 		if ( 'title' === \get_option( 'activitypub_post_content_type', 'content' ) ) {
-			return "<p><strong>[ap_title]</strong></p>\n\n<p>[ap_permalink]</p>";
+			return "<p>[ap_title]</p>\n\n<p>[ap_permalink]</p>";
 		}
 
 		if ( 'content' === \get_option( 'activitypub_post_content_type', 'content' ) ) {

From 718bd78cf4f57ee4e76a2a285a8bd21f0b3c0260 Mon Sep 17 00:00:00 2001
From: Matthias Pfefferle <pfefferle@users.noreply.github.com>
Date: Mon, 23 Jan 2023 21:09:25 +0100
Subject: [PATCH 22/25] typos

---
 templates/settings.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/settings.php b/templates/settings.php
index d50a68a..eb01128 100644
--- a/templates/settings.php
+++ b/templates/settings.php
@@ -56,10 +56,10 @@
 						<p>
 							<textarea name="activitypub_custom_post_content" id="activitypub_custom_post_content" rows="10" cols="50" class="large-text" placeholder="<?php echo wp_kses( ACTIVITYPUB_CUSTOM_POST_CONTENT, 'post' ); ?>"><?php echo wp_kses( \get_option( 'activitypub_custom_post_content', ACTIVITYPUB_CUSTOM_POST_CONTENT ), 'post' ); ?></textarea>
 							<details>
-								<summary><?php esc_html_e( 'See the complete list of activitypub shortcodes.', 'activitypub' ); ?></summary>
+								<summary><?php esc_html_e( 'See the complete list of ActivityPub shortcodes.', 'activitypub' ); ?></summary>
 								<div class="description">
 									<p><?php esc_html_e( 'You may use any shortcode normally available to you on your site, however be aware that shortcodes may significantly increase the size of your content depending on what they do.', 'activitypub' ); ?>
-									<p><?php esc_html_e( 'In addition, the following shortcodes are available during an activitypub post:', 'activitypub' ); ?>
+									<p><?php esc_html_e( 'In addition, the following shortcodes are available during an ActivityPub post:', 'activitypub' ); ?>
 									<ul>
 										<li><code>[ap_title]</code> - <?php \esc_html_e( 'The post\'s title.', 'activitypub' ); ?></li>
 										<li><code>[ap_content]</code> - <?php \esc_html_e( 'The post\'s content.', 'activitypub' ); ?></li>

From a55dc903794d13d5cb2b59928b651259c02784f3 Mon Sep 17 00:00:00 2001
From: Matthias Pfefferle <pfefferle@users.noreply.github.com>
Date: Mon, 23 Jan 2023 21:13:50 +0100
Subject: [PATCH 23/25] fix length

---
 includes/class-shortcodes.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/includes/class-shortcodes.php b/includes/class-shortcodes.php
index ea803f8..b7243d5 100644
--- a/includes/class-shortcodes.php
+++ b/includes/class-shortcodes.php
@@ -92,10 +92,10 @@ class Shortcodes {
 			$tag
 		);
 
-		$length = intval( $atts['length'] );
+		$excerpt_length = intval( $atts['length'] );
 
-		if ( 0 === $length ) {
-			$length = ACTIVITYPUB_EXCERPT_LENGTH;
+		if ( 0 === $excerpt_length ) {
+			$excerpt_length = ACTIVITYPUB_EXCERPT_LENGTH;
 		}
 
 		$excerpt = \get_post_field( 'post_excerpt', $post );

From 7be74c18378f75fd94f1f9a97f5a4ffb2028aa5f Mon Sep 17 00:00:00 2001
From: Matthias Pfefferle <pfefferle@users.noreply.github.com>
Date: Mon, 23 Jan 2023 21:24:54 +0100
Subject: [PATCH 24/25] fix upgrade call

---
 includes/model/class-post.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/model/class-post.php b/includes/model/class-post.php
index 6586388..9eaab30 100644
--- a/includes/model/class-post.php
+++ b/includes/model/class-post.php
@@ -276,7 +276,7 @@ class Post {
 		}
 
 		// Upgrade from old template codes to shortcodes.
-		$content = $this->upgrade_post_content_template();
+		$content = self::upgrade_post_content_template();
 
 		return $content;
 	}

From e1df1293551002436cbba6589c58105bacedeb88 Mon Sep 17 00:00:00 2001
From: Matthias Pfefferle <pfefferle@users.noreply.github.com>
Date: Mon, 23 Jan 2023 22:22:22 +0100
Subject: [PATCH 25/25] simplify inline help a bit

---
 includes/help.php      | 46 ++++++++++++++++++++++++++++++++++++++++++
 templates/settings.php | 25 ++++++-----------------
 2 files changed, 52 insertions(+), 19 deletions(-)

diff --git a/includes/help.php b/includes/help.php
index f84ccaf..1f29119 100644
--- a/includes/help.php
+++ b/includes/help.php
@@ -1,5 +1,51 @@
 <?php
 
+\get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'template-tags',
+		'title'   => \__( 'Template Tags', 'activitypub' ),
+		'content' =>
+			'<p>' . __( 'The following Template Tags are available:', 'activitypub' ) . '</p>' .
+			'<dl>
+				<dt><code>[ap_title]</code></dt>
+				<dd>' . \wp_kses( __( 'The post\'s title.', 'activitypub' ), 'default' ) . '</dd>
+				<dt><code>[ap_content]</code></dt>
+				<dd>' . \wp_kses( __( 'The post\'s content.', 'activitypub' ), 'default' ) . '</dd>
+				<dt><code>[ap_excerpt lenght="400"]</code></dt>
+				<dd>' . \wp_kses( __( 'The post\'s excerpt (default 400 chars). length parameter is optional.', 'activitypub' ), 'default' ) . '</dd>
+				<dt><code>[ap_permalink type="url"]</code></dt>
+				<dd>' . \wp_kses( __( 'The post\'s permalink. Type can be either: <code>url</code> or <code>html</code> (an &lt;a /&gt; tag to the url).', 'activitypub' ), 'default' ) . '</dd>
+				<dt><code>[ap_shortlink type="url"]</code></dt>
+				<dd>' . \wp_kses( __( 'The post\'s shortlink. Type can be either <code>url</code> or <code>html</code> (an &lt;a /&gt; tag to the url). I can recommend <a href="https://wordpress.org/plugins/hum/" target="_blank">Hum</a>, to prettify the Shortlinks.', 'activitypub' ), 'default' ) . '</dd>
+				<dt><code>[ap_hashtags]</code></dt>
+				<dd>' . \wp_kses( __( 'The post\'s tags as hashtags.', 'activitypub' ), 'default' ) . '</dd>
+				<dt><code>[ap_hashcats]</code></dt>
+				<dd>' . \wp_kses( __( 'The post\'s categories as hashtags.', 'activitypub' ), 'default' ) . '</dd>
+				<dt><code>[ap_image type=full]</code></dt>
+				<dd>' . \wp_kses( __( 'The URL for the post\'s featured image, defaults to full size. The type attribute can be any of the following: <code>thumbnail</code>, <code>medium</code>, <code>large</code>, <code>full</code>', 'activitypub' ), 'default' ) . '</dd>
+				<dt><code>[ap_author]</code></dt>
+				<dd>' . \wp_kses( __( 'The author\'s name.', 'activitypub' ), 'default' ) . '</dd>
+				<dt><code>[ap_authorurl]</code></dt>
+				<dd>' . \wp_kses( __( 'The URL to the author\'s profile page.', 'activitypub' ), 'default' ) . '</dd>
+				<dt><code>[ap_date]</code></dt>
+				<dd>' . \wp_kses( __( 'The post\'s date.', 'activitypub' ), 'default' ) . '</dd>
+				<dt><code>[ap_time]</code></dt>
+				<dd>' . \wp_kses( __( 'The post\'s time.', 'activitypub' ), 'default' ) . '</dd>
+				<dt><code>[ap_datetime]</code></dt>
+				<dd>' . \wp_kses( __( 'The post\'s date/time formated as "date @ time".', 'activitypub' ), 'default' ) . '</dd>
+				<dt><code>[ap_blogurl]</code></dt>
+				<dd>' . \wp_kses( __( 'The URL to the site.', 'activitypub' ), 'default' ) . '</dd>
+				<dt><code>[ap_blogname]</code></dt>
+				<dd>' . \wp_kses( __( 'The name of the site.', 'activitypub' ), 'default' ) . '</dd>
+				<dt><code>[ap_blogdesc]</code></dt>
+				<dd>' . \wp_kses( __( 'The description of the site.', 'activitypub' ), 'default' ) . '</dd>
+			</dl>' .
+			'<p>' . __( 'You may also use any Shortcode normally available to you on your site, however be aware that Shortcodes may significantly increase the size of your content depending on what they do.', 'activitypub' ) . '</p>' .
+			'<p>' . __( 'Note: the old Template Tags are now deprecated and automatically converted to the new ones.', 'activitypub' ) . '</p>' .
+			'<p>' . \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' ), 'activitypub' ) . '</p>',
+	)
+);
+
 \get_current_screen()->add_help_tab(
 	array(
 		'id'      => 'glossar',
diff --git a/templates/settings.php b/templates/settings.php
index eb01128..24cd5c4 100644
--- a/templates/settings.php
+++ b/templates/settings.php
@@ -56,35 +56,22 @@
 						<p>
 							<textarea name="activitypub_custom_post_content" id="activitypub_custom_post_content" rows="10" cols="50" class="large-text" placeholder="<?php echo wp_kses( ACTIVITYPUB_CUSTOM_POST_CONTENT, 'post' ); ?>"><?php echo wp_kses( \get_option( 'activitypub_custom_post_content', ACTIVITYPUB_CUSTOM_POST_CONTENT ), 'post' ); ?></textarea>
 							<details>
-								<summary><?php esc_html_e( 'See the complete list of ActivityPub shortcodes.', 'activitypub' ); ?></summary>
+								<summary><?php esc_html_e( 'See a list of ActivityPub Template Tags.', 'activitypub' ); ?></summary>
 								<div class="description">
-									<p><?php esc_html_e( 'You may use any shortcode normally available to you on your site, however be aware that shortcodes may significantly increase the size of your content depending on what they do.', 'activitypub' ); ?>
-									<p><?php esc_html_e( 'In addition, the following shortcodes are available during an ActivityPub post:', 'activitypub' ); ?>
 									<ul>
 										<li><code>[ap_title]</code> - <?php \esc_html_e( 'The post\'s title.', 'activitypub' ); ?></li>
 										<li><code>[ap_content]</code> - <?php \esc_html_e( 'The post\'s content.', 'activitypub' ); ?></li>
-										<li><code>[ap_excerpt <i>lenght=400</i>]</code> - <?php \esc_html_e( 'The post\'s excerpt (default 400 chars). length parameter is optional.', 'activitypub' ); ?></li>
-										<li><code>[ap_permalink <i>type=url</i>]</code> - <?php \esc_html_e( 'The post\'s permalink. Type can be either: url (default, the escaped url), html (an a tag to the url).', 'activitypub' ); ?></li>
-										<?php // translators: ?>
-										<li><code>[ap_shortlink <i>type=url</i>]</code> - <?php echo \wp_kses( \__( 'The post\'s shortlink. I can recommend <a href="https://wordpress.org/plugins/hum/" target="_blank">Hum</a>, to prettify the Shortlinks. Type can be either: url (default, the escaped url), html (an a tag to the url).', 'activitypub' ), 'default' ); ?></li>
+										<li><code>[ap_excerpt]</code> - <?php \esc_html_e( 'The post\'s excerpt (default 400 chars).', 'activitypub' ); ?></li>
+										<li><code>[ap_permalink]</code> - <?php \esc_html_e( 'The post\'s permalink.', 'activitypub' ); ?></li>
+										<li><code>[ap_shortlink]</code> - <?php echo \wp_kses( \__( 'The post\'s shortlink. I can recommend <a href="https://wordpress.org/plugins/hum/" target="_blank">Hum</a>.', 'activitypub' ), 'default' ); ?></li>
 										<li><code>[ap_hashtags]</code> - <?php \esc_html_e( 'The post\'s tags as hashtags.', 'activitypub' ); ?></li>
 										<li><code>[ap_hashcats]</code> - <?php \esc_html_e( 'The post\'s categories as hashtags.', 'activitypub' ); ?></li>
-										<li><code>[ap_image <i>type=full</i>]</code> - <?php \esc_html_e( 'The URL for the post\'s featured image, defaults to full size. The type attribute can be any of the following: thumbnail, medium, large, full', 'activitypub' ); ?></li>
-										<li><code>[ap_author]</code> - <?php \esc_html_e( 'The author\'s name.', 'activitypub' ); ?></li>
-										<li><code>[ap_authorurl]</code> - <?php \esc_html_e( 'The URL to the author\'s profile page.', 'activitypub' ); ?></li>
-										<li><code>[ap_date]</code> - <?php \esc_html_e( 'The post\'s date.', 'activitypub' ); ?></li>
-										<li><code>[ap_time]</code> - <?php \esc_html_e( 'The post\'s time.', 'activitypub' ); ?></li>
-										<li><code>[ap_datetime]</code> - <?php \esc_html_e( 'The post\'s date/time formated as "date @ time".', 'activitypub' ); ?></li>
-										<li><code>[ap_blogurl]</code> - <?php \esc_html_e( 'The URL to the site.', 'activitypub' ); ?></li>
-										<li><code>[ap_blogname]</code> - <?php \esc_html_e( 'The name of the site.', 'activitypub' ); ?></li>
-										<li><code>[ap_blogdesc]</code> - <?php \esc_html_e( 'The description of the site.', 'activitypub' ); ?></li>
+										<li><code>[ap_image]</code> - <?php \esc_html_e( 'The URL for the post\'s featured image.', 'activitypub' ); ?></li>
 									</ul>
-									<p><?php esc_html_e( 'Note: the old template codes are now deprecated and automatically converted to the new shortcodes.', 'activitypub' ); ?>
+									<p><?php \esc_html_e( 'You can find the full list with all possible attributes in the help section on the top-right of the screen.', 'activitypub' ); ?></p>
 								</div>
 							</details>
 						</p>
-						<?php // translators: ?>
-						<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' ), 'activitypub' ); ?></p>
 					</td>
 				</tr>
 				<tr>