Archos/masto-fe-archos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[build] upgrade eslint to 9.37.0 (#88)

Browse Source 
Co-authored-by: tobi <tobi.smethurst@protonmail.com>
Reviewed-on: https://codeberg.org/superseriousbusiness/masto-fe-standalone/pulls/88
Co-authored-by: Zoë Bijl <moiety@noreply.codeberg.org>
Co-committed-by: Zoë Bijl <moiety@noreply.codeberg.org>
This commit is contained in:
Zoë Bijl
2025-10-12 13:42:02 +02:00
committed by tobi
parent 75d7a62693
commit 1ff70886a1
975 changed files with 22196 additions and 21964 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/javascript/mastodon/reducers/notifications.js
+115 -115
View File
@@ -1,20 +1,20 @@
import { fromJS, Map as ImmutableMap, List as ImmutableList } from 'immutable';
import { fromJS, Map as ImmutableMap, List as ImmutableList } from "immutable";
import { DOMAIN_BLOCK_SUCCESS } from 'mastodon/actions/domain_blocks';
import { DOMAIN_BLOCK_SUCCESS } from "mastodon/actions/domain_blocks";
import {
ACCOUNT_BLOCK_SUCCESS,
ACCOUNT_MUTE_SUCCESS,
FOLLOW_REQUEST_AUTHORIZE_SUCCESS,
FOLLOW_REQUEST_REJECT_SUCCESS,
} from '../actions/accounts';
} from "../actions/accounts";
import {
focusApp,
unfocusApp,
} from '../actions/app';
} from "../actions/app";
import {
MARKERS_FETCH_SUCCESS,
} from '../actions/markers';
} from "../actions/markers";
import {
NOTIFICATIONS_UPDATE,
NOTIFICATIONS_EXPAND_SUCCESS,
@@ -29,9 +29,9 @@ import {
NOTIFICATIONS_MARK_AS_READ,
NOTIFICATIONS_SET_BROWSER_SUPPORT,
NOTIFICATIONS_SET_BROWSER_PERMISSION,
} from '../actions/notifications';
import { TIMELINE_DELETE, TIMELINE_DISCONNECT } from '../actions/timelines';
import { compareId } from '../compare_id';
} from "../actions/notifications";
import { TIMELINE_DELETE, TIMELINE_DISCONNECT } from "../actions/timelines";
import { compareId } from "../compare_id";
const initialState = ImmutableMap({
pendingItems: ImmutableList(),
@@ -40,12 +40,12 @@ const initialState = ImmutableMap({
top: false,
mounted: 0,
unread: 0,
lastReadId: '0',
readMarkerId: '0',
lastReadId: "0",
readMarkerId: "0",
isTabVisible: true,
isLoading: 0,
browserSupport: false,
browserPermission: 'default',
browserPermission: "default",
});
const notificationToMap = notification => ImmutableMap({
@@ -58,24 +58,24 @@ const notificationToMap = notification => ImmutableMap({
});
const normalizeNotification = (state, notification, usePendingItems) => {
const top = state.get('top');
const top = state.get("top");
// Under currently unknown conditions, the client may receive duplicates from the server
if (state.get('pendingItems').some((item) => item?.get('id') === notification.id) || state.get('items').some((item) => item?.get('id') === notification.id)) {
if (state.get("pendingItems").some((item) => item?.get("id") === notification.id) || state.get("items").some((item) => item?.get("id") === notification.id)) {
return state;
}
if (usePendingItems || !state.get('pendingItems').isEmpty()) {
return state.update('pendingItems', list => list.unshift(notificationToMap(notification))).update('unread', unread => unread + 1);
if (usePendingItems || !state.get("pendingItems").isEmpty()) {
return state.update("pendingItems", list => list.unshift(notificationToMap(notification))).update("unread", unread => unread + 1);
}
if (shouldCountUnreadNotifications(state)) {
state = state.update('unread', unread => unread + 1);
state = state.update("unread", unread => unread + 1);
} else {
state = state.set('lastReadId', notification.id);
state = state.set("lastReadId", notification.id);
}
return state.update('items', list => {
return state.update("items", list => {
if (top && list.size > 40) {
list = list.take(20);
}
@@ -92,26 +92,26 @@ const expandNormalizedNotifications = (state, notifications, next, isLoadingMore
// - `notifications` may include items that are already included
// - this function can be called either to fill in a gap, or load newer items
const lastReadId = state.get('lastReadId');
const lastReadId = state.get("lastReadId");
const newItems = ImmutableList(notifications.map(notificationToMap));
return state.withMutations(mutable => {
if (!newItems.isEmpty()) {
usePendingItems = isLoadingRecent && (usePendingItems || !mutable.get('pendingItems').isEmpty());
usePendingItems = isLoadingRecent && (usePendingItems || !mutable.get("pendingItems").isEmpty());
mutable.update(usePendingItems ? 'pendingItems' : 'items', oldItems => {
mutable.update(usePendingItems ? "pendingItems" : "items", oldItems => {
// If called to poll *new* notifications, we just need to add them on top without duplicates
if (isLoadingRecent) {
const idsToCheck = oldItems.map(item => item?.get('id')).toSet();
const insertedItems = newItems.filterNot(item => idsToCheck.includes(item.get('id')));
const idsToCheck = oldItems.map(item => item?.get("id")).toSet();
const insertedItems = newItems.filterNot(item => idsToCheck.includes(item.get("id")));
return insertedItems.concat(oldItems);
}
// If called to expand more (presumably older than any known to the WebUI), we just have to
// add them to the bottom without duplicates
if (isLoadingMore) {
const idsToCheck = oldItems.map(item => item?.get('id')).toSet();
const insertedItems = newItems.filterNot(item => idsToCheck.includes(item.get('id')));
const idsToCheck = oldItems.map(item => item?.get("id")).toSet();
const insertedItems = newItems.filterNot(item => idsToCheck.includes(item.get("id")));
return oldItems.concat(insertedItems);
}
@@ -124,14 +124,14 @@ const expandNormalizedNotifications = (state, notifications, next, isLoadingMore
// First, find the furthest (if properly sorted, oldest) item in the notifications that is
// newer than the oldest fetched one, as it's most likely that it delimits the gap.
// Start the gap *after* that item.
const lastIndex = oldItems.findLastIndex(item => item !== null && compareId(item.get('id'), newItems.last().get('id')) >= 0) + 1;
const lastIndex = oldItems.findLastIndex(item => item !== null && compareId(item.get("id"), newItems.last().get("id")) >= 0) + 1;
// Then, try to find the furthest (if properly sorted, oldest) item in the notifications that
// is newer than the most recent fetched one, as it delimits a section comprised of only
// items older or within `newItems` (or that were deleted from the server, so should be removed
// anyway).
// Stop the gap *after* that item.
const firstIndex = oldItems.take(lastIndex).findLastIndex(item => item !== null && compareId(item.get('id'), newItems.first().get('id')) > 0) + 1;
const firstIndex = oldItems.take(lastIndex).findLastIndex(item => item !== null && compareId(item.get("id"), newItems.first().get("id")) > 0) + 1;
// At this point:
// - no `oldItems` after `firstIndex` is newer than any of the `newItems`
@@ -143,9 +143,9 @@ const expandNormalizedNotifications = (state, notifications, next, isLoadingMore
// should be added in the back.
// - to avoid duplicates, `newItems` should be checked the first `firstIndex` items of
// `oldItems`
const idsToCheck = oldItems.take(firstIndex).map(item => item?.get('id')).toSet();
const insertedItems = newItems.filterNot(item => idsToCheck.includes(item.get('id')));
const olderItems = oldItems.slice(firstIndex, lastIndex).filter(item => item !== null && compareId(item.get('id'), newItems.last().get('id')) < 0);
const idsToCheck = oldItems.take(firstIndex).map(item => item?.get("id")).toSet();
const insertedItems = newItems.filterNot(item => idsToCheck.includes(item.get("id")));
const olderItems = oldItems.slice(firstIndex, lastIndex).filter(item => item !== null && compareId(item.get("id"), newItems.last().get("id")) < 0);
return oldItems.take(firstIndex).concat(
insertedItems,
@@ -156,35 +156,35 @@ const expandNormalizedNotifications = (state, notifications, next, isLoadingMore
}
if (!next) {
mutable.set('hasMore', false);
mutable.set("hasMore", false);
}
if (shouldCountUnreadNotifications(state)) {
mutable.set('unread', mutable.get('pendingItems').count(item => item !== null) + mutable.get('items').count(item => item && compareId(item.get('id'), lastReadId) > 0));
mutable.set("unread", mutable.get("pendingItems").count(item => item !== null) + mutable.get("items").count(item => item && compareId(item.get("id"), lastReadId) > 0));
} else {
const mostRecent = newItems.find(item => item !== null);
if (mostRecent && compareId(lastReadId, mostRecent.get('id')) < 0) {
mutable.set('lastReadId', mostRecent.get('id'));
if (mostRecent && compareId(lastReadId, mostRecent.get("id")) < 0) {
mutable.set("lastReadId", mostRecent.get("id"));
}
}
mutable.update('isLoading', (nbLoading) => nbLoading - 1);
mutable.update("isLoading", (nbLoading) => nbLoading - 1);
});
};
const filterNotifications = (state, accountIds, type) => {
const helper = list => list.filterNot(item => item !== null && accountIds.includes(item.get('account')) && (type === undefined || type === item.get('type')));
return state.update('items', helper).update('pendingItems', helper);
const helper = list => list.filterNot(item => item !== null && accountIds.includes(item.get("account")) && (type === undefined || type === item.get("type")));
return state.update("items", helper).update("pendingItems", helper);
};
const clearUnread = (state) => {
state = state.set('unread', state.get('pendingItems').size);
const lastNotification = state.get('items').find(item => item !== null);
return state.set('lastReadId', lastNotification ? lastNotification.get('id') : '0');
state = state.set("unread", state.get("pendingItems").size);
const lastNotification = state.get("items").find(item => item !== null);
return state.set("lastReadId", lastNotification ? lastNotification.get("id") : "0");
};
const updateTop = (state, top) => {
state = state.set('top', top);
state = state.set("top", top);
if (!shouldCountUnreadNotifications(state)) {
state = clearUnread(state);
@@ -194,115 +194,115 @@ const updateTop = (state, top) => {
};
const deleteByStatus = (state, statusId) => {
const lastReadId = state.get('lastReadId');
const lastReadId = state.get("lastReadId");
if (shouldCountUnreadNotifications(state)) {
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);
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);
}
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);
state = state.update('unread', unread => unread - deletedUnread.size);
return state.update('items', helper).update('pendingItems', helper);
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);
state = state.update("unread", unread => unread - deletedUnread.size);
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 = 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);
state = state.set("isTabVisible", visibility);
if (!shouldCountUnreadNotifications(state)) {
state = state.set('readMarkerId', state.get('lastReadId'));
state = state.set("readMarkerId", state.get("lastReadId"));
state = clearUnread(state);
}
return state;
};
const shouldCountUnreadNotifications = (state, ignoreScroll = false) => {
const isTabVisible = state.get('isTabVisible');
const isOnTop = state.get('top');
const isMounted = state.get('mounted') > 0;
const lastReadId = state.get('lastReadId');
const lastItem = state.get('items').findLast(item => item !== null);
const lastItemReached = !state.get('hasMore') || lastReadId === '0' || (lastItem && compareId(lastItem.get('id'), lastReadId) <= 0);
const isTabVisible = state.get("isTabVisible");
const isOnTop = state.get("top");
const isMounted = state.get("mounted") > 0;
const lastReadId = state.get("lastReadId");
const lastItem = state.get("items").findLast(item => item !== null);
const lastItemReached = !state.get("hasMore") || lastReadId === "0" || (lastItem && compareId(lastItem.get("id"), lastReadId) <= 0);
return !(isTabVisible && (ignoreScroll || isOnTop) && isMounted && lastItemReached);
};
const recountUnread = (state, last_read_id) => {
return state.withMutations(mutable => {
if (compareId(last_read_id, mutable.get('lastReadId')) > 0) {
mutable.set('lastReadId', last_read_id);
if (compareId(last_read_id, mutable.get("lastReadId")) > 0) {
mutable.set("lastReadId", last_read_id);
}
if (compareId(last_read_id, mutable.get('readMarkerId')) > 0) {
mutable.set('readMarkerId', last_read_id);
if (compareId(last_read_id, mutable.get("readMarkerId")) > 0) {
mutable.set("readMarkerId", last_read_id);
}
if (state.get('unread') > 0 || shouldCountUnreadNotifications(state)) {
mutable.set('unread', mutable.get('pendingItems').count(item => item !== null) + mutable.get('items').count(item => item && compareId(item.get('id'), last_read_id) > 0));
if (state.get("unread") > 0 || shouldCountUnreadNotifications(state)) {
mutable.set("unread", mutable.get("pendingItems").count(item => item !== null) + mutable.get("items").count(item => item && compareId(item.get("id"), last_read_id) > 0));
}
});
};
export default function notifications(state = initialState, action) {
switch(action.type) {
case MARKERS_FETCH_SUCCESS:
return action.markers.notifications ? recountUnread(state, action.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:
return updateVisibility(state, false);
case NOTIFICATIONS_LOAD_PENDING:
return state.update('items', list => state.get('pendingItems').concat(list.take(40))).set('pendingItems', ImmutableList()).set('unread', 0);
case NOTIFICATIONS_EXPAND_REQUEST:
return state.update('isLoading', (nbLoading) => nbLoading + 1);
case NOTIFICATIONS_EXPAND_FAIL:
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 NOTIFICATIONS_UPDATE:
return normalizeNotification(state, action.notification, action.usePendingItems);
case NOTIFICATIONS_EXPAND_SUCCESS:
return expandNormalizedNotifications(state, action.notifications, action.next, action.isLoadingMore, action.isLoadingRecent, action.usePendingItems);
case ACCOUNT_BLOCK_SUCCESS:
return filterNotifications(state, [action.relationship.id]);
case ACCOUNT_MUTE_SUCCESS:
return action.relationship.muting_notifications ? filterNotifications(state, [action.relationship.id]) : state;
case DOMAIN_BLOCK_SUCCESS:
return filterNotifications(state, action.accounts);
case FOLLOW_REQUEST_AUTHORIZE_SUCCESS:
case FOLLOW_REQUEST_REJECT_SUCCESS:
return filterNotifications(state, [action.id], 'follow_request');
case NOTIFICATIONS_CLEAR:
return state.set('items', ImmutableList()).set('pendingItems', ImmutableList()).set('hasMore', false);
case TIMELINE_DELETE:
return deleteByStatus(state, action.id);
case TIMELINE_DISCONNECT:
return action.timeline === 'home' ?
state.update(action.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:
return state.set('browserPermission', action.value);
default:
return state;
case MARKERS_FETCH_SUCCESS:
return action.markers.notifications ? recountUnread(state, action.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:
return updateVisibility(state, false);
case NOTIFICATIONS_LOAD_PENDING:
return state.update("items", list => state.get("pendingItems").concat(list.take(40))).set("pendingItems", ImmutableList()).set("unread", 0);
case NOTIFICATIONS_EXPAND_REQUEST:
return state.update("isLoading", (nbLoading) => nbLoading + 1);
case NOTIFICATIONS_EXPAND_FAIL:
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 NOTIFICATIONS_UPDATE:
return normalizeNotification(state, action.notification, action.usePendingItems);
case NOTIFICATIONS_EXPAND_SUCCESS:
return expandNormalizedNotifications(state, action.notifications, action.next, action.isLoadingMore, action.isLoadingRecent, action.usePendingItems);
case ACCOUNT_BLOCK_SUCCESS:
return filterNotifications(state, [action.relationship.id]);
case ACCOUNT_MUTE_SUCCESS:
return action.relationship.muting_notifications ? filterNotifications(state, [action.relationship.id]) : state;
case DOMAIN_BLOCK_SUCCESS:
return filterNotifications(state, action.accounts);
case FOLLOW_REQUEST_AUTHORIZE_SUCCESS:
case FOLLOW_REQUEST_REJECT_SUCCESS:
return filterNotifications(state, [action.id], "follow_request");
case NOTIFICATIONS_CLEAR:
return state.set("items", ImmutableList()).set("pendingItems", ImmutableList()).set("hasMore", false);
case TIMELINE_DELETE:
return deleteByStatus(state, action.id);
case TIMELINE_DISCONNECT:
return action.timeline === "home" ?
state.update(action.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:
return state.set("browserPermission", action.value);
default:
return state;
}
}