fix: fix the changelog api to handle nightly builds

3 files changed, 6 insertions, 9 deletions

diff --git a/src/api/apiBase.js b/src/api/apiBase.js
index db974c96f..ad37ca02c 100644
--- a/src/api/apiBase.js
+++ b/src/api/apiBase.js
@@ -30,10 +30,7 @@ const apiBase = (withVersion = true) => {
     url = window.ferdi.stores.settings.all.app.server;
   }
 
-  if (withVersion) {
-    return `${url}/${API_VERSION}`;
-  }
-  return url;
+  return withVersion ? `${url}/${API_VERSION}` : url;
 };
 
 export default apiBase;
diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index 2111eb80b..bc0b0dff9 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -447,7 +447,7 @@ export default class ServerApi {
   }
 
   async hideNews(id) {
-    const request = await sendAuthRequest(`${apiBase(true)}/news/${id}/read`);
+    const request = await sendAuthRequest(`${apiBase()}/news/${id}/read`);
     if (!request.ok) throw request;
     debug('ServerApi::hideNews resolves', id);
   }
diff --git a/src/features/announcements/api.js b/src/features/announcements/api.js
index 53df69eed..a7fe24bb1 100644
--- a/src/features/announcements/api.js
+++ b/src/features/announcements/api.js
@@ -1,7 +1,7 @@
 import { app } from '@electron/remote';
 import Request from '../../stores/lib/Request';
 import apiBase from '../../api/apiBase';
-import { GITHUB_FERDI_REPO_NAME, GITHUB_ORG_NAME } from '../../config';
+import { GITHUB_FERDI_REPO_NAME, GITHUB_NIGHTLIES_REPO_NAME, GITHUB_ORG_NAME } from '../../config';
 
 const debug = require('debug')('Ferdi:feature:announcements:api');
 
@@ -12,8 +12,8 @@ export const announcementsApi = {
   },
 
   async getChangelog(version) {
-    // TODO: This doesn't seem to handle the different 'nightlies' repo that we currently use. Needs to be fixed.
-    const url = `https://api.github.com/repos/${GITHUB_ORG_NAME}/${GITHUB_FERDI_REPO_NAME}/releases/tags/v${version}`;
+    const ferdiRepoName = version.includes('nightly') ? GITHUB_NIGHTLIES_REPO_NAME : GITHUB_FERDI_REPO_NAME;
+    const url = `https://api.github.com/repos/${GITHUB_ORG_NAME}/${ferdiRepoName}/releases/tags/v${version}`;
     debug(`fetching release changelog from Github url: ${url}`);
     const request = await window.fetch(url, { method: 'GET' });
     if (!request.ok) return null;
@@ -22,7 +22,7 @@ export const announcementsApi = {
   },
 
   async getAnnouncement(version) {
-    const url = `${apiBase(true)}/announcements/${version}`;
+    const url = `${apiBase()}/announcements/${version}`;
     debug(`fetching release announcement from api url: ${url}`);
     const response = await window.fetch(url, { method: 'GET' });
     if (!response.ok) return null;