rsshub 1.0.0-master.ff487f3 → 1.0.0-master.ff76aa7

package/lib/routes/sis001/forum.ts

@@ -2,9 +2,7 @@ import { Route } from '@/types';
 import cache from '@/utils/cache';
 import got from '@/utils/got';
 import { load } from 'cheerio';
-import { parseDate } from '@/utils/parse-date';
-import timezone from '@/utils/timezone';
-const baseUrl = 'https://www.sis001.com';
+import { baseUrl, getThread } from './common';
 
 export const route: Route = {
     path: '/forum/:id?',
@@ -43,35 +41,10 @@ async function handler(ctx) {
                 title: item.find('th em').text() + ' ' + item.find('span a').eq(0).text(),
                 link: new URL(item.find('span a').eq(0).attr('href'), `${baseUrl}/forum/`).href,
                 author: item.find('.author a').text(),
-                pubDate: parseDate(item.find('.author em').text(), 'YYYY-M-D'),
             };
         });
 
-    items = await Promise.all(
-        items.map((item) =>
-            cache.tryGet(item.link, async () => {
-                const response = await got(item.link);
-                const $ = load(response.data);
-
-                item.category = $('.posttags a')
-                    .toArray()
-                    .map((a) => $(a).text());
-                item.pubDate = timezone(
-                    parseDate(
-                        $('.postinfo')
-                            .eq(0)
-                            .text()
-                            .match(/发表于 (.*)\s*只看该作者/)[1],
-                        'YYYY-M-D HH:mm'
-                    ),
-                    8
-                );
-                $('div[id^=postmessage_] table, fieldset, .posttags').remove();
-                item.description = $('div[id^=postmessage_]').eq(0).html() + ($('.defaultpost .postattachlist').html() ?? '');
-                return item;
-            })
-        )
-    );
+    items = await Promise.all(items.map((item) => cache.tryGet(item.link, async () => await getThread(item))));
 
     return {
         title: $('head title').text(),

package/lib/routes/sjtu/jwc.ts

@@ -7,7 +7,10 @@ import { parseDate } from '@/utils/parse-date';
 const urlRoot = 'https://jwc.sjtu.edu.cn/xwtg';
 
 async function getFullArticle(link) {
-    const response = await got(link);
+    const response = await got(link).catch(() => null);
+    if (!response) {
+        return null;
+    }
     const $ = load(response.body);
     const content = $('.content-con');
     if (content.length === 0) {

package/lib/routes/sjtu/namespace.ts

@@ -2,5 +2,5 @@ import type { Namespace } from '@/types';
 
 export const namespace: Namespace = {
     name: '上海交通大学',
-    url: 'bjwb.seiee.sjtu.edu.cn',
+    url: 'www.sjtu.edu.cn',
 };

package/lib/routes/sjtu/seiee/index.ts

@@ -0,0 +1,97 @@
+import { Route } from '@/types';
+import cache from '@/utils/cache';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
+import timezone from '@/utils/timezone';
+import ofetch from '@/utils/ofetch';
+
+export const route: Route = {
+    path: '/seiee/:path/:catID?/:searchCatCode?',
+    categories: ['university'],
+    example: '/sjtu/seiee/xzzx_notice_bks',
+    parameters: { path: "不含'.html'的最后一部分路径", catID: "'本科生人才培养'与'研究生人才培养'的类别ID", searchCatCode: "'本科生人才培养'与'研究生人才培养'下类别名" },
+    features: {
+        requireConfig: false,
+        requirePuppeteer: false,
+        antiCrawler: true,
+        supportBT: false,
+        supportPodcast: false,
+        supportScihub: false,
+    },
+    radar: [
+        {
+            source: ['www.seiee.sjtu.edu.cn/:path.html'],
+            target: '/seiee/:path',
+        },
+    ],
+    name: '电子信息与电气工程学院',
+    maintainers: ['dzx-dzx'],
+    handler,
+};
+
+async function handler(ctx) {
+    const { path, catID = '', searchCatCode = '' } = ctx.req.param();
+
+    const rootUrl = 'https://www.seiee.sjtu.edu.cn';
+    const currentUrl = `${rootUrl}/${path}.html`;
+    const ajaxUrl = `${rootUrl}/active/ajax_article_list.html`;
+    const response = catID
+        ? (
+              await ofetch(ajaxUrl, {
+                  method: 'POST',
+                  body: new URLSearchParams({
+                      page: '1',
+                      cat_id: catID,
+                      search_cat_code: searchCatCode,
+                      search_cat_title: '',
+                      template: 'v_ajax_normal_list1',
+                  }),
+                  headers: {
+                      'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
+                  },
+                  parseResponse: JSON.parse,
+              })
+          ).content
+        : await ofetch(currentUrl);
+
+    const $ = load(response);
+
+    const list = $(catID ? 'li' : '.u10 li')
+        .toArray()
+        .map((item) => {
+            item = $(item);
+
+            return {
+                title: item.find('.name').text().trim(),
+                link: item.find('a').attr('href'),
+            };
+        });
+
+    const items = await Promise.all(
+        list.map((item) =>
+            cache.tryGet(item.link, async () => {
+                const detailResponse = await ofetch(item.link);
+                const content = load(detailResponse);
+
+                item.description = content('.nr').html();
+                item.pubDate = timezone(
+                    parseDate(
+                        content('.jj')
+                            .text()
+                            .trim()
+                            .match(/日期：([\d-]+) /)[1]
+                    ),
+                    +8
+                );
+
+                return item;
+            })
+        )
+    );
+
+    return {
+        title: $('title').text() || load(await ofetch(currentUrl))('title').text(),
+        link: currentUrl,
+        item: items,
+    };
+}

package/lib/routes/skeb/following-creators.ts

@@ -0,0 +1,52 @@
+import { Data, DataItem, Route } from '@/types';
+import { config } from '@/config';
+import ConfigNotFoundError from '@/errors/types/config-not-found';
+import { getFollowingsItems } from './utils';
+
+export const route: Route = {
+    path: '/following_creators/:username',
+    categories: ['picture'],
+    example: '/skeb/following_creators/@brm2_1925',
+    parameters: { username: 'Skeb Username with @' },
+    features: {
+        requireConfig: [
+            {
+                name: 'SKEB_BEARER_TOKEN',
+                optional: false,
+                description: '在瀏覽器開發者工具（F12）的主控台中輸入 `localStorage.getItem("token")` 獲取',
+            },
+        ],
+        requirePuppeteer: false,
+        antiCrawler: false,
+        supportBT: false,
+        supportPodcast: false,
+        supportScihub: false,
+    },
+    name: 'Following Creators',
+    maintainers: ['SnowAgar25'],
+    handler,
+    radar: [
+        {
+            title: 'Following Creators',
+            source: ['skeb.jp/:username'],
+            target: '/following_creators/:username',
+        },
+    ],
+    description: 'Get the list of creators the specified user is following on Skeb.',
+};
+
+async function handler(ctx): Promise<Data> {
+    const username = ctx.req.param('username');
+
+    if (!config.skeb || !config.skeb.bearerToken) {
+        throw new ConfigNotFoundError('Skeb followings RSS is disabled due to the lack of relevant config');
+    }
+
+    const items = await getFollowingsItems(username, 'following_creators');
+
+    return {
+        title: `Skeb - ${username} - フォロー中のクリエイター`,
+        link: `https://skeb.jp/${username}`,
+        item: items as DataItem[],
+    };
+}

package/lib/routes/skeb/following-works.ts

@@ -0,0 +1,52 @@
+import { Data, DataItem, Route } from '@/types';
+import { config } from '@/config';
+import ConfigNotFoundError from '@/errors/types/config-not-found';
+import { getFollowingsItems } from './utils';
+
+export const route: Route = {
+    path: '/following_works/:username',
+    categories: ['picture'],
+    example: '/skeb/following_works/@brm2_1925',
+    parameters: { username: 'Skeb Username with @' },
+    features: {
+        requireConfig: [
+            {
+                name: 'SKEB_BEARER_TOKEN',
+                optional: false,
+                description: '在瀏覽器開發者工具（F12）的主控台中輸入 `localStorage.getItem("token")` 獲取',
+            },
+        ],
+        requirePuppeteer: false,
+        antiCrawler: false,
+        supportBT: false,
+        supportPodcast: false,
+        supportScihub: false,
+    },
+    name: 'Following Works',
+    maintainers: ['SnowAgar25'],
+    handler,
+    radar: [
+        {
+            title: 'Following Works',
+            source: ['skeb.jp/:username'],
+            target: '/following_works/:username',
+        },
+    ],
+    description: "Get the latest works for the specified user's followings on Skeb.",
+};
+
+async function handler(ctx): Promise<Data> {
+    const username = ctx.req.param('username');
+
+    if (!config.skeb || !config.skeb.bearerToken) {
+        throw new ConfigNotFoundError('Skeb followings RSS is disabled due to the lack of relevant config');
+    }
+
+    const items = await getFollowingsItems(username, 'following_works');
+
+    return {
+        title: `Skeb - ${username} - フォロー中のクリエイターの新着作品`,
+        link: `https://skeb.jp/${username}`,
+        item: items as DataItem[],
+    };
+}

package/lib/routes/skeb/friend-works.ts

@@ -0,0 +1,52 @@
+import { Data, DataItem, Route } from '@/types';
+import { config } from '@/config';
+import ConfigNotFoundError from '@/errors/types/config-not-found';
+import { getFollowingsItems } from './utils';
+
+export const route: Route = {
+    path: '/friend_works/:username',
+    categories: ['picture'],
+    example: '/skeb/friend_works/@brm2_1925',
+    parameters: { username: 'Skeb Username with @' },
+    features: {
+        requireConfig: [
+            {
+                name: 'SKEB_BEARER_TOKEN',
+                optional: false,
+                description: '在瀏覽器開發者工具（F12）的主控台中輸入 `localStorage.getItem("token")` 獲取',
+            },
+        ],
+        requirePuppeteer: false,
+        antiCrawler: false,
+        supportBT: false,
+        supportPodcast: false,
+        supportScihub: false,
+    },
+    name: 'Friend Works',
+    maintainers: ['SnowAgar25'],
+    handler,
+    radar: [
+        {
+            title: 'Friend Works',
+            source: ['skeb.jp/:username'],
+            target: '/friend_works/:username',
+        },
+    ],
+    description: "Get the latest requests for the specified user's followings on Skeb.",
+};
+
+async function handler(ctx): Promise<Data> {
+    const username = ctx.req.param('username');
+
+    if (!config.skeb || !config.skeb.bearerToken) {
+        throw new ConfigNotFoundError('Skeb followings RSS is disabled due to the lack of relevant config');
+    }
+
+    const items = await getFollowingsItems(username, 'friend_works');
+
+    return {
+        title: `Skeb - ${username} - フォロー中のクライアントの新着リクエスト`,
+        link: `https://skeb.jp/${username}`,
+        item: items as DataItem[],
+    };
+}

package/lib/routes/skeb/index.ts

@@ -0,0 +1,131 @@
+import { Route, Data, DataItem } from '@/types';
+import ofetch from '@/utils/ofetch';
+import cache from '@/utils/cache';
+import { baseUrl, processWork, processCreator } from './utils';
+import { config } from '@/config';
+
+const categoryMap = {
+    // Works categories
+    new_art_works: '新着作品 (Illust)',
+    new_voice_works: '新着作品 (Voice)',
+    new_novel_works: '新着作品 (Novel)',
+    new_video_works: '新着作品 (Video)',
+    new_music_works: '新着作品 (Music)',
+    new_correction_works: '新着作品 (Advice)',
+    new_comic_works: '新着作品 (Comic)',
+    popular_works: '人気の作品 (Popular)',
+    // Creators categories
+    popular_creators: '人気クリエイター',
+    new_creators: '新着クリエイター',
+};
+
+const workCategories = new Set(['new_art_works', 'new_voice_works', 'new_novel_works', 'new_video_works', 'new_music_works', 'new_correction_works', 'new_comic_works', 'popular_works']);
+
+export const route: Route = {
+    path: '/:category',
+    categories: ['picture'],
+    example: '/skeb/new_art_works',
+    parameters: { category: 'Category, the div id of the section title on the homepage.' },
+    features: {
+        requireConfig: false,
+        requirePuppeteer: false,
+        antiCrawler: false,
+        supportBT: false,
+        supportPodcast: false,
+        supportScihub: false,
+    },
+    name: 'Skeb',
+    maintainers: ['SnowAgar25'],
+    handler,
+    radar: [
+        {
+            title: '新着作品 (Illust)',
+            source: ['skeb.jp'],
+            target: '/new_art_works',
+        },
+        {
+            title: '新着作品 (Voice)',
+            source: ['skeb.jp'],
+            target: '/new_voice_works',
+        },
+        {
+            title: '新着作品 (Novel)',
+            source: ['skeb.jp'],
+            target: '/new_novel_works',
+        },
+        {
+            title: '新着作品 (Video)',
+            source: ['skeb.jp'],
+            target: '/new_video_works',
+        },
+        {
+            title: '新着作品 (Music)',
+            source: ['skeb.jp'],
+            target: '/new_music_works',
+        },
+        {
+            title: '新着作品 (Advice)',
+            source: ['skeb.jp'],
+            target: '/new_correction_works',
+        },
+        {
+            title: '新着作品 (Comic)',
+            source: ['skeb.jp'],
+            target: '/new_comic_works',
+        },
+        {
+            title: '人気の作品 (Popular)',
+            source: ['skeb.jp'],
+            target: '/popular_works',
+        },
+        {
+            title: '人気クリエイター',
+            source: ['skeb.jp'],
+            target: '/popular_creators',
+        },
+        {
+            title: '新着クリエイター',
+            source: ['skeb.jp'],
+            target: '/new_creators',
+        },
+    ],
+};
+
+async function handler(ctx): Promise<Data> {
+    const category = ctx.req.param('category') || 'new_art_works';
+
+    if (!(category in categoryMap)) {
+        throw new Error('Invalid category');
+    }
+
+    const url = `${baseUrl}/api`;
+
+    const apiData = await cache.tryGet(
+        url,
+        async () => {
+            const data = await ofetch(url);
+            return data;
+        },
+        config.cache.routeExpire,
+        false
+    );
+
+    if (!apiData || typeof apiData !== 'object') {
+        throw new Error('Invalid data received from API');
+    }
+
+    const items = await cache.tryGet(category, async () => {
+        if (!(category in apiData) || !Array.isArray(apiData[category])) {
+            return [];
+        }
+
+        const processItem = workCategories.has(category) ? processWork : processCreator;
+        return (await Promise.all(apiData[category].map(async (item) => await processItem(item)).filter(Boolean))) as DataItem[];
+    });
+
+    return {
+        title: `Skeb - ${categoryMap[category]}`,
+        link: `${baseUrl}/#${category}`,
+        item: items as DataItem[],
+    };
+}

package/lib/routes/skeb/namespace.ts

@@ -0,0 +1,6 @@
+import type { Namespace } from '@/types';
+
+export const namespace: Namespace = {
+    name: 'Skeb',
+    url: 'skeb.jp',
+};

package/lib/routes/skeb/search.ts

@@ -0,0 +1,77 @@
+import { Data, DataItem, Route } from '@/types';
+import cache from '@/utils/cache';
+import ofetch from '@/utils/ofetch';
+import { processWork, baseUrl } from './utils';
+import InvalidParameterError from '@/errors/types/invalid-parameter';
+
+export const route: Route = {
+    path: '/search/:keyword',
+    categories: ['picture'],
+    example: '/skeb/search/初音ミク',
+    parameters: { keyword: 'Search keyword' },
+    features: {
+        requireConfig: false,
+        requirePuppeteer: false,
+        antiCrawler: false,
+        supportBT: false,
+        supportPodcast: false,
+        supportScihub: false,
+    },
+    name: 'Search Results',
+    maintainers: ['SnowAgar25'],
+    handler,
+    description: 'Get the search results for works on Skeb',
+};
+
+async function handler(ctx): Promise<Data> {
+    const keyword = ctx.req.param('keyword');
+
+    if (!keyword) {
+        throw new InvalidParameterError('Invalid search keyword');
+    }
+
+    const url = 'https://hb1jt3kre9-dsn.algolia.net/1/indexes/*/queries';
+
+    const items = await cache.tryGet(`skeb:search:${keyword}`, async () => {
+        const data = await ofetch(url, {
+            method: 'POST',
+            headers: {
+                'x-algolia-application-id': 'HB1JT3KRE9',
+                'x-algolia-api-key': '9a4ce7d609e71bf29e977925e4c6740c',
+            },
+            body: {
+                requests: [
+                    {
+                        indexName: 'User',
+                        query: keyword,
+                        params: 'hitsPerPage=40',
+                        filters: 'genres:art OR genres:comic OR genres:voice OR genres:novel OR genres:video OR genres:music OR genres:correction',
+                    },
+                    {
+                        indexName: 'Request',
+                        query: keyword,
+                        params: 'hitsPerPage=40&filters=genre%3Aart%20OR%20genre%3Acomic%20OR%20genre%3Avoice%20OR%20genre%3Anovel%20OR%20genre%3Avideo%20OR%20genre%3Amusic%20OR%20genre%3Acorrection',
+                    },
+                ],
+            },
+        });
+
+        if (!data || !data.results || !Array.isArray(data.results) || data.results.length < 2) {
+            throw new Error('Invalid data received from API');
+        }
+
+        const works = data.results[1].hits;
+
+        if (!Array.isArray(works)) {
+            throw new TypeError('Invalid hits data received from API');
+        }
+
+        return works.map((item) => processWork(item)).filter(Boolean);
+    });
+
+    return {
+        title: `Skeb - Search Results for "${keyword}"`,
+        link: `${baseUrl}/search?q=${encodeURIComponent(keyword)}`,
+        item: items as DataItem[],
+    };
+}

package/lib/routes/skeb/templates/creator.art

@@ -0,0 +1,8 @@
+{{ if avatarUrl }}
+    <img src="{{ avatarUrl }}" />
+{{ /if }}
+<p>委託狀況（Accepting Commissions）：{{ acceptingCommissions }}</p>
+<p>NSFW：{{ nsfwAcceptable }}</p>
+{{ if skills }}
+    <p>類型（Genre）：{{ skills }}</p>
+{{ /if }}

package/lib/routes/skeb/templates/work.art

@@ -0,0 +1,10 @@
+{{ if imageUrl }}
+    <img src="{{ imageUrl }}" /><br>
+{{ /if }}
+{{ if audioUrl }}
+    <audio controls>
+    <source src="{{ audioUrl }}" type="audio/mp3">
+    Your browser does not support the audio element.
+    </audio><br>
+{{ /if }}
+{{ body }}