mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-27 23:06:23 +01:00
Code Issues Projects Releases Wiki Activity

Add special alert for throttled requests (#11677)

Browse Source 
* Add special alert for throttled requests

* Use an extra attribute instead of an array
This commit is contained in:
ThibG 2019-08-27 16:50:39 +02:00 committed by Eugen Rochko
parent a033679eed
commit 81f864d4da
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/javascript/mastodon/actions/alerts.js
View File

@ -3,6 +3,8 @@ import { defineMessages } from 'react-intl';
const messages = defineMessages({ const messages = defineMessages({
unexpectedTitle: { id: 'alert.unexpected.title', defaultMessage: 'Oops!' }, unexpectedTitle: { id: 'alert.unexpected.title', defaultMessage: 'Oops!' },
unexpectedMessage: { id: 'alert.unexpected.message', defaultMessage: 'An unexpected error occurred.' }, unexpectedMessage: { id: 'alert.unexpected.message', defaultMessage: 'An unexpected error occurred.' },
rateLimitedTitle: { id: 'alert.rate_limited.title', defaultMessage: 'Rate limited' },
rateLimitedMessage: { id: 'alert.rate_limited.message', defaultMessage: 'Please retry after {retry_time, time, medium}.' },
}); });
export const ALERT_SHOW = 'ALERT_SHOW'; export const ALERT_SHOW = 'ALERT_SHOW';
@ -23,23 +25,29 @@ export function clearAlert() {
}; };
}; };
export function showAlert(title = messages.unexpectedTitle, message = messages.unexpectedMessage) { export function showAlert(title = messages.unexpectedTitle, message = messages.unexpectedMessage, message_values = undefined) {
return { return {
type: ALERT_SHOW, type: ALERT_SHOW,
title, title,
message, message,
message_values,
}; };
}; };
export function showAlertForError(error) { export function showAlertForError(error) {
if (error.response) { if (error.response) {
const { data, status, statusText } = error.response; const { data, status, statusText, headers } = error.response;
if (status === 404 || status === 410) { if (status === 404 || status === 410) {
// Skip these errors as they are reflected in the UI // Skip these errors as they are reflected in the UI
return { type: ALERT_NOOP }; return { type: ALERT_NOOP };
} }
if (status === 429 && headers['x-ratelimit-reset']) {
const reset_date = new Date(headers['x-ratelimit-reset']);
return showAlert(messages.rateLimitedTitle, messages.rateLimitedMessage, { 'retry_time': reset_date });
}
let message = statusText; let message = statusText;
let title = `${status}`; let title = `${status}`;

2
app/javascript/mastodon/features/ui/containers/notifications_container.js
View File

@ -11,7 +11,7 @@ const mapStateToProps = (state, { intl }) => {
const value = notification[key]; const value = notification[key];
if (typeof value === 'object') { if (typeof value === 'object') {
notification[key] = intl.formatMessage(value); notification[key] = intl.formatMessage(value, notification[`${key}_values`]);
} }
})); }));

1
app/javascript/mastodon/reducers/alerts.js
View File

@ -14,6 +14,7 @@ export default function alerts(state = initialState, action) {
key: state.size > 0 ? state.last().get('key') + 1 : 0, key: state.size > 0 ? state.last().get('key') + 1 : 0,
title: action.title, title: action.title,
message: action.message, message: action.message,
message_values: action.message_values,
})); }));
case ALERT_DISMISS: case ALERT_DISMISS:
return state.filterNot(item => item.get('key') === action.alert.key); return state.filterNot(item => item.get('key') === action.alert.key);

1
app/javascript/mastodon/selectors/index.js
View File

@ -128,6 +128,7 @@ export const getAlerts = createSelector([getAlertsBase], (base) => {
base.forEach(item => { base.forEach(item => {
arr.push({ arr.push({
message: item.get('message'), message: item.get('message'),
message_values: item.get('message_values'),
title: item.get('title'), title: item.get('title'),
key: item.get('key'), key: item.get('key'),
dismissAfter: 5000, dismissAfter: 5000,