diff --git a/app/javascript/flavours/glitch/actions/server.js b/app/javascript/flavours/glitch/actions/server.js index 5889bb65a..75509f1e2 100644 --- a/app/javascript/flavours/glitch/actions/server.js +++ b/app/javascript/flavours/glitch/actions/server.js @@ -24,12 +24,12 @@ export const fetchServer = () => (dispatch, getState) => { try { api(getState) .get('/api/v2/instance').then({ data }) - if (data.contact.account) dispatch(importFetchedAccount(data.contact.account)); - dispatch(fetchServerSuccess(data)); + if (data.contact.account) dispatch(importFetchedAccount(data.contact.account)); + dispatch(fetchServerSuccess(data)); } catch (e) { api(getState) .get('/api/v1/instance').then(({ data }) => { - if (data.contact.account) dispatch(importFetchedAccount(data.contact.account)); + if (data.contact_account) dispatch(importFetchedAccount(data.contact_account)); dispatch(fetchServerSuccess(data)); }).catch(err => dispatch(fetchServerFail(err))); } diff --git a/app/javascript/mastodon/actions/server.js b/app/javascript/mastodon/actions/server.js index 2129985a1..dedbbbccb 100644 --- a/app/javascript/mastodon/actions/server.js +++ b/app/javascript/mastodon/actions/server.js @@ -20,12 +20,12 @@ export const fetchServer = () => (dispatch, getState) => { try { api(getState) .get('/api/v2/instance').then({ data }); - if (data.contact.account) dispatch(importFetchedAccount(data.contact.account)); - dispatch(fetchServerSuccess(data)); + if (data.contact.account) dispatch(importFetchedAccount(data.contact.account)); + dispatch(fetchServerSuccess(data)); } catch (e) { api(getState) .get('/api/v1/instance').then(({ data }) => { - if (data.contact.account) dispatch(importFetchedAccount(data.contact.account)); + if (data.contact_account) dispatch(importFetchedAccount(data.contact_account)); dispatch(fetchServerSuccess(data)); }).catch(err => dispatch(fetchServerFail(err))); }