~cytrogen/masto-fe: [bugfix] account for data structure change in instance API fallback (#63)

110c8fb8ccb1363f649d3eb30ca822f415145e6a — Sqx. Flann 9 months ago 6d0b964

[bugfix] account for data structure change in instance API fallback (#63)

Reviewed-on: https://codeberg.org/superseriousbusiness/masto-fe-standalone/pulls/63
Co-authored-by: Sqx. Flann <fl4nn+codeberg@opensuse.org>
Co-committed-by: Sqx. Flann <fl4nn+codeberg@opensuse.org>

patch browse .tar.gz

2 files changed, 6 insertions(+), 6 deletions(-)

M app/javascript/flavours/glitch/actions/server.js
M app/javascript/mastodon/actions/server.js

M app/javascript/flavours/glitch/actions/server.js => app/javascript/flavours/glitch/actions/server.js +3 -3

@@ 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)));
   }

M app/javascript/mastodon/actions/server.js => app/javascript/mastodon/actions/server.js +3 -3

@@ 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)));
   }