Fixed getImages urls

No more "https:https://"
Will this work tomorrow, i don't know

README.md

@@ -1,4 +1,4 @@
-# **Aruppi API** (v4.1.6)
+# **Aruppi API** (v4.2.2)
 
 > This API has everything about Japan, from anime, music, radio, images, videos ... to japanese culture
 >
@@ -116,7 +116,7 @@ Currently the Aruppi app on Android is already using the v4.x.x API services fro
     </td>
         <td align="center">
       <a href="https://github.com/Fmaldonado6/Akiyama">
-        <img src="https://raw.githubusercontent.com/Fmaldonado6/Akiyama/master/images/logo/web-logo.png" width="75px;" alt="Jeluchu"/><br />
+        <img src="https://raw.githubusercontent.com/Fmaldonado6/Akiyama/master/images/logo/logo.png" width="75px;" alt="Jeluchu"/><br />
           <sub>
             <b>Akiyama</b>
           </sub>
@@ -156,4 +156,4 @@ There are also **people who have made contributions** and therefore it is also i
 - [Jéluchu](https://github.com/Jeluchu) (Multiplatform Developer, designer, and others)
 - [Capitanwesler](https://github.com/capitanwesler) (Backend developer, web developer and others)
 
-Copyright © 2021 [Jéluchu](https://about.jeluchu.com/).
+Copyright © 2022 [Jéluchu](https://about.jeluchu.com/).

package.json

@@ -1,6 +1,6 @@
 {
   "name": "aruppi",
-  "version": "4.1.6",
+  "version": "4.2.2",
   "description": "Aruppi is a custom API to obtain data from the Japanese culture for the mobile app",
   "main": "./src/api/api.ts",
   "scripts": {
@@ -54,11 +54,11 @@
     "compose-middleware": "^5.0.1",
     "cors": "^2.8.5",
     "dotenv": "^8.2.0",
-    "express": "^4.17.1",
-    "got": "^11.8.2",
+    "express": "^4.17.3",
+    "got": "^11.8.5",
     "helmet": "^4.5.0",
     "mongodb": "^3.6.6",
-    "mongoose": "^5.12.5",
+    "mongoose": "^5.13.15",
     "redis": "^3.1.2",
     "rss-parser": "^3.12.0",
     "tough-cookie": "^4.0.0",

src/controllers/AnimeController.ts

@@ -81,7 +81,7 @@ interface Movie {
 export default class AnimeController {
   async schedule(req: Request, res: Response, next: NextFunction) {
     const { day } = req.params;
-    let data: any;
+    let info: any;
 
     try {
       if (redisClient.connected) {
@@ -96,7 +96,7 @@ export default class AnimeController {
         }
       }
 
-      data = await requestGot(`${urls.BASE_JIKAN}schedule/${day}`, {
+      info = await requestGot(`${urls.BASE_JIKAN}schedules?filter=${day}`, {
         parse: true,
         scrapy: false,
       });
@@ -104,10 +104,10 @@ export default class AnimeController {
       return next(err);
     }
 
-    const animeList: Schedule[] = data[day].map((item: Schedule) => ({
-      title: item.title,
+    const animeList: Schedule[] = info.data.map((item: any) => ({
+      title: item.titles.find((x: { type: string; }) => x.type === "Default").title,
       malid: item.mal_id,
-      image: item.image_url,
+      image: item.images.jpg.image_url,
     }));
 
     if (animeList.length > 0) {
@@ -119,11 +119,11 @@ export default class AnimeController {
           JSON.stringify({ day: animeList }),
         );
 
-        /* After 24hrs expire the key. */
+        /* After 6hrs expire the key. */
 
-        redisClient.expireat(
+        redisClient.expire(
           `schedule_${hashStringMd5(day)}`,
-          parseInt(`${+new Date() / 1000}`, 10) + 7200,
+           + 21600,
         );
       }
 
@@ -137,7 +137,7 @@ export default class AnimeController {
 
   async top(req: Request, res: Response, next: NextFunction) {
     const { type, subtype, page } = req.params;
-    let data: any;
+    let info: any;
 
     try {
       if (redisClient.connected) {
@@ -161,12 +161,12 @@ export default class AnimeController {
       }
 
       if (subtype !== undefined) {
-        data = await requestGot(
-          `${urls.BASE_JIKAN}top/${type}/${page}/${subtype}`,
+        info = await requestGot(
+          `${urls.BASE_JIKAN}top/${type}?filter=${subtype}&page=${page}`,
           { parse: true, scrapy: false },
         );
       } else {
-        data = await requestGot(`${urls.BASE_JIKAN}top/${type}/${page}`, {
+        info = await requestGot(`${urls.BASE_JIKAN}top/${type}?page=${page}`, {
           parse: true,
           scrapy: false,
         });
@@ -175,11 +175,12 @@ export default class AnimeController {
       return next(err);
     }
 
-    const top: Top[] = data.top.map((item: Top) => ({
-      rank: item.rank,
-      title: item.title,
+    const top: Top[] = info.data.map((item: any, index: number) => ({
+      // A little hacky way to fix null ranks
+      rank: item.rank || index + 1 + (info.pagination.current_page-1)*info.pagination.items.per_page,
+      title: item.titles.find((x: { type: string; }) => x.type === "Default").title,
       url: item.url,
-      image_url: item.image_url,
+      image_url: item.images.jpg.image_url,
       type: type,
       subtype: subtype,
       page: page,
@@ -229,6 +230,7 @@ export default class AnimeController {
       data = await requestGot(`${urls.BASE_ANIMEFLV}api/animes/list`, {
         parse: true,
         scrapy: false,
+        spoof: true,
       });
     } catch (err) {
       return next(err);
@@ -282,7 +284,7 @@ export default class AnimeController {
         id: `ver/${anime.id}`,
         title: anime.title,
         image: anime.image,
-        episode: anime.episode,
+        episode: anime.no,
       });
     }
 

src/controllers/DirectoryController.ts

@@ -104,7 +104,7 @@ export default class DirectoryController {
 
   async getSeason(req: Request, res: Response, next: NextFunction) {
     const { year, type } = req.params;
-    let data: any;
+    let info: any;
 
     try {
       if (redisClient.connected) {
@@ -119,7 +119,7 @@ export default class DirectoryController {
         }
       }
 
-      data = await requestGot(`${urls.BASE_JIKAN}season/${year}/${type}`, {
+      info = await requestGot(`${urls.BASE_JIKAN}seasons/${year}/${type}`, {
         scrapy: false,
         parse: true,
       });
@@ -127,10 +127,10 @@ export default class DirectoryController {
       return next(err);
     }
 
-    const season: TypeAnime[] = data.anime.map((item: any) => {
+    const season: TypeAnime[] = info.data.map((item: any) => {
       return {
-        title: item.title,
-        image: item.image_url,
+        title: item.titles.find((x: { type: string; }) => x.type === "Default").title,
+        image: item.images.jpg.image_url,
         genres: item.genres.map((genre: any) => genre.name),
       };
     });
@@ -161,7 +161,7 @@ export default class DirectoryController {
   }
 
   async allSeasons(req: Request, res: Response, next: NextFunction) {
-    let data: any;
+    let info: any;
 
     try {
       if (redisClient.connected) {
@@ -176,7 +176,7 @@ export default class DirectoryController {
         }
       }
 
-      data = await requestGot(`${urls.BASE_JIKAN}season/archive`, {
+      info = await requestGot(`${urls.BASE_JIKAN}seasons`, {
         parse: true,
         scrapy: false,
       });
@@ -184,7 +184,7 @@ export default class DirectoryController {
       return next(err);
     }
 
-    const archive: Archive[] = data.archive.map((item: any) => {
+    const archive: Archive[] = info.data.map((item: any) => {
       return {
         year: item.year,
         seasons: item.seasons,
@@ -215,7 +215,7 @@ export default class DirectoryController {
   }
 
   async laterSeasons(req: Request, res: Response, next: NextFunction) {
-    let data: any;
+    let info: any;
 
     try {
       if (redisClient.connected) {
@@ -230,7 +230,7 @@ export default class DirectoryController {
         }
       }
 
-      data = await requestGot(`${urls.BASE_JIKAN}season/later`, {
+      info = await requestGot(`${urls.BASE_JIKAN}seasons/upcoming`, {
         parse: true,
         scrapy: false,
       });
@@ -238,10 +238,10 @@ export default class DirectoryController {
       return next(err);
     }
 
-    const future: Season[] = data.anime.map((item: any) => {
+    const future: Season[] = info.data.map((item: any) => {
       return {
-        title: item.title,
-        image: item.image_url,
+        title: item.titles.find((x: { type: string; }) => x.type === "Default").title,
+        image: item.images.jpg.image_url,
         malink: item.url,
       };
     });
@@ -294,6 +294,7 @@ export default class DirectoryController {
       const extraInfo: any = await animeExtraInfo(resultQuery!.mal_id);
 
       resultAnime = {
+        //aruppi_key: hashStringMd5(title),
         title: resultQuery?.title,
         poster: resultQuery?.poster,
         synopsis: resultQuery?.description,

src/controllers/UtilsController.ts

@@ -234,7 +234,7 @@ export default class UtilsController {
         `${urls.BASE_QWANT}t=images&q=${encodeURIComponent(
           title,
         )}&count=51&locale=es_ES&safesearch=1`,
-        { scrapy: false, parse: true },
+        { scrapy: false, parse: true, spoof: true, },
       );
     } catch (err) {
       return next(err);
@@ -243,8 +243,8 @@ export default class UtilsController {
     const results: any[] = data.data.result.items.map((item: any) => {
       return {
         type: item.thumb_type,
-        thumbnail: `https:${item.thumbnail}`,
-        fullsize: `https:${item.media_fullsize}`,
+        thumbnail: `${item.thumbnail}`,
+        fullsize: `${item.media_fullsize}`,
       };
     });
 
@@ -637,6 +637,7 @@ export default class UtilsController {
       data = await requestGot(`${urls.BASE_THEMEMOE}roulette`, {
         parse: true,
         scrapy: false,
+        spoof: true,
       });
     } catch (err) {
       return next(err);

src/routes.ts

@@ -26,7 +26,7 @@ routes.get('/api/v4/', (req: Request, res: Response) => {
   res.json({
     message: 'Aruppi /api - 🎏',
     author: 'Jéluchu',
-    version: '4.1.6',
+    version: '4.2.2',
     credits: 'The bitch loves /apis that offers data to Aruppi App',
     entries: [
       {

src/utils/animeTheme.ts

@@ -285,6 +285,7 @@ async function redditocall(href: string) {
   const resp = await requestGot(urls.REDDIT_ANIMETHEMES + href + '.json', {
     parse: true,
     scrapy: false,
+    spoof: true,
   });
 
   return cheerio.load(getHTML(resp.data.content_html));

src/utils/requestCall.ts

@@ -1,28 +1,52 @@
 import got from 'got';
 import cheerio from 'cheerio';
 import { CookieJar } from 'tough-cookie';
+// @ts-ignore
+import * as got_pjson from 'got/package.json'
+const pjson = require('../../package.json');
 
 const cookieJar = new CookieJar();
+const aruppi_options: any = {
+    cookieJar,
+    'headers': {
+        'user-agent': `Aruppi-API/${pjson.version} ${got_pjson.name}/${got_pjson.version}`,
+        'x-client': 'aruppi-api'
+    },
+
+};
 
 interface Options {
-  scrapy: boolean;
-  parse: boolean;
+  scrapy?:  boolean,
+  parse?:   boolean,
+  spoof?:   boolean
 }
 
 export const requestGot = async (
-  url: string,
-  options?: Options,
+    url: string,
+    options?: Options,
 ): Promise<any> => {
-  if (options !== undefined) {
-    if (options.scrapy) {
-      const response = await got(url, { cookieJar });
-      return await cheerio.load(response.body);
-    }
+    const got_options: any = {...got.defaults.options, ...aruppi_options}
+    if (options) {
+        if (options.spoof != null) {
+            got_options.headers["user-agent"] = "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:71.0) Gecko/20100101 Firefox/69.0";
+            delete got_options.headers['x-client'];
+            if (!options.spoof)
+                got_options.headers['user-agent'] = got.defaults.options.headers['user-agent'];
+        } else if (process.env.ALPI_KEY && (new URL(url)).hostname.match(/\.jeluchu\.xyz$/)) {
+            got_options.headers['x-aruppi-key'] = process.env.ALPI_KEY;
+        }
+
+        if (options.scrapy) {
+            const response = await got(url, got_options);
+            return cheerio.load(response.body);
+        }
 
-    if (options.parse) {
-      return await got(url, { cookieJar }).json();
+        if (options.parse) {
+            got_options.responseType = 'json';
+            const response = await got(url, got_options);
+            return response.body;
+        }
     }
-  } else {
-    return await got.get(url, { cookieJar });
-  }
+    const response = await got.get(url, got_options);
+    return response;
 };

src/utils/urls.ts

@@ -7,9 +7,8 @@ export default {
   BASE_ANIMEFLV_JELU: 'https://aruppi.jeluchu.xyz/apis/animeflv/v1/',
   BASE_YOUTUBE: 'https://aruppi.jeluchu.xyz/api/Youtube/?channelId=',
   BASE_YOUTUBE_PLAYLIST: 'https://aruppi.jeluchu.xyz/api/Youtube/playlist/?playlistId=',
-  BASE_JIKAN: 'https://aruppi.jeluchu.xyz/apis/jikan/v3/',
-  BASE_IVOOX:
-    'https://www.ivoox.com/podcast-anitakume_fg_f1660716_filtro_1.xml',
+  BASE_JIKAN: 'https://aruppi.jeluchu.xyz/apis/jikan/v4/',
+  BASE_IVOOX: 'https://www.ivoox.com/podcast-anitakume_fg_f1660716_filtro_1.xml',
   BASE_KUDASAI: 'https://somoskudasai.com/feed/',
   BASE_RAMENPARADOS: 'https://ramenparados.com/category/noticias/anime/feed/',
   BASE_CRUNCHYROLL: 'https://www.crunchyroll.com/newsrss?lang=esES',
@@ -17,7 +16,7 @@ export default {
   ANIMEFLV_SEARCH: 'https://animeflv.net/browse?',
   SEARCH_DIRECTORY: 'https://animeflv.net/browse?order=title&page=',
   BASE_EPISODE_IMG_URL: 'https://cdn.animeflv.net/screenshots/',
-  BASE_QWANT: 'https://api.qwant.com/search/images?',
+  BASE_QWANT: 'https://api.qwant.com/v3/search/images?',
   REDDIT_ANIMETHEMES: 'https://reddit.com/r/AnimeThemes/wiki/',
   BASE_THEMEMOE: 'https://themes.moe/api/',
   BASE_ARUPPI_MONOSCHINOS: 'https://aruppi.jeluchu.xyz/apis/monoschinos/',