Merge pull request #4443 from pixelfed/staging

Update Notifications.vue component, fix filtering logic to prevent en…
This commit is contained in:
daniel 2023-06-02 05:32:57 -06:00 committed by GitHub
commit ad88a07118
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 6 additions and 4 deletions

View file

@ -2,6 +2,8 @@
## [Unreleased](https://github.com/pixelfed/pixelfed/compare/v0.11.8...dev) ## [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/)) - ([](https://github.com/pixelfed/pixelfed/commit/))
## [v0.11.8 (2023-05-29)](https://github.com/pixelfed/pixelfed/compare/v0.11.7...v0.11.8) ## [v0.11.8 (2023-05-29)](https://github.com/pixelfed/pixelfed/compare/v0.11.7...v0.11.8)

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
public/js/home.chunk.0e9fc41724d23244.js vendored Normal file

Binary file not shown.

Binary file not shown.

BIN
public/js/manifest.js vendored

Binary file not shown.

BIN
public/js/post.chunk.7c05c9ede39712e0.js vendored Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -234,16 +234,16 @@
return; return;
} }
let data = res.data.filter(n => { let data = res.data.filter(n => {
if(n.type == 'share' && !n.status) { if(n.type == 'share' && (!n.status || !n.account)) {
return false; return false;
} }
if(n.type == 'comment' && !n.status) { if(n.type == 'comment' && (!n.status || !n.account)) {
return false; return false;
} }
if(n.type == 'mention' && !n.status) { if(n.type == 'mention' && (!n.status || !n.account)) {
return false; return false;
} }
if(n.type == 'favourite' && !n.status) { if(n.type == 'favourite' && (!n.status || !n.account)) {
return false; return false;
} }
if(n.type == 'follow' && !n.account) { if(n.type == 'follow' && !n.account) {