Reused commonly defined method for 'apiBase'

2 files changed, 4 insertions, 3 deletions

diff --git a/src/api/apiBase.js b/src/api/apiBase.js
index 85dd0f3df..842c85e56 100644
--- a/src/api/apiBase.js
+++ b/src/api/apiBase.js
@@ -18,7 +18,8 @@ const apiBase = (withVersion = true) => {
     || !window.ferdi.stores.settings.all.app.server) {
     // Stores have not yet been loaded - return SERVER_NOT_LOADED to force a retry when stores are loaded
     return SERVER_NOT_LOADED;
-  } if (window.ferdi.stores.settings.all.app.server === LOCAL_SERVER) {
+  }
+  if (window.ferdi.stores.settings.all.app.server === LOCAL_SERVER) {
     // Use URL for local server
     url = `http://127.0.0.1:${window.ferdi.stores.requests.localServerPort}`;
   } else {
diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index 5fd5268ce..5365f9dbe 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -457,7 +457,7 @@ export default class ServerApi {
 
   // News
   async getLatestNews() {
-    const url = `https://api.getferdi.com/v1/news?platform=${os.platform()}&arch=${os.arch()}&version=${app.getVersion()}`;
+    const url = `${apiBase(true)}/news?platform=${os.platform()}&arch=${os.arch()}&version=${app.getVersion()}`;
     const request = await sendAuthRequest(url);
     if (!request.ok) throw request;
     const data = await request.json();
@@ -467,7 +467,7 @@ export default class ServerApi {
   }
 
   async hideNews(id) {
-    const request = await sendAuthRequest(`https://api.getferdi.com/v1/news/${id}/read`);
+    const request = await sendAuthRequest(`${apiBase(true)}/news/${id}/read`);
     if (!request.ok) throw request;
     debug('ServerApi::hideNews resolves', id);
   }