treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Minor refactoring and fixups

lolsob-rspec
Thibaut Girka 2020-09-19 13:53:24 +02:00 committed by ThibG
parent 42c6a85139
commit 4e59bb5f9f
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/javascript/flavours/glitch/actions/notifications.js
View File

@ -18,6 +18,7 @@ import compareId from 'flavours/glitch/util/compare_id';
import { searchTextFromRawStatus } from 'flavours/glitch/actions/importer/normalizer'; import { searchTextFromRawStatus } from 'flavours/glitch/actions/importer/normalizer';
export const NOTIFICATIONS_UPDATE = 'NOTIFICATIONS_UPDATE'; export const NOTIFICATIONS_UPDATE = 'NOTIFICATIONS_UPDATE';
export const NOTIFICATIONS_UPDATE_NOOP = 'NOTIFICATIONS_UPDATE_NOOP';
// tracking the notif cleaning request // tracking the notif cleaning request
export const NOTIFICATIONS_DELETE_MARKED_REQUEST = 'NOTIFICATIONS_DELETE_MARKED_REQUEST'; export const NOTIFICATIONS_DELETE_MARKED_REQUEST = 'NOTIFICATIONS_DELETE_MARKED_REQUEST';

1
app/javascript/flavours/glitch/features/notifications/components/notification.js
View File

@ -22,6 +22,7 @@ export default class Notification extends ImmutablePureComponent {
cacheMediaWidth: PropTypes.func, cacheMediaWidth: PropTypes.func,
cachedMediaWidth: PropTypes.number, cachedMediaWidth: PropTypes.number,
onUnmount: PropTypes.func, onUnmount: PropTypes.func,
unread: PropTypes.bool,
}; };
render () { render () {

6
app/javascript/flavours/glitch/reducers/notifications.js
View File

@ -138,16 +138,16 @@ const updateTop = (state, top) => {
state = clearUnread(state); state = clearUnread(state);
} }
return state.set('top', top); return state;
}; };
const deleteByStatus = (state, statusId) => { const deleteByStatus = (state, statusId) => {
const top = !(shouldCountUnreadNotifications(state)); if (shouldCountUnreadNotifications(state)) {
if (!top) {
const lastReadId = state.get('lastReadId'); const lastReadId = state.get('lastReadId');
const deletedUnread = state.get('items').filter(item => item !== null && item.get('status') === statusId && compareId(item.get('id'), lastReadId) > 0); const deletedUnread = state.get('items').filter(item => item !== null && item.get('status') === statusId && compareId(item.get('id'), lastReadId) > 0);
state = state.update('unread', unread => unread - deletedUnread.size); state = state.update('unread', unread => unread - deletedUnread.size);
} }
const helper = list => list.filterNot(item => item !== null && item.get('status') === statusId); const helper = list => list.filterNot(item => item !== null && item.get('status') === statusId);
const deletedUnread = state.get('pendingItems').filter(item => item !== null && item.get('status') === statusId && compareId(item.get('id'), lastReadId) > 0); const deletedUnread = state.get('pendingItems').filter(item => item !== null && item.get('status') === statusId && compareId(item.get('id'), lastReadId) > 0);
state = state.update('unread', unread => unread - deletedUnread.size); state = state.update('unread', unread => unread - deletedUnread.size);