Merge pull request #4443 from pixelfed/staging

Update Notifications.vue component, fix filtering logic to prevent en…
2024-12-20 12:03:16 +00:00 · 2023-06-02 05:32:57 -06:00 · 2023-06-02 05:32:57 -06:00 · ad88a07118
commit ad88a07118
parent 70e82038a7 69a53d0fa1
14 changed files with 6 additions and 4 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -2,6 +2,8 @@

 ## [Unreleased](https://github.com/pixelfed/pixelfed/compare/v0.11.8...dev)

+### Updates
+- Update Notifications.vue component, fix filtering logic to prevent endless spinner ([3df9b53f](https://github.com/pixelfed/pixelfed/commit/3df9b53f))
 -  ([](https://github.com/pixelfed/pixelfed/commit/))

 ## [v0.11.8 (2023-05-29)](https://github.com/pixelfed/pixelfed/compare/v0.11.7...v0.11.8)
--- a/public/js/discover.chunk.5d1455b7a1531f25.js
+++ b/public/js/discover.chunk.5d1455b7a1531f25.js
--- a/public/js/discover.chunk.93193c6ec9a42fc4.js
+++ b/public/js/discover.chunk.93193c6ec9a42fc4.js
--- a/public/js/discover~hashtag.bundle.0f0dea872c1b644e.js
+++ b/public/js/discover~hashtag.bundle.0f0dea872c1b644e.js
--- a/public/js/discover~hashtag.bundle.10cb33346c033ea7.js
+++ b/public/js/discover~hashtag.bundle.10cb33346c033ea7.js
--- a/public/js/home.chunk.0e9fc41724d23244.js
+++ b/public/js/home.chunk.0e9fc41724d23244.js
--- a/public/js/home.chunk.0e9fc41724d23244.js.LICENSE.txt
+++ b/public/js/home.chunk.0e9fc41724d23244.js.LICENSE.txt
--- a/public/js/home.chunk.5e2199ecf7058763.js
+++ b/public/js/home.chunk.5e2199ecf7058763.js
--- a/public/js/manifest.js
+++ b/public/js/manifest.js
--- a/public/js/post.chunk.7c05c9ede39712e0.js
+++ b/public/js/post.chunk.7c05c9ede39712e0.js
--- a/public/js/post.chunk.7c05c9ede39712e0.js.LICENSE.txt
+++ b/public/js/post.chunk.7c05c9ede39712e0.js.LICENSE.txt
--- a/public/js/post.chunk.df55c616763e284d.js
+++ b/public/js/post.chunk.df55c616763e284d.js
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
--- a/resources/assets/components/sections/Notifications.vue
+++ b/resources/assets/components/sections/Notifications.vue
@ -234,16 +234,16 @@
 						return;
 					}
 					let data = res.data.filter(n => {
-						if(n.type == 'share' && !n.status) {
+						if(n.type == 'share' && (!n.status || !n.account)) {
 							return false;
 						}
-						if(n.type == 'comment' && !n.status) {
+						if(n.type == 'comment' && (!n.status || !n.account)) {
 							return false;
 						}
-						if(n.type == 'mention' && !n.status) {
+						if(n.type == 'mention' && (!n.status || !n.account)) {
 							return false;
 						}
-						if(n.type == 'favourite' && !n.status) {
+						if(n.type == 'favourite' && (!n.status || !n.account)) {
 							return false;
 						}
 						if(n.type == 'follow' && !n.account) {