From 03f28d3fa6b57d97cfd4933f4f0f232201075f92 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 17 Sep 2018 18:55:11 +0300
Subject: Fixed "user.id is undefined" or something error more sane by properly
 handling HTTP errors

---
 src/services/api/api.service.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'src/services/api/api.service.js')

diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 87315657..e973667b 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -335,7 +335,14 @@ const fetchTimeline = ({timeline, credentials, since = false, until = false, use
   const queryString = map(params, (param) => `${param[0]}=${param[1]}`).join('&')
   url += `?${queryString}`
 
-  return fetch(url, { headers: authHeaders(credentials) }).then((data) => data.json())
+  return fetch(url, { headers: authHeaders(credentials) })
+    .then((data) => {
+      if (data.ok) {
+        return data
+      }
+      throw new Error('Error fetching timeline')
+    })
+    .then((data) => data.json())
 }
 
 const verifyCredentials = (user) => {
-- 
cgit v1.2.3-70-g09d2


From 419744080ff2dfcf4b860f01692463b78f30c40a Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 17 Sep 2018 19:16:33 +0300
Subject: console.log cleanup

---
 src/main.js                     | 2 --
 src/services/api/api.service.js | 2 --
 2 files changed, 4 deletions(-)

(limited to 'src/services/api/api.service.js')

diff --git a/src/main.js b/src/main.js
index 31607f0d..367db881 100644
--- a/src/main.js
+++ b/src/main.js
@@ -80,7 +80,6 @@ window.fetch('/api/statusnet/config.json')
   .then((data) => {
     const {name, closed: registrationClosed, textlimit, server} = data.site
 
-    console.log(store)
     store.dispatch('setInstanceOption', { name: 'name', value: name })
     store.dispatch('setInstanceOption', { name: 'registrationOpen', value: (registrationClosed === '0') })
     store.dispatch('setInstanceOption', { name: 'textlimit', value: parseInt(textlimit) })
@@ -92,7 +91,6 @@ window.fetch('/api/statusnet/config.json')
       .then((res) => res.json())
       .catch((err) => {
         console.warn('Failed to load static/config.json, continuing without it.')
-        console.warn('Error was: ')
         console.warn(err)
         return {}
       })
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index e973667b..83a83e91 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -133,8 +133,6 @@ const updateBanner = ({credentials, params}) => {
 const updateProfile = ({credentials, params}) => {
   let url = PROFILE_UPDATE_URL
 
-  console.log(params)
-
   const form = new FormData()
 
   each(params, (value, key) => {
-- 
cgit v1.2.3-70-g09d2