forked from treehouse/mastodon
[Glitch] Add special alert for throttled requests
Port 81f864d4da
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
rebase/4.0.0rc2
parent
f11e9d5524
commit
04de74c992
|
@ -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}`;
|
||||||
|
|
||||||
|
|
|
@ -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`]);
|
||||||
}
|
}
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
|
|
@ -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);
|
||||||
|
|
|
@ -157,6 +157,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,
|
||||||
|
|
Loading…
Reference in New Issue