From 6b1c9afe4a606e8dbc7c6641777a0e4700ba80e7 Mon Sep 17 00:00:00 2001 From: Claire Date: Fri, 3 Jan 2025 11:01:18 +0100 Subject: [PATCH] Remove unused notifications actions and reducers --- .../mastodon/actions/notifications.js | 26 --------------- .../mastodon/reducers/notifications.js | 33 ------------------- 2 files changed, 59 deletions(-) diff --git a/app/javascript/mastodon/actions/notifications.js b/app/javascript/mastodon/actions/notifications.js index 4c6e27cd5f..4b9afd2cbe 100644 --- a/app/javascript/mastodon/actions/notifications.js +++ b/app/javascript/mastodon/actions/notifications.js @@ -32,14 +32,8 @@ export const NOTIFICATIONS_EXPAND_FAIL = 'NOTIFICATIONS_EXPAND_FAIL'; export const NOTIFICATIONS_FILTER_SET = 'NOTIFICATIONS_FILTER_SET'; -export const NOTIFICATIONS_SCROLL_TOP = 'NOTIFICATIONS_SCROLL_TOP'; export const NOTIFICATIONS_LOAD_PENDING = 'NOTIFICATIONS_LOAD_PENDING'; -export const NOTIFICATIONS_MOUNT = 'NOTIFICATIONS_MOUNT'; -export const NOTIFICATIONS_UNMOUNT = 'NOTIFICATIONS_UNMOUNT'; - -export const NOTIFICATIONS_MARK_AS_READ = 'NOTIFICATIONS_MARK_AS_READ'; - export const NOTIFICATIONS_SET_BROWSER_SUPPORT = 'NOTIFICATIONS_SET_BROWSER_SUPPORT'; export const NOTIFICATIONS_SET_BROWSER_PERMISSION = 'NOTIFICATIONS_SET_BROWSER_PERMISSION'; @@ -223,13 +217,6 @@ export function expandNotificationsFail(error, isLoadingMore) { }; } -export function scrollTopNotifications(top) { - return { - type: NOTIFICATIONS_SCROLL_TOP, - top, - }; -} - export function setFilter (filterType) { return dispatch => { dispatch({ @@ -242,19 +229,6 @@ export function setFilter (filterType) { }; } -export const mountNotifications = () => ({ - type: NOTIFICATIONS_MOUNT, -}); - -export const unmountNotifications = () => ({ - type: NOTIFICATIONS_UNMOUNT, -}); - - -export const markNotificationsAsRead = () => ({ - type: NOTIFICATIONS_MARK_AS_READ, -}); - // Browser support export function setupBrowserNotifications() { return dispatch => { diff --git a/app/javascript/mastodon/reducers/notifications.js b/app/javascript/mastodon/reducers/notifications.js index c99a619b52..0e9bb6a8bb 100644 --- a/app/javascript/mastodon/reducers/notifications.js +++ b/app/javascript/mastodon/reducers/notifications.js @@ -23,11 +23,7 @@ import { NOTIFICATIONS_EXPAND_REQUEST, NOTIFICATIONS_EXPAND_FAIL, NOTIFICATIONS_FILTER_SET, - NOTIFICATIONS_SCROLL_TOP, NOTIFICATIONS_LOAD_PENDING, - NOTIFICATIONS_MOUNT, - NOTIFICATIONS_UNMOUNT, - NOTIFICATIONS_MARK_AS_READ, NOTIFICATIONS_SET_BROWSER_SUPPORT, NOTIFICATIONS_SET_BROWSER_PERMISSION, } from '../actions/notifications'; @@ -186,16 +182,6 @@ const clearUnread = (state) => { return state.set('lastReadId', lastNotification ? lastNotification.get('id') : '0'); }; -const updateTop = (state, top) => { - state = state.set('top', top); - - if (!shouldCountUnreadNotifications(state)) { - state = clearUnread(state); - } - - return state; -}; - const deleteByStatus = (state, statusId) => { const lastReadId = state.get('lastReadId'); @@ -210,15 +196,6 @@ const deleteByStatus = (state, statusId) => { return state.update('items', helper).update('pendingItems', helper); }; -const updateMounted = (state) => { - state = state.update('mounted', count => count + 1); - if (!shouldCountUnreadNotifications(state, state.get('mounted') === 1)) { - state = state.set('readMarkerId', state.get('lastReadId')); - state = clearUnread(state); - } - return state; -}; - const updateVisibility = (state, visibility) => { state = state.set('isTabVisible', visibility); if (!shouldCountUnreadNotifications(state)) { @@ -259,10 +236,6 @@ export default function notifications(state = initialState, action) { switch(action.type) { case fetchMarkers.fulfilled.type: return action.payload.markers.notifications ? recountUnread(state, action.payload.markers.notifications.last_read_id) : state; - case NOTIFICATIONS_MOUNT: - return updateMounted(state); - case NOTIFICATIONS_UNMOUNT: - return state.update('mounted', count => count - 1); case focusApp.type: return updateVisibility(state, true); case unfocusApp.type: @@ -275,8 +248,6 @@ export default function notifications(state = initialState, action) { return state.update('isLoading', (nbLoading) => nbLoading - 1); case NOTIFICATIONS_FILTER_SET: return state.set('items', ImmutableList()).set('pendingItems', ImmutableList()).set('hasMore', true); - case NOTIFICATIONS_SCROLL_TOP: - return updateTop(state, action.top); case notificationsUpdate.type: return normalizeNotification(state, action.payload.notification, action.payload.usePendingItems); case NOTIFICATIONS_EXPAND_SUCCESS: @@ -298,10 +269,6 @@ export default function notifications(state = initialState, action) { return action.payload.timeline === 'home' ? state.update(action.payload.usePendingItems ? 'pendingItems' : 'items', items => items.first() ? items.unshift(null) : items) : state; - case NOTIFICATIONS_MARK_AS_READ: { - const lastNotification = state.get('items').find(item => item !== null); - return lastNotification ? recountUnread(state, lastNotification.get('id')) : state; - } case NOTIFICATIONS_SET_BROWSER_SUPPORT: return state.set('browserSupport', action.value); case NOTIFICATIONS_SET_BROWSER_PERMISSION: