v3.3.7 - Refactor MoreInfo and GetEpisodes

README.md

@@ -1,4 +1,4 @@
-# **Aruppi API** (v3.3.6)
+# **Aruppi API** (v3.3.7)
 
 > This API has everything about Japan, from anime, music, radio, images, videos ... to japanese culture 
 >

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "aruppi",
-  "version": "3.3.6",
+  "version": "3.3.7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "aruppi",
-  "version": "3.3.6",
+  "version": "3.3.7",
   "description": "Aruppi is a custom API to obtain data from the Japanese culture for the mobile app",
   "main": "./src/api/api.js",
   "scripts": {

src/api/api.js

@@ -238,43 +238,22 @@ const getMoreInfo = async (title) =>{
 
   try {
 
-    const promises = []
-
     let data = JSON.parse(JSON.stringify(require('../assets/directory.json')));
-    const res = data.filter(x => x.title === title || x.mal_title === title)[0];
+    let result = data.filter(anime => anime.title === title)[0];
-
+
-    if (!res.jkanime) {
+    return {
-      promises.push({
+      title: result.title || null,
-        title: res.title || null,
+      poster: result.poster || null,
-        poster: res.poster || null,
+      synopsis: result.description || null,
-        synopsis: res.description || null,
+      status: result.state || null,
-        status: res.state || null,
+      type: result.type || null,
-        type: res.type || null,
+      rating: result.score || null,
-        rating: res.score || null,
+      genres: result.genres || null,
-        genres: res.genres || null,
+      moreInfo: await animeExtraInfo(result.mal_title).then(info => info || null),
-        episodes: await animeflvInfo(res.id).then(episodes => episodes || null),
+      promo: await getAnimeVideoPromo(result.mal_title).then(promo => promo || null),
-        moreInfo: await animeExtraInfo(res.mal_title).then(info => info || null),
+      characters: await getAnimeCharacters(result.mal_title).then(characters => characters || null)
-        promo: await getAnimeVideoPromo(res.mal_title).then(promo => promo || null),
-        characters: await getAnimeCharacters(res.mal_title).then(characters => characters || null)
-      });
-    } else {
-      promises.push({
-        title: res.title || null,
-        poster: res.poster || null,
-        synopsis: res.description || null,
-        status: res.state || null,
-        type: res.type || null,
-        rating: res.score || null,
-        genres: res.genres || null,
-        episodes: await jkanimeInfo(res.id).then(episodes => episodes || null),
-        moreInfo: await animeExtraInfo(res.mal_title).then(info => info || null),
-        promo: await getAnimeVideoPromo(res.mal_title).then(promo => promo || null),
-        characters: await getAnimeCharacters(res.mal_title).then(characters => characters || null)
-      });
     }
 
-    return promises;
-
   } catch (e) {
     console.log(e)
   }
@@ -285,23 +264,15 @@ const getEpisodes = async (title) =>{
 
   try {
 
-    const promises = []
-
     let data = JSON.parse(JSON.stringify(require('../assets/directory.json')));
     const res = data.filter(x => x.title === title || x.mal_title === title)[0];
 
     if (!res.jkanime) {
-      promises.push({
+      return await animeflvInfo(res.id).then(episodes => episodes || null)
-        episodes: await animeflvInfo(res.id).then(episodes => episodes || null),
-      });
     } else {
-      promises.push({
+      return await jkanimeInfo(res.id).then(episodes => episodes || null)
-        episodes: await jkanimeInfo(res.id).then(episodes => episodes || null),
-      });
     }
 
-    return promises;
-
   } catch (e) {
     console.log(e)
   }

src/api/routes/index.js

@@ -270,10 +270,8 @@ router.get('/moreInfo/:title' , (req, res) =>{
 
     api.getMoreInfo(title)
         .then(info =>{
-            if (info.length > 0) {
+            if (info !== undefined) {
-                res.status(200).json({
+                res.status(200).json(info);
-                    info
-                });
             } else (
                 res.status(500).json({ message: 'Aruppi lost in the shell'})
             )
@@ -290,7 +288,7 @@ router.get('/getEpisodes/:title' , (req, res) =>{
     api.getEpisodes(title)
         .then(episodes =>{
             if (episodes.length > 0) {
-                res.status(200).json(episodes);
+                res.status(200).json({episodes});
             } else (
                 res.status(500).json({ message: 'Aruppi lost in the shell'})
             )

src/utils/index.js

@@ -168,8 +168,8 @@ const animeflvInfo = async (id) => {
         amimeTempList.push(episode, episodeId);
     }
     const animeListEps = [{ nextEpisodeDate: nextEpisodeDate }];
-    Array.from({ length: amimeTempList[1].length }, (v, k) => {
+    for (let i = 0; i < amimeTempList[1].length; i++){
-        let data = amimeTempList.map(x => x[k]);
+        let data = amimeTempList.map(x => x[i]);
         let episode = data[0];
         let id = data[1];
         let link = `${id}/${animeId}-${episode}`
@@ -178,7 +178,7 @@ const animeflvInfo = async (id) => {
             episode: episode,
             id: link,
         })
-    })
+    }
 
     return animeListEps
 
@@ -260,7 +260,7 @@ const animeExtraInfo = async (title) => {
                 } else {
                     broadcast = airDay[doc.broadcast.split('at')[0].replace(" ", "").toLowerCase()]
                 }
-
+                
                 promises.push({
                     titleJapanese: doc.title_japanese,
                     source: doc.source,