Fix too many requests caused by relationship look-ups in web UI (#32042)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
This commit is contained in:
parent
f1b6a611aa
commit
70988519df
3 changed files with 40 additions and 19 deletions
|
@ -1,4 +1,5 @@
|
||||||
import { browserHistory } from 'mastodon/components/router';
|
import { browserHistory } from 'mastodon/components/router';
|
||||||
|
import { debounceWithDispatchAndArguments } from 'mastodon/utils/debounce';
|
||||||
|
|
||||||
import api, { getLinks } from '../api';
|
import api, { getLinks } from '../api';
|
||||||
|
|
||||||
|
@ -449,6 +450,20 @@ export function expandFollowingFail(id, error) {
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const debouncedFetchRelationships = debounceWithDispatchAndArguments((dispatch, ...newAccountIds) => {
|
||||||
|
if (newAccountIds.length === 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
dispatch(fetchRelationshipsRequest(newAccountIds));
|
||||||
|
|
||||||
|
api().get(`/api/v1/accounts/relationships?with_suspended=true&${newAccountIds.map(id => `id[]=${id}`).join('&')}`).then(response => {
|
||||||
|
dispatch(fetchRelationshipsSuccess({ relationships: response.data }));
|
||||||
|
}).catch(error => {
|
||||||
|
dispatch(fetchRelationshipsFail(error));
|
||||||
|
});
|
||||||
|
}, { delay: 500 });
|
||||||
|
|
||||||
export function fetchRelationships(accountIds) {
|
export function fetchRelationships(accountIds) {
|
||||||
return (dispatch, getState) => {
|
return (dispatch, getState) => {
|
||||||
const state = getState();
|
const state = getState();
|
||||||
|
@ -460,13 +475,7 @@ export function fetchRelationships(accountIds) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
dispatch(fetchRelationshipsRequest(newAccountIds));
|
debouncedFetchRelationships(dispatch, ...newAccountIds);
|
||||||
|
|
||||||
api().get(`/api/v1/accounts/relationships?with_suspended=true&${newAccountIds.map(id => `id[]=${id}`).join('&')}`).then(response => {
|
|
||||||
dispatch(fetchRelationshipsSuccess({ relationships: response.data }));
|
|
||||||
}).catch(error => {
|
|
||||||
dispatch(fetchRelationshipsFail(error));
|
|
||||||
});
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@ import api, { getLinks } from '../api';
|
||||||
import { unescapeHTML } from '../utils/html';
|
import { unescapeHTML } from '../utils/html';
|
||||||
import { requestNotificationPermission } from '../utils/notifications';
|
import { requestNotificationPermission } from '../utils/notifications';
|
||||||
|
|
||||||
import { fetchFollowRequests, fetchRelationships } from './accounts';
|
import { fetchFollowRequests } from './accounts';
|
||||||
import {
|
import {
|
||||||
importFetchedAccount,
|
importFetchedAccount,
|
||||||
importFetchedAccounts,
|
importFetchedAccounts,
|
||||||
|
@ -56,14 +56,6 @@ defineMessages({
|
||||||
group: { id: 'notifications.group', defaultMessage: '{count} notifications' },
|
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 = () => ({
|
export const loadPending = () => ({
|
||||||
type: NOTIFICATIONS_LOAD_PENDING,
|
type: NOTIFICATIONS_LOAD_PENDING,
|
||||||
});
|
});
|
||||||
|
@ -106,8 +98,6 @@ export function updateNotifications(notification, intlMessages, intlLocale) {
|
||||||
|
|
||||||
|
|
||||||
dispatch(notificationsUpdate({ notification, preferPendingItems, playSound: playSound && !filtered}));
|
dispatch(notificationsUpdate({ notification, preferPendingItems, playSound: playSound && !filtered}));
|
||||||
|
|
||||||
fetchRelatedRelationships(dispatch, [notification]);
|
|
||||||
} else if (playSound && !filtered) {
|
} else if (playSound && !filtered) {
|
||||||
dispatch({
|
dispatch({
|
||||||
type: NOTIFICATIONS_UPDATE_NOOP,
|
type: NOTIFICATIONS_UPDATE_NOOP,
|
||||||
|
@ -199,7 +189,6 @@ export function expandNotifications({ maxId = undefined, forceLoad = false }) {
|
||||||
dispatch(importFetchedAccounts(response.data.filter(item => item.report).map(item => item.report.target_account)));
|
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));
|
dispatch(expandNotificationsSuccess(response.data, next ? next.uri : null, isLoadingMore, isLoadingRecent, isLoadingRecent && preferPendingItems));
|
||||||
fetchRelatedRelationships(dispatch, response.data);
|
|
||||||
dispatch(submitMarkers());
|
dispatch(submitMarkers());
|
||||||
} catch(error) {
|
} catch(error) {
|
||||||
dispatch(expandNotificationsFail(error, isLoadingMore));
|
dispatch(expandNotificationsFail(error, isLoadingMore));
|
||||||
|
|
23
app/javascript/mastodon/utils/debounce.ts
Normal file
23
app/javascript/mastodon/utils/debounce.ts
Normal file
|
@ -0,0 +1,23 @@
|
||||||
|
import { debounce } from 'lodash';
|
||||||
|
|
||||||
|
import type { AppDispatch } from 'mastodon/store';
|
||||||
|
|
||||||
|
export const debounceWithDispatchAndArguments = <T>(
|
||||||
|
fn: (dispatch: AppDispatch, ...args: T[]) => void,
|
||||||
|
{ delay = 100 },
|
||||||
|
) => {
|
||||||
|
let argumentBuffer: T[] = [];
|
||||||
|
let dispatchBuffer: AppDispatch;
|
||||||
|
|
||||||
|
const wrapped = debounce(() => {
|
||||||
|
const tmpBuffer = argumentBuffer;
|
||||||
|
argumentBuffer = [];
|
||||||
|
fn(dispatchBuffer, ...tmpBuffer);
|
||||||
|
}, delay);
|
||||||
|
|
||||||
|
return (dispatch: AppDispatch, ...args: T[]) => {
|
||||||
|
dispatchBuffer = dispatch;
|
||||||
|
argumentBuffer.push(...args);
|
||||||
|
wrapped();
|
||||||
|
};
|
||||||
|
};
|
Loading…
Reference in a new issue