rsshub 1.0.0-master.f9ec483 → 1.0.0-master.fa04a11

package/lib/routes/telegram/tglib/client.ts

@@ -23,14 +23,18 @@ export async function getClient(authParams?: UserAuthParams, session?: string) {
         autoReconnect: true,
         retryDelay: 3000,
         maxConcurrentDownloads: Number(config.telegram.maxConcurrentDownloads ?? 10),
+        proxy:
+            config.telegram.proxy?.host && config.telegram.proxy.port && config.telegram.proxy.secret
+                ? {
+                      ip: config.telegram.proxy.host,
+                      port: Number(config.telegram.proxy.port),
+                      MTProxy: true,
+                      secret: config.telegram.proxy.secret,
+                  }
+                : undefined,
     });
-    await client.start(
-        Object.assign(authParams ?? {}, {
-            onError: (err) => {
-                throw new Error('Cannot start TG: ' + err);
-            },
-        }) as any
-    );
+
+    await client.connect();
     return client;
 }
 
@@ -77,7 +81,7 @@ function ExpandInlineBytes(bytes) {
     return real;
 }
 
-function getMediaLink(ctx, channel, channelName, message) {
+function getMediaLink(ctx, channel: Api.InputPeerChannel, channelName: string, message: Api.Message) {
     const base = `${ctx.protocol}://${ctx.host}/telegram/channel/${channelName}`;
     const src = base + `${channel.channelId}_${message.id}`;
 
@@ -98,7 +102,7 @@ function getMediaLink(ctx, channel, channelName, message) {
         linkText += ` (${humanFileSize(x.document.size)})`;
         return `<a href="${src}" target="_blank"><img src="${src}?thumb" alt=""/><br/>${linkText}</a>`;
     }
-    return;
+    return '';
 }
 function getFilename(x) {
     if (x instanceof Api.MessageMediaDocument) {

package/lib/routes/tesla/cx.ts

@@ -28,9 +28,9 @@ export const route: Route = {
     description: `| 充电免停 | 酒店 | 美食 | 生活方式 |
   | -------- | ---- | ---- | -------- |
 
-  :::tip
+::: tip
   分类为 **充电免停** 时，城市参数不起作用
-  :::
+:::
 
 <details>
   <summary>可选城市</summary>

package/lib/routes/test/index.ts

@@ -32,6 +32,10 @@ async function handler(ctx) {
     if (ctx.req.param('id') === 'invalid-parameter-error') {
         throw new InvalidParameterError('Test invalid parameter error');
     }
+    if (ctx.req.param('id') === 'redirect') {
+        ctx.set('redirect', '/test/1');
+        return;
+    }
     let item: DataItem[] = [];
     let image: string | null = null;
     switch (ctx.req.param('id')) {

package/lib/routes/the/index.ts

@@ -111,7 +111,7 @@ export const route: Route = {
     handler,
     example: '/the',
     parameters: { filter: '过滤器，见下方描述' },
-    description: `:::tip
+    description: `::: tip
   如果你想订阅特定类别或标签，可以在路由中填写 filter 参数。\`/category/rawmw7dsta2jew\` 可以实现订阅 [剩余价值](https://the.bi/s/rawmw7dsta2jew) 类别。此时，路由是 [\`/the/category/rawmw7dsta2jew/\`](https://rsshub.app/the/category/rawmw7dsta2jew).
 
   你还可以订阅多个类别。\`/category/rawmw7dsta2jew,rawbcvxkktdkq8/\` 可以实现同时订阅 [剩余价值](https://the.bi/s/rawmw7dsta2jew) 和 [打江山](https://the.bi/s/rawbcvxkktdkq8) 两个类别。此时，路由是 [\`/the/category/rawmw7dsta2jew,rawbcvxkktdkq8\`](https://rsshub.app/the/category/rawmw7dsta2jew,rawbcvxkktdkq8).
@@ -119,7 +119,7 @@ export const route: Route = {
   类别和标签也可以合并订阅。\`/category/rawmw7dsta2jew/tag/raweekl3na8trq\` 订阅 [剩余价值](https://the.bi/s/rawmw7dsta2jew) 类别和 [动物](https://the.bi/s/raweekl3na8trq) 标签。此时，路由是 [\`/the/category/rawmw7dsta2jew/tag/raweekl3na8trq\`](https://rsshub.app/the/category/rawmw7dsta2jew/tag/raweekl3na8trq).
 
   你还可以搜索关键字。\`/search/中国\` 搜索关键字 [中国](https://the.bi/s/?s=中国)。在这种情况下，路径是 [\`/the/search/中国\`](https://rsshub.app/the/search/中国).
-  :::
+:::
 
   | 分类                                           | ID                                                               |
   | ---------------------------------------------- | ---------------------------------------------------------------- |

package/lib/routes/theatlantic/news.ts

@@ -1,5 +1,5 @@
 import { Route } from '@/types';
-import got from '@/utils/got';
+import ofetch from '@/utils/ofetch';
 import { load } from 'cheerio';
 import { getArticleDetails } from './utils';
 export const route: Route = {
@@ -21,7 +21,7 @@ export const route: Route = {
         },
     ],
     name: 'News',
-    maintainers: ['EthanWng97'],
+    maintainers: ['EthanWng97', 'pseudoyu'],
     handler,
     description: `| Popular      | Latest | Politics | Technology | Business |
   | ------------ | ------ | -------- | ---------- | -------- |
@@ -34,11 +34,8 @@ async function handler(ctx) {
     const host = 'https://www.theatlantic.com';
     const category = ctx.req.param('category');
     const url = `${host}/${category}/`;
-    const response = await got({
-        method: 'get',
-        url,
-    });
-    const $ = load(response.data);
+    const response = await ofetch(url);
+    const $ = load(response);
     const contents = JSON.parse($('script#__NEXT_DATA__').text()).props.pageProps.urqlState;
     const keyWithContent = Object.keys(contents).filter((key) => contents[key].data.includes(category));
     const data = JSON.parse(contents[keyWithContent].data);

package/lib/routes/theatlantic/utils.ts

@@ -3,7 +3,7 @@ const __dirname = getCurrentPath(import.meta.url);
 
 import cache from '@/utils/cache';
 import { load } from 'cheerio';
-import got from '@/utils/got';
+import ofetch from '@/utils/ofetch';
 import { parseDate } from '@/utils/parse-date';
 import { art } from '@/utils/render';
 import path from 'node:path';
@@ -16,20 +16,18 @@ const getArticleDetails = async (items) => {
         items.map((item) =>
             cache.tryGet(item.link, async () => {
                 const url = item.link;
-                const response = await got({
-                    url,
-                    method: 'get',
+                const html = await ofetch(url, {
                     headers: {
                         'User-Agent': UA,
                     },
                 });
-                const html = response.data;
                 const $ = load(html);
                 let data = JSON.parse($('script#__NEXT_DATA__').text());
 
                 const list = data.props.pageProps.urqlState;
                 const keyWithContent = Object.keys(list).filter((key) => list[key].data.includes('content'));
                 data = JSON.parse(list[keyWithContent].data).article;
+
                 item.title = data.shareTitle;
                 item.category = data.categories.map((category) => category.slug);
                 for (const channel of data.channels) {
@@ -37,9 +35,13 @@ const getArticleDetails = async (items) => {
                 }
                 item.content = data.content.filter((item) => item.innerHtml !== undefined && item.innerHtml !== '');
                 item.caption = data.dek;
-                item.imgUrl = data.leadArt.image?.url;
-                item.imgAlt = data.leadArt.image?.altText;
-                item.imgCaption = data.leadArt.image?.attributionText;
+
+                if (data.leadArt) {
+                    item.imgUrl = data.leadArt.image?.url;
+                    item.imgAlt = data.leadArt.image?.altText;
+                    item.imgCaption = data.leadArt.image?.attributionText;
+                }
+
                 item.description = art(path.join(__dirname, 'templates/article-description.art'), {
                     item,
                 });

package/lib/routes/theblockbeats/index.ts

@@ -3,7 +3,7 @@ import cache from '@/utils/cache';
 import ofetch from '@/utils/ofetch';
 import { load } from 'cheerio';
 import { parseDate } from '@/utils/parse-date';
-import path from 'path';
+import path from 'node:path';
 import { art } from '@/utils/render';
 import { getCurrentPath } from '@/utils/helpers';
 

package/lib/routes/thegradient/index.ts

@@ -0,0 +1,80 @@
+import { Route, DataItem } from '@/types';
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
+import cache from '@/utils/cache';
+
+export const route: Route = {
+    path: '/posts',
+    categories: ['blog'],
+    example: '/thegradient/posts',
+    radar: [
+        {
+            source: ['thegradient.pub/'],
+        },
+    ],
+    url: 'thegradient.pub/',
+    name: 'Posts',
+    maintainers: ['liyaozhong'],
+    handler,
+    description: 'The Gradient Blog Posts',
+};
+
+async function handler() {
+    const rootUrl = 'https://thegradient.pub';
+    const currentUrl = rootUrl;
+
+    const response = await got(currentUrl);
+    const $ = load(response.data);
+
+    let items = $('.c-post-card-wrap')
+        .toArray()
+        .map((item) => {
+            const $item = $(item);
+            const $link = $item.find('.c-post-card__title-link').first();
+            const $meta = $item.find('.c-post-card__meta');
+
+            const href = $link.attr('href');
+            const title = $link.text().trim();
+            const dateStr = $meta.find('time').attr('datetime');
+
+            if (!href || !title || !dateStr) {
+                return null;
+            }
+
+            const link = new URL(href, rootUrl).href;
+            const pubDate = parseDate(dateStr);
+
+            return {
+                title,
+                link,
+                pubDate,
+            } as DataItem;
+        })
+        .filter((item): item is DataItem => item !== null);
+
+    items = (
+        await Promise.all(
+            items.map((item) =>
+                cache.tryGet(item.link as string, async () => {
+                    try {
+                        const detailResponse = await got(item.link);
+                        const $detail = load(detailResponse.data);
+
+                        item.description = $detail('.c-content').html() || '';
+
+                        return item as DataItem;
+                    } catch {
+                        return item;
+                    }
+                })
+            )
+        )
+    ).filter((item): item is DataItem => item !== null);
+
+    return {
+        title: 'The Gradient Blog',
+        link: rootUrl,
+        item: items,
+    };
+}

package/lib/routes/thegradient/namespace.ts

@@ -0,0 +1,7 @@
+import type { Namespace } from '@/types';
+
+export const namespace: Namespace = {
+    name: 'The Gradient',
+    url: 'thegradient.pub',
+    lang: 'en',
+};

package/lib/routes/theinitium/app.ts

@@ -9,7 +9,7 @@ import { getCurrentPath } from '@/utils/helpers';
 
 export const route: Route = {
     path: '/app/:category?',
-    categories: ['new-media'],
+    categories: ['new-media', 'popular'],
     example: '/theinitium/app',
     parameters: {
         category: 'Category, see below, latest_sc by default',
@@ -32,7 +32,7 @@ export const route: Route = {
     handler,
     description: `抓取[The Initium App](https://app.theinitium.com/)的文章列表
 
-:::warning
+::: warning
 此路由暂不支持登陆认证
 :::
 
@@ -131,6 +131,10 @@ async function handler(ctx) {
                 });
                 const article = $('.pp-article__body');
                 article.find('.block-related-articles').remove();
+                article.find('figure.wp-block-pullquote').children().unwrap();
+                article.find('div.block-explanation-note').wrapInner('<blockquote></blockquote>');
+                article.find('div.wp-block-tcc-author-note').wrapInner('<em></em>').after('<hr>');
+                article.find('p.has-small-font-size').wrapInner('<small></small>');
                 item.description = art(path.join(__dirname, 'templates/description.art'), {
                     standfirst: $('.pp-header-group__standfirst').html(),
                     coverImage: $('.pp-media__image').attr('src'),

package/lib/routes/theinitium/author.ts

@@ -19,5 +19,5 @@ export const route: Route = {
     ],
     handler,
     example: '/theinitium/author/ninghuilulu/zh-hans',
-    categories: ['new-media'],
+    categories: ['new-media', 'popular'],
 };

package/lib/routes/theinitium/channel.ts

@@ -19,7 +19,7 @@ export const route: Route = {
     ],
     handler,
     example: '/theinitium/channel/latest/zh-hans',
-    categories: ['new-media'],
+    categories: ['new-media', 'popular'],
     description: `Type 栏目：
 
   | 最新   | 深度    | What’s New | 广场              | 科技       | 风物    | 特约     | ... |

package/lib/routes/theinitium/namespace.ts

@@ -5,7 +5,7 @@ export const namespace: Namespace = {
     url: 'theinitium.com',
     description: `通过提取文章全文，以提供比官方源更佳的阅读体验。
 
-:::warning
+::: warning
 付费内容全文可能需要登陆获取，详情见部署页面的配置模块。
 :::`,
     lang: 'zh-HK',

package/lib/routes/theinitium/tags.ts

@@ -19,5 +19,5 @@ export const route: Route = {
     ],
     handler,
     example: '/theinitium/tags/2019_10/zh-hans',
-    categories: ['new-media'],
+    categories: ['new-media', 'popular'],
 };

package/lib/routes/themoviedb/namespace.ts

@@ -3,7 +3,7 @@ import type { Namespace } from '@/types';
 export const namespace: Namespace = {
     name: 'The Movie Database',
     url: 'themoviedb.org',
-    description: `:::tip
+    description: `::: tip
 Refer to [https://developers.themoviedb.org/3/getting-started/languages](https://developers.themoviedb.org/3/getting-started/languages) for the language parameter in the route.
 :::`,
     lang: 'en',

package/lib/routes/thepaper/839studio/category.ts

@@ -9,7 +9,7 @@ export const route: Route = {
             source: ['thepaper.cn/'],
         },
     ],
-    name: 'Unknown',
+    name: '澎湃美数课作品集 - 分类',
     maintainers: ['umm233'],
     handler,
     url: 'thepaper.cn/',

package/lib/routes/thepaper/839studio/studio.ts

@@ -4,7 +4,7 @@ import { load } from 'cheerio';
 
 export const route: Route = {
     path: '/839studio',
-    name: 'Unknown',
+    name: '澎湃美数课作品集',
     maintainers: ['umm233'],
     handler,
 };

package/lib/routes/thepaper/channel.ts

@@ -5,7 +5,7 @@ import got from '@/utils/got';
 
 export const route: Route = {
     path: '/channel/:id',
-    categories: ['traditional-media'],
+    categories: ['new-media', 'popular'],
     example: '/thepaper/channel/25950',
     parameters: { id: '频道 id，可在频道页 URL 中找到' },
     features: {

package/lib/routes/thepaper/factpaper.ts

@@ -11,7 +11,7 @@ import path from 'node:path';
 
 export const route: Route = {
     path: '/factpaper/:status?',
-    categories: ['traditional-media'],
+    categories: ['new-media', 'popular'],
     example: '/thepaper/factpaper',
     parameters: { status: '状态 id，可选 `1` 即 有定论 或 `0` 即 核查中，默认为 `1`' },
     features: {

package/lib/routes/thepaper/featured.ts

@@ -5,7 +5,7 @@ import got from '@/utils/got';
 
 export const route: Route = {
     path: '/featured',
-    categories: ['traditional-media'],
+    categories: ['new-media', 'popular'],
     example: '/thepaper/featured',
     parameters: {},
     features: {

package/lib/routes/thepaper/list.ts

@@ -5,7 +5,7 @@ import got from '@/utils/got';
 
 export const route: Route = {
     path: '/list/:id',
-    categories: ['traditional-media'],
+    categories: ['new-media', 'popular'],
     example: '/thepaper/list/25457',
     parameters: { id: '栏目 id，可在栏目页 URL 中找到' },
     features: {

package/lib/routes/thepaper/sidebar.ts

@@ -16,7 +16,10 @@ export const route: Route = {
             target: '/sidebar',
         },
     ],
-    name: 'Unknown',
+    name: '侧边栏',
+    categories: ['new-media', 'popular'],
+    example: '/thepaper/sidebar',
+    parameters: { sec: '侧边栏 id，可选 `hotNews` 即 澎湃热榜、`financialInformationNews` 即 澎湃财讯、`morningEveningNews` 即 早晚报，默认为 `hotNews`' },
     maintainers: ['bigfei'],
     handler,
     url: 'thepaper.cn/',

package/lib/routes/thepaper/user.ts

@@ -0,0 +1,174 @@
+import { Route } from '@/types';
+import * as cheerio from 'cheerio';
+import ofetch from '@/utils/ofetch';
+import cache from '@/utils/cache';
+import { parseDate } from '@/utils/parse-date';
+
+export const route: Route = {
+    path: '/user/:pphId',
+    categories: ['new-media', 'popular'],
+    example: '/thepaper/user/4221423',
+    parameters: { pphId: '澎湃号 id，可在澎湃号页 URL 中找到' },
+    name: '澎湃号',
+    maintainers: ['TonyRL'],
+    handler,
+};
+
+interface AuthorInfo {
+    userId: number;
+    sname: string;
+    pic: string;
+    isAuth: string;
+    userType: string;
+    perDesc: string;
+    mobile: null;
+    isOrder: string;
+    sex: string;
+    area: string;
+    attentionNum: string;
+    fansNum: string;
+    praiseNum: null;
+    pph: boolean;
+    normalUser: boolean;
+    mobForwardType: number;
+    authInfo: string;
+    mail: string;
+    pphImpactNum: string;
+    wonderfulCommentCount: string;
+    location: string;
+    lastLoginDate: null;
+}
+
+interface PPHContentResponse {
+    code: number;
+    data: Data;
+    desc: string;
+    time: number;
+}
+
+interface Data {
+    hasNext: boolean;
+    startTime: number;
+    list: ListItem[];
+    nodeInfo: null;
+    tagInfo: null;
+    moreNodeInfo: null;
+    pageNum: null;
+    pageSize: null;
+    pages: null;
+    total: null;
+    prevPageNum: null;
+    nextPageNum: null;
+    excludeContIds: null;
+    contCont: null;
+    filterIds: null;
+    updateCount: null;
+}
+
+interface ListItem {
+    contId: string;
+    isOutForword: string;
+    isOutForward: string;
+    forwardType: string;
+    mobForwardType: number;
+    interactionNum: string;
+    praiseTimes: string;
+    pic: string;
+    imgCardMode: number;
+    smallPic: string;
+    sharePic: string;
+    pubTime: string;
+    pubTimeNew: string;
+    name: string;
+    closePraise: string;
+    authorInfo: AuthorInfo;
+    nodeId: number;
+    contType: number;
+    pubTimeLong: number;
+    specialNodeId: number;
+    cardMode: string;
+    dataObjId: number;
+    closeFrontComment: boolean;
+    isSupInteraction: boolean;
+    hideVideoFlag: boolean;
+    praiseStyle: number;
+    isSustainedFly: number;
+    softLocType: number;
+    closeComment: boolean;
+    voiceInfo: VoiceInfo;
+    softAdTypeStr: string;
+}
+
+interface VoiceInfo {
+    imgSrc: string;
+    isHaveVoice: string;
+}
+
+async function handler(ctx) {
+    const { pphId } = ctx.req.param();
+
+    const mobileBuildId = (await cache.tryGet('thepaper:m:buildId', async () => {
+        const response = await ofetch('https://m.thepaper.cn');
+        const $ = cheerio.load(response);
+        const nextData = JSON.parse($('script#__NEXT_DATA__').text());
+        return nextData.buildId;
+    })) as string;
+
+    const userInfo = (await cache.tryGet(`thepaper:user:${pphId}`, async () => {
+        const response = await ofetch(`https://api.thepaper.cn/userservice/user/homePage/${pphId}`, {
+            headers: {
+                'Client-Type': '2',
+                Origin: 'https://m.thepaper.cn',
+                Referer: 'https://m.thepaper.cn/',
+            },
+        });
+        return response.userInfo;
+    })) as AuthorInfo;
+
+    const response = await ofetch<PPHContentResponse>('https://api.thepaper.cn/contentapi/cont/pph/user', {
+        method: 'POST',
+        body: {
+            pageSize: 10,
+            pageNum: 1,
+            contType: 0,
+            excludeContIds: [],
+            pphId,
+            startTime: 0,
+        },
+    });
+
+    const list = response.data.list.map((item) => ({
+        title: item.name,
+        link: `https://www.thepaper.cn/newsDetail_forward_${item.contId}`,
+        pubDate: parseDate(item.pubTimeLong),
+        author: item.authorInfo.sname,
+        contId: item.contId,
+        image: item.pic,
+    }));
+
+    const items = await Promise.all(
+        list.map((item) =>
+            cache.tryGet(item.link, async () => {
+                const response = await ofetch(`https://m.thepaper.cn/_next/data/${mobileBuildId}/detail/${item.contId}.json`, {
+                    query: {
+                        id: item.contId,
+                    },
+                });
+
+                item.description = response.pageProps.detailData.contentDetail.content;
+                item.updated = parseDate(response.pageProps.detailData.contentDetail.updateTime);
+
+                return item;
+            })
+        )
+    );
+
+    return {
+        title: userInfo.sname,
+        description: userInfo.perDesc,
+        link: `https://www.thepaper.cn/user_${pphId}`,
+        item: items,
+        itunes_author: userInfo.sname,
+        image: userInfo.pic,
+    };
+}

package/lib/routes/thepetcity/index.ts

@@ -8,7 +8,7 @@ const baseUrl = 'https://thepetcity.co';
 
 export const route: Route = {
     path: '/:term?',
-    categories: ['new-media'],
+    categories: ['new-media', 'popular'],
     example: '/thepetcity',
     parameters: { term: '見下表，留空為全部文章' },
     radar: Object.entries(termsMap).map(([key, value]) => ({

package/lib/routes/thepetcity/namespace.ts

@@ -2,6 +2,6 @@ import type { Namespace } from '@/types';
 
 export const namespace: Namespace = {
     name: 'PetCity 毛孩日常',
-    url: 'thepetcity.com',
-    lang: 'en',
+    url: 'thepetcity.co',
+    lang: 'zh-TW',
 };

package/lib/routes/theverge/index.ts

@@ -6,7 +6,7 @@ import { load } from 'cheerio';
 
 export const route: Route = {
     path: '/:hub?',
-    categories: ['new-media'],
+    categories: ['new-media', 'popular'],
     example: '/theverge',
     parameters: { hub: 'Hub, see below, All Posts by default' },
     features: {

package/lib/routes/tiddlywiki/namespace.ts

@@ -0,0 +1,8 @@
+import type { Namespace } from '@/types';
+
+export const namespace: Namespace = {
+    name: 'TiddlyWiki',
+    url: 'tiddlywiki.com',
+    description: '',
+    lang: 'en',
+};