fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-18 23:49:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Mute XHR abort errors (#31952)

Browse source
This commit is contained in:
Christian Schmidt 2024-09-18 10:43:24 +02:00 committed by GitHub
parent a791274824
commit 7740f1a6bb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/javascript/mastodon/actions/alerts.js
View file

@ -1,5 +1,7 @@
import { defineMessages } from 'react-intl'; import { defineMessages } from 'react-intl';
import { AxiosError } from 'axios';
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.' },
@ -50,6 +52,11 @@ export const showAlertForError = (error, skipNotFound = false) => {
}); });
} }
// An aborted request, e.g. due to reloading the browser window, it not really error
if (error.code === AxiosError.ECONNABORTED) {
return { type: ALERT_NOOP };
}
console.error(error); console.error(error);
return showAlert({ return showAlert({

3
app/javascript/mastodon/api.ts
View file

@ -42,6 +42,9 @@ const authorizationTokenFromInitialState = (): RawAxiosRequestHeaders => {
// eslint-disable-next-line import/no-default-export // eslint-disable-next-line import/no-default-export
export default function api(withAuthorization = true) { export default function api(withAuthorization = true) {
return axios.create({ return axios.create({
transitional: {
clarifyTimeoutError: true,
},
headers: { headers: {
...csrfHeader, ...csrfHeader,
...(withAuthorization ? authorizationTokenFromInitialState() : {}), ...(withAuthorization ? authorizationTokenFromInitialState() : {}),