55bef1e34f
Follow-up to #18960 The aforementioned PR fixed an issue in which switching notification filters while notifications were loading prevented the query for the new filter from running, but another issue remained: if the first query completed after the second one, its results would override the second one, thus leading to the same issue. This commit cancels the first request if it is still running, before issuing the second one.
308 lines
9.9 KiB
JavaScript
308 lines
9.9 KiB
JavaScript
import api, { getLinks } from '../api';
|
|
import IntlMessageFormat from 'intl-messageformat';
|
|
import { fetchFollowRequests, fetchRelationships } from './accounts';
|
|
import {
|
|
importFetchedAccount,
|
|
importFetchedAccounts,
|
|
importFetchedStatus,
|
|
importFetchedStatuses,
|
|
} from './importer';
|
|
import { submitMarkers } from './markers';
|
|
import { saveSettings } from './settings';
|
|
import { defineMessages } from 'react-intl';
|
|
import { List as ImmutableList } from 'immutable';
|
|
import { unescapeHTML } from '../utils/html';
|
|
import { usePendingItems as preferPendingItems } from 'mastodon/initial_state';
|
|
import compareId from 'mastodon/compare_id';
|
|
import { requestNotificationPermission } from '../utils/notifications';
|
|
|
|
export const NOTIFICATIONS_UPDATE = 'NOTIFICATIONS_UPDATE';
|
|
export const NOTIFICATIONS_UPDATE_NOOP = 'NOTIFICATIONS_UPDATE_NOOP';
|
|
|
|
export const NOTIFICATIONS_EXPAND_REQUEST = 'NOTIFICATIONS_EXPAND_REQUEST';
|
|
export const NOTIFICATIONS_EXPAND_SUCCESS = 'NOTIFICATIONS_EXPAND_SUCCESS';
|
|
export const NOTIFICATIONS_EXPAND_FAIL = 'NOTIFICATIONS_EXPAND_FAIL';
|
|
|
|
export const NOTIFICATIONS_FILTER_SET = 'NOTIFICATIONS_FILTER_SET';
|
|
|
|
export const NOTIFICATIONS_CLEAR = 'NOTIFICATIONS_CLEAR';
|
|
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';
|
|
|
|
defineMessages({
|
|
mention: { id: 'notification.mention', defaultMessage: '{name} mentioned you' },
|
|
group: { id: 'notifications.group', defaultMessage: '{count} notifications' },
|
|
});
|
|
|
|
const fetchRelatedRelationships = (dispatch, notifications) => {
|
|
const accountIds = notifications.filter(item => ['follow', 'follow_request', 'admin.sign_up'].indexOf(item.type) !== -1).map(item => item.account.id);
|
|
|
|
if (accountIds.length > 0) {
|
|
dispatch(fetchRelationships(accountIds));
|
|
}
|
|
};
|
|
|
|
export const loadPending = () => ({
|
|
type: NOTIFICATIONS_LOAD_PENDING,
|
|
});
|
|
|
|
export function updateNotifications(notification, intlMessages, intlLocale) {
|
|
return (dispatch, getState) => {
|
|
const activeFilter = getState().getIn(['settings', 'notifications', 'quickFilter', 'active']);
|
|
const showInColumn = activeFilter === 'all' ? getState().getIn(['settings', 'notifications', 'shows', notification.type], true) : activeFilter === notification.type;
|
|
const showAlert = getState().getIn(['settings', 'notifications', 'alerts', notification.type], true);
|
|
const playSound = getState().getIn(['settings', 'notifications', 'sounds', notification.type], true);
|
|
|
|
let filtered = false;
|
|
|
|
if (['mention', 'status'].includes(notification.type) && notification.status.filtered) {
|
|
const filters = notification.status.filtered.filter(result => result.filter.context.includes('notifications'));
|
|
|
|
if (filters.some(result => result.filter.filter_action === 'hide')) {
|
|
return;
|
|
}
|
|
|
|
filtered = filters.length > 0;
|
|
}
|
|
|
|
if (['follow_request'].includes(notification.type)) {
|
|
dispatch(fetchFollowRequests());
|
|
}
|
|
|
|
dispatch(submitMarkers());
|
|
|
|
if (showInColumn) {
|
|
dispatch(importFetchedAccount(notification.account));
|
|
|
|
if (notification.status) {
|
|
dispatch(importFetchedStatus(notification.status));
|
|
}
|
|
|
|
if (notification.report) {
|
|
dispatch(importFetchedAccount(notification.report.target_account));
|
|
}
|
|
|
|
dispatch({
|
|
type: NOTIFICATIONS_UPDATE,
|
|
notification,
|
|
usePendingItems: preferPendingItems,
|
|
meta: (playSound && !filtered) ? { sound: 'boop' } : undefined,
|
|
});
|
|
|
|
fetchRelatedRelationships(dispatch, [notification]);
|
|
} else if (playSound && !filtered) {
|
|
dispatch({
|
|
type: NOTIFICATIONS_UPDATE_NOOP,
|
|
meta: { sound: 'boop' },
|
|
});
|
|
}
|
|
|
|
// Desktop notifications
|
|
if (typeof window.Notification !== 'undefined' && showAlert && !filtered) {
|
|
const title = new IntlMessageFormat(intlMessages[`notification.${notification.type}`], intlLocale).format({ name: notification.account.display_name.length > 0 ? notification.account.display_name : notification.account.username });
|
|
const body = (notification.status && notification.status.spoiler_text.length > 0) ? notification.status.spoiler_text : unescapeHTML(notification.status ? notification.status.content : '');
|
|
|
|
const notify = new Notification(title, { body, icon: notification.account.avatar, tag: notification.id });
|
|
|
|
notify.addEventListener('click', () => {
|
|
window.focus();
|
|
notify.close();
|
|
});
|
|
}
|
|
};
|
|
};
|
|
|
|
const excludeTypesFromSettings = state => state.getIn(['settings', 'notifications', 'shows']).filter(enabled => !enabled).keySeq().toJS();
|
|
|
|
const excludeTypesFromFilter = filter => {
|
|
const allTypes = ImmutableList([
|
|
'follow',
|
|
'follow_request',
|
|
'favourite',
|
|
'reblog',
|
|
'mention',
|
|
'poll',
|
|
'status',
|
|
'update',
|
|
'admin.sign_up',
|
|
'admin.report',
|
|
]);
|
|
|
|
return allTypes.filterNot(item => item === filter).toJS();
|
|
};
|
|
|
|
const noOp = () => {};
|
|
|
|
let expandNotificationsController = new AbortController();
|
|
|
|
export function expandNotifications({ maxId, forceLoad } = {}, done = noOp) {
|
|
return (dispatch, getState) => {
|
|
const activeFilter = getState().getIn(['settings', 'notifications', 'quickFilter', 'active']);
|
|
const notifications = getState().get('notifications');
|
|
const isLoadingMore = !!maxId;
|
|
|
|
if (notifications.get('isLoading')) {
|
|
if (forceLoad) {
|
|
expandNotificationsController.abort();
|
|
expandNotificationsController = new AbortController();
|
|
} else {
|
|
done();
|
|
return;
|
|
}
|
|
}
|
|
|
|
const params = {
|
|
max_id: maxId,
|
|
exclude_types: activeFilter === 'all'
|
|
? excludeTypesFromSettings(getState())
|
|
: excludeTypesFromFilter(activeFilter),
|
|
};
|
|
|
|
if (!params.max_id && (notifications.get('items', ImmutableList()).size + notifications.get('pendingItems', ImmutableList()).size) > 0) {
|
|
const a = notifications.getIn(['pendingItems', 0, 'id']);
|
|
const b = notifications.getIn(['items', 0, 'id']);
|
|
|
|
if (a && b && compareId(a, b) > 0) {
|
|
params.since_id = a;
|
|
} else {
|
|
params.since_id = b || a;
|
|
}
|
|
}
|
|
|
|
const isLoadingRecent = !!params.since_id;
|
|
|
|
dispatch(expandNotificationsRequest(isLoadingMore));
|
|
|
|
api(getState).get('/api/v1/notifications', { params, signal: expandNotificationsController.signal }).then(response => {
|
|
const next = getLinks(response).refs.find(link => link.rel === 'next');
|
|
|
|
dispatch(importFetchedAccounts(response.data.map(item => item.account)));
|
|
dispatch(importFetchedStatuses(response.data.map(item => item.status).filter(status => !!status)));
|
|
dispatch(importFetchedAccounts(response.data.filter(item => item.report).map(item => item.report.target_account)));
|
|
|
|
dispatch(expandNotificationsSuccess(response.data, next ? next.uri : null, isLoadingMore, isLoadingRecent, isLoadingRecent && preferPendingItems));
|
|
fetchRelatedRelationships(dispatch, response.data);
|
|
dispatch(submitMarkers());
|
|
}).catch(error => {
|
|
dispatch(expandNotificationsFail(error, isLoadingMore));
|
|
}).finally(() => {
|
|
done();
|
|
});
|
|
};
|
|
};
|
|
|
|
export function expandNotificationsRequest(isLoadingMore) {
|
|
return {
|
|
type: NOTIFICATIONS_EXPAND_REQUEST,
|
|
skipLoading: !isLoadingMore,
|
|
};
|
|
};
|
|
|
|
export function expandNotificationsSuccess(notifications, next, isLoadingMore, isLoadingRecent, usePendingItems) {
|
|
return {
|
|
type: NOTIFICATIONS_EXPAND_SUCCESS,
|
|
notifications,
|
|
next,
|
|
isLoadingRecent: isLoadingRecent,
|
|
usePendingItems,
|
|
skipLoading: !isLoadingMore,
|
|
};
|
|
};
|
|
|
|
export function expandNotificationsFail(error, isLoadingMore) {
|
|
return {
|
|
type: NOTIFICATIONS_EXPAND_FAIL,
|
|
error,
|
|
skipLoading: !isLoadingMore,
|
|
skipAlert: !isLoadingMore || error.name === 'AbortError',
|
|
};
|
|
};
|
|
|
|
export function clearNotifications() {
|
|
return (dispatch, getState) => {
|
|
dispatch({
|
|
type: NOTIFICATIONS_CLEAR,
|
|
});
|
|
|
|
api(getState).post('/api/v1/notifications/clear');
|
|
};
|
|
};
|
|
|
|
export function scrollTopNotifications(top) {
|
|
return {
|
|
type: NOTIFICATIONS_SCROLL_TOP,
|
|
top,
|
|
};
|
|
};
|
|
|
|
export function setFilter (filterType) {
|
|
return dispatch => {
|
|
dispatch({
|
|
type: NOTIFICATIONS_FILTER_SET,
|
|
path: ['notifications', 'quickFilter', 'active'],
|
|
value: filterType,
|
|
});
|
|
dispatch(expandNotifications({ forceLoad: true }));
|
|
dispatch(saveSettings());
|
|
};
|
|
};
|
|
|
|
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 => {
|
|
dispatch(setBrowserSupport('Notification' in window));
|
|
if ('Notification' in window) {
|
|
dispatch(setBrowserPermission(Notification.permission));
|
|
}
|
|
|
|
if ('Notification' in window && 'permissions' in navigator) {
|
|
navigator.permissions.query({ name: 'notifications' }).then((status) => {
|
|
status.onchange = () => dispatch(setBrowserPermission(Notification.permission));
|
|
}).catch(console.warn);
|
|
}
|
|
};
|
|
}
|
|
|
|
export function requestBrowserPermission(callback = noOp) {
|
|
return dispatch => {
|
|
requestNotificationPermission((permission) => {
|
|
dispatch(setBrowserPermission(permission));
|
|
callback(permission);
|
|
});
|
|
};
|
|
};
|
|
|
|
export function setBrowserSupport (value) {
|
|
return {
|
|
type: NOTIFICATIONS_SET_BROWSER_SUPPORT,
|
|
value,
|
|
};
|
|
}
|
|
|
|
export function setBrowserPermission (value) {
|
|
return {
|
|
type: NOTIFICATIONS_SET_BROWSER_PERMISSION,
|
|
value,
|
|
};
|
|
}
|