aboutsummaryrefslogtreecommitdiffstats
path: root/src/api
diff options
context:
space:
mode:
authorLibravatar Markus Hatvan <markus_hatvan@aon.at>2021-10-14 18:20:26 +0200
committerLibravatar GitHub <noreply@github.com>2021-10-14 18:20:26 +0200
commitc27972c12b2d0dba2aee9e3dcffadcf7806a9afd (patch)
tree46fcfe261ae55e6faab604e9c75f94f6ffe326ee /src/api
parentchore: upgrade 'electron-builder' to '22.14.5' to fix upstream issues. (#2068) (diff)
downloadferdium-app-c27972c12b2d0dba2aee9e3dcffadcf7806a9afd.tar.gz
ferdium-app-c27972c12b2d0dba2aee9e3dcffadcf7806a9afd.tar.zst
ferdium-app-c27972c12b2d0dba2aee9e3dcffadcf7806a9afd.zip
chore: remove all code related to news (#2069)
Diffstat (limited to 'src/api')
-rw-r--r--src/api/NewsApi.ts18
-rw-r--r--src/api/index.ts2
-rw-r--r--src/api/server/ServerApi.js36
3 files changed, 1 insertions, 55 deletions
diff --git a/src/api/NewsApi.ts b/src/api/NewsApi.ts
deleted file mode 100644
index 31d3d903b..000000000
--- a/src/api/NewsApi.ts
+++ /dev/null
@@ -1,18 +0,0 @@
1export default class NewsApi {
2 server: any;
3
4 local: any;
5
6 constructor(server: any, local: any) {
7 this.server = server;
8 this.local = local;
9 }
10
11 latest() {
12 return this.server.getLatestNews();
13 }
14
15 hide(id: any) {
16 return this.server.hideNews(id);
17 }
18}
diff --git a/src/api/index.ts b/src/api/index.ts
index 73f613da1..59fad194a 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -4,7 +4,6 @@ import RecipePreviewsApi from './RecipePreviewsApi';
4import RecipesApi from './RecipesApi'; 4import RecipesApi from './RecipesApi';
5import UserApi from './UserApi'; 5import UserApi from './UserApi';
6import LocalApi from './LocalApi'; 6import LocalApi from './LocalApi';
7import NewsApi from './NewsApi';
8import FeaturesApi from './FeaturesApi'; 7import FeaturesApi from './FeaturesApi';
9 8
10export default (server: any, local: any) => ({ 9export default (server: any, local: any) => ({
@@ -15,5 +14,4 @@ export default (server: any, local: any) => ({
15 features: new FeaturesApi(server), 14 features: new FeaturesApi(server),
16 user: new UserApi(server, local), 15 user: new UserApi(server, local),
17 local: new LocalApi(server, local), 16 local: new LocalApi(server, local),
18 news: new NewsApi(server, local),
19}); 17});
diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index e321f9372..6bbf572fa 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -16,14 +16,12 @@ import fetch from 'electron-fetch';
16import ServiceModel from '../../models/Service'; 16import ServiceModel from '../../models/Service';
17import RecipePreviewModel from '../../models/RecipePreview'; 17import RecipePreviewModel from '../../models/RecipePreview';
18import RecipeModel from '../../models/Recipe'; 18import RecipeModel from '../../models/Recipe';
19import NewsModel from '../../models/News';
20import UserModel from '../../models/User'; 19import UserModel from '../../models/User';
21 20
22import { sleep } from '../../helpers/async-helpers'; 21import { sleep } from '../../helpers/async-helpers';
23 22
24import { SERVER_NOT_LOADED } from '../../config'; 23import { SERVER_NOT_LOADED } from '../../config';
25import { osArch, osPlatform } from '../../environment'; 24import { userDataRecipesPath, userDataPath } from '../../environment-remote';
26import { userDataRecipesPath, userDataPath, ferdiVersion } from '../../environment-remote';
27import { asarRecipesPath } from '../../helpers/asar-helpers'; 25import { asarRecipesPath } from '../../helpers/asar-helpers';
28import apiBase from '../apiBase'; 26import apiBase from '../apiBase';
29import { prepareAuthRequest, sendAuthRequest } from '../utils/auth'; 27import { prepareAuthRequest, sendAuthRequest } from '../utils/auth';
@@ -442,25 +440,6 @@ export default class ServerApi {
442 } 440 }
443 } 441 }
444 442
445 // News
446 async getLatestNews() {
447 const url = `${apiBase(
448 true,
449 )}/news?platform=${osPlatform}&arch=${osArch}&version=${ferdiVersion}`;
450 const request = await sendAuthRequest(url);
451 if (!request.ok) throw request;
452 const data = await request.json();
453 const news = this._mapNewsModels(data);
454 debug('ServerApi::getLatestNews resolves', news);
455 return news;
456 }
457
458 async hideNews(id) {
459 const request = await sendAuthRequest(`${apiBase()}/news/${id}/read`);
460 if (!request.ok) throw request;
461 debug('ServerApi::hideNews resolves', id);
462 }
463
464 // Health Check 443 // Health Check
465 async healthCheck() { 444 async healthCheck() {
466 if (apiBase() === SERVER_NOT_LOADED) { 445 if (apiBase() === SERVER_NOT_LOADED) {
@@ -587,19 +566,6 @@ export default class ServerApi {
587 .filter(recipe => recipe !== null); 566 .filter(recipe => recipe !== null);
588 } 567 }
589 568
590 _mapNewsModels(news) {
591 return news
592 .map(newsItem => {
593 try {
594 return new NewsModel(newsItem);
595 } catch (error) {
596 console.error(error);
597 return null;
598 }
599 })
600 .filter(newsItem => newsItem !== null);
601 }
602
603 _getDevRecipes() { 569 _getDevRecipes() {
604 const recipesDirectory = getDevRecipeDirectory(); 570 const recipesDirectory = getDevRecipeDirectory();
605 try { 571 try {