Merge pull request #4407 from pixelfed/staging

Update AP Inbox, fix delete handling

CHANGELOG.md

@@ -50,8 +50,9 @@
 - Update admin dashboard, add mass account deletes ([b8426cce](https://github.com/pixelfed/pixelfed/commit/b8426cce))
 - Update scheduler, fix S3 media garbage collection not being executed when cloud storage is enabled via dashboard without .env/config being enabled ([adb070f1](https://github.com/pixelfed/pixelfed/commit/adb070f1))
 - Update MediaController, add fallback for local files that are later stored on S3 but still are referenced in cached objects remotely ([4973cb46](https://github.com/pixelfed/pixelfed/commit/4973cb46))
--  ([](https://github.com/pixelfed/pixelfed/commit/))
 - Update PublicTimelineService, improve warmCache query ([9f901d65](https://github.com/pixelfed/pixelfed/commit/9f901d65))
+- Update AP Inbox, fix delete handling ([2800c888](https://github.com/pixelfed/pixelfed/commit/2800c888))
+-  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ## [v0.11.6 (2023-05-03)](https://github.com/pixelfed/pixelfed/compare/v0.11.5...v0.11.6)
 

app/Util/ActivityPub/Helpers.php

@@ -479,8 +479,8 @@ class Helpers {
 				'profile_id' => $pid,
 				'url' => $url,
 				'object_url' => $id,
-				'caption' => strip_tags($activity['content']),
-				'rendered' => Purify::clean($activity['content']),
+				'caption' => isset($activity['content']) ? Purify::clean(strip_tags($activity['content'])) : null,
+				'rendered' => isset($activity['content']) ? Purify::clean($activity['content']) : null,
 				'created_at' => Carbon::parse($ts)->tz('UTC'),
 				'in_reply_to_id' => $reply_to,
 				'local' => false,

app/Util/ActivityPub/Inbox.php

@@ -698,7 +698,7 @@ class Inbox
 							return;
 						}
 						$status = Status::whereProfileId($profile->id)
-							->whereUri($id)
+							->whereObjectUrl($id)
 							->first();
 						if(!$status) {
 							return;