rsshub 1.0.0-master.fc1b99f → 1.0.0-master.fc2cf18

package/lib/routes/pixiv/search.ts

@@ -1,4 +1,4 @@
-import { Route } from '@/types';
+import { Route, ViewType } from '@/types';
 import cache from '@/utils/cache';
 import { getToken } from './token';
 import searchPopularIllust from './api/search-popular-illust';
@@ -6,12 +6,62 @@ import searchIllust from './api/search-illust';
 import { config } from '@/config';
 import pixivUtils from './utils';
 import { parseDate } from '@/utils/parse-date';
+import ConfigNotFoundError from '@/errors/types/config-not-found';
 
 export const route: Route = {
-    path: '/search/:keyword/:order?/:mode?',
-    categories: ['social-media'],
-    example: '/pixiv/search/Nezuko/popular/2',
-    parameters: { keyword: 'keyword', order: 'rank mode, empty or other for time order, popular for popular order', mode: 'filte R18 content' },
+    path: '/search/:keyword/:order?/:mode?/:include_ai?',
+    categories: ['social-media', 'popular'],
+    view: ViewType.Pictures,
+    example: '/pixiv/search/Nezuko/popular',
+    parameters: {
+        keyword: 'keyword',
+        order: {
+            description: 'rank mode, empty or other for time order, popular for popular order',
+            default: 'date',
+            options: [
+                {
+                    label: 'time order',
+                    value: 'date',
+                },
+                {
+                    label: 'popular order',
+                    value: 'popular',
+                },
+            ],
+        },
+        mode: {
+            description: 'filte R18 content',
+            default: 'no',
+            options: [
+                {
+                    label: 'only not R18',
+                    value: 'safe',
+                },
+                {
+                    label: 'only R18',
+                    value: 'r18',
+                },
+                {
+                    label: 'no filter',
+                    value: 'no',
+                },
+            ],
+        },
+        include_ai: {
+            description: 'whether AI-generated content is included',
+            default: 'yes',
+            options: [
+                {
+                    label: 'does not include AI-generated content',
+                    value: 'no',
+                },
+                {
+                    label: 'include AI-generated content',
+                    value: 'yes',
+                },
+            ],
+        },
+    },
     features: {
         requireConfig: false,
         requirePuppeteer: false,
@@ -23,23 +73,21 @@ export const route: Route = {
     name: 'Keyword',
     maintainers: ['DIYgod'],
     handler,
-    description: `| only not R18 | only R18 | no filter      |
-  | ------------ | -------- | -------------- |
-  | safe         | r18      | empty or other |`,
 };
 
 async function handler(ctx) {
     if (!config.pixiv || !config.pixiv.refreshToken) {
-        throw new Error('pixiv RSS is disabled due to the lack of <a href="https://docs.rsshub.app/install/#pei-zhi-bu-fen-rss-mo-kuai-pei-zhi">relevant config</a>');
+        throw new ConfigNotFoundError('pixiv RSS is disabled due to the lack of <a href="https://docs.rsshub.app/deploy/config#route-specific-configurations">relevant config</a>');
     }
 
     const keyword = ctx.req.param('keyword');
     const order = ctx.req.param('order') || 'date';
     const mode = ctx.req.param('mode');
+    const includeAI = ctx.req.param('include_ai');
 
     const token = await getToken(cache.tryGet);
     if (!token) {
-        throw new Error('pixiv not login');
+        throw new ConfigNotFoundError('pixiv not login');
     }
 
     const response = await (order === 'popular' ? searchPopularIllust(keyword, token) : searchIllust(keyword, token));
@@ -51,6 +99,10 @@ async function handler(ctx) {
         illusts = illusts.filter((item) => item.x_restrict === 1);
     }
 
+    if (includeAI === 'no' || includeAI === '0') {
+        illusts = illusts.filter((item) => item.illust_ai_type <= 1);
+    }
+
     return {
         title: `${keyword} 的 pixiv ${order === 'popular' ? '热门' : ''}内容`,
         link: `https://www.pixiv.net/tags/${keyword}/artworks`,
@@ -60,7 +112,7 @@ async function handler(ctx) {
                 title: illust.title,
                 author: illust.user.name,
                 pubDate: parseDate(illust.create_date),
-                description: `<p>画师：${illust.user.name} - 阅览数：${illust.total_view} - 收藏数：${illust.total_bookmarks}</p>${images.join('')}`,
+                description: `${illust.caption}<br><p>画师：${illust.user.name} - 阅览数：${illust.total_view} - 收藏数：${illust.total_bookmarks}</p>${images.join('')}`,
                 link: `https://www.pixiv.net/artworks/${illust.id}`,
             };
         }),

package/lib/routes/pixiv/token.ts

@@ -15,34 +15,27 @@ const refreshToken = (tryGet) =>
     tryGet(
         'pixiv:accessToken',
         () =>
-            got
-                .post('https://oauth.secure.pixiv.net/auth/token', {
-                    form: {
-                        ...authorizationInfo,
-                        get_secure_url: 1,
-                        grant_type: 'refresh_token',
-                        refresh_token: config.pixiv.refreshToken,
-                    },
-                    headers: {
-                        ...maskHeader,
-                    },
-                    responseType: 'json',
-                    resolveBodyOnly: true,
-                })
-                .catch((error) => {
-                    logger.error('Pixiv refresh token failed.');
-                    logger.error(error);
-                }),
+            got.post('https://oauth.secure.pixiv.net/auth/token', {
+                form: {
+                    ...authorizationInfo,
+                    get_secure_url: 1,
+                    grant_type: 'refresh_token',
+                    refresh_token: config.pixiv.refreshToken,
+                },
+                headers: {
+                    ...maskHeader,
+                },
+            }),
         3600,
         false
     );
 
 async function getToken(tryGet) {
-    const result = await refreshToken(tryGet);
+    const { data } = await refreshToken(tryGet);
     // let expireTime;
-    if (result && result.access_token) {
+    if (data && data.access_token) {
         logger.debug('Pixiv refresh token success.');
-        token = result.access_token;
+        token = data.access_token;
         // expireTime = result.expires_in;
     }
     // } else {

package/lib/routes/pixiv/user.ts

@@ -1,14 +1,16 @@
-import { Route } from '@/types';
+import { Route, ViewType } from '@/types';
 import cache from '@/utils/cache';
 import { getToken } from './token';
 import getIllusts from './api/get-illusts';
 import { config } from '@/config';
 import pixivUtils from './utils';
 import { parseDate } from '@/utils/parse-date';
+import ConfigNotFoundError from '@/errors/types/config-not-found';
 
 export const route: Route = {
     path: '/user/:id',
-    categories: ['social-media'],
+    categories: ['social-media', 'popular'],
+    view: ViewType.Pictures,
     example: '/pixiv/user/15288095',
     parameters: { id: "user id, available in user's homepage URL" },
     features: {
@@ -31,13 +33,13 @@ export const route: Route = {
 
 async function handler(ctx) {
     if (!config.pixiv || !config.pixiv.refreshToken) {
-        throw new Error('pixiv RSS is disabled due to the lack of <a href="https://docs.rsshub.app/install/#pei-zhi-bu-fen-rss-mo-kuai-pei-zhi">relevant config</a>');
+        throw new ConfigNotFoundError('pixiv RSS is disabled due to the lack of <a href="https://docs.rsshub.app/deploy/config#route-specific-configurations">relevant config</a>');
     }
 
     const id = ctx.req.param('id');
     const token = await getToken(cache.tryGet);
     if (!token) {
-        throw new Error('pixiv not login');
+        throw new ConfigNotFoundError('pixiv not login');
     }
 
     const response = await getIllusts(id, token);
@@ -48,6 +50,7 @@ async function handler(ctx) {
     return {
         title: `${username} 的 pixiv 动态`,
         link: `https://www.pixiv.net/users/${id}`,
+        image: illusts[0].user.profile_image_urls.medium,
         description: `${username} 的 pixiv 最新动态`,
         item: illusts.map((illust) => {
             const images = pixivUtils.getImgs(illust);

package/lib/routes/pixiv/utils.ts

@@ -2,15 +2,15 @@ import { config } from '@/config';
 
 export default {
     getImgs(illust) {
-        const images = [];
+        const images: string[] = [];
         if (illust.meta_pages?.length) {
             for (const page of illust.meta_pages) {
                 const original = page.image_urls.original.replace('https://i.pximg.net', config.pixiv.imgProxy);
-                images.push(`<p><img src="${original}"/></p>`);
+                images.push(`<p><img src="${original}" width="${page.width}" height="${page.height}" /></p>`);
             }
         } else if (illust.meta_single_page.original_image_url) {
             const original = illust.meta_single_page.original_image_url.replace('https://i.pximg.net', config.pixiv.imgProxy);
-            images.push(`<p><img src="${original}"/></p>`);
+            images.push(`<p><img src="${original}" width="${illust.width}" height="${illust.height}" /></p>`);
         }
         return images;
     },

package/lib/routes/playpcesor/rss.ts

@@ -5,13 +5,14 @@ import { load } from 'cheerio';
 
 export const route: Route = {
     path: '/',
+    categories: ['blog'],
+    example: '/playpcesor',
     radar: [
         {
             source: ['playpcesor.com/'],
-            target: '',
         },
     ],
-    name: 'Unknown',
+    name: '每日精选文章',
     maintainers: ['cnkmmk'],
     handler,
     url: 'playpcesor.com/',

package/lib/routes/plurk/top.ts

@@ -2,6 +2,7 @@ import { Route } from '@/types';
 import cache from '@/utils/cache';
 import got from '@/utils/got';
 import { baseUrl, getPlurk } from './utils';
+import InvalidParameterError from '@/errors/types/invalid-parameter';
 
 const categoryList = new Set(['topReplurks', 'topFavorites', 'topResponded']);
 
@@ -33,7 +34,7 @@ export const route: Route = {
 async function handler(ctx) {
     const { category = 'topReplurks', lang = 'en' } = ctx.req.param();
     if (!categoryList.has(category)) {
-        throw new Error(`Invalid category: ${category}`);
+        throw new InvalidParameterError(`Invalid category: ${category}`);
     }
 
     const { data: apiResponse } = await got(`${baseUrl}/Stats/${category}`, {

package/lib/routes/pnas/index.ts

@@ -7,7 +7,7 @@ import { load } from 'cheerio';
 import got from '@/utils/got';
 import { parseDate } from '@/utils/parse-date';
 import { art } from '@/utils/render';
-import * as path from 'node:path';
+import path from 'node:path';
 import { setCookies } from '@/utils/puppeteer-utils';
 import { CookieJar } from 'tough-cookie';
 import logger from '@/utils/logger';

package/lib/routes/podwise/collections.ts

@@ -0,0 +1,46 @@
+import { Route } from '@/types';
+import { load } from 'cheerio';
+import ofetch from '@/utils/ofetch'; // 统一使用的请求库
+
+export const route: Route = {
+    path: '/explore',
+    categories: ['multimedia'],
+    example: '/podwise/explore',
+    radar: [
+        {
+            source: ['podwise.ai', 'podwise.ai/explore'],
+        },
+    ],
+    name: 'Collections',
+    maintainers: ['lyling'],
+    handler: async () => {
+        const link = 'https://podwise.ai/explore';
+        const response = await ofetch(link);
+        const $ = load(response);
+        const content = $('#navigator').next();
+        // header/[div => content]/footer, content p(2)
+        const collectinDescription = content.find('p').eq(1).text();
+
+        const items = content
+            .find('.group')
+            .toArray()
+            .map((item) => {
+                item = $(item);
+                const title = item.find('a').first().text();
+                const link = item.find('a').first().attr('href');
+                const description = item.find('p').first().text();
+                return {
+                    title,
+                    link: `https://podwise.ai${link}`,
+                    description,
+                };
+            });
+
+        return {
+            title: $('title').text(),
+            description: collectinDescription,
+            item: items,
+            link,
+        };
+    },
+};

package/lib/routes/podwise/episodes.ts

@@ -0,0 +1,119 @@
+import { Route } from '@/types';
+import { load } from 'cheerio';
+import ofetch from '@/utils/ofetch'; // 统一使用的请求库
+import cache from '@/utils/cache';
+import { parseDate } from '@/utils/parse-date';
+import timezone from '@/utils/timezone';
+import dayjs from 'dayjs';
+import duration from 'dayjs/plugin/duration';
+dayjs.extend(duration);
+
+export const route: Route = {
+    path: '/explore/:type',
+    categories: ['multimedia'],
+    example: '/podwise/explore/latest',
+    parameters: { type: 'latest or all episodes.' },
+    radar: [
+        {
+            source: ['podwise.ai/explore/:type'],
+        },
+    ],
+    name: 'Episodes',
+    maintainers: ['lyling'],
+    handler: async (ctx) => {
+        const type = ctx.req.param('type');
+        const link = `https://podwise.ai/explore/${type}`;
+        const response = await ofetch(link);
+        const $ = load(response);
+        const content = $('#navigator').next();
+        // header/[div => content]/footer, content>div(2)>h1
+        const title = content.find('h1').first().text();
+        const description = content.find('p').eq(1).text();
+
+        const list = content
+            .find('.group')
+            .toArray()
+            .map((item) => {
+                item = $(item);
+                const link = item.find('a').first().attr('href');
+                const description = item.find('p').first().text();
+                const pubDate = item.find('a').next().children('span').text();
+
+                return {
+                    link: `https://podwise.ai${link}`,
+                    description,
+                    pubDate: timezone(parseDate(pubDate, 'DD MMM YYYY', 'en'), 8),
+                };
+            });
+
+        const items = await Promise.all(
+            list.map((item) =>
+                cache.tryGet(item.link, async () => {
+                    const response = await ofetch(item.link);
+                    const $ = load(response);
+
+                    item.description = $('summary').first().html();
+
+                    // duration
+                    const $cover = $('img[alt="Podcast cover"]').eq(1);
+                    const $duration = $cover.next().find('span').eq(2);
+
+                    const nextData = JSON.parse(
+                        $('script:contains("podName")')
+                            .first()
+                            .text()
+                            .match(/self\.__next_f\.push\((.+)\)/)?.[1] ?? ''
+                    );
+                    const podcastData = JSON.parse(nextData[1].slice(2))[1][3].children[3].episode;
+
+                    // rss feed
+                    item.title = podcastData.title;
+                    item.author = podcastData.podName;
+
+                    // podcast feed
+                    item.itunes_item_image = podcastData.cover;
+                    item.itunes_duration = parseDuration($duration.text());
+                    item.enclosure_url = podcastData.link;
+                    // item.enclosure_length: nothing can convert to.
+                    item.enclosure_type = toEnclosureType(podcastData.linkType);
+
+                    return item;
+                })
+            )
+        );
+
+        return {
+            title,
+            description,
+            link,
+            item: items,
+        };
+    },
+};
+
+function parseDuration(durationStr) {
+    const matches = durationStr.match(/(\d+h)?(\d+m)?/);
+    const hours = matches[1] ? Number.parseInt(matches[1]) : 0;
+    const minutes = matches[2] ? Number.parseInt(matches[2]) : 0;
+
+    // 使用 dayjs 的 duration 创建持续时间对象
+    return dayjs
+        .duration({
+            hours,
+            minutes,
+        })
+        .asSeconds();
+}
+
+function toEnclosureType(linkType: string): string {
+    switch (linkType) {
+        case 'mp3':
+            return 'audio/mpeg';
+        case 'm4a':
+            return 'audio/x-m4a';
+        case 'mp4':
+            return 'video/mp4';
+        default:
+            return linkType;
+    }
+}

package/lib/routes/podwise/namespace.ts

@@ -0,0 +1,9 @@
+import type { Namespace } from '@/types';
+
+export const namespace: Namespace = {
+    name: 'Podwise',
+    url: 'podwise.ai',
+    zh: {
+        name: 'Podwise',
+    },
+};

package/lib/routes/pornhub/category-url.ts

@@ -3,9 +3,10 @@ import got from '@/utils/got';
 import { load } from 'cheerio';
 import { isValidHost } from '@/utils/valid-host';
 import { headers, parseItems } from './utils';
+import InvalidParameterError from '@/errors/types/invalid-parameter';
 
 export const route: Route = {
-    path: '/:language?/category_url/:url?',
+    path: '/category_url/:url?/:language?',
     categories: ['multimedia'],
     example: '/pornhub/category_url/video%3Fc%3D15%26o%3Dmv%26t%3Dw%26cc%3Djp',
     parameters: { language: 'language, see below', url: 'relative path after `pornhub.com/`, need to be URL encoded' },
@@ -33,7 +34,7 @@ async function handler(ctx) {
     const { language = 'www', url = 'video' } = ctx.req.param();
     const link = `https://${language}.pornhub.com/${url}`;
     if (!isValidHost(language)) {
-        throw new Error('Invalid language');
+        throw new InvalidParameterError('Invalid language');
     }
 
     const { data: response } = await got(link, { headers });

package/lib/routes/pornhub/model.ts

@@ -3,9 +3,10 @@ import got from '@/utils/got';
 import { load } from 'cheerio';
 import { isValidHost } from '@/utils/valid-host';
 import { headers, parseItems } from './utils';
+import InvalidParameterError from '@/errors/types/invalid-parameter';
 
 export const route: Route = {
-    path: '/:language?/model/:username/:sort?',
+    path: '/model/:username/:language?/:sort?',
     categories: ['multimedia'],
     example: '/pornhub/model/stacy-starando',
     parameters: { language: 'language, see below', username: 'username, part of the url e.g. `pornhub.com/model/stacy-starando`', sort: 'sorting method, see below' },
@@ -32,7 +33,7 @@ async function handler(ctx) {
     const { language = 'www', username, sort = '' } = ctx.req.param();
     const link = `https://${language}.pornhub.com/model/${username}/videos${sort ? `?o=${sort}` : ''}`;
     if (!isValidHost(language)) {
-        throw new Error('Invalid language');
+        throw new InvalidParameterError('Invalid language');
     }
 
     const { data: response } = await got(link, { headers });
@@ -42,7 +43,7 @@ async function handler(ctx) {
         .map((e) => parseItems($(e)));
 
     return {
-        title: $('title').first().text(),
+        title: $('h1').first().text(),
         description: $('section.aboutMeSection').text().trim(),
         link,
         image: $('#coverPictureDefault').attr('src'),

package/lib/routes/pornhub/pornstar.ts

@@ -3,9 +3,10 @@ import got from '@/utils/got';
 import { load } from 'cheerio';
 import { isValidHost } from '@/utils/valid-host';
 import { headers, parseItems } from './utils';
+import InvalidParameterError from '@/errors/types/invalid-parameter';
 
 export const route: Route = {
-    path: '/:language?/pornstar/:username/:sort?',
+    path: '/pornstar/:username/:language?/:sort?',
     categories: ['multimedia'],
     example: '/pornhub/pornstar/june-liu',
     parameters: { language: 'language, see below', username: 'username, part of the url e.g. `pornhub.com/pornstar/june-liu`', sort: 'sorting method, see below' },
@@ -35,19 +36,19 @@ export const route: Route = {
 
 async function handler(ctx) {
     const { language = 'www', username, sort = 'mr' } = ctx.req.param();
-    const link = `https://${language}.pornhub.com/pornstar/${username}/videos?o=${sort}`;
+    const link = `https://${language}.pornhub.com/pornstar/${username}?o=${sort}`;
     if (!isValidHost(language)) {
-        throw new Error('Invalid language');
+        throw new InvalidParameterError('Invalid language');
     }
 
     const { data: response } = await got(link, { headers });
     const $ = load(response);
-    const items = $('#mostRecentVideosSection .videoBox')
+    const items = $('#pornstarsVideoSection .videoBox')
         .toArray()
         .map((e) => parseItems($(e)));
 
     return {
-        title: $('title').first().text(),
+        title: $('h1').first().text(),
         description: $('section.aboutMeSection').text().trim(),
         link,
         image: $('#coverPictureDefault').attr('src'),

package/lib/routes/pornhub/templates/description.art

@@ -1,5 +1,5 @@
 {{ if previewVideo }}
-<video controls preload="none" poster="{{ poster }}">
+<video controls preload="metadata" poster="{{ poster }}">
     <source src="{{ previewVideo }}" type="video/webm">
 </video>
 {{ /if }}

package/lib/routes/pornhub/users.ts

@@ -3,9 +3,10 @@ import got from '@/utils/got';
 import { load } from 'cheerio';
 import { isValidHost } from '@/utils/valid-host';
 import { headers, parseItems } from './utils';
+import InvalidParameterError from '@/errors/types/invalid-parameter';
 
 export const route: Route = {
-    path: '/:language?/users/:username',
+    path: '/users/:username/:language?',
     categories: ['multimedia'],
     example: '/pornhub/users/pornhubmodels',
     parameters: { language: 'language, see below', username: 'username, part of the url e.g. `pornhub.com/users/pornhubmodels`' },
@@ -32,7 +33,7 @@ async function handler(ctx) {
     const { language = 'www', username } = ctx.req.param();
     const link = `https://${language}.pornhub.com/users/${username}/videos`;
     if (!isValidHost(language)) {
-        throw new Error('Invalid language');
+        throw new InvalidParameterError('Invalid language');
     }
 
     const { data: response } = await got(link, { headers });
@@ -42,7 +43,7 @@ async function handler(ctx) {
         .map((e) => parseItems($(e)));
 
     return {
-        title: $('title').first().text(),
+        title: $('.profileUserName a').text(),
         description: $('.aboutMeText').text().trim(),
         link,
         image: $('#coverPictureDefault').attr('src'),

package/lib/routes/pornhub/utils.ts

@@ -2,7 +2,7 @@ import { getCurrentPath } from '@/utils/helpers';
 const __dirname = getCurrentPath(import.meta.url);
 
 import { art } from '@/utils/render';
-import * as path from 'node:path';
+import path from 'node:path';
 import { parseRelativeDate } from '@/utils/parse-date';
 import dayjs from 'dayjs';
 
@@ -27,7 +27,7 @@ const parseItems = (e) => ({
         previewVideo: e.find('img').data('mediabook'),
     }),
     author: e.find('.usernameWrap a').text(),
-    pubDate: dayjs(extractDateFromImageUrl(e.find('img').data('mediumthumb'))) || parseRelativeDate(e.find('.added').text()),
+    pubDate: dayjs(extractDateFromImageUrl(e.find('img').data('mediumthumb'))).toDate() || parseRelativeDate(e.find('.added').text()),
 });
 
 export { defaultDomain, headers, renderDescription, parseItems };