From 4d946e5b177dca3238f9db66c5033a64816d493b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9luchu?= Date: Fri, 12 Jun 2020 17:17:42 +0200 Subject: [PATCH] Fix LastEpisodes Servers - v2.2.2 --- README.md | 2 +- package.json | 2 +- src/api/api.js | 23 ++++++++++++----------- src/api/index.js | 2 +- src/utils/index.js | 29 +++++++++++------------------ 5 files changed, 26 insertions(+), 32 deletions(-) diff --git a/README.md b/README.md index e524091..6fb1e62 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# **Aruppi API** (v2.2.1) +# **Aruppi API** (v2.2.2) > This API has everything about Japan, from anime, music, radio, images, videos ... to japanese culture > diff --git a/package.json b/package.json index 7e31ae0..ad44425 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "aruppi", - "version": "2.2.1", + "version": "2.2.2", "description": "Aruppi is a custom API to obtain data from the Japanese culture for the mobile app", "main": "./src/api/api.js", "scripts": { diff --git a/src/api/api.js b/src/api/api.js index db065e3..33bcaf7 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -11,7 +11,8 @@ const { transformUrlServer, obtainPreviewNews, structureThemes, - getAnimes + getAnimes, + helper } = require('../utils/index'); const { @@ -186,18 +187,19 @@ const getLastEpisodes = async () =>{ let body = data.episodes; const promises = [] - body.map(doc =>{ + body.map(doc => { + + promises.push(helper().then(async () => ({ + id: doc.id, + title: doc.title, + image: doc.poster, + episode: doc.episode, + servers: await transformUrlServer(JSON.parse(JSON.stringify(doc.servers))) + }))); - promises.push({ - id: doc.id, - title: doc.title, - image: doc.poster, - episode: doc.episode, - servers: doc.servers.map(x => x) - }); }); - return promises; + return Promise.all(promises); }; @@ -227,7 +229,6 @@ const getSpecials = async (type, subType, page) =>{ }; - const getMoreInfo = async (title) =>{ const promises = [] diff --git a/src/api/index.js b/src/api/index.js index 4d7a913..9a69d90 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -7,7 +7,7 @@ router.get('/', (req, res) => { res.json({ message: 'Aruppi API - 🎏', author: 'Jéluchu', - version: '2.2.0', + version: '2.2.2', credits: 'The bitch loves APIs that offers data to Aruppi App', entries: [ { diff --git a/src/utils/index.js b/src/utils/index.js index 81ed896..6342bc4 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -231,7 +231,7 @@ const imageUrlToBase64 = async (url) => { return await base64.encode(url, {string: true}); }; -const search = async () => {} +const helper = async () => {} const searchAnime = async (query) => { @@ -254,7 +254,7 @@ const searchAnime = async (query) => { let poster = $element.find('a div.Image figure img').attr('src') || $element.find('a div.Image figure img').attr('data-cfsrc'); const type = $element.find('div.Description p span.Type').text(); - promises.push(search().then(async () => ({ + promises.push(helper().then(async () => ({ id: id || null, title: title || null, type: type || null, @@ -272,21 +272,13 @@ const transformUrlServer = async (urlReal) => { let res const promises = [] - for (i = 0; i <= urlReal.length - 1; i++) { - switch (urlReal[i].server) { - case "amus": - res = await html(urlReal[i].code.replace("embed", "check")).json(); - urlReal[i].code = res.file - urlReal[i].direct = true - break; - case "natsuki": - res = await html(urlReal[i].code.replace("embed", "check")).json(); - urlReal[i].code = res.file - urlReal[i].direct = true - break; - default: - urlReal[i].direct = false - break; + for (const index in urlReal) { + if (urlReal[index].server === 'amus' || urlReal[index].server === 'natsuki') { + res = await html(urlReal[index].code.replace("embed", "check")).json(); + urlReal[index].code = res.file || null + urlReal[index].direct = true + } else { + urlReal[index].direct = false } } @@ -455,5 +447,6 @@ module.exports = { obtainPreviewNews, structureThemes, getThemes, - getAnimes + getAnimes, + helper }