some consistency

3 files changed, 12 insertions, 5 deletions

diff --git a/src/modules/users.js b/src/modules/users.js
index c4d479f9..0b55d701 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -209,7 +209,7 @@ const users = {
         store.rootState.api.backendInteractor.verifyCredentials(accessToken)
           .then((data) => {
             if (!data.error) {
-              const { user } = data
+              const user = data
               // user.credentials = userCredentials
               user.credentials = accessToken
               commit('setCurrentUser', user)
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index c45f8572..62d35d33 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -375,9 +375,7 @@ const verifyCredentials = (user) => {
         }
       }
     })
-    .then((data) => ({
-      user: parseUser(data)
-    }))
+    .then((data) => data.error ? data : parseUser(data))
 }
 
 const favorite = ({ id, credentials }) => {
@@ -429,6 +427,16 @@ const postStatus = ({credentials, status, spoilerText, visibility, sensitive, me
     method: 'POST',
     headers: authHeaders(credentials)
   })
+    .then((response) => {
+      if (response.ok) {
+        return response.json()
+      } else {
+        return {
+          error: response
+        }
+      }
+    })
+    .then((data) => data.error ? data : parseStatus(data))
 }
 
 const deleteStatus = ({ id, credentials }) => {
diff --git a/src/services/status_poster/status_poster.service.js b/src/services/status_poster/status_poster.service.js
index 1e20d336..f1932bb6 100644
--- a/src/services/status_poster/status_poster.service.js
+++ b/src/services/status_poster/status_poster.service.js
@@ -5,7 +5,6 @@ const postStatus = ({ store, status, spoilerText, visibility, sensitive, media =
   const mediaIds = map(media, 'id')
 
   return apiService.postStatus({credentials: store.state.users.currentUser.credentials, status, spoilerText, visibility, sensitive, mediaIds, inReplyToStatusId, contentType, noAttachmentLinks: store.state.instance.noAttachmentLinks})
-    .then((data) => data.json())
     .then((data) => {
       if (!data.error) {
         store.dispatch('addNewStatuses', {