diff --git a/src/routes.ts b/src/routes.ts index b18212d..b1e6dc9 100644 --- a/src/routes.ts +++ b/src/routes.ts @@ -117,7 +117,7 @@ routes.get('/api/v4/generateWaifu/', utilsController.getWaifuRandom); /* Routes to handling the v3 deprecated */ routes.get('/api/v3/*', (req: Request, res: Response, next: NextFunction) => { - res.status(302).redirect('/api/v2'); + res.status(302).redirect('/api/v3'); }); routes.get('/api/v3', (req: Request, res: Response, next: NextFunction) => { diff --git a/src/utils/util.ts b/src/utils/util.ts index 2d1db98..678bfc1 100644 --- a/src/utils/util.ts +++ b/src/utils/util.ts @@ -601,11 +601,24 @@ export const videoServersMonosChinos = async (id: string) => { return err; } - let videosContainer = $('.TPlayerTb').text(); - let counter: number = 1; + let videoNames: string[] = $('.TPlayerNv li') + .map((index: number, element: cheerio.Element) => { + return $(element).attr('title'); + }) + .get(); + + videoServers.push({ + id: videoNames[0], + url: decodeURIComponent( + $('.TPlayer div iframe').attr('src')?.split('url=')[1]!, + ).split('&id')[0], + direct: false, + }); + + const videoContainer: any = $('.TPlayer div').text(); - $(videosContainer).each((index: number, element: cheerio.Element) => { - let video = $(element).attr('src'); + $(videoContainer).each((index: number, element: cheerio.Element) => { + let video: any = $(element).attr('src'); if (video) { video = video.split('url=')[1]; @@ -614,10 +627,14 @@ export const videoServersMonosChinos = async (id: string) => { } if (video) { - videoServers.push({ - id: `Op${counter++}`, - url: video, - direct: false, + videoNames.forEach((value: string) => { + if (video.includes(value.toLowerCase())) { + videoServers.push({ + id: value.toLowerCase(), + url: video, + direct: false, + }); + } }); } });