Merge pull request #2810 from pixelfed/staging

Staging

CHANGELOG.md

@@ -20,6 +20,8 @@
 - Updated AP Helpers, generate notification for remote replies. ([8edd8294](https://github.com/pixelfed/pixelfed/commit/8edd8294))
 - Updated like api, store status_profile_id and is_comment. ([c8c6b983](https://github.com/pixelfed/pixelfed/commit/c8c6b983))
 - Updated Remote Post + Profile hashtag to redirect to local urls. ([1fa08644](https://github.com/pixelfed/pixelfed/commit/1fa08644))
+- Updated Inbox, delete notifications on tombstone. ([ef63124d](https://github.com/pixelfed/pixelfed/commit/ef63124d))
+- Updated NotificationCard, fix missing status bug. ([a3a86d46](https://github.com/pixelfed/pixelfed/commit/a3a86d46))
 -  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ## [v0.11.0 (2021-06-01)](https://github.com/pixelfed/pixelfed/compare/v0.10.10...v0.11.0)

app/Util/ActivityPub/Inbox.php

@@ -500,6 +500,10 @@ class Inbox
 							->orWhere('url', $id)
 							->orWhere('object_url', $id)
 							->first();
+						Notification::whereActorId($profile->id)
+							->whereItemType('App\Status')
+							->whereItemId($status->id)
+							->forceDelete();
 						if(!$status) {
 							return;
 						}

resources/assets/js/components/NotificationCard.vue

@@ -130,8 +130,19 @@
 			fetchNotifications() {
 				axios.get('/api/pixelfed/v1/notifications?pg=true')
 				.then(res => {
-					let data = res.data;
-					let ids = res.data.map(n => n.id);
+					let data = res.data.filter(n => {
+						if(n.type == 'share' && !status) {
+							return false;
+						}
+						if(n.type == 'comment' && !status) {
+							return false;
+						}
+						if(n.type == 'mention' && !status) {
+							return false;
+						}
+						return true;
+					});
+					let ids = data.map(n => n.id);
 					this.notificationMaxId = Math.min(...ids);
 					this.notifications = data;
 					this.loading = false;
@@ -154,11 +165,19 @@
 							if(n.type == 'share' && !status) {
 								return false;
 							}
+							if(n.type == 'comment' && !status) {
+								return false;
+							}
+							if(n.type == 'mention' && !status) {
+								return false;
+							}
 							if(_.find(this.notifications, {id: n.id})) {
 								return false;
 							}
 							return true;
 						});
+						let ids = data.map(n => n.id);
+						this.notificationMaxId = Math.min(...ids);
 						this.notifications.push(...data);
 						this.notificationCursor++;
 						$state.loaded();