From 713de650a53dbcb071fa8d9913d42d5e379f5ae2 Mon Sep 17 00:00:00 2001
From: Lai Power <kawaiipunk@posteo.net>
Date: Mon, 21 Mar 2022 13:34:54 +0000
Subject: [PATCH] updated plugin `ActivityPub` version 0.13.3

---
 wp-content/plugins/activitypub/activitypub.php            | 2 +-
 .../plugins/activitypub/includes/model/class-activity.php | 4 +++-
 wp-content/plugins/activitypub/readme.txt                 | 8 ++++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/wp-content/plugins/activitypub/activitypub.php b/wp-content/plugins/activitypub/activitypub.php
index c54be221..dd7b6737 100644
--- a/wp-content/plugins/activitypub/activitypub.php
+++ b/wp-content/plugins/activitypub/activitypub.php
@@ -3,7 +3,7 @@
  * Plugin Name: ActivityPub
  * Plugin URI: https://github.com/pfefferle/wordpress-activitypub/
  * Description: The ActivityPub protocol is a decentralized social networking protocol based upon the ActivityStreams 2.0 data format.
- * Version: 0.13.2
+ * Version: 0.13.3
  * Author: Matthias Pfefferle
  * Author URI: https://notiz.blog/
  * License: MIT
diff --git a/wp-content/plugins/activitypub/includes/model/class-activity.php b/wp-content/plugins/activitypub/includes/model/class-activity.php
index 1b5931e9..b6cc2515 100644
--- a/wp-content/plugins/activitypub/includes/model/class-activity.php
+++ b/wp-content/plugins/activitypub/includes/model/class-activity.php
@@ -55,8 +55,10 @@ class Activity {
 			$this->actor = $object['attributedTo'];
 		}
 
+		$type = \strtolower( $this->type );
+
 		if ( isset( $object['id'] ) ) {
-			$this->id = $object['id'];
+			$this->id = add_query_arg( 'activity', $type, $object['id'] );
 		}
 	}
 
diff --git a/wp-content/plugins/activitypub/readme.txt b/wp-content/plugins/activitypub/readme.txt
index 16550323..244327cf 100644
--- a/wp-content/plugins/activitypub/readme.txt
+++ b/wp-content/plugins/activitypub/readme.txt
@@ -3,8 +3,8 @@ Contributors: pfefferle, mediaformat
 Donate link: https://notiz.blog/donate/
 Tags: OStatus, fediverse, activitypub, activitystream
 Requires at least: 4.7
-Tested up to: 5.8
-Stable tag: 0.13.2
+Tested up to: 5.9
+Stable tag: 0.13.3
 Requires PHP: 5.6
 License: MIT
 License URI: http://opensource.org/licenses/MIT
@@ -88,6 +88,10 @@ Where 'blog' is the path to the subdirectory at which your blog resides.
 
 Project maintained on GitHub at [pfefferle/wordpress-activitypub](https://github.com/pfefferle/wordpress-activitypub).
 
+= 0.13.3 =
+
+* fix: Create and Note should not have the same ActivityPub ID
+
 = 0.13.2 =
 
 * fix Follow issue AGAIN