Merge pull request #2811 from pixelfed/staging

Staging

CHANGELOG.md

@@ -22,6 +22,7 @@
 - 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))
+- Updated Activity component, fix comment bug. ([9a2db8eb](https://github.com/pixelfed/pixelfed/commit/9a2db8eb))
 -  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ## [v0.11.0 (2021-06-01)](https://github.com/pixelfed/pixelfed/compare/v0.10.10...v0.11.0)

public/mix-manifest.json

@@ -2,7 +2,7 @@
     "/js/manifest.js": "/js/manifest.js?id=7db827d654313dce4250",
     "/js/vendor.js": "/js/vendor.js?id=a818775c694ed2a103e9",
     "/js/ace.js": "/js/ace.js?id=11e5550a450fece75c33",
-    "/js/activity.js": "/js/activity.js?id=f0812b1955bb467b43dd",
+    "/js/activity.js": "/js/activity.js?id=4a842807331f87a15e7f",
     "/js/admin.js": "/js/admin.js?id=8d48022b71fa67e40d80",
     "/js/app.js": "/js/app.js?id=21e5dee579887e5192ab",
     "/css/app.css": "/css/app.css?id=b8654ac6bc3bc7bdc2b0",

resources/assets/js/components/Activity.vue

@@ -144,6 +144,12 @@ export default {
 					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 = res.data.map(n => n.id);
@@ -170,6 +176,12 @@ export default {
 						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;
 						}