rsshub 1.0.0-master.f9003f9 → 1.0.0-master.f917bdc

package/lib/routes/twitter/user.ts

@@ -1,11 +1,12 @@
-import { Route } from '@/types';
+import { Route, ViewType } from '@/types';
 import utils from './utils';
 import api from './api';
 
 export const route: Route = {
     path: '/user/:id/:routeParams?',
     categories: ['social-media', 'popular'],
-    example: '/twitter/user/DIYgod',
+    view: ViewType.SocialMedia,
+    example: '/twitter/user/_RSSHub',
     parameters: {
         id: 'username; in particular, if starts with `+`, it will be recognized as a [unique ID](https://github.com/DIYgod/RSSHub/issues/12221), e.g. `+44196397`',
         routeParams:
@@ -27,7 +28,7 @@ export const route: Route = {
                 optional: true,
             },
             {
-                name: 'TWITTER_COOKIE',
+                name: 'TWITTER_AUTH_TOKEN',
                 description: 'Please see above for details.',
             },
         ],
@@ -38,7 +39,7 @@ export const route: Route = {
         supportScihub: false,
     },
     name: 'User timeline',
-    maintainers: ['DIYgod', 'yindaheng98', 'Rongronggg9'],
+    maintainers: ['DIYgod', 'yindaheng98', 'Rongronggg9', 'CaoMeiYouRen'],
     handler,
     radar: [
         {

package/lib/routes/twitter/utils.ts

@@ -104,7 +104,7 @@ const ProcessFeed = (ctx, { data = [] }, params = {}) => {
             if (!readable) {
                 content += '<br>';
             }
-            content += `<video src='${video.url}' ${gifAutoPlayAttr} controls='controls' poster='${getOriginalImg(media.media_url_https)}' ${extraAttrs}></video>`;
+            content += `<video width="${media.sizes.large.w}" height="${media.sizes.large.h}" src='${video.url}' ${gifAutoPlayAttr} controls='controls' poster='${getOriginalImg(media.media_url_https)}' ${extraAttrs}></video>`;
         }
 
         return content;
@@ -142,6 +142,9 @@ const ProcessFeed = (ctx, { data = [] }, params = {}) => {
                             content += `height="${heightOfPics}" `;
                             style += `height: ${heightOfPics}px;`;
                         }
+                        if (widthOfPics <= 0 && heightOfPics <= 0) {
+                            content += `width="${media.sizes.large.w}" height="${media.sizes.large.h}" `;
+                        }
                         content += ` style="${style}" ` + `${readable ? 'hspace="4" vspace="8"' : ''} src="${originalImg}">`;
                         if (addLinkForPics) {
                             content += `</a>`;
@@ -359,9 +362,10 @@ const ProcessFeed = (ctx, { data = [] }, params = {}) => {
         }
 
         description += item.full_text;
+        // 从 description 提取 话题作为 category，放在此处是为了避免 匹配到 quote 中的 # 80808030 颜色字符
+        const category = description.match(/(\s)?(#[^\s;<]+)/g)?.map((e) => e?.match(/#([^\s<]+)/)?.[1]);
         description += img;
         description += quote;
-
         if (readable) {
             description += `<br clear='both' /><div style='clear: both'></div>`;
         }
@@ -373,19 +377,24 @@ const ProcessFeed = (ctx, { data = [] }, params = {}) => {
             description += `<small>${parseDate(item.created_at)}</small>`;
         }
 
-        const authorName = originalItem.user.name;
         const link =
             originalItem.user.screen_name && (originalItem.id_str || originalItem.conversation_id_str)
                 ? `https://x.com/${originalItem.user.screen_name}/status/${originalItem.id_str || originalItem.conversation_id_str}`
                 : `https://x.com/${item.user.screen_name}/status/${item.id_str || item.conversation_id_str}`;
         return {
             title,
-            author: authorName,
+            author: [
+                {
+                    name: originalItem.user.name,
+                    url: `https://x.com/${originalItem.user.screen_name}`,
+                    avatar: originalItem.user.profile_image_url_https,
+                },
+            ],
             description,
             pubDate: parseDate(item.created_at),
             link,
             guid: link.replace('x.com', 'twitter.com'),
-
+            category,
             _extra:
                 (isRetweet && {
                     links: [

package/lib/routes/twreporter/category.ts

@@ -1,6 +1,6 @@
 import { Route } from '@/types';
 import cache from '@/utils/cache';
-import got from '@/utils/got';
+import ofetch from '@/utils/ofetch';
 
 import fetch from './fetch-article';
 
@@ -28,28 +28,73 @@ export const route: Route = {
     url: 'twreporter.org/',
 };
 
+// 发现其实是个开源项目 https://github.com/twreporter/go-api，所以我们能在以下两个文件找到相应的类目 ID，从 https://go-api.twreporter.org/v2/index_page 这里拿的话复杂度比较高而且少了侧栏的几个类目：
+// https://github.com/twreporter/go-api/blob/master/internal/news/category_set.go
+// https://github.com/twreporter/go-api/blob/master/internal/news/category.go
+const CATEGORIES = {
+    world: {
+        name: '國際兩岸',
+        url_name: 'world',
+        category_id: '63206383207bf7c5f871622c',
+    },
+    humanrights: {
+        name: '人權司法',
+        url_name: 'humanrights',
+        category_id: '63206383207bf7c5f8716234',
+    },
+    politics_and_society: {
+        name: '政治社會',
+        url_name: 'politics-and-society',
+        category_id: '63206383207bf7c5f871623d',
+    },
+    health: {
+        name: '醫療健康',
+        url_name: 'health',
+        category_id: '63206383207bf7c5f8716245',
+    },
+    environment: {
+        name: '環境永續',
+        url_name: 'environment',
+        category_id: '63206383207bf7c5f871624d',
+    },
+    econ: {
+        name: '經濟產業',
+        url_name: 'econ',
+        category_id: '63206383207bf7c5f8716254',
+    },
+    culture: {
+        name: '文化生活',
+        url_name: 'culture',
+        category_id: '63206383207bf7c5f8716259',
+    },
+    education: {
+        name: '教育校園',
+        url_name: 'education',
+        category_id: '63206383207bf7c5f8716260',
+    },
+    podcast: {
+        name: 'Podcast',
+        url_name: 'podcast',
+        category_id: '63206383207bf7c5f8716266',
+    },
+    opinion: {
+        name: '評論',
+        url_name: 'opinion',
+        category_id: '63206383207bf7c5f8716269',
+    },
+    photos_section: {
+        name: '影像',
+        url_name: 'photography',
+        category_id: '574d028748fa171000c45d48',
+    },
+};
+
 async function handler(ctx) {
     const category = ctx.req.param('category');
-    const url = `https://go-api.twreporter.org/v2/index_page`;
-    const res = await got(url).json();
-    const list = res.data[category];
-
-    let name = list[0].category_set[0].category.name;
-    let categoryID = category;
-    switch (categoryID) {
-        case 'photos_section':
-            categoryID = 'photography';
-
-            break;
-        case 'politics_and_society':
-            categoryID = categoryID.replaceAll('_', '-');
-            name = '政治社會';
-
-            break;
-        default:
-            break;
-    }
-    const home = `https://www.twreporter.org/categories/${categoryID}`;
+    const url = `https://go-api.twreporter.org/v2/posts?category_id=${CATEGORIES[category].category_id}`;
+    const home = `https://www.twreporter.org/categories/${CATEGORIES[category].url_name}`;
+    const res = await ofetch(url);
+    const list = res.data.records;
 
     const out = await Promise.all(
         list.map((item) => {
@@ -64,7 +109,7 @@ async function handler(ctx) {
     );
 
     return {
-        title: `報導者 | ${name}`,
+        title: `報導者 | ${CATEGORIES[category].name}`,
         link: home,
         item: out,
     };

package/lib/routes/twreporter/fetch-article.ts

@@ -1,15 +1,15 @@
 import { getCurrentPath } from '@/utils/helpers';
 const __dirname = getCurrentPath(import.meta.url);
 
-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';
 
 export default async function fetch(slug: string) {
     const url = `https://go-api.twreporter.org/v2/posts/${slug}?full=true`;
-    const res = await got(url);
-    const post = res.data.data;
+    const res = await ofetch(url);
+    const post = res.data;
 
     const time = post.published_date;
     // For `writers`
@@ -33,9 +33,9 @@ export default async function fetch(slug: string) {
         authors += '；' + photographers;
     }
 
-    const bannerImage = post.og_image.resized_targets.desktop.url;
+    const bannerImage = post.hero_image.resized_targets.desktop.url;
     const caption = post.leading_image_description;
-    const bannerDescription = post.og_image.description;
+    const bannerDescription = post.hero_image.description;
     const ogDescription = post.og_description;
     const banner = art(path.join(__dirname, 'templates/image.art'), { image: bannerImage, description: bannerDescription, caption });
 
@@ -77,6 +77,12 @@ export default async function fetch(slug: string) {
 
                     break;
                 }
+                case 'quoteby': {
+                    const quote = content[0];
+                    block = `<blockquote>${quote.quote}</blockquote><p>${quote.quoteBy}</p>`;
+
+                    break;
+                }
                 default:
                     block = `${content}<br>`;
             }

package/lib/routes/twreporter/newest.ts

@@ -1,6 +1,6 @@
 import { Route } from '@/types';
 import cache from '@/utils/cache';
-import got from '@/utils/got';
+import ofetch from '@/utils/ofetch';
 
 import fetch from './fetch-article';
 
@@ -31,7 +31,7 @@ export const route: Route = {
 async function handler() {
     const base = `https://www.twreporter.org`;
     const url = `https://go-api.twreporter.org/v2/index_page`;
-    const res = await got(url).json();
+    const res = await ofetch(url);
     const list = res.data.latest_section;
     const out = await Promise.all(
         list.map((item) => {

package/lib/routes/typst/universe.ts

@@ -26,6 +26,25 @@ interface Context {
     an: { exports: Array<Package> };
 }
 
+const GITHUBRAW_BASE = 'https://raw.githubusercontent.com';
+const PKG_GITHUB_BASE = `${GITHUBRAW_BASE}/typst/packages/main/packages/preview`;
+
+function fixImageSrc(src: string, env: Package) {
+    if (src.includes('://')) {
+        if (src.startsWith('https://typst.app/universe/package')) {
+            src = src.replaceAll('https://typst.app/universe/package', `${PKG_GITHUB_BASE}/${env.name}/${env.version}`);
+        } else if (src.startsWith('https://github.com/') && src.match(/\.(jpeg|jpg|gif|png|bmp|webp)$/gi)?.length) {
+            src = src.replace('https://github.com/', `${GITHUBRAW_BASE}/`);
+        }
+    } else {
+        const suffix = src.startsWith('/') ? '' : '/';
+        const package_base = `${PKG_GITHUB_BASE}/${env.name}/${env.version}${suffix}`;
+        const url = new URL(src, package_base);
+        src = url.toString();
+    }
+    return src;
+}
+
 export const route: Route = {
     path: '/universe',
     categories: ['program-update'],
@@ -39,7 +58,7 @@ export const route: Route = {
     name: 'Universe',
     maintainers: ['HPDell'],
     handler: async () => {
-        const targetUrl = 'https://typst.app/universe/search?kind=packages%2Ctemplates&packages=last-published';
+        const targetUrl = 'https://typst.app/universe/search?kind=packages%2Ctemplates&packages=last-updated';
         const page = await ofetch(targetUrl);
         const $ = load(page);
         const script = $('script')
@@ -58,18 +77,25 @@ export const route: Route = {
                 displayErrors: true,
             });
             const md = markdownit('commonmark');
-            const items = context.an.exports
-                .sort((a, b) => b.updatedAt - a.updatedAt)
-                .map((item) => ({
-                    title: `${item.name} | ${item.description}`,
+            const items = context.an.exports.sort((a, b) => a.updatedAt - b.updatedAt);
+            const groups = new Map(items.map((it) => [it.name, it]));
+            const pkgs = [...groups.values()].map((item) => {
+                const $ = load(md.render(item.readme));
+                $('img').each((i, el) => {
+                    const src = el.attribs.src;
+                    el.attribs.src = fixImageSrc(src, item);
+                });
+                return {
+                    title: `${item.name} (${item.version}) | ${item.description}`,
                     link: `https://typst.app/universe/package/${item.name}`,
-                    description: md.render(item.readme),
+                    description: $.html(),
                     pubDate: parseDate(item.updatedAt, 'X'),
-                }));
+                };
+            });
             return {
                 title: 'Typst universe',
                 link: targetUrl,
-                item: items,
+                item: pkgs,
             };
         } else {
             return {

package/lib/routes/udn/breaking-news.ts

@@ -85,6 +85,15 @@ async function handler(ctx) {
                     description += body.html();
                 }
 
+                if (data.publisher.name === '轉角國際 udn Global') {
+                    // 轉角24小時
+                    description += $('.story_body_content')
+                        .html()
+                        .split(/<!--\d+?-->/g)
+                        .slice(1, -1)
+                        .join(',');
+                }
+
                 return {
                     title: item.title,
                     author: data.author.name,

package/lib/routes/utgd/category.ts

@@ -1,22 +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';
-import MarkdownIt from 'markdown-it';
-const md = MarkdownIt({
-    html: true,
-});
+import ofetch from '@/utils/ofetch';
+import { rootUrl, apiRootUrl, parseResult, parseArticle } from './utils';
 
 export const route: Route = {
-    path: '/:category?',
+    path: '/category/:category?',
     categories: ['new-media'],
-    example: '/utgd/method',
+    example: '/utgd/category/method',
     parameters: { category: '分类，可在对应分类页的 URL 中找到，默认为方法' },
     features: {
         requireConfig: false,
@@ -29,7 +19,7 @@ export const route: Route = {
     radar: [
         {
             source: ['utgd.net/category/s/:category', 'utgd.net/'],
-            target: '/:category',
+            target: '/category/:category',
         },
     ],
     name: '分类',
@@ -42,61 +32,30 @@ export const route: Route = {
 
 async function handler(ctx) {
     const category = ctx.req.param('category') ?? 'method';
-    const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 20;
+    const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 9;
 
-    const rootUrl = 'https://utgd.net';
-    const apiUrl = `${rootUrl}/api/v2/pages/`;
+    const apiUrl = `${apiRootUrl}/api/v2/categories`;
     const currentUrl = `${rootUrl}/category/s/${category}`;
-    const slugUrl = `${rootUrl}/api/v2/category/slug/${category}/`;
+    const slugUrl = `${apiRootUrl}/api/v2/category/slug/${category}/`;
 
-    let response = await got({
-        method: 'get',
-        url: slugUrl,
-    });
-
-    const data = response.data;
+    const categoryData = await ofetch(slugUrl);
 
-    response = await got({
-        method: 'get',
-        url: apiUrl,
-        searchParams: {
-            type: 'article.Article',
-            fields: `article_category(category_name),article_tag(tag_name),title,article_image,article_author,article_description,article_published_time`,
-            article_category: data.id,
-            order: '-article_published_time',
-            limit,
+    const response = await ofetch(`${apiUrl}/${categoryData.id}/related_articles`, {
+        query: {
+            page: 1,
+            page_size: limit,
         },
     });
 
-    const items = await Promise.all(
-        response.data.items.map((item) =>
-            cache.tryGet(`untag-${item.id}`, async () => {
-                const authorResponse = await got({
-                    method: 'get',
-                    url: `${rootUrl}/api/v2/user/profile/${item.article_author.id}/`,
-                });
+    const list = parseResult(response.results, limit);
 
-                return {
-                    title: item.title,
-                    link: `${rootUrl}/article/${item.id}`,
-                    description: art(path.join(__dirname, 'templates/description.art'), {
-                        membership: item.article_for_membership,
-                        image: item.article_image,
-                        description: md.render(item.article_description),
-                    }),
-                    author: authorResponse.data.display_name,
-                    pubDate: timezone(parseDate(item.article_published_time), +8),
-                    category: [...item.article_category.map((c) => c.category_name), ...item.article_tag.map((t) => t.tag_name)],
-                };
-            })
-        )
-    );
+    const items = await Promise.all(list.map((item) => parseArticle(item)));
 
     return {
-        title: `UNTAG - ${data.category_name}`,
+        title: `UNTAG - ${categoryData.category_name}`,
         link: currentUrl,
         item: items,
-        image: data.category_image,
-        description: data.category_description,
+        image: categoryData.category_image,
+        description: categoryData.category_description,
     };
 }

package/lib/routes/utgd/timeline.ts

@@ -1,17 +1,7 @@
 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';
-import MarkdownIt from 'markdown-it';
-const md = MarkdownIt({
-    html: true,
-});
+import ofetch from '@/utils/ofetch';
+import { rootUrl, apiRootUrl, parseResult, parseArticle } from './utils';
 
 export const route: Route = {
     path: '/timeline',
@@ -40,42 +30,16 @@ export const route: Route = {
 async function handler(ctx) {
     const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 20;
 
-    const rootUrl = 'https://utgd.net';
-    const apiUrl = `${rootUrl}/api/v2/timeline/?page=1&page_size=${limit}`;
-
-    const response = await got({
-        method: 'get',
-        url: apiUrl,
+    const response = await ofetch(`${apiRootUrl}/api/v2/timeline/`, {
+        query: {
+            page: 1,
+            page_size: limit,
+        },
     });
 
-    const items = await Promise.all(
-        response.data.results.slice(0, limit).map((item) =>
-            cache.tryGet(`untag-${item.id}`, async () => {
-                const detailResponse = await got({
-                    method: 'get',
-                    url: `${rootUrl}/api/v2/article/${item.id}/`,
-                    searchParams: {
-                        fields: 'article_description,article_category(category_name),article_tag(tag_name)',
-                    },
-                });
-
-                const data = detailResponse.data;
+    const list = parseResult(response.results, limit);
 
-                return {
-                    title: item.title,
-                    link: `${rootUrl}/article/${item.id}`,
-                    description: art(path.join(__dirname, 'templates/description.art'), {
-                        membership: data.article_for_membership,
-                        image: item.article_image,
-                        description: md.render(data.article_description),
-                    }),
-                    author: item.article_author_displayname,
-                    pubDate: timezone(parseDate(item.article_published_time), +8),
-                    category: [...data.article_category.map((c) => c.category_name), ...data.article_tag.map((t) => t.tag_name)],
-                };
-            })
-        )
-    );
+    const items = await Promise.all(list.map((item) => parseArticle(item)));
 
     return {
         title: 'UNTAG',

package/lib/routes/utgd/topic.ts

@@ -1,18 +1,8 @@
 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';
-import MarkdownIt from 'markdown-it';
+import ofetch from '@/utils/ofetch';
 import InvalidParameterError from '@/errors/types/invalid-parameter';
-const md = MarkdownIt({
-    html: true,
-});
+import { rootUrl, apiRootUrl, parseResult, parseArticle } from './utils';
 
 export const route: Route = {
     path: '/topic/:topic?',
@@ -47,56 +37,24 @@ async function handler(ctx) {
     const topic = ctx.req.param('topic') ?? '在线阅读专栏';
     const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 20;
 
-    const rootUrl = 'https://utgd.net';
     const currentUrl = `${rootUrl}/topic`;
-    const topicUrl = `${rootUrl}/api/v2/topic/`;
+    const topicUrl = `${apiRootUrl}/api/v2/topic/`;
 
-    let response = await got({
-        method: 'get',
-        url: topicUrl,
-    });
+    let response = await ofetch(topicUrl);
 
-    const topicItems = response.data.filter((i) => i.title === topic);
+    const topicItem = response.find((i) => i.title === topic);
 
-    if (!topicItems) {
+    if (!topicItem) {
         throw new InvalidParameterError(`No topic named ${topic}`);
     }
 
-    const topicItem = topicItems[0];
-
     const apiUrl = `${rootUrl}/api/v2/topic/${topicItem.id}/article/`;
 
-    response = await got({
-        method: 'get',
-        url: apiUrl,
-    });
+    response = await ofetch(apiUrl);
 
-    const items = await Promise.all(
-        response.data.slice(0, limit).map((item) =>
-            cache.tryGet(`untag-${item.id}`, async () => {
-                const detailResponse = await got({
-                    method: 'get',
-                    url: `${rootUrl}/api/v2/article/${item.id}/`,
-                    searchParams: {
-                        fields: 'article_description',
-                    },
-                });
+    const list = parseResult(response.results, limit);
 
-                return {
-                    title: item.title,
-                    link: `${rootUrl}/article/${item.id}`,
-                    description: art(path.join(__dirname, 'templates/description.art'), {
-                        membership: item.article_for_membership,
-                        image: item.article_image,
-                        description: md.render(detailResponse.data.article_description),
-                    }),
-                    author: item.article_author_displayname,
-                    pubDate: timezone(parseDate(item.article_published_time), +8),
-                    category: [...item.article_category.map((c) => c.name), ...item.article_tag.map((t) => t.name)],
-                };
-            })
-        )
-    );
+    const items = await Promise.all(list.map((item) => parseArticle(item)));
 
     return {
         title: `UNTAG - ${topicItem.title}`,

package/lib/routes/utgd/utils.ts

@@ -0,0 +1,41 @@
+import { getCurrentPath } from '@/utils/helpers';
+const __dirname = getCurrentPath(import.meta.url);
+
+import cache from '@/utils/cache';
+import ofetch from '@/utils/ofetch';
+import timezone from '@/utils/timezone';
+import { parseDate } from '@/utils/parse-date';
+import { art } from '@/utils/render';
+import path from 'node:path';
+import MarkdownIt from 'markdown-it';
+const md = MarkdownIt({
+    html: true,
+});
+
+export const rootUrl = 'https://utgd.net';
+export const apiRootUrl = 'https://api.utgd.net';
+
+export const parseResult = (results, limit) =>
+    results.slice(0, limit).map((item) => ({
+        id: item.id,
+        title: item.title,
+        link: `${rootUrl}/article/${item.id}`,
+        author: item.article_author_displayname,
+        pubDate: timezone(parseDate(item.article_published_time), +8),
+        category: item.article_category.map((c) => c.category_name),
+    }));
+
+export const parseArticle = (item) =>
+    cache.tryGet(`untag-${item.id}`, async () => {
+        const data = await ofetch(`${apiRootUrl}/api/v2/article/${item.id}/`);
+
+        item.description = art(path.join(__dirname, 'templates/description.art'), {
+            membership: data.article_for_membership,
+            image: data.article_image,
+            description: md.render(data.article_description),
+        });
+
+        item.category = [...data.article_category.map((c) => c.category_name), ...data.article_tag.map((t) => t.tag_name)];
+
+        return item;
+    });