Update Notifications.vue component, fix filtering logic to prevent endless spinner

dansup · dansup · commit 3df9b53f4e81 · 2023-06-02T05:30:11.000-06:00
diff --git 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) {

Original file line number	Diff line number	Diff line change
`@@ -234,16 +234,16 @@`
`234`	`234`	`return;`
`235`	`235`	`}`
`236`	`236`	`let data = res.data.filter(n => {`
`237`		`- if(n.type == 'share' && !n.status) {`
	`237`	`+ if(n.type == 'share' && (!n.status \|\| !n.account)) {`
`238`	`238`	`return false;`
`239`	`239`	`}`
`240`		`- if(n.type == 'comment' && !n.status) {`
	`240`	`+ if(n.type == 'comment' && (!n.status \|\| !n.account)) {`
`241`	`241`	`return false;`
`242`	`242`	`}`
`243`		`- if(n.type == 'mention' && !n.status) {`
	`243`	`+ if(n.type == 'mention' && (!n.status \|\| !n.account)) {`
`244`	`244`	`return false;`
`245`	`245`	`}`
`246`		`- if(n.type == 'favourite' && !n.status) {`
	`246`	`+ if(n.type == 'favourite' && (!n.status \|\| !n.account)) {`
`247`	`247`	`return false;`
`248`	`248`	`}`
`249`	`249`	`if(n.type == 'follow' && !n.account) {`