rsshub 1.0.0-master.fdb1381 → 1.0.0-master.fdb4325

package/lib/routes/papers/query.ts

@@ -86,10 +86,10 @@ export const route: Route = {
   If you subscibe to [arXiv Paper queryed by Detection](https://papers.cool/arxiv/search?highlight=1&query=Detection), where the URL is \`https://papers.cool/arxiv/search?highlight=1&query=Detection\`, extract the part \`https://papers.cool/\` to the end, and use it as the parameter to fill in. Therefore, the route will be [\`/papers/query/Detection\`](https://rsshub.app/papers/query/Detection).
 :::
 
-  | Category                                              | id                  |
-  | ----------------------------------------------------- | ------------------- |
-  | arXiv Paper queryed by Detection                      | query/Detection     |
-  | arXiv Paper queryed by Segmentation                   | query/Segmentation  |
+| Category                                              | id                  |
+| ----------------------------------------------------- | ------------------- |
+| arXiv Paper queryed by Detection                      | query/Detection     |
+| arXiv Paper queryed by Segmentation                   | query/Segmentation  |
   `,
     categories: ['journal'],
 

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

@@ -2,16 +2,19 @@
   <a href="{{ pdfUrl }}">[PDF]</a>
 {{ /if }}
 
-{{ if siteUrl }}
-  <a href="{{ siteUrl }}">[Site]</a>
-{{ /if }}
-
 {{ if kimiUrl }}
   <a href="{{ kimiUrl }}">[Kimi]</a>
 {{ /if }}
 
-{{ if authorString }}
-  <p><b>Authors:</b> {{ authorString }}</p>
+{{ if authors }}
+  <p>
+    <b>Authors:</b>
+    {{ each authors author }}
+      <a href="{{ author.url }}">
+        {{ author.name }}
+      </a>,
+    {{ /each }}
+  </p>
 {{ /if }}
 
 {{ if summary }}

package/lib/routes/parliament/section77.ts

@@ -22,9 +22,9 @@ export const route: Route = {
     maintainers: ['itpcc'],
     handler,
     description: `| Presented by MP \*       | Presented by People \* | Hearing Ongoing     | Hearing ended   | Hearing result reported  | Waiting for PM approval | Assigned into the session | Processed  | PM Rejected   |
-  | ------------------------ | ---------------------- | ------------------- | --------------- | ------------------------ | ----------------------- | ------------------------- | ---------- | ------------- |
-  | presentbymp              | presentbyperson        | openwsu             | closewsu        | reportwsu                | substatus1              | substatus2                | substatus3 | closewsubypm  |
-  | เสนอโดยสมาชิกสภาผู้แทนราษฏร | เสนอโดยประชาชน         | กำลังเปิดรับฟังความคิดเห็น | ปิดรับฟังความคิดเห็น | รายงานผลการรับฟังความคิดเห็น | รอคำรับรองจากนายกรัฐมนตรี   | บรรจุเข้าระเบียบวาระ         | พิจารณาแล้ว  | นายกฯ ไม่รับรอง |
+| ------------------------ | ---------------------- | ------------------- | --------------- | ------------------------ | ----------------------- | ------------------------- | ---------- | ------------- |
+| presentbymp              | presentbyperson        | openwsu             | closewsu        | reportwsu                | substatus1              | substatus2                | substatus3 | closewsubypm  |
+| เสนอโดยสมาชิกสภาผู้แทนราษฏร | เสนอโดยประชาชน         | กำลังเปิดรับฟังความคิดเห็น | ปิดรับฟังความคิดเห็น | รายงานผลการรับฟังความคิดเห็น | รอคำรับรองจากนายกรัฐมนตรี   | บรรจุเข้าระเบียบวาระ         | พิจารณาแล้ว  | นายกฯ ไม่รับรอง |
 
   *Note:* For \`presentbymp\` and \`presentbyperson\`, it can also add:
 

package/lib/routes/parliament.uk/commonslibrary.ts

@@ -46,7 +46,7 @@ async function handler(ctx) {
             description: $(article).find('p').last().text().trim(),
             pubDate: timezone($(article).find('.card__date time').attr('datetime')),
         }));
-    browser.close();
+    await browser.close();
     return {
         title: `parliament - lordslibrary - ${topic}`,
         link: url,

package/lib/routes/parliament.uk/lordslibrary.ts

@@ -46,7 +46,7 @@ async function handler(ctx) {
             description: $(article).find('p').last().text().trim(),
             pubDate: timezone($(article).find('.card__date time').attr('datetime')),
         }));
-    browser.close();
+    await browser.close();
     return {
         title: `parliament - lordslibrary - ${topic}`,
         link: url,

package/lib/routes/parliament.uk/petitions.ts

@@ -99,7 +99,7 @@ If you subscribe to [Recent petitions](https://petition.parliament.uk/petitions?
 :::
 
 <details>
-  <summary>More states</summary>
+<summary>More states</summary>
 
 | Name                            | ID                |
 | ------------------------------- | ----------------- |

package/lib/routes/patagonia/new-arrivals.ts

@@ -36,8 +36,8 @@ export const route: Route = {
     maintainers: [],
     handler,
     description: `| Men's | Women's | Kids' & Baby | Packs & Gear |
-  | ----- | ------- | ------------ | ------------ |
-  | mens  | womens  | kids         | luggage      |`,
+| ----- | ------- | ------------ | ------------ |
+| mens  | womens  | kids         | luggage      |`,
 };
 
 async function handler(ctx) {

package/lib/routes/patreon/feed.ts

@@ -98,7 +98,7 @@ async function handler(ctx) {
             }
         }
         if (attributes.video_preview) {
-            relationships.video_preview = posts.included.find((i) => Number.parseInt(i.id) === attributes.video_preview.media_id) as unknown as MediaRelation;
+            relationships.video_preview = posts.included.find((i) => Number.parseInt(i.id) === attributes.video_preview?.media_id) as unknown as MediaRelation;
         }
 
         return {
@@ -110,7 +110,7 @@ async function handler(ctx) {
             }),
             link: attributes.url,
             pubDate: parseDate(attributes.published_at),
-            image: attributes.thumbnail?.url ?? attributes.image.url,
+            image: attributes.thumbnail?.url ?? attributes.image?.url,
             category: relationships.user_defined_tags?.map((tag) => tag.attributes.value),
         };
     });

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

@@ -23,6 +23,8 @@
 {{ else if attributes.post_type === 'video_embed' || attributes.post_type === 'link' }}
     <img src="{{ attributes.image.url }}"><br>
 
+{{ else if attributes.post_type === 'text_only' }}
+
 {{ else }}
 Post type: "{{ attributes.post_type }}" is not supported. <br>
 

package/lib/routes/patreon/types.ts

@@ -83,6 +83,14 @@ interface Image {
     thumb_square_large_url?: string;
     thumb_square_url?: string;
     thumb_url?: string;
+    thumbnail: string;
+    default?: string;
+    default_blurred?: string;
+    default_blurred_small?: string;
+    default_small?: string;
+    original?: string;
+    thumbnail_large?: string;
+    thumbnail_small?: string;
 }
 
 interface PostMetadata {
@@ -325,18 +333,6 @@ interface VideoIssues {
     };
 }
 
-interface Image {
-    thumbnail: string;
-    url: string;
-    default?: string;
-    default_blurred?: string;
-    default_blurred_small?: string;
-    default_small?: string;
-    original?: string;
-    thumbnail_large?: string;
-    thumbnail_small?: string;
-}
-
 interface Metadata {
     audio_preview_duration?: number;
     audio_preview_start_time?: number;

package/lib/routes/people/index.ts

@@ -47,7 +47,7 @@ async function handler(ctx) {
         $(e).parent().remove();
     });
 
-    let items = $('.p6, div.p2j_list, div.headingNews, div.ej_list_box, .fl, .leftItem')
+    let items = $('.p6, div.p2j_list, div.headingNews, div.ej_list_box, .leftItem')
         .find('a')
         .slice(0, limit)
         .toArray()
@@ -75,7 +75,7 @@ async function handler(ctx) {
 
                     content('.paper_num, #rwb_tjyd').remove();
 
-                    item.description = content('.rm_txt_con, .show_text').html();
+                    item.description = content('#rwb_zw').html();
                     item.pubDate = timezone(parseDate(data.match(/(\d{4}年\d{2}月\d{2}日\d{2}:\d{2})/)[1], 'YYYY年MM月DD日 HH:mm'), +8);
                 } catch (error) {
                     item.description = error;

package/lib/routes/people/liuyan.ts

@@ -27,8 +27,8 @@ export const route: Route = {
     handler,
     url: 'liuyan.people.com.cn/',
     description: `| 全部 | 待回复 | 办理中 | 已办理 |
-  | ---- | ------ | ------ | ------ |
-  | 1    | 2      | 3      | 4      |`,
+| ---- | ------ | ------ | ------ |
+| 1    | 2      | 3      | 4      |`,
 };
 
 async function handler(ctx) {

package/lib/routes/peopo/topic.ts

@@ -29,24 +29,24 @@ export const route: Route = {
     maintainers: [],
     handler,
     description: `| 分類     | ID  |
-  | -------- | --- |
-  | 社會關懷 | 159 |
-  | 生態環保 | 113 |
-  | 文化古蹟 | 143 |
-  | 社區改造 | 160 |
-  | 教育學習 | 161 |
-  | 農業     | 163 |
-  | 生活休閒 | 162 |
-  | 媒體觀察 | 164 |
-  | 運動科技 | 165 |
-  | 政治經濟 | 166 |
-  | 北台灣   | 223 |
-  | 中台灣   | 224 |
-  | 南台灣   | 225 |
-  | 東台灣   | 226 |
-  | 校園中心 | 167 |
-  | 原住民族 | 227 |
-  | 天然災害 | 168 |`,
+| -------- | --- |
+| 社會關懷 | 159 |
+| 生態環保 | 113 |
+| 文化古蹟 | 143 |
+| 社區改造 | 160 |
+| 教育學習 | 161 |
+| 農業     | 163 |
+| 生活休閒 | 162 |
+| 媒體觀察 | 164 |
+| 運動科技 | 165 |
+| 政治經濟 | 166 |
+| 北台灣   | 223 |
+| 中台灣   | 224 |
+| 南台灣   | 225 |
+| 東台灣   | 226 |
+| 校園中心 | 167 |
+| 原住民族 | 227 |
+| 天然災害 | 168 |`,
 };
 
 async function handler(ctx) {

package/lib/routes/picnob/user.ts

@@ -13,10 +13,13 @@ import puppeteer from '@/utils/puppeteer';
 import sanitizeHtml from 'sanitize-html';
 
 export const route: Route = {
-    path: '/user/:id',
+    path: '/user/:id/:type?',
     categories: ['social-media', 'popular'],
     example: '/picnob/user/xlisa_olivex',
-    parameters: { id: 'Instagram id' },
+    parameters: {
+        id: 'Instagram id',
+        type: 'Type of profile page (profile or tagged)',
+    },
     features: {
         requireConfig: false,
         requirePuppeteer: true,
@@ -27,129 +30,173 @@ export const route: Route = {
     },
     radar: [
         {
-            source: ['piokok.com/profile/:id/*'],
+            source: ['pixwox.com/profile/:id'],
             target: '/user/:id',
         },
+        {
+            source: ['pixwox.com/profile/:id/tagged'],
+            target: '/user/:id/tagged',
+        },
     ],
     name: 'User Profile - Picnob',
-    maintainers: ['TonyRL', 'micheal-death'],
+    maintainers: ['TonyRL', 'micheal-death', 'AiraNadih'],
     handler,
     view: ViewType.Pictures,
 };
 
 async function handler(ctx) {
-    // NOTE: 'picnob' is still available, but all requests to 'picnob' will be redirected to 'piokok' eventually
-    const baseUrl = 'https://www.piokok.com';
+    // NOTE: 'picnob' is still available, but all requests to 'picnob' will be redirected to 'pixwox' eventually
+    const baseUrl = 'https://www.pixwox.com';
     const id = ctx.req.param('id');
-    const url = `${baseUrl}/profile/${id}/`;
+    const type = ctx.req.param('type') ?? 'profile';
+    const profileUrl = `${baseUrl}/profile/${id}/${type === 'tagged' ? 'tagged/' : ''}`;
 
     const browser = await puppeteer();
     // TODO: can't bypass cloudflare 403 error without puppeteer
-    const profile = (await cache.tryGet(`picnob:user:${id}`, async () => {
-        let html;
-        let usePuppeteer = false;
-        try {
-            const data = await ofetch(url, {
-                headers: {
-                    accept: 'text/html',
-                    referer: 'https://www.google.com/',
-                },
-            });
-            html = data;
-        } catch (error: any) {
-            if (error.message.includes('403')) {
-                html = await puppeteerGet(url, browser);
+    try {
+        const profile = (await cache.tryGet(`picnob:user:${id}`, async () => {
+            let html;
+            let usePuppeteer = false;
+            try {
+                const data = await ofetch(profileUrl, {
+                    headers: {
+                        accept: 'text/html',
+                        referer: 'https://www.google.com/',
+                    },
+                });
+                html = data;
+            } catch {
+                html = await puppeteerGet(profileUrl, browser);
                 usePuppeteer = true;
             }
-        }
-        const $ = load(html);
-        const name = $('h1.fullname').text();
-        const userId = $('input[name=userid]').attr('value');
+            const $ = load(html);
+            const name = $('h1.fullname').text();
+            const userId = $('input[name=userid]').attr('value');
 
-        return {
-            name,
-            userId,
-            description: $('.info .sum').text(),
-            image: $('.ava .pic img').attr('src'),
-            usePuppeteer,
+            if (!userId) {
+                throw new Error('Failed to get user ID');
+            }
+
+            return {
+                name,
+                userId,
+                description: $('.info .sum').text(),
+                image: $('.ava .pic img').attr('src'),
+                usePuppeteer,
+            };
+        })) as {
+            name: string;
+            userId: string;
+            description: string;
+            image: string;
+            usePuppeteer: boolean;
         };
-    })) as {
-        name: string;
-        userId: string;
-        description: string;
-        image: string;
-        usePuppeteer: boolean;
-    };
-
-    let posts;
-    if (profile.usePuppeteer) {
-        const data = await puppeteerGet(`${baseUrl}/api/posts?userid=${profile.userId}`, browser);
-        posts = data.posts;
-    } else {
-        const data = await ofetch(`${baseUrl}/api/posts`, {
-            headers: {
-                accept: 'application/json',
-            },
-            query: {
-                userid: profile.userId,
-            },
-        });
-        posts = data.posts;
-    }
 
-    const list = await Promise.all(
-        posts.items.map(async (item) => {
-            const { shortcode, sum, sum_pure, type, time } = item;
-
-            const link = `${baseUrl}/post/${shortcode}/`;
-            if (type === 'img_multi') {
-                item.images = await cache.tryGet(link, async () => {
-                    let html;
-                    if (profile.usePuppeteer) {
-                        html = await puppeteerGet(link, browser);
-                    } else {
-                        const data = await ofetch(link);
-                        html = data;
-                    }
-                    const $ = load(html);
-                    return [
-                        ...new Set(
-                            $('.post_slide a')
-                                .toArray()
-                                .map((a: any) => {
-                                    a = $(a);
-                                    return {
-                                        ori: a.attr('href'),
-                                        url: a.find('img').attr('data-src'),
-                                        isVideo: !!a.find('.icon_play').length,
-                                    };
-                                })
-                        ),
-                    ];
+        let profileTitle;
+        let endpoint;
+        if (type === 'tagged') {
+            profileTitle = `${profile.name} (@${id}) tagged posts - Picnob`;
+            endpoint = 'tagged';
+        } else {
+            profileTitle = `${profile.name} (@${id}) public posts - Picnob`;
+            endpoint = 'posts';
+        }
+
+        const apiUrl = `${baseUrl}/api/${endpoint}`;
+
+        let responseData;
+        try {
+            if (profile.usePuppeteer) {
+                responseData = await puppeteerGet(`${apiUrl}?userid=${profile.userId}`, browser);
+                responseData = typeof responseData === 'string' ? JSON.parse(responseData) : responseData;
+            } else {
+                const data = await ofetch(apiUrl, {
+                    headers: {
+                        accept: 'application/json',
+                    },
+                    query: {
+                        userid: profile.userId,
+                    },
                 });
+                responseData = typeof data === 'string' ? JSON.parse(data) : data;
             }
+        } catch {
+            responseData = await puppeteerGet(`${apiUrl}?userid=${profile.userId}`, browser);
+            responseData = typeof responseData === 'string' ? JSON.parse(responseData) : responseData;
+        }
 
-            return {
-                title: sanitizeHtml(sum.split('\n')[0], { allowedTags: [], allowedAttributes: {} }) || sum_pure,
-                description: art(path.join(__dirname, 'templates/desc.art'), {
-                    item: {
-                        ...item,
-                        // Fix linebreaks
-                        sum: sum.replaceAll('\n', '<br>'),
-                    },
-                }),
-                link,
-                pubDate: parseDate(time, 'X'),
-            };
-        })
-    );
-    await browser.close();
-
-    return {
-        title: `${profile.name} (@${id}) - Picnob`,
-        description: profile.description,
-        link: url,
-        image: profile.image,
-        item: list,
-    };
+        const posts = responseData?.posts;
+
+        if (!posts?.items?.length) {
+            throw new Error('No posts found');
+        }
+
+        if (type === 'tagged') {
+            posts.items = posts.items.map((post, index) => {
+                const taggedPost = responseData.tagged.items[index] || {};
+                return { ...taggedPost, ...post };
+            });
+        }
+
+        const list = await Promise.all(
+            posts.items.map(async (item) => {
+                const { shortcode, sum, sum_pure, type, time } = item;
+
+                const link = `${baseUrl}/post/${shortcode}/`;
+                if (type === 'img_multi') {
+                    item.images = await cache.tryGet(link, async () => {
+                        let html;
+                        if (profile.usePuppeteer) {
+                            html = await puppeteerGet(link, browser);
+                        } else {
+                            const data = await ofetch(link);
+                            html = data;
+                        }
+                        const $ = load(html);
+                        return [
+                            ...new Set(
+                                $('.post_slide a')
+                                    .toArray()
+                                    .map((a: any) => {
+                                        a = $(a);
+                                        return {
+                                            ori: a.attr('href'),
+                                            url: a.find('img').attr('data-src'),
+                                            isVideo: !!a.find('.icon_play').length,
+                                        };
+                                    })
+                            ),
+                        ];
+                    });
+                }
+
+                return {
+                    title: sanitizeHtml(sum.split('\n')[0], { allowedTags: [], allowedAttributes: {} }) || sum_pure,
+                    description: art(path.join(__dirname, 'templates/desc.art'), {
+                        item: {
+                            ...item,
+                            // Fix linebreaks
+                            sum: sum.replaceAll('\n', '<br>'),
+                        },
+                    }),
+                    link,
+                    guid: shortcode,
+                    pubDate: parseDate(time, 'X'),
+                };
+            })
+        );
+
+        return {
+            title: profileTitle,
+            description: profile.description,
+            link: profileUrl,
+            image: profile.image,
+            item: list,
+        };
+    } catch (error) {
+        await browser.close();
+        throw error;
+    } finally {
+        await browser.close();
+    }
 }

package/lib/routes/pincong/utils.ts

@@ -14,7 +14,7 @@ const puppeteerGet = (url, cache) =>
             waitUntil: 'domcontentloaded',
         });
         const html = await page.evaluate(() => document.documentElement.innerHTML);
-        browser.close();
+        await browser.close();
         return html;
     });
 

package/lib/routes/pingwest/tag.ts

@@ -22,9 +22,9 @@ export const route: Route = {
     handler,
     description: `内容类型
 
-  | 最新 | 热门 |
-  | ---- | ---- |
-  | 1    | 2    |
+| 最新 | 热门 |
+| ---- | ---- |
+| 1    | 2    |
 
   参数
 

package/lib/routes/pingwest/user.ts

@@ -28,9 +28,9 @@ export const route: Route = {
     handler,
     description: `内容类型
 
-  | 文章    | 动态  |
-  | ------- | ----- |
-  | article | state |
+| 文章    | 动态  |
+| ------- | ----- |
+| article | state |
 
   参数
 

package/lib/routes/pinterest/user.ts

@@ -69,6 +69,9 @@ async function handler(ctx) {
 const getUserResource = (username: string) =>
     cache.tryGet(`pinterest:user:${username}`, async () => {
         const response = await ofetch(`${baseUrl}/resource/UserResource/get/`, {
+            headers: {
+                'x-pinterest-pws-handler': 'www/[username]/_created.js',
+            },
             query: {
                 source_url: `/${username}/_created`,
                 data: JSON.stringify({ options: { username, field_set_key: 'unauth_profile' }, context: {} }),
@@ -81,6 +84,9 @@ const getUserResource = (username: string) =>
 
 const getUserActivityPinsResource = async (username: string, userId: string) => {
     const response = await ofetch(`${baseUrl}/resource/UserActivityPinsResource/get/`, {
+        headers: {
+            'x-pinterest-pws-handler': 'www/[username]/_created.js',
+        },
         query: {
             source_url: `/${username}/_created`,
             data: JSON.stringify({ options: { exclude_add_pin_rep: true, field_set_key: 'grid_item', is_own_profile_pins: false, user_id: userId, username }, context: {} }),
@@ -93,6 +99,9 @@ const getUserActivityPinsResource = async (username: string, userId: string) =>
 
 const getBoardsFeedResource = async (username: string) => {
     const response = await ofetch(`${baseUrl}/resource/BoardsFeedResource/get/`, {
+        headers: {
+            'x-pinterest-pws-handler': 'www/[username]/_saved.js',
+        },
         query: {
             source_url: `/${username}/_saved`,
             data: JSON.stringify({ options: { field_set_key: 'profile_grid_item', filter_stories: false, sort: 'last_pinned_to', username }, context: {} }),

package/lib/routes/pixiv/api/get-ranking.ts

@@ -13,7 +13,7 @@ const allowMode = new Set(['day', 'week', 'month', 'day_male', 'day_female', 'da
  * @returns {Promise<got.AxiosResponse<{illusts: illust[]}>>}
  */
 export default function getRanking(mode, date, token) {
-    assert(allowMode.has(mode), 'Mode not allow.');
+    assert.ok(allowMode.has(mode), 'Mode not allow.');
     return got('https://app-api.pixiv.net/v1/illust/ranking', {
         headers: {
             ...maskHeader,

package/lib/routes/pixiv/novel-api/content/utils.ts

@@ -1,6 +1,7 @@
 import { load } from 'cheerio';
 import getIllustDetail from '../../api/get-illust-detail';
 import pixivUtils from '../../utils';
+import logger from '@/utils/logger';
 
 export function convertPixivProtocolExtended(caption: string): string {
     const protocolMap = new Map([

package/lib/routes/pku/scc/recruit.ts

@@ -30,8 +30,8 @@ export const route: Route = {
     maintainers: ['DylanXie123'],
     handler,
     description: `| xwrd     | tzgg     | zpxx     | sxxx     | cyxx     |
-  | -------- | -------- | -------- | -------- | -------- |
-  | 新闻热点 | 通知公告 | 招聘信息 | 实习信息 | 创业信息 |`,
+| -------- | -------- | -------- | -------- | -------- |
+| 新闻热点 | 通知公告 | 招聘信息 | 实习信息 | 创业信息 |`,
 };
 
 async function handler(ctx) {

package/lib/routes/playno1/av.ts

@@ -27,9 +27,9 @@ export const route: Route = {
 目前观测到该博客可能禁止日本 IP 访问。建议部署在日本区以外的服务器上。
 :::
 
-  | 全部文章 | AV 新聞 | AV 導覽 |
-  | -------- | ------- | ------- |
-  | 78       | 3       | 5       |`,
+| 全部文章 | AV 新聞 | AV 導覽 |
+| -------- | ------- | ------- |
+| 78       | 3       | 5       |`,
 };
 
 async function handler(ctx) {