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;
 						}

public/mix-manifest.json

@@ -21,7 +21,7 @@
     "/js/hashtag.js": "/js/hashtag.js?id=8137c9aeac44cd972dbc",
     "/js/loops.js": "/js/loops.js?id=ae34b77c4cfe1824f5a0",
     "/js/mode-dot.js": "/js/mode-dot.js?id=dd9c87024fbaa8e75ac4",
-    "/js/network-timeline.js": "/js/network-timeline.js?id=b73e5496518096a424a1",
+    "/js/network-timeline.js": "/js/network-timeline.js?id=df34e2f507a52792ad03",
     "/js/profile.js": "/js/profile.js?id=e0365f377fb6c574fda4",
     "/js/profile-directory.js": "/js/profile-directory.js?id=e63d5f2c6f2d5710a8bd",
     "/js/quill.js": "/js/quill.js?id=4769f11fc9a6c32dde50",
@@ -31,5 +31,5 @@
     "/js/status.js": "/js/status.js?id=ce91385c7214bfa91c29",
     "/js/story-compose.js": "/js/story-compose.js?id=e93760b2356732faecf8",
     "/js/theme-monokai.js": "/js/theme-monokai.js?id=85f0af57479412548223",
-    "/js/timeline.js": "/js/timeline.js?id=f210ff14c6da30f6744a"
+    "/js/timeline.js": "/js/timeline.js?id=eb4a49daa9c2b010b854"
 }

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();