From 2800c8886a80d0a4492a36c5f90671e1bb7ff2e0 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 23 May 2023 02:54:02 -0600 Subject: [PATCH 1/2] Update AP Inbox, fix delete handling --- app/Util/ActivityPub/Helpers.php | 4 ++-- app/Util/ActivityPub/Inbox.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Util/ActivityPub/Helpers.php b/app/Util/ActivityPub/Helpers.php index 563cca7fe..a61e1d572 100644 --- a/app/Util/ActivityPub/Helpers.php +++ b/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, diff --git a/app/Util/ActivityPub/Inbox.php b/app/Util/ActivityPub/Inbox.php index 70dea452a..790a48e8d 100644 --- a/app/Util/ActivityPub/Inbox.php +++ b/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; From 39a42c637f9625bc2ec309e0f44f2939b868cfa5 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 23 May 2023 02:54:53 -0600 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 55050e5d7..999b9f305 100644 --- a/CHANGELOG.md +++ b/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)