From 2e4f23779d10e4ab0ba876fb8d378f400feabe24 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 16 Aug 2022 03:32:37 -0600 Subject: [PATCH 1/2] Remove remote posts from NetworkTimelineService when processing Tombstones --- app/Util/ActivityPub/Inbox.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Util/ActivityPub/Inbox.php b/app/Util/ActivityPub/Inbox.php index 0500ebd2f..42d9c7a83 100644 --- a/app/Util/ActivityPub/Inbox.php +++ b/app/Util/ActivityPub/Inbox.php @@ -38,6 +38,7 @@ use App\Services\PollService; use App\Services\FollowerService; use App\Services\StatusService; use App\Services\UserFilterService; +use App\Services\NetworkTimelineService; use App\Models\Conversation; use App\Jobs\ProfilePipeline\IncrementPostCount; use App\Jobs\ProfilePipeline\DecrementPostCount; @@ -659,6 +660,7 @@ class Inbox if(!$status) { return; } + NetworkTimelineService::del($status->id); StatusService::del($status->id, true); Notification::whereActorId($profile->id) ->whereItemType('App\Status') From 284d6fedafd67b152cedd8ce37480ca283b55e2a Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 16 Aug 2022 03:33:17 -0600 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d0ee5b2e9..cf59ca7ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -61,6 +61,7 @@ - Improve mute/block v1 api endpoints, fixes #3540 ([c3e8a0e4](https://github.com/pixelfed/pixelfed/commit/c3e8a0e4)) - Set Last-Modified header for atom feeds, fixes #2988 ([c18dcde3](https://github.com/pixelfed/pixelfed/commit/c18dcde3)) - Add instance post/profile embed config setting ([7734dc03](https://github.com/pixelfed/pixelfed/commit/7734dc03)) +- Remove remote posts from NetworkTimelineService when processing Tombstones ([2e4f2377](https://github.com/pixelfed/pixelfed/commit/2e4f2377)) - ([](https://github.com/pixelfed/pixelfed/commit/)) ## [v0.11.3 (2022-05-09)](https://github.com/pixelfed/pixelfed/compare/v0.11.2...v0.11.3)