Merge pull request #3625 from pixelfed/staging

Staging

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)

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')