Merge pull request #2046 from DIYgod/master

[pull] master from diygod:master

lib/routes/bilibili/user-collection.ts

@@ -28,7 +28,7 @@ export const route: Route = {
         supportScihub: false,
     },
     name: 'UP 主频道的合集',
-    maintainers: ['shininome'],
+    maintainers: ['shininome', 'cscnk52'],
     handler,
 };
 
@@ -42,7 +42,7 @@ async function handler(ctx) {
 
     const link = `https://space.bilibili.com/${uid}/channel/collectiondetail?sid=${sid}`;
     const [userName, face] = await cache.getUsernameAndFaceFromUID(uid);
-    const host = `https://api.bilibili.com/x/polymer/space/seasons_archives_list?mid=${uid}&season_id=${sid}&sort_reverse=${sortReverse}&page_num=${page}&page_size=${limit}`;
+    const host = `https://api.bilibili.com/x/polymer/web-space/seasons_archives_list?mid=${uid}&season_id=${sid}&sort_reverse=${sortReverse}&page_num=${page}&page_size=${limit}`;
 
     const response = await got(host, {
         headers: {

lib/routes/hrbust/news.ts

@@ -13,11 +13,17 @@ export const route: Route = {
     handler,
     example: '/hrbust/news',
     parameters: { category: '栏目标识，默认为 lgyw（理工要闻）' },
-    description: `| 理工要闻 | 新闻导读 | 综合新闻 | 教学科研 | 院处动态 | 学术科创 | 交流合作 | 招生就业 | 党建思政 | 在线播放 | 理工校报 | 媒体理工 | 讲座论坛 | 人才招聘 |
-|----------|----------|----------|----------|----------|----------|----------|----------|----------|----------|----------|----------|----------|----------|
-| lgyw     | xwdd     | zhenew   | jxky     | ycdt     | xskc     | jlhz     | zsjy     | djsz     | zxbf     | lgxb     | mtlg     | jzlt     | rczp     |`,
+    description: `| 理工要闻 | 新闻导读 | 图文报道 | 综合新闻 | 教学科研 | 院处动态 | 学术科创 | 交流合作 | 学生天地 | 招生就业 | 党建思政 | 在线播放 | 理工人物 | 理工校报 | 媒体理工 | 讲座论坛 | 人才招聘 | 学科建设 |
+|----------|----------|----------|----------|----------|----------|----------|----------|----------|----------|----------|----------|----------|----------|----------|----------|----------|----------|
+| lgyw     | xwdd     | twbd     | zhenew   | jxky     | ycdt     | xskc     | jlhz     | xstd     | zsjy     | djsz     | zxbf     | lgrw     | lgxb     | mtlg     | jzlt     | rczp     | xkjs     |`,
     categories: ['university'],
     features: {
+        requireConfig: false,
+        requirePuppeteer: false,
+        antiCrawler: false,
+        supportBT: false,
+        supportPodcast: false,
+        supportScihub: false,
         supportRadar: true,
     },
     radar: [
@@ -44,7 +50,7 @@ async function handler(ctx) {
 
     const bigTitle = $('title').text().split('-')[0].trim();
 
-    const list = $('div.main-liebiao-con-left-bottom li[id^=line_u10]')
+    const list = $('li[id^=line_u10]')
         .toArray()
         .map((item) => {
             const element = $(item);
@@ -75,7 +81,17 @@ async function handler(ctx) {
                     item.pubDate = pubTime;
                 }
 
-                item.description = content('div.v_news_content').html() || '解析正文失败';
+                const author = content('p.xinxi span:contains("作者：")').text().replace('作者：', '').trim();
+                item.author = author || null;
+
+                const newsContent = content('div.v_news_content') || '解析正文失败';
+                const listAttachments = content('ul[style="list-style-type:none;"] a');
+                let listAttachmentsHtml = '';
+                listAttachments.each((_, a_element) => {
+                    listAttachmentsHtml += '<br />' + content(a_element).prop('outerHTML');
+                });
+
+                item.description = newsContent + listAttachmentsHtml;
                 return item;
             })
         )

lib/routes/tmtpost/namespace.ts

@@ -0,0 +1,9 @@
+import type { Namespace } from '@/types';
+
+export const namespace: Namespace = {
+    name: '钛媒体',
+    url: 'tmtpost.com',
+    categories: ['new-media'],
+    description: '钛媒体是一家专注于新媒体领域的科技媒体',
+    lang: 'zh-CN',
+};

lib/routes/tmtpost/nictation.ts

@@ -0,0 +1,59 @@
+import { Route } from '@/types';
+import got from '@/utils/got';
+import { parseDate } from '@/utils/parse-date';
+
+export const route: Route = {
+    path: '/nictation',
+    categories: ['new-media'],
+    example: '/tmtpost/word',
+    parameters: {},
+    features: {
+        requireConfig: false,
+        requirePuppeteer: false,
+        antiCrawler: false,
+        supportBT: false,
+        supportPodcast: false,
+        supportScihub: false,
+    },
+    radar: {
+        source: ['www.tmtpost.com'],
+    },
+    name: '快报',
+    maintainers: ['defp'],
+    handler,
+    url: 'www.tmtpost.com/nictation',
+};
+
+async function handler() {
+    const currentTime = Math.floor(Date.now() / 1000);
+    const oneHourAgo = currentTime - 3600;
+    const url = 'https://api.tmtpost.com/v1/word/list';
+
+    const response = await got({
+        method: 'get',
+        url,
+        searchParams: {
+            time_start: oneHourAgo,
+            time_end: currentTime,
+            limit: 40,
+            fields: ['share_description', 'share_image', 'word_comments', 'stock_list', 'is_important', 'duration', 'word_classify', 'share_link'].join(';'),
+        },
+        headers: {
+            'app-version': 'web1.0',
+        },
+    });
+
+    const data = response.data.data;
+
+    return {
+        title: '钛媒体 - 快报',
+        link: 'https://www.tmtpost.com/nictation',
+        item: data.map((item) => ({
+            title: item.title,
+            description: item.detail,
+            pubDate: parseDate(item.time_published, 'X'),
+            link: item.share_link || `https://www.tmtpost.com/nictation/${item.guid}.html`,
+            author: item.author_name,
+        })),
+    };
+}

lib/routes/tongji/gs.ts

@@ -0,0 +1,66 @@
+import { Route } 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: '/gs',
+    categories: ['university'],
+    example: '/tongji/gs',
+    parameters: {},
+    features: {
+        requireConfig: false,
+        requirePuppeteer: false,
+        antiCrawler: false,
+        supportBT: false,
+        supportPodcast: false,
+        supportScihub: false,
+    },
+    radar: [
+        {
+            source: ['gs.tongji.edu.cn/tzgg.htm', 'gs.tongji.edu.cn/'],
+        },
+    ],
+    name: '研究生院通知公告',
+    maintainers: ['sitdownkevin'],
+    handler,
+    url: 'gs.tongji.edu.cn/tzgg.htm',
+};
+
+async function getNoticeContent(item) {
+    const response = await got(item.link);
+    const $ = load(response.body);
+    const content = $('#vsb_content').html();
+    item.description = content;
+    return item;
+}
+
+async function handler() {
+    const baseUrl = 'https://gs.tongji.edu.cn';
+    const response = await got(`${baseUrl}/tzgg.htm`);
+    const $ = load(response.body);
+    const container = $('body > div > div.con_list.ma0a > div > div.list_content_right > div.list_list > ul');
+    const items = container
+        .find('li')
+        .toArray()
+        .map((item) => {
+            const title = $(item).find('a').attr('title');
+            const linkRaw = $(item).find('a').attr('href');
+            const link = linkRaw.startsWith('http') ? linkRaw : `${baseUrl}/${linkRaw}`;
+            const pubDate = $(item).find('span').text();
+            return { title, link, pubDate: parseDate(pubDate, 'YYYY-MM-DD') };
+        });
+
+    const itemsWithContent = await Promise.all(items.map((item) => cache.tryGet(item.link, () => getNoticeContent(item))));
+
+    return {
+        title: '同济大学研究生院',
+        link: baseUrl,
+        description: '同济大学研究生院通知公告',
+        image: 'https://upload.wikimedia.org/wikipedia/zh/f/f8/Tongji_University_Emblem.svg',
+        icon: 'https://upload.wikimedia.org/wikipedia/zh/f/f8/Tongji_University_Emblem.svg',
+        logo: 'https://upload.wikimedia.org/wikipedia/zh/f/f8/Tongji_University_Emblem.svg',
+        item: itemsWithContent,
+    };
+}

lib/routes/tongji/yjs.ts

@@ -2,6 +2,7 @@ import { Route } 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: '/yjs',
@@ -21,32 +22,45 @@ export const route: Route = {
             source: ['yz.tongji.edu.cn/zsxw/ggtz.htm', 'yz.tongji.edu.cn/'],
         },
     ],
-    name: '研究生院通知公告',
-    maintainers: ['shengmaosu'],
+    name: '研究生招生网通知公告',
+    maintainers: ['shengmaosu', 'sitdownkevin'],
     handler,
     url: 'yz.tongji.edu.cn/zsxw/ggtz.htm',
 };
 
-async function handler() {
-    const link = 'https://yz.tongji.edu.cn/zsxw/ggtz.htm';
-    const response = await got(link);
+async function getNoticeContent(item) {
+    const response = await got(item.link);
     const $ = load(response.data);
-    const list = $('.list_main_content li');
+    const content = $('#vsb_content').html();
+    item.description = content;
+    return item;
+}
+
+async function handler() {
+    const baseUrl = 'https://yz.tongji.edu.cn';
+    const response = await got(`${baseUrl}/zsxw/ggtz.htm`);
+    const $ = load(response.body);
+    const container = $('#content-box > div.content > div.list_main_content > ul');
+    const items = container
+        .find('li')
+        .toArray()
+        .map((item) => {
+            const title = $(item).find('a').attr('title');
+            const linkRaw = $(item).find('a').attr('href');
+            const link = linkRaw.startsWith('http') ? linkRaw : new URL(linkRaw, `${baseUrl}/zsxw`).toString();
+            const pubDate = $(item).find('span').text();
+            return { title, link, pubDate: parseDate(pubDate, 'YYYY-MM-DD') };
+        });
+
+    const itemsWithContent = await Promise.all(items.map((item) => cache.tryGet(item.link, () => getNoticeContent(item))));
 
     return {
-        title: '同济大学研究生院',
-        link,
-        description: '同济大学研究生院通知公告',
-        item:
-            list &&
-            list.toArray().map((item) => {
-                item = $(item);
-                const a = item.find('a');
-                return {
-                    title: a.attr('title'),
-                    link: new URL(a.attr('href'), link).href,
-                    pubDate: parseDate(item.find('span').text(), 'YYYY-MM-DD'),
-                };
-            }),
+        title: '同济大学研究生招生网',
+        link: baseUrl,
+        description: '同济大学研究生招生网通知公告',
+        image: 'https://upload.wikimedia.org/wikipedia/zh/f/f8/Tongji_University_Emblem.svg',
+        icon: 'https://upload.wikimedia.org/wikipedia/zh/f/f8/Tongji_University_Emblem.svg',
+        logo: 'https://upload.wikimedia.org/wikipedia/zh/f/f8/Tongji_University_Emblem.svg',
+        item: itemsWithContent,
     };
 }