Merge pull request #892 from DIYgod/master

pull[bot] · web-flow · commit 89181d161b19 · 2023-03-27T18:44:39.000Z
[pull] master from diygod:master
diff --git a/docs/en/other.md b/docs/en/other.md
@@ -126,6 +126,18 @@ Official Website: <https://news.yahoo.co.jp/pages/article/20200207>
 
 <RouteEn author="LogicJake" example="/instapaper/person/viridiano" path="/instapaper/person"/>
 
+## Instructables
+
+### Projects
+
+<RouteEn author="wolfg1969" example="/instructables/projects/circuits" path="/instructables/projects/:category?" :paramsDesc="['Category, empty by default, can be found in URL or see the table below']" radar="1">
+
+| All | Circuits | Workshop | Craft | Cooking | Living | Outside | Teachers |
+| --- | -------- | -------- | ----- | ------- | ------ | ------- | -------- |
+|     | circuits | workshop | craft | cooking | living | outside | teachers |
+
+</RouteEn>
+
 ## Japanpost
 
 ### Track & Trace Service
diff --git a/docs/other.md b/docs/other.md
@@ -157,6 +157,18 @@ pageClass: routes
 
 <Route author="LogicJake" example="/instapaper/person/viridiano" path="/instapaper/person"/>
 
+## Instructables
+
+### Projects
+
+<Route author="wolfg1969" example="/instructables/projects/circuits" path="/instructables/projects/:category?" :paramsDesc="['项目类别。默认空值为全部，从网页地址中得知，见下表']" radar="1">
+
+| All | Circuits | Workshop | Craft | Cooking | Living | Outside | Teachers |
+| --- | -------- | -------- | ----- | ------- | ------ | ------- | -------- |
+|     | circuits | workshop | craft | cooking | living | outside | teachers |
+
+</Route>
+
 ## iYouport
 
 ### 首页（旧版）
diff --git a/docs/university.md b/docs/university.md
@@ -1650,6 +1650,16 @@ jsjxy.hbut.edu.cn 证书链不全，自建 RSSHub 可设置环境变量 NODE_TLS
 
 </Route>
 
+## 江苏海洋大学
+
+### 官网通知公告
+
+<Route author="real-jiakai" example="/jou/tzgg" path="/jou/tzgg" radar="1" />
+
+### 研招网通知公告
+
+<Route author="real-jiakai" example="/jou/yztzgg" path="/jou/yztzgg" radar="1" />
+
 ## 井冈山大学
 
 ### 教务处通知
@@ -2031,7 +2041,11 @@ jsjxy.hbut.edu.cn 证书链不全，自建 RSSHub 可设置环境变量 NODE_TLS
 
 ### 官网通知公告
 
-<Route author="real-jiakai" example="/njxzc/tzgg" path="/njxzc/tzgg" radar="1"/>
+<Route author="real-jiakai" example="/njxzc/tzgg" path="/njxzc/tzgg" radar="1" />
+
+### 图书馆通知公告
+
+<Route author="real-jiakai" example="/njxzc/libtzgg" path="/njxzc/libtzgg" radar="1" />
 
 ## 南京信息工程大学
 
diff --git a/lib/v2/instructables/maintainer.js b/lib/v2/instructables/maintainer.js
@@ -0,0 +1,3 @@
+module.exports = {
+    '/projects/:category?': ['wolfg1969'],
+};
diff --git a/lib/v2/instructables/projects.js b/lib/v2/instructables/projects.js
@@ -0,0 +1,55 @@
+const got = require('@/utils/got');
+
+module.exports = async (ctx) => {
+    const category = ctx.params.category ?? 'all';
+
+    const siteDomain = 'www.instructables.com';
+    const apiKey = 'NU5CdGwyRDdMVnVmM3l4cWNqQzFSVzJNZU5jaUxFU3dGK3J2L203MkVmVT02ZWFYeyJleGNsdWRlX2ZpZWxkcyI6WyJvdXRfb2YiLCJzZWFyY2hfdGltZV9tcyIsInN0ZXBCb2R5Il0sInBlcl9wYWdlIjo1MH0=';
+
+    let pathPrefix, projectFilter;
+    if (category === 'all') {
+        pathPrefix = '';
+        projectFilter = '';
+    } else {
+        pathPrefix = `${category}/`;
+        const filterValue = `${category.charAt(0).toUpperCase()}${category.slice(1)}`;
+        projectFilter = category !== 'teachers' ? ` && category:=${filterValue}` : `&& teachers:=${filterValue}`;
+    }
+
+    const link = `https://${siteDomain}/${pathPrefix}projects?projects=all`;
+
+    const response = await got({
+        method: 'get',
+        url: `https://${siteDomain}/api_proxy/search/collections/projects/documents/search`,
+        headers: {
+            Referer: link,
+            Host: siteDomain,
+            'x-typesense-api-key': apiKey,
+        },
+        searchParams: {
+            q: '*',
+            query_by: 'title,stepBody,screenName',
+            page: 1,
+            per_page: 50,
+            sort_by: 'publishDate:desc',
+            include_fields: 'title,urlString,coverImageUrl,screenName,publishDate,favorites,views,primaryClassification,featureFlag,prizeLevel,IMadeItCount',
+            filter_by: `featureFlag:=true${projectFilter}`,
+        },
+    });
+
+    const data = response.data;
+
+    ctx.state.data = {
+        title: 'Instructables Projects', // 项目的标题
+        link, // 指向项目的链接
+        description: 'Instructables Projects', // 描述项目
+        language: 'en', // 频道语言
+        item: data.hits.map((item) => ({
+            title: item.document.title,
+            link: `https://${siteDomain}/${item.document.urlString}`,
+            author: item.document.screenName,
+            pubDate: new Date(item.document.publishDate).toUTCString(),
+            category: item.document.primaryClassification,
+        })),
+    };
+};
diff --git a/lib/v2/instructables/radar.js b/lib/v2/instructables/radar.js
@@ -0,0 +1,19 @@
+module.exports = {
+    'instructables.com': {
+        _name: 'Instructables',
+        '.': [
+            {
+                title: 'All Projects - Instructables',
+                docs: 'https://docs.rsshub.app/other.html#instructables',
+                source: ['/projects'],
+                target: '/instructables/projects',
+            },
+            {
+                title: 'Projects - Instructables',
+                docs: 'https://docs.rsshub.app/other.html#instructables',
+                source: ['/:category/projects'],
+                target: (params) => `/instructables/projects/${params.category}`,
+            },
+        ],
+    },
+};
diff --git a/lib/v2/instructables/router.js b/lib/v2/instructables/router.js
@@ -0,0 +1,3 @@
+module.exports = (router) => {
+    router.get('/projects/:category?', require('./projects'));
+};
diff --git a/lib/v2/jou/home.js b/lib/v2/jou/home.js
@@ -0,0 +1,18 @@
+const { getItems } = require('./utils');
+
+const url = 'https://www.jou.edu.cn/index/tzgg.htm';
+const host = 'https://www.jou.edu.cn';
+
+module.exports = async (ctx) => {
+    const out = await getItems(ctx, url, host, 'winstyle106390', 'timestyle106390', 'titlestyle106402', 'timestyle106402');
+
+    // 生成RSS源
+    ctx.state.data = {
+        // 项目标题
+        title: '江苏海洋大学 -- 通知公告',
+        // 项目链接
+        link: url,
+        // items的内容
+        item: out,
+    };
+};
diff --git a/lib/v2/jou/maintainer.js b/lib/v2/jou/maintainer.js
@@ -0,0 +1,4 @@
+module.exports = {
+    '/tzgg': ['real-jiakai'],
+    '/yztzgg': ['real-jiakai'],
+};
diff --git a/lib/v2/jou/radar.js b/lib/v2/jou/radar.js
@@ -0,0 +1,21 @@
+module.exports = {
+    'jou.edu.cn': {
+        _name: '江苏海洋大学',
+        www: [
+            {
+                title: '通知公告',
+                docs: 'https://docs.rsshub.app/university.html#jiang-su-hai-yang-da-xue-guan-wang-tong-zhi-gong-gao',
+                source: ['/index/tzgg.htm', '/'],
+                target: '/jou/tzgg',
+            },
+        ],
+        yz: [
+            {
+                title: '研招通知公告',
+                docs: 'https://docs.rsshub.app/university.html#jiang-su-hai-yang-da-xue-yan-zhao-wang-tong-zhi-gong-gao',
+                source: ['/index/zxgg.htm', '/'],
+                target: '/jou/yztzgg',
+            },
+        ],
+    },
+};
diff --git a/lib/v2/jou/router.js b/lib/v2/jou/router.js
@@ -0,0 +1,6 @@
+module.exports = (router) => {
+    // 江苏海洋大学通知公告
+    router.get('/tzgg', require('./home'));
+    // 江苏海洋大学研招网通知公告
+    router.get('/yztzgg', require('./yz'));
+};
diff --git a/lib/v2/jou/utils/index.js b/lib/v2/jou/utils/index.js
@@ -0,0 +1,60 @@
+// 导入got库，该库用来请求网页数据
+const got = require('@/utils/got');
+// 导入cheerio库，该库用来解析网页数据
+const cheerio = require('cheerio');
+// 导入parseDate函数，该函数用于日期处理
+const { parseDate } = require('@/utils/parse-date');
+// 导入timezone库，该库用于时区处理
+const timezone = require('@/utils/timezone');
+
+async function getItems(ctx, url, host, tableClass, timeStyleClass1, titleStyleClass, timeStyleClass2) {
+    // 发起Http请求，获取网页数据
+    const response = await got({ url, https: { rejectUnauthorized: false } });
+    // 解析网页数据
+    const $ = cheerio.load(response.data);
+
+    // 通知公告的items的标题、url链接、发布日期
+    const list = $(`table.${tableClass} > tbody > tr[height=20]`)
+        .toArray()
+        .map((item) => {
+            const currentItem = $(item); // 获取当前tr元素的jQuery对象
+            const item1 = currentItem.find('td:eq(1)'); // 获取当前tr元素下的第二个td
+            const item2 = currentItem.find('td:eq(2)'); // 获取当前tr元素下的第三个td
+            const link = new URL(item1.find('a').attr('href'), host).href;
+
+            return {
+                title: item1.find('a').attr('title'),
+                link,
+                pubDate: timezone(parseDate(item2.find(`.${timeStyleClass1}`).text(), 'YYYY-MM-DD'), +8),
+            };
+        });
+
+    const out = await Promise.all(
+        list.map((item) =>
+            // 使用缓存
+            ctx.cache.tryGet(item.link, async () => {
+                const response = await got({ url: item.link, https: { rejectUnauthorized: false } });
+                if (response.redirectUrls.length) {
+                    item.link = response.redirectUrls[0];
+                    item.description = '该通知无法直接预览，请点击原文链接↑查看';
+                } else {
+                    const $ = cheerio.load(response.data);
+                    item.title = $(`.${titleStyleClass}`).text();
+                    item.description = $('.v_news_content')
+                        .html()
+                        .replace(/src="\//g, `src="${new URL('.', host).href}`)
+                        .replace(/href="\//g, `href="${new URL('.', host).href}`)
+                        .trim();
+                    item.pubDate = timezone(parseDate($(`.${timeStyleClass2}`).text().replace('发布时间：', '')), +8);
+                }
+                return item;
+            })
+        )
+    );
+
+    return out;
+}
+
+module.exports = {
+    getItems,
+};
diff --git a/lib/v2/jou/yz.js b/lib/v2/jou/yz.js
@@ -0,0 +1,18 @@
+const { getItems } = require('./utils');
+
+const url = 'https://yz.jou.edu.cn/index/zxgg.htm';
+const host = 'https://yz.jou.edu.cn';
+
+module.exports = async (ctx) => {
+    const out = await getItems(ctx, url, host, 'winstyle207638', 'timestyle207638', 'titlestyle207543', 'timestyle207543');
+
+    // 生成RSS源
+    ctx.state.data = {
+        // 项目标题
+        title: '江苏海洋大学 -- 研招通知公告',
+        // 项目链接
+        link: url,
+        // items的内容
+        item: out,
+    };
+};
diff --git a/lib/v2/njxzc/home.js b/lib/v2/njxzc/home.js
@@ -1,66 +1,26 @@
-// 导入got库，该库用来请求网页数据
-const got = require('@/utils/got');
-// 导入cheerio库，该库用来解析网页数据
-const cheerio = require('cheerio');
-// 导入parseDate函数，该函数用于日期处理
-const { parseDate } = require('@/utils/parse-date');
-// 导入timezone库，该库用于时区处理
-const timezone = require('@/utils/timezone');
+const { getNoticeList } = require('./utils');
 
-// 通知通告的url链接
 const url = 'https://www.njxzc.edu.cn/89/list.htm';
-// 南京晓庄学院的首页网址
 const host = 'https://www.njxzc.edu.cn';
 
 module.exports = async (ctx) => {
-    // 发起Http请求，获取网页数据
-    const response = await got(url);
-
-    // 解析网页数据
-    const $ = cheerio.load(response.data);
-
-    // 通知公告的items的标题、url链接、发布日期
-    const list = $('.news_list .news')
-        .toArray()
-        .map((item) => {
-            item = $(item);
-            return {
-                title: item.find('a').attr('title'),
-                link: host + item.find('a').attr('href'),
-                pubDate: timezone(parseDate(item.find('.news_meta').text(), 'YYYY-MM-DD'), +8),
-            };
-        });
-
-    const out = await Promise.all(
-        list.map((item) =>
-            // 使用缓存
-            ctx.cache.tryGet(item.link, async () => {
-                const response = await got(item.link);
-                if (response.redirectUrls.length > 0) {
-                    item.link = response.redirectUrls[0];
-                    item.description = '该通知无法直接预览，请点击原文链接↑查看';
-                } else {
-                    const $ = cheerio.load(response.data);
-                    item.title = $('.arti_title').text();
-                    item.description = $('.wp_articlecontent')
-                        .html()
-                        .replace(/src="\//g, `src="${new URL('.', host).href}`)
-                        .replace(/href="\//g, `href="${new URL('.', host).href}`)
-                        .trim();
-                    item.pubDate = timezone(parseDate($('.arti_update').text().replace('发布时间：', '')), +8);
-                }
-                return item;
-            })
-        )
+    const out = await getNoticeList(
+        ctx,
+        url,
+        host,
+        'a',
+        '.news_meta',
+        {
+            title: '.arti_title',
+            content: '.wp_articlecontent',
+            date: '.arti_update',
+        },
+        '.news_list .news'
     );
 
-    // 生成RSS源
     ctx.state.data = {
-        // 项目标题
         title: '南京晓庄学院 -- 通知公告',
-        // 项目链接
         link: url,
-        // items的内容
         item: out,
     };
 };
diff --git a/lib/v2/njxzc/lib.js b/lib/v2/njxzc/lib.js
@@ -0,0 +1,26 @@
+const { getNoticeList } = require('./utils');
+
+const url = 'https://lib.njxzc.edu.cn/pxyhd/list.htm';
+const host = 'https://lib.njxzc.edu.cn';
+
+module.exports = async (ctx) => {
+    const out = await getNoticeList(
+        ctx,
+        url,
+        host,
+        'a',
+        '.news_meta',
+        {
+            title: '.arti_title',
+            content: '.wp_articlecontent',
+            date: '.arti_update',
+        },
+        '.news'
+    );
+
+    ctx.state.data = {
+        title: '南京晓庄学院 -- 图书馆通知公告',
+        link: url,
+        item: out,
+    };
+};
diff --git a/lib/v2/njxzc/maintainer.js b/lib/v2/njxzc/maintainer.js
@@ -1,3 +1,4 @@
 module.exports = {
+    '/libtzgg': ['real-jiakai'],
     '/tzgg': ['real-jiakai'],
 };
diff --git a/lib/v2/njxzc/radar.js b/lib/v2/njxzc/radar.js
diff --git a/lib/v2/njxzc/router.js b/lib/v2/njxzc/router.js
diff --git a/lib/v2/njxzc/utils/index.js b/lib/v2/njxzc/utils/index.js

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+module.exports = {`
	`2`	`+ '/projects/:category?': ['wolfg1969'],`
	`3`	`+};`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+module.exports = (router) => {`
	`2`	`+ router.get('/projects/:category?', require('./projects'));`
	`3`	`+};`