rsshub 1.0.0-master.f72af1b → 1.0.0-master.f7347d9

package/lib/routes/aibase/util.ts

@@ -0,0 +1,114 @@
+import { getCurrentPath } from '@/utils/helpers';
+const __dirname = getCurrentPath(import.meta.url);
+
+import ofetch from '@/utils/ofetch';
+import { CheerioAPI } from 'cheerio';
+import timezone from '@/utils/timezone';
+import { parseDate } from '@/utils/parse-date';
+import { art } from '@/utils/render';
+import path from 'node:path';
+
+const defaultSrc = '_static/ee6af7e.js';
+const defaultToken = 'djflkdsoisknfoklsyhownfrlewfknoiaewf';
+
+const rootUrl = 'https://top.aibase.com';
+const apiRootUrl = 'https://app.chinaz.com';
+
+/**
+ * Converts a string to an array.
+ * If the string starts with '[', it is assumed to be a JSON array and is parsed accordingly.
+ * Otherwise, the string is wrapped in an array.
+ *
+ * @param str - The input string to convert to an array.
+ * @returns An array created from the input string.
+ */
+const strToArray = (str: string) => {
+    if (str.startsWith('[')) {
+        return JSON.parse(str);
+    }
+    return [str];
+};
+
+art.defaults.imports.strToArray = strToArray;
+
+/**
+ * Retrieve a token asynchronously using a CheerioAPI instance.
+ * @param $ - The CheerioAPI instance.
+ * @returns A Promise that resolves to a string representing the token.
+ */
+const getToken = async ($: CheerioAPI): Promise<string> => {
+    const scriptUrl = new URL($('script[src]').last()?.prop('src') ?? defaultSrc, rootUrl).href;
+
+    const script = await ofetch(scriptUrl, {
+        responseType: 'text',
+    });
+
+    return script.match(/"\/(\w+)\/ai\/.*?\.aspx"/)?.[1] ?? defaultToken;
+};
+
+/**
+ * Build API URLs asynchronously using a CheerioAPI instance.
+ * @param $ - The CheerioAPI instance.
+ * @returns An object containing API URLs.
+ */
+const buildApiUrl = async ($: CheerioAPI) => {
+    const token = await getToken($);
+
+    const apiRecommListUrl = new URL(`${token}/ai/GetAIProcRecommList.aspx`, apiRootUrl).href;
+    const apiRecommProcUrl = new URL(`${token}/ai/GetAIProcListByRecomm.aspx`, apiRootUrl).href;
+    const apiTagProcUrl = new URL(`${token}/ai/GetAiProductOfTag.aspx`, apiRootUrl).href;
+    // AI 资讯列表
+    const apiInfoListUrl = new URL(`${token}/ai/GetAiInfoList.aspx`, apiRootUrl).href;
+
+    return {
+        apiRecommListUrl,
+        apiRecommProcUrl,
+        apiTagProcUrl,
+        apiInfoListUrl,
+    };
+};
+
+/**
+ * Process an array of items to generate a new array of processed items for RSS.
+ * @param items - An array of items to process.
+ * @returns An array of processed items.
+ */
+const processItems = (items: any[]): any[] =>
+    items.map((item) => {
+        const title = item.name;
+        const image = item.imgurl;
+        const description = art(path.join(__dirname, 'templates/description.art'), {
+            images: image
+                ? [
+                      {
+                          src: image,
+                          alt: title,
+                      },
+                  ]
+                : undefined,
+            item,
+        });
+        const guid = `aibase-${item.zurl}`;
+
+        return {
+            title,
+            description,
+            pubDate: timezone(parseDate(item.addtime), +8),
+            link: new URL(`tool/${item.zurl}`, rootUrl).href,
+            category: [...new Set([...strToArray(item.categories), ...strToArray(item.tags), item.catname, item.procattrname, item.procformname, item.proctypename])].filter(Boolean),
+            guid,
+            id: guid,
+            content: {
+                html: description,
+                text: item.desc,
+            },
+            image,
+            banner: image,
+            updated: parseDate(item.UpdTime),
+            enclosure_url: item.logo,
+            enclosure_type: item.logo ? `image/${item.logo.split(/\./).pop()}` : undefined,
+            enclosure_title: title,
+        };
+    });
+
+export { rootUrl, processItems, buildApiUrl };

package/lib/routes/apnews/api.ts

@@ -6,12 +6,27 @@ import { parseDate } from '@/utils/parse-date';
 
 export const route: Route = {
     path: '/api/:tags?',
-    categories: ['traditional-media'],
-    example: '/apnews/api/business',
+    categories: ['traditional-media', 'popular'],
+    example: '/apnews/api/apf-topnews',
     view: ViewType.Articles,
     parameters: {
         tags: {
-            description: 'Getting a list of articles from a public API based on tags. See https://github.com/kovidgoyal/calibre/blob/81666219718b5f57d56b149a7ac017cc2a76b931/recipes/ap.recipe#L43-L46',
+            description: 'Getting a list of articles from a public API based on tags.',
+            options: [
+                { value: 'apf-topnews', label: 'Top News' },
+                { value: 'apf-sports', label: 'Sports' },
+                { value: 'apf-politics', label: 'Politics' },
+                { value: 'apf-entertainment', label: 'Entertainment' },
+                { value: 'apf-usnews', label: 'US News' },
+                { value: 'apf-oddities', label: 'Oddities' },
+                { value: 'apf-Travel', label: 'Travel' },
+                { value: 'apf-technology', label: 'Technology' },
+                { value: 'apf-lifestyle', label: 'Lifestyle' },
+                { value: 'apf-business', label: 'Business' },
+                { value: 'apf-Health', label: 'Health' },
+                { value: 'apf-science', label: 'Science' },
+                { value: 'apf-intlnews', label: 'International News' },
+            ],
             default: 'apf-topnews',
         },
     },

package/lib/routes/apnews/rss.ts

@@ -5,7 +5,7 @@ const HOME_PAGE = 'https://apnews.com';
 
 export const route: Route = {
     path: '/rss/:category?',
-    categories: ['traditional-media', 'popular'],
+    categories: ['traditional-media'],
     example: '/apnews/rss/business',
     view: ViewType.Articles,
     parameters: {

package/lib/routes/apnews/topics.ts

@@ -5,7 +5,7 @@ import { fetchArticle, removeDuplicateByKey } from './utils';
 const HOME_PAGE = 'https://apnews.com';
 
 export const route: Route = {
-    path: '/topics/:topic?',
+    path: ['/topics/:topic?', '/nav/:nav{.*}?'],
     categories: ['traditional-media', 'popular'],
     example: '/apnews/topics/apf-topnews',
     view: ViewType.Articles,
@@ -35,8 +35,9 @@ export const route: Route = {
 };
 
 async function handler(ctx) {
-    const { topic = 'trending-news' } = ctx.req.param();
-    const url = `${HOME_PAGE}/hub/${topic}`;
+    const { topic = 'trending-news', nav = '' } = ctx.req.param();
+    const useNav = ctx.req.routePath === '/apnews/nav/:nav{.*}?';
+    const url = useNav ? `${HOME_PAGE}/${nav}` : `${HOME_PAGE}/hub/${topic}`;
     const response = await got(url);
     const $ = load(response.data);
 

package/lib/routes/apple/podcast.ts

@@ -36,29 +36,33 @@ async function handler(ctx) {
 
     const $ = load(response.data);
 
-    const page_data = JSON.parse($('#shoebox-media-api-cache-amp-podcasts').text());
+    const serializedServerData = JSON.parse($('#serialized-server-data').text());
 
-    const data = JSON.parse(page_data[Object.keys(page_data)[0]]).d[0];
-    const attributes = data.attributes;
+    const seoEpisodes = serializedServerData[0].data.seoData.schemaContent.workExample;
+    const originEpisodes = serializedServerData[0].data.shelves.find((item) => item.contentType === 'episode').items;
+    const header = serializedServerData[0].data.shelves.find((item) => item.contentType === 'showHeaderRegular').items[0];
+
+    const episodes = originEpisodes.map((item) => {
+        // Try to keep line breaks in the description
+        const matchedSeoEpisode = seoEpisodes.find((seoEpisode) => seoEpisode.name === item.title) || null;
+        const episodeDescription = (matchedSeoEpisode ? matchedSeoEpisode.description : item.summary).replaceAll('\n', '<br>');
 
-    const episodes = data.relationships.episodes.data.map((item) => {
-        const attr = item.attributes;
         return {
-            title: attr.name,
-            enclosure_url: attr.assetUrl,
-            itunes_duration: attr.durationInMilliseconds / 1000,
+            title: item.title,
+            enclosure_url: item.playAction.episodeOffer.streamUrl,
             enclosure_type: 'audio/mp4',
-            link: attr.url,
-            pubDate: parseDate(attr.releaseDateTime),
-            description: attr.description.standard.replaceAll('\n', '<br>'),
+            itunes_duration: item.duration,
+            link: item.playAction.episodeOffer.storeUrl,
+            pubDate: parseDate(item.releaseDate),
+            description: episodeDescription,
         };
     });
 
     return {
-        title: attributes.name,
-        link: attributes.url,
-        itunes_author: attributes.artistName,
+        title: header.title,
+        link: header.contextAction.podcastOffer.storeUrl,
+        itunes_author: header.contextAction.podcastOffer.author,
         item: episodes,
-        description: attributes.description.standard,
+        description: header.description.replaceAll('\n', ' '),
     };
 }

package/lib/routes/bangumi/templates/tv/subject.art

@@ -0,0 +1,6 @@
+{{ if routeSubjectType === 'all' }}类型：{{ subjectTypeName }} <br>{{ /if }}
+{{ if subjectType === 2 }}看到：{{ epStatus }} / {{ subjectEps ? subjectEps: '???' }}<br>{{ /if }}
+{{ if subjectType === 1 }}读到：{{ epStatus }} / {{ subjectEps ? subjectEps: '???' }}<br>{{ /if }}
+评分：{{ score }}<br>
+放送时间：{{ date ? date : '未知' }}<br>
+<img src="{{ picUrl }}">

package/lib/routes/bangumi/tv/other/followrank.ts

@@ -7,7 +7,7 @@ export const route: Route = {
     path: '/:type/followrank',
     categories: ['anime'],
     example: '/bangumi/anime/followrank',
-    parameters: { type: '类型：anime - 动画, book - 图书, music - 音乐, game - 游戏, real - 三次元' },
+    parameters: { type: '类型：anime - 动画，book - 图书，music - 音乐，game - 游戏，real - 三次元' },
     features: {
         requireConfig: false,
         requirePuppeteer: false,
@@ -23,7 +23,7 @@ export const route: Route = {
         },
     ],
     name: '成员关注榜',
-    maintainers: ['honue', 'zhoukuncheng'],
+    maintainers: ['honue', 'zhoukuncheng', 'NekoAria'],
     handler,
 };
 
@@ -42,25 +42,22 @@ async function handler(ctx) {
 
     const $ = load(response);
 
-    const items = [
-        ...$('#columnB > div:nth-child(4) > table > tbody')
-            .find('tr')
-            .toArray()
-            .map((item) => {
-                const aTag = $(item).children('td').next().find('a');
-                return {
-                    title: aTag.html(),
-                    link: 'https://bgm.tv' + aTag.attr('href'),
-                };
-            }),
-        ...$('#chl_subitem > ul')
-            .find('li')
-            .toArray()
-            .map((item) => ({
-                title: $(item).children('a').attr('title'),
-                link: 'https://bgm.tv' + $(item).children('a').attr('href'),
-            })),
-    ];
+    const items = $('.featuredItems .mainItem')
+        .map((_, item) => {
+            const $item = $(item);
+            const link = 'https://bgm.tv' + $item.find('a').first().attr('href');
+            const imageUrl = $item
+                .find('.image')
+                .attr('style')
+                ?.match(/url\((.*?)\)/)?.[1];
+            const info = $item.find('small.grey').text();
+            return {
+                title: $item.find('.title').text().trim(),
+                link,
+                description: `<img src="${imageUrl}"><br>${info}`,
+            };
+        })
+        .toArray();
 
     const RANK_TYPES = {
         tv: '动画',
@@ -75,6 +72,6 @@ async function handler(ctx) {
         title: `BangumiTV 成员关注${RANK_TYPES[type]}榜`,
         link: url,
         item: items,
-        description: `BangumiTV 首页-成员关注${RANK_TYPES[type]}榜`,
+        description: `BangumiTV 首页 - 成员关注${RANK_TYPES[type]}榜`,
     };
 }

package/lib/routes/bangumi/tv/user/collections.ts

@@ -0,0 +1,172 @@
+import { Route } from '@/types';
+import got from '@/utils/got';
+import timezone from '@/utils/timezone';
+import { parseDate } from '@/utils/parse-date';
+import { config } from '@/config';
+import { art } from '@/utils/render';
+import path from 'node:path';
+
+import { getCurrentPath } from '@/utils/helpers';
+const __dirname = getCurrentPath(import.meta.url);
+
+// 合并不同 subjectType 的 type 映射
+const getTypeNames = (subjectType) => {
+    const commonTypeNames = {
+        1: '想看',
+        2: '看过',
+        3: '在看',
+        4: '搁置',
+        5: '抛弃',
+    };
+
+    switch (subjectType) {
+        case '1': // 书籍
+            return {
+                1: '想读',
+                2: '读过',
+                3: '在读',
+                4: '搁置',
+                5: '抛弃',
+            };
+        case '2': // 动画
+        case '6': // 三次元
+            return commonTypeNames;
+        case '3': // 音乐
+            return {
+                1: '想听',
+                2: '听过',
+                3: '在听',
+                4: '搁置',
+                5: '抛弃',
+            };
+        case '4': // 游戏
+            return {
+                1: '想玩',
+                2: '玩过',
+                3: '在玩',
+                4: '搁置',
+                5: '抛弃',
+            };
+        default:
+            return commonTypeNames; // 默认使用通用的类型
+    }
+};
+
+export const route: Route = {
+    path: '/tv/user/collections/:id/:subjectType/:type',
+    categories: ['anime'],
+    example: '/bangumi/tv/user/collections/sai/1/1',
+    parameters: {
+        id: '用户 id, 在用户页面地址栏查看',
+        subjectType: {
+            description: '全部类别: `空`、book: `1`、anime: `2`、music: `3`、game: `4`、real: `6`',
+            options: [
+                { value: 'ALL', label: 'all' },
+                { value: 'book', label: '1' },
+                { value: 'anime', label: '2' },
+                { value: 'music', label: '3' },
+                { value: 'game', label: '4' },
+                { value: 'real', label: '6' },
+            ],
+        },
+        type: {
+            description: '全部类别: `空`、想看: `1`、看过: `2`、在看: `3`、搁置: `4`、抛弃: `5`',
+            options: [
+                { value: 'ALL', label: 'all' },
+                { value: '想看', label: '1' },
+                { value: '看过', label: '2' },
+                { value: '在看', label: '3' },
+                { value: '搁置', label: '4' },
+                { value: '抛弃', label: '5' },
+            ],
+        },
+    },
+    features: {
+        requireConfig: false,
+        requirePuppeteer: false,
+        antiCrawler: false,
+        supportBT: false,
+        supportPodcast: false,
+        supportScihub: false,
+    },
+    radar: [],
+    name: 'Bangumi 用户收藏列表',
+    maintainers: ['youyou-sudo'],
+    handler,
+};
+
+async function handler(ctx) {
+    const userId = ctx.req.param('id');
+    const subjectType = ctx.req.param('subjectType') || '';
+    const type = ctx.req.param('type') || '';
+
+    const subjectTypeNames = {
+        1: '书籍',
+        2: '动画',
+        3: '音乐',
+        4: '游戏',
+        6: '三次元',
+    };
+
+    const typeNames = getTypeNames(subjectType);
+    const typeName = typeNames[type] || '';
+    const subjectTypeName = subjectTypeNames[subjectType] || '';
+
+    let descriptionFields = '';
+
+    if (typeName && subjectTypeName) {
+        descriptionFields = `${typeName}的${subjectTypeName}列表`;
+    } else if (typeName) {
+        descriptionFields = `${typeName}的列表`;
+    } else if (subjectTypeName) {
+        descriptionFields = `收藏的${subjectTypeName}列表`;
+    } else {
+        descriptionFields = '的Bangumi收藏列表';
+    }
+
+    const userDataUrl = `https://api.bgm.tv/v0/users/${userId}`;
+    const userData = await got(userDataUrl, {
+        method: 'get',
+        headers: {
+            'User-Agent': config.trueUA,
+        },
+    });
+
+    const collectionDataUrl = `https://api.bgm.tv/v0/users/${userId}/collections?${subjectType && subjectType !== 'all' ? `subject_type=${subjectType}` : ''}${type && type !== 'all' ? `&type=${type}` : ''}`;
+    const collectionData = await got(collectionDataUrl, {
+        method: 'get',
+        headers: {
+            'User-Agent': config.trueUA,
+        },
+    });
+
+    const userNickname = userData.data.nickname;
+    const items = collectionData.data.data.map((item) => {
+        const titles = item.subject.name_cn || item.subject.name;
+        const updateTime = item.updated_at;
+        const subjectId = item.subject_id;
+
+        return {
+            title: `${type === 'all' ? `${getTypeNames(item.subject_type)[item.type]}：` : ''}${titles}`,
+            description: art(path.join(__dirname, '../../templates/tv/subject.art'), {
+                routeSubjectType: subjectType,
+                subjectTypeName: subjectTypeNames[item.subject_type],
+                subjectType: item.subject_type,
+                subjectEps: item.subject.eps,
+                epStatus: item.ep_status,
+                score: item.subject.score,
+                date: item.subject.date,
+                picUrl: item.subject.images.large,
+            }),
+            link: `https://bgm.tv/subject/${subjectId}`,
+            pubDate: timezone(parseDate(updateTime), 0),
+            urls: `https://bgm.tv/subject/${subjectId}`,
+        };
+    });
+    return {
+        title: `${userNickname}${descriptionFields}`,
+        link: `https://bgm.tv/user/${userId}/collections`,
+        item: items,
+        description: `${userNickname}${descriptionFields}`,
+    };
+}

package/lib/routes/bilibili/cache.ts

@@ -8,8 +8,18 @@ import puppeteer from '@/utils/puppeteer';
 import { JSDOM } from 'jsdom';
 
 let disableConfigCookie = false;
+
 const getCookie = () => {
     if (!disableConfigCookie && Object.keys(config.bilibili.cookies).length > 0) {
+        // Update b_lsid in cookies
+        for (const key of Object.keys(config.bilibili.cookies)) {
+            const cookie = config.bilibili.cookies[key];
+            if (cookie) {
+                const updatedCookie = cookie.replace(/b_lsid=[0-9A-F]+_[0-9A-F]+/, `b_lsid=${utils.lsid()}`);
+                config.bilibili.cookies[key] = updatedCookie;
+            }
+        }
+
         return config.bilibili.cookies[Object.keys(config.bilibili.cookies)[Math.floor(Math.random() * Object.keys(config.bilibili.cookies).length)]];
     }
     const key = 'bili-cookie';
@@ -22,7 +32,9 @@ const getCookie = () => {
             page.on('requestfinished', async (request) => {
                 if (request.url() === 'https://api.bilibili.com/x/internal/gaia-gateway/ExClimbWuzhi') {
                     const cookies = await page.cookies();
-                    const cookieString = cookies.map((cookie) => `${cookie.name}=${cookie.value}`).join('; ');
+                    let cookieString = cookies.map((cookie) => `${cookie.name}=${cookie.value}`).join('; ');
+
+                    cookieString = cookieString.replace(/b_lsid=[0-9A-F]+_[0-9A-F]+/, `b_lsid=${utils.lsid()}`);
                     resolve(cookieString);
                 }
             });
@@ -129,13 +141,9 @@ const getUsernameAndFaceFromUID = async (uid) => {
     if (!name || !face) {
         const cookie = await getCookie();
         const wbiVerifyString = await getWbiVerifyString();
-        // await got(`https://space.bilibili.com/${uid}/`, {
-        //     headers: {
-        //         Referer: `https://www.bilibili.com/`,
-        //         Cookie: cookie,
-        //     },
-        // });
-        const params = utils.addWbiVerifyInfo(`mid=${uid}&token=&platform=web&web_location=1550101`, wbiVerifyString);
+        const dmImgList = utils.getDmImgList();
+        const renderData = await getRenderData(uid);
+        const params = utils.addWbiVerifyInfo(utils.addRenderData(utils.addDmVerifyInfo(`mid=${uid}&token=&platform=web&web_location=1550101`, dmImgList), renderData), wbiVerifyString);
         const { data: nameResponse } = await got(`https://api.bilibili.com/x/space/wbi/acc/info?${params}`, {
             headers: {
                 Referer: `https://space.bilibili.com/${uid}/`,

package/lib/routes/bilibili/utils.ts

@@ -95,8 +95,8 @@ function getDmImgList() {
         const dmImgList = JSON.parse(config.bilibili.dmImgList);
         return JSON.stringify([dmImgList[Math.floor(Math.random() * dmImgList.length)]]);
     }
-    const x = Math.max(generateGaussianInteger(650, 5), 0);
-    const y = Math.max(generateGaussianInteger(400, 5), 0);
+    const x = Math.max(generateGaussianInteger(1245, 5), 0);
+    const y = Math.max(generateGaussianInteger(1285, 5), 0);
     const path = [
         {
             x: 3 * x + 2 * y,
@@ -109,12 +109,92 @@ function getDmImgList() {
     return JSON.stringify(path);
 }
 
-function addDmVerifyInfo(params, dmImgList) {
+function getDmImgInter() {
+    if (config.bilibili.dmImgInter !== undefined) {
+        const dmImgInter = JSON.parse(config.bilibili.dmImgInter);
+        return JSON.stringify([dmImgInter[Math.floor(Math.random() * dmImgInter.length)]]);
+    }
+    const p1 = getDmImgInterWh(274, 601);
+    const s1 = getDmImgInterOf(134, 30);
+    const p2 = getDmImgInterWh(332, 64);
+    const s2 = getDmImgInterOf(1101, 338);
+    const of = getDmImgInterOf(0, 0);
+    const wh = getDmImgInterWh(1245, 1285);
+    const ds = [
+        {
+            t: getDmImgInterT('div'),
+            c: getDmImgInterC('clearfix g-search search-container'),
+            p: [p1[0], p1[2], p1[1]],
+            s: [s1[2], s1[0], s1[1]],
+        },
+        {
+            t: getDmImgInterT('div'),
+            c: getDmImgInterC('wrapper'),
+            p: [p2[0], p2[2], p2[1]],
+            s: [s2[2], s2[0], s2[1]],
+        },
+    ];
+    return JSON.stringify({ ds, wh, of });
+}
+
+function getDmImgInterT(tag: string) {
+    return {
+        a: 4,
+        article: 29,
+        button: 7,
+        div: 2,
+        em: 27,
+        form: 17,
+        h1: 11,
+        h2: 12,
+        h3: 13,
+        h4: 14,
+        h5: 15,
+        h6: 16,
+        img: 5,
+        input: 6,
+        label: 25,
+        li: 10,
+        ol: 9,
+        option: 20,
+        p: 3,
+        section: 28,
+        select: 19,
+        span: 1,
+        strong: 26,
+        table: 21,
+        td: 23,
+        textarea: 18,
+        th: 24,
+        tr: 22,
+        ul: 8,
+    }[tag];
+}
+
+function getDmImgInterC(className: string) {
+    return Buffer.from(className).toString('base64').slice(0, -2);
+}
+
+function getDmImgInterOf(top: number, left: number) {
+    const seed = Math.floor(514 * Math.random());
+    return [3 * top + 2 * left + seed, 4 * top - 4 * left + 2 * seed, seed];
+}
+
+function getDmImgInterWh(width: number, height: number) {
+    const seed = Math.floor(114 * Math.random());
+    return [2 * width + 2 * height + 3 * seed, 4 * width - height + seed, seed];
+}
+
+function addDmVerifyInfo(params: string, dmImgList: string) {
     const dmImgStr = Buffer.from('no webgl').toString('base64').slice(0, -2);
     const dmCoverImgStr = Buffer.from('no webgl').toString('base64').slice(0, -2);
     return `${params}&dm_img_list=${dmImgList}&dm_img_str=${dmImgStr}&dm_cover_img_str=${dmCoverImgStr}`;
 }
 
+function addDmVerifyInfoWithInter(params: string, dmImgList: string, dmImgInter: string) {
+    return `${addDmVerifyInfo(params, dmImgList)}&dm_img_inter=${dmImgInter}`;
+}
+
 const bvidTime = 1_589_990_400;
 
 export default {
@@ -124,7 +204,9 @@ export default {
     hexsign,
     addWbiVerifyInfo,
     getDmImgList,
+    getDmImgInter,
     addDmVerifyInfo,
+    addDmVerifyInfoWithInter,
     bvidTime,
     addRenderData,
 };

package/lib/routes/bilibili/video.ts

@@ -25,7 +25,7 @@ export const route: Route = {
         },
     ],
     name: 'UP 主投稿',
-    maintainers: ['DIYgod'],
+    maintainers: ['DIYgod', 'Konano', 'pseudoyu'],
     handler,
 };
 
@@ -35,19 +35,17 @@ async function handler(ctx) {
     const cookie = await cache.getCookie();
     const wbiVerifyString = await cache.getWbiVerifyString();
     const dmImgList = utils.getDmImgList();
+    const dmImgInter = utils.getDmImgInter();
     const renderData = await cache.getRenderData(uid);
     const [name, face] = await cache.getUsernameAndFaceFromUID(uid);
 
-    // await got(`https://space.bilibili.com/${uid}/video?tid=0&page=1&keyword=&order=pubdate`, {
-    //     headers: {
-    //         Referer: `https://space.bilibili.com/${uid}/`,
-    //         Cookie: cookie,
-    //     },
-    // });
-    const params = utils.addWbiVerifyInfo(utils.addRenderData(utils.addDmVerifyInfo(`mid=${uid}&ps=30&tid=0&pn=1&keyword=&order=pubdate&platform=web&web_location=1550101&order_avoided=true`, dmImgList), renderData), wbiVerifyString);
+    const params = utils.addWbiVerifyInfo(
+        utils.addRenderData(utils.addDmVerifyInfoWithInter(`mid=${uid}&ps=30&tid=0&pn=1&keyword=&order=pubdate&platform=web&web_location=1550101&order_avoided=true`, dmImgList, dmImgInter), renderData),
+        wbiVerifyString
+    );
     const response = await got(`https://api.bilibili.com/x/space/wbi/arc/search?${params}`, {
         headers: {
-            Referer: `https://space.bilibili.com/${uid}/video?tid=0&page=1&keyword=&order=pubdate`,
+            Referer: `https://space.bilibili.com/${uid}/video?tid=0&pn=1&keyword=&order=pubdate`,
             Cookie: cookie,
         },
     });