diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-01-14 16:14:51 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-01-14 16:14:51 +0300 |
| commit | 40c4a49223daaa95ee6e1597e84ced9bd5401865 (patch) | |
| tree | d6fadeeab4ecdec4cd66f688420957462ef2ee9b | |
| parent | 99db89fa17a2fe4401519f050f1bf1ea4f0e0714 (diff) | |
| parent | dd740043c658f312b6331a6b715592c9d50c50e7 (diff) | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop
| -rw-r--r-- | CHANGELOG.md | 16 | ||||
| -rw-r--r-- | src/services/notifications_fetcher/notifications_fetcher.service.js | 7 |
2 files changed, 19 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d6ef1a5..2e17dc64 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,21 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [Unreleased] +### Fixed +- Single notifications left unread when hitting read on another device/tab + +## [1.1.8] - 2020-01-10 +### Added +- Icons in nav panel +- Private mode support +- Support for 'Move' type notifications +- Pleroma AMOLED dark theme +### Changed +- 403 messaging +### Fixed +- Deactivation of remote accounts from frontend + +## [1.1.7 and earlier] - 2019-12-14 ### Added - Ability to hide/show repeats from user - User profile button clutter organized into a menu @@ -11,6 +26,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Started changelog anew - Ability to change user's email - About page +- Added remote user redirect ### Changed - changed the way fading effects for user profile/long statuses works, now uses css-mask instead of gradient background hacks which weren't exactly compatible with semi-transparent themes ### Fixed diff --git a/src/services/notifications_fetcher/notifications_fetcher.service.js b/src/services/notifications_fetcher/notifications_fetcher.service.js index 47008026..64499a1b 100644 --- a/src/services/notifications_fetcher/notifications_fetcher.service.js +++ b/src/services/notifications_fetcher/notifications_fetcher.service.js @@ -2,7 +2,6 @@ import apiService from '../api/api.service.js' const update = ({ store, notifications, older }) => { store.dispatch('setNotificationsError', { value: false }) - store.dispatch('addNewNotifications', { notifications, older }) } @@ -30,9 +29,9 @@ const fetchAndUpdate = ({ store, credentials, older = false }) => { // load unread notifications repeatedly to provide consistency between browser tabs const notifications = timelineData.data - const unread = notifications.filter(n => !n.seen).map(n => n.id) - if (unread.length) { - args['since'] = Math.min(...unread) + const readNotifsIds = notifications.filter(n => n.seen).map(n => n.id) + if (readNotifsIds.length) { + args['since'] = Math.max(...readNotifsIds) fetchNotifications({ store, args, older }) } |