rsshub 1.0.0-master.facc6d5 → 1.0.0-master.fad0dfa

package/lib/routes/mihoyo/ys/news.ts

@@ -1,19 +1,12 @@
 import { Route } from '@/types';
-import { getCurrentPath } from '@/utils/helpers';
-const __dirname = getCurrentPath(import.meta.url);
-
-import cache from '@/utils/cache';
 import got from '@/utils/got';
-import timezone from '@/utils/timezone';
 import { parseDate } from '@/utils/parse-date';
-import { art } from '@/utils/render';
-import path from 'node:path';
 
 const categories = {
     latest: {
         main: {
-            id: 10,
-            slug: 10,
+            id: 719,
+            slug: 719,
             title: '最新',
         },
         'zh-tw': {
@@ -24,8 +17,8 @@ const categories = {
     },
     news: {
         main: {
-            id: 11,
-            slug: 11,
+            id: 720,
+            slug: 720,
             title: '新闻',
         },
         'zh-tw': {
@@ -36,8 +29,8 @@ const categories = {
     },
     notice: {
         main: {
-            id: 12,
-            slug: 12,
+            id: 721,
+            slug: 721,
             title: '公告',
         },
         'zh-tw': {
@@ -48,8 +41,8 @@ const categories = {
     },
     activity: {
         main: {
-            id: 258,
-            slug: 258,
+            id: 722,
+            slug: 722,
             title: '活动',
         },
         'zh-tw': {
@@ -66,7 +59,7 @@ const rootUrls = {
 };
 
 const apiRootUrls = {
-    main: 'https://content-static.mihoyo.com',
+    main: 'https://api-takumi-static.mihoyo.com',
     'zh-tw': 'https://api-os-takumi-static.hoyoverse.com',
 };
 
@@ -76,7 +69,7 @@ const currentUrls = {
 };
 
 const apiUrls = {
-    main: '/content/ysCn/getContentList',
+    main: '/content_v2_user/app/16471662a82d418a/getContentList',
     'zh-tw': '/content_v2_user/app/a1b1f9d3315447cc/getContentList',
 };
 
@@ -115,7 +108,7 @@ async function handler(ctx) {
     const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 50;
 
     const params = {
-        main: `pageNum=1&channelId=${categories[category][location].id}&pageSize=${limit}`,
+        main: `iPage=1&sLangKey=zh-cn&iChanId=${categories[category][location].id}&iPageSize=${limit}`,
         'zh-tw': `iPage=1&sLangKey=zh-tw&iChanId=${categories[category][location].id}&iPageSize=${limit}`,
     };
 
@@ -129,63 +122,14 @@ async function handler(ctx) {
         url: apiUrl,
     });
 
-    const data = response.data.data.list;
-
-    let banner = '';
-
-    let items =
-        location === 'main'
-            ? data.map((item) => {
-                  banner = item.ext.filter((e) => e.arrtName === 'banner');
-
-                  return {
-                      author: item.author,
-                      title: item.title.trim(),
-                      pubDate: timezone(parseDate(item.start_time), +8),
-                      link: `${rootUrl}/main/news/detail/${item.contentId}`,
-                      image: banner.value ? banner.value[0].url : undefined,
-                  };
-              })
-            : data.map((item) => {
-                  banner = item.sExt ? JSON.parse(item.sExt).banner : undefined;
-
-                  return {
-                      author: item.sAuthor,
-                      title: item.sTitle.split('｜')[0],
-                      pubDate: timezone(parseDate(item.dtCreateTime), +8),
-                      link: `${rootUrl}/zh-tw/news/detail/${item.contentId}`,
-                      description: art(path.join(__dirname, '../templates/ys.art'), {
-                          image: banner ? banner[0].url : undefined,
-                          description: item.sContent,
-                      }),
-                  };
-              });
-
-    if (location === 'main') {
-        items = await Promise.all(
-            items.map((item) =>
-                cache.tryGet(item.link, async () => {
-                    const detailResponse = await got({
-                        method: 'get',
-                        url: item.link,
-                    });
-
-                    try {
-                        item.description = art(path.join(__dirname, '../templates/ys.art'), {
-                            image: item.image,
-                            description: JSON.parse(detailResponse.data.match(/,content:(".*?"),ext:/)[1].trim()),
-                        });
-                    } catch {
-                        // no-empty
-                    }
-
-                    delete item.image;
-
-                    return item;
-                })
-            )
-        );
-    }
+    const list = response.data.data.list;
+    const items = list.map((item) => ({
+        title: item.sTitle,
+        description: item.sContent,
+        link: `${rootUrl}${currentUrls[location]}/detail/${item.iInfoId}`,
+        pubDate: parseDate(item.dtStartTime),
+        category: item.sCategoryName,
+    }));
 
     return {
         title: `原神 - ${categories[category][location].title}`,

package/lib/routes/mindmeister/example.ts

@@ -1,6 +1,4 @@
 import { Route } from '@/types';
-import { getCurrentPath } from '@/utils/helpers';
-const __dirname = getCurrentPath(import.meta.url);
 
 import got from '@/utils/got';
 import { load } from 'cheerio';

package/lib/routes/minecraft/version.ts

@@ -63,13 +63,13 @@ const linkFormatter: any = {
     enwiki: (item: VersionInManifest) => {
         let id = item.id;
         if (item.type === 'old_beta' && id.startsWith('b')) {
-            id = `Beta ${id.substring(1)}`;
+            id = `Beta ${id.slice(1)}`;
         }
         if (item.type === 'old_alpha') {
             if (id.startsWith('a')) {
-                id = `Alpha ${id.substring(1)}`;
+                id = `Alpha ${id.slice(1)}`;
             } else if (id.startsWith('c')) {
-                id = `Classic ${id.substring(1)}`;
+                id = `Classic ${id.slice(1)}`;
             } else if (id.startsWith('inf-')) {
                 id = `Infdev`;
             } else if (id.startsWith('rd-')) {
@@ -84,13 +84,13 @@ const linkFormatter: any = {
             id = `Java版${id}`;
         }
         if (item.type === 'old_beta' && id.startsWith('b')) {
-            id = `Java版Beta ${id.substring(1)}`;
+            id = `Java版Beta ${id.slice(1)}`;
         }
         if (item.type === 'old_alpha') {
             if (id.startsWith('a')) {
-                id = `Java版Alpha ${id.substring(1)}`;
+                id = `Java版Alpha ${id.slice(1)}`;
             } else if (id.startsWith('c')) {
-                id = `Java版Classic ${id.substring(1)}`;
+                id = `Java版Classic ${id.slice(1)}`;
             } else if (id.startsWith('inf-')) {
                 id = `Java版Infdev`;
             } else if (id.startsWith('rd-')) {

package/lib/routes/mingpao/index.ts

@@ -1,6 +1,4 @@
 import { Route } from '@/types';
-import { getCurrentPath } from '@/utils/helpers';
-const __dirname = getCurrentPath(import.meta.url);
 
 import cache from '@/utils/cache';
 import ofetch from '@/utils/ofetch';
@@ -160,7 +158,7 @@ async function handler(ctx) {
 
                 item.description = renderDesc(fancybox, $('.txt4').html() ?? $('.article_content.line_1_5em').html() ?? $('.txt3').html());
                 item.pubDate = parseDate(item.pubDate);
-                item.guid = item.link.includes('?') ? item.link : item.link.substring(0, item.link.lastIndexOf('/'));
+                item.guid = item.link.includes('?') ? item.link : item.link.slice(0, item.link.lastIndexOf('/'));
 
                 return item;
             })

package/lib/routes/miniflux/entry.ts

@@ -74,8 +74,8 @@ async function handler(ctx) {
             return '';
         }
 
-        const filter = item.substring(0, item.indexOf('='));
-        const option = item.substring(item.lastIndexOf('=') + 1);
+        const filter = item.slice(0, item.indexOf('='));
+        const option = item.slice(item.lastIndexOf('=') + 1);
 
         switch (filter) {
             case 'mark':
@@ -105,7 +105,7 @@ async function handler(ctx) {
                 break;
             // If user mistakenly set `category=Int`
             case 'category':
-                isNaN(Number.parseInt(option)) ? (item = '') : (item = `category_id=${option}`);
+                Number.isNaN(Number.parseInt(option)) ? (item = '') : (item = `category_id=${option}`);
                 break;
             case 'order':
                 if (option !== 'id' && option !== 'category_title' && option !== 'published_at' && option !== 'status' && option !== 'category_id') {
@@ -117,7 +117,7 @@ async function handler(ctx) {
             // parameter, since user may mistakenly input this parameter
             // several times.
             case 'limit':
-                if (!isNaN(option) && !setLimit.length) {
+                if (!Number.isNaN(option) && !setLimit.length) {
                     limit = option;
                     setLimit.push(1);
                 }
@@ -157,7 +157,7 @@ async function handler(ctx) {
 
     let queryLimit = ctx.req.query('limit');
     let result: Data;
-    if (feeds.search(/feeds?=/g) !== -1 || !isNaN(Number.parseInt(feeds.split('&').join('')))) {
+    if (feeds.search(/feeds?=/g) !== -1 || !Number.isNaN(Number.parseInt(feeds.split('&').join('')))) {
         const feedsID = feeds.replaceAll(/feeds?=/g, '');
         const feedsList = [feedsID.split('&')].flat();
 

package/lib/routes/miniflux/subscription.ts

@@ -51,8 +51,8 @@ async function handler(ctx) {
         if (item.search('=') === -1) {
             return '';
         }
-        const filter = item.substring(0, item.indexOf('='));
-        const option = item.substring(item.lastIndexOf('=') + 1);
+        const filter = item.slice(0, item.indexOf('='));
+        const option = item.slice(item.lastIndexOf('=') + 1);
         if (filter.search('categor') !== -1) {
             option.split(',').map((item) => categories.push(item.toString().toLowerCase()));
             return filter;

package/lib/routes/missav/new.ts

@@ -1,6 +1,4 @@
 import { Route } from '@/types';
-import { getCurrentPath } from '@/utils/helpers';
-const __dirname = getCurrentPath(import.meta.url);
 
 import ofetch from '@/utils/ofetch';
 import * as cheerio from 'cheerio';

package/lib/routes/misskey/home-timeline.ts

@@ -3,7 +3,7 @@ import ConfigNotFoundError from '@/errors/types/config-not-found';
 import { Route, ViewType } from '@/types';
 import got from '@/utils/got';
 import { queryToBoolean } from '@/utils/readable-social';
-import querystring from 'querystring';
+import querystring from 'node:querystring';
 import utils from './utils';
 
 export const route: Route = {

package/lib/routes/misskey/user-timeline.ts

@@ -3,7 +3,7 @@ import ConfigNotFoundError from '@/errors/types/config-not-found';
 import InvalidParameterError from '@/errors/types/invalid-parameter';
 import { Data, Route, ViewType } from '@/types';
 import { fallback, queryToBoolean } from '@/utils/readable-social';
-import querystring from 'querystring';
+import querystring from 'node:querystring';
 import utils from './utils';
 
 export const route: Route = {

package/lib/routes/misskey/utils.ts

@@ -1,6 +1,3 @@
-import { getCurrentPath } from '@/utils/helpers';
-const __dirname = getCurrentPath(import.meta.url);
-
 import cache from '@/utils/cache';
 import got from '@/utils/got';
 import { parseDate } from '@/utils/parse-date';

package/lib/routes/mittrchina/index.ts

@@ -1,6 +1,4 @@
 import { Route } from '@/types';
-import { getCurrentPath } from '@/utils/helpers';
-const __dirname = getCurrentPath(import.meta.url);
 
 import cache from '@/utils/cache';
 import got from '@/utils/got';

package/lib/routes/modelscope/community.ts

@@ -1,6 +1,4 @@
 import { Route } from '@/types';
-import { getCurrentPath } from '@/utils/helpers';
-const __dirname = getCurrentPath(import.meta.url);
 
 import cache from '@/utils/cache';
 import { load } from 'cheerio';

package/lib/routes/modelscope/datasets.ts

@@ -1,6 +1,4 @@
 import { Route } from '@/types';
-import { getCurrentPath } from '@/utils/helpers';
-const __dirname = getCurrentPath(import.meta.url);
 
 import cache from '@/utils/cache';
 import got from '@/utils/got';

package/lib/routes/modelscope/studios.ts

@@ -1,6 +1,4 @@
 import { Route } from '@/types';
-import { getCurrentPath } from '@/utils/helpers';
-const __dirname = getCurrentPath(import.meta.url);
 
 import cache from '@/utils/cache';
 import got from '@/utils/got';

package/lib/routes/modian/zhongchou.ts

@@ -62,15 +62,15 @@ async function handler(ctx) {
 
     const list = $('.pro_title')
         .slice(0, 12)
-        .map((_, item) => {
+        .toArray()
+        .map((item) => {
             item = $(item).parent();
 
             return {
                 title: item.text(),
                 link: item.attr('href'),
             };
-        })
-        .get();
+        });
 
     const items = await Promise.all(
         list.map((item) =>

package/lib/routes/modrinth/versions.ts

@@ -1,5 +1,4 @@
 import { Route } from '@/types';
-import { getCurrentPath } from '@/utils/helpers';
 import { parseDate } from '@/utils/parse-date';
 import { art } from '@/utils/render';
 import path from 'node:path';
@@ -9,8 +8,6 @@ import MarkdownIt from 'markdown-it';
 import type { Author, Project, Version } from '@/routes/modrinth/api';
 import type { Context } from 'hono';
 
-const __dirname = getCurrentPath(import.meta.url);
-
 const ofetch = _ofetch.create({
     headers: {
         // https://docs.modrinth.com/#section/User-Agents

package/lib/routes/mpaypass/main.ts

@@ -38,20 +38,20 @@ async function handler(ctx) {
 
     const title_cn = type ? $(`a[href="http://www.mpaypass.com.cn/${type}.html"]`).text() : '最新文章';
     const list = $('.newslist')
-        .map(function () {
+        .toArray()
+        .map((item) => {
             const info = {
-                title: $(this).find('#title').text(),
-                link: $(this).find('#title').find('a').attr('href'),
-                time: $(this).find('#time').text(),
-                category: $(this)
+                title: $(item).find('#title').text(),
+                link: $(item).find('#title').find('a').attr('href'),
+                time: $(item).find('#time').text(),
+                category: $(item)
                     .find('#keywords')
                     .find('a')
                     .toArray()
                     .map((e) => $(e).text().trim()),
             };
             return info;
-        })
-        .get();
+        });
 
     const out = await Promise.all(
         list.map((info) =>

package/lib/routes/mpaypass/news.ts

@@ -39,7 +39,8 @@ async function handler() {
         language: 'zh-CN',
         item: await Promise.all(
             $list('.Newslist-li')
-                .map((_, el) => {
+                .toArray()
+                .map((el) => {
                     const $el = $list(el);
                     const $a = $el.find('.Newslist-title a');
                     const href = $a.attr('href');
@@ -59,7 +60,6 @@ async function handler() {
                         };
                     });
                 })
-                .get()
         ),
     };
 }

package/lib/routes/mrdx/daily.ts

@@ -4,7 +4,7 @@ import { load } from 'cheerio';
 import { parseDate } from '@/utils/parse-date';
 import { getElementChildrenInnerText } from './utils';
 import dayjs from 'dayjs';
-import utc from 'dayjs/plugin/utc';
+import utc from 'dayjs/plugin/utc.js';
 dayjs.extend(utc);
 
 import got from '@/utils/got';

package/lib/routes/msn/index.ts

@@ -35,7 +35,7 @@ export const route: Route = {
         const { market, name, id } = ctx.req.param();
         let truncatedId = id;
         if (truncatedId.startsWith('sr-')) {
-            truncatedId = truncatedId.substring(3);
+            truncatedId = truncatedId.slice(3);
         }
 
         const pageData = await ofetch(`https://www.msn.com/${market}/channel/source/${name}/${id}`);
@@ -54,7 +54,7 @@ export const route: Route = {
                 const parsedArticleUrl = URL.parse(articleUrl);
                 let articleId = parsedArticleUrl?.pathname.split('/').pop();
                 if (articleId?.startsWith('ar-')) {
-                    articleId = articleId.substring(3);
+                    articleId = articleId.slice(3);
                     const fetchedArticleContentHtml = (await cache.tryGet(articleId, async () => {
                         const articleData = await ofetch(`https://assets.msn.com/content/view/v2/Detail/${market}/${articleId}`);
                         return articleData.body;

package/lib/routes/mycard520/news.ts

@@ -4,7 +4,8 @@ import cache from '@/utils/cache';
 import ofetch from '@/utils/ofetch';
 import { parseDate } from '@/utils/parse-date';
 
-import { type CheerioAPI, type Cheerio, type Element, load } from 'cheerio';
+import { type CheerioAPI, type Cheerio, load } from 'cheerio';
+import type { Element } from 'domhandler';
 import { type Context } from 'hono';
 
 export const handler = async (ctx: Context): Promise<Data> => {
@@ -70,16 +71,7 @@ export const handler = async (ctx: Context): Promise<Data> => {
                     const pubDateStr: string | undefined = $$('div.date').first().text();
                     const upDatedStr: string | undefined = pubDateStr;
 
-                    const clearIndex = $$pageBox
-                        .children()
-                        .toArray()
-                        .map((el, index) => ({ el, index }))
-                        .filter(({ el }) => el.tagName === 'div' && el.attributes.some((attr) => attr.name === 'style' && attr.value.split(';').some((prop) => prop.trim() === 'clear:both')))
-                        .reduce((_, { index }) => index, -1);
-
-                    if (clearIndex !== -1) {
-                        $$pageBox.children().slice(0, clearIndex).remove();
-                    }
+                    $$pageBox.find('h2, div.date, .the_champ_sharing_container').remove();
 
                     const description: string | undefined = $$pageBox.html() ?? item.description;