From 0e193914fa50e127460264f2f5281375c896a65d Mon Sep 17 00:00:00 2001
From: Matthias Pfefferle <pfefferle@users.noreply.github.com>
Date: Thu, 4 May 2023 09:01:23 +0200
Subject: [PATCH 1/2] update URLs

---
 README.md  | 8 ++++++--
 readme.txt | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index d1b4461b..d7a96625 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 **Contributors:** [pfefferle](https://profiles.wordpress.org/pfefferle/), [mediaformat](https://profiles.wordpress.org/mediaformat/), [akirk](https://profiles.wordpress.org/akirk/), [automattic](https://profiles.wordpress.org/automattic/)  
 **Tags:** OStatus, fediverse, activitypub, activitystream  
 **Requires at least:** 4.7  
-**Tested up to:** 6.1  
+**Tested up to:** 6.2  
 **Stable tag:** 0.17.0  
 **Requires PHP:** 5.6  
 **License:** MIT  
@@ -111,7 +111,11 @@ Where 'blog' is the path to the subdirectory at which your blog resides.
 
 ## Changelog ##
 
-Project maintained on GitHub at [pfefferle/wordpress-activitypub](https://github.com/pfefferle/wordpress-activitypub).
+Project maintained on GitHub at [automattic/wordpress-activitypub](https://github.com/automattic/wordpress-activitypub).
+
+### Next ###
+
+* Compatibility: indicate that the plugin is compatible and has been tested with the latest version of WordPress, 6.2.
 
 ### 0.17.0 ###
 
diff --git a/readme.txt b/readme.txt
index e89c7686..3f9f7f06 100644
--- a/readme.txt
+++ b/readme.txt
@@ -111,7 +111,7 @@ Where 'blog' is the path to the subdirectory at which your blog resides.
 
 == Changelog ==
 
-Project maintained on GitHub at [pfefferle/wordpress-activitypub](https://github.com/pfefferle/wordpress-activitypub).
+Project maintained on GitHub at [automattic/wordpress-activitypub](https://github.com/automattic/wordpress-activitypub).
 
 = Next =
 

From e489a048808abd285fdedc048971d6fc673f8985 Mon Sep 17 00:00:00 2001
From: Matthias Pfefferle <pfefferle@users.noreply.github.com>
Date: Thu, 4 May 2023 09:32:52 +0200
Subject: [PATCH 2/2] remove unused constants

---
 activitypub.php          | 3 +--
 includes/class-admin.php | 4 ++--
 includes/functions.php   | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/activitypub.php b/activitypub.php
index 38886ff3..d61af85d 100644
--- a/activitypub.php
+++ b/activitypub.php
@@ -23,9 +23,8 @@ 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_USERNAME_REGEXP' ) || \define( 'ACTIVITYPUB_USERNAME_REGEXP', '(?:([A-Za-z0-9_-]+)@((?:[A-Za-z0-9_-]+\.)+[A-Za-z]+))' );
-	\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>[ap_title]</strong></p>\n\n[ap_content]\n\n<p>[ap_hashtags]</p>\n\n<p>[ap_shortlink]</p>" );
-	\defined( 'ACTIVITYPUB_USER_DESCRIPTION_KEY' ) || \define( 'ACTIVITYPUB_USER_DESCRIPTION_KEY', 'activitypub_user_description' );
+
 	\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/class-admin.php b/includes/class-admin.php
index 66966f9b..5329d3a6 100644
--- a/includes/class-admin.php
+++ b/includes/class-admin.php
@@ -156,7 +156,7 @@ class Admin {
 	}
 
 	public static function add_fediverse_profile( $user ) {
-		$description = get_user_meta( $user->ID, ACTIVITYPUB_USER_DESCRIPTION_KEY, true );
+		$description = get_user_meta( $user->ID, 'activitypub_user_description', true );
 
 		\load_template(
 			ACTIVITYPUB_PLUGIN_DIR . 'templates/user-settings.php',
@@ -174,7 +174,7 @@ class Admin {
 		if ( ! current_user_can( 'edit_user', $user_id ) ) {
 			return false;
 		}
-		update_user_meta( $user_id, ACTIVITYPUB_USER_DESCRIPTION_KEY, sanitize_text_field( $_POST['activitypub-user-description'] ) );
+		update_user_meta( $user_id, 'activitypub_user_description', sanitize_text_field( $_POST['activitypub-user-description'] ) );
 	}
 
 	public static function enqueue_scripts( $hook_suffix ) {
diff --git a/includes/functions.php b/includes/functions.php
index 4d44853e..e115c70f 100644
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -312,7 +312,7 @@ function url_to_authorid( $url ) {
  * @return string
  */
 function get_author_description( $user_id ) {
-	$description = get_user_meta( $user_id, ACTIVITYPUB_USER_DESCRIPTION_KEY, true );
+	$description = get_user_meta( $user_id, 'activitypub_user_description', true );
 	if ( empty( $description ) ) {
 		$description = get_user_meta( $user_id, 'description', true );
 	}