Merge pull request #942 from DIYgod/master

pull[bot] · web-flow · commit b09e21f9c930 · 2023-05-08T03:45:57.000Z
[pull] master from diygod:master
diff --git a/.dockerignore b/.dockerignore
@@ -1,6 +1,7 @@
 # folders
 .devcontainer
 .github
+.husky
 .idea
 .vscode
 Dockerfile*
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 .DS_Store
 .env
+.eslintcache
 .idea
 .log
 .now
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+npm run format:staged
diff --git a/Dockerfile b/Dockerfile
@@ -15,6 +15,7 @@ RUN \
         pnpm config set registry https://registry.npmmirror.com ; \
     fi;
 
+COPY ./scripts/prepare.js /app/scripts/
 COPY ./pnpm-lock.yaml /app/
 COPY ./package.json /app/
 
diff --git a/docs/en/programming.md b/docs/en/programming.md
@@ -223,6 +223,10 @@ For instance, the `/github/topics/framework/l=php&o=desc&s=stars` route will gen
 
 <RouteEn author="zhzy0077" example="/github/notifications" path="/github/notifications" radar="1" rssbud="1" selfhost="1"/>
 
+### Gist Commits
+
+<RouteEn author="TonyRL" example="/github/gist/d2c152bb7179d07015f336b1a0582679" path="/github/gist/:gistId" :paramsDesc="['Gist ID']" radar="1" rssbud="1"/>
+
 ## GitLab
 
 ### Explore
diff --git a/docs/forecast.md b/docs/forecast.md
@@ -77,16 +77,6 @@ pageClass: routes
 
 <Route author="nczitzk" example="/12379" path="/12379/index"/>
 
-## 国家应急广播网
-
-### 预警信息
-
-<Route author="muzea" example="/cneb/yjxx" path="/cneb/yjxx"/>
-
-### 国内新闻
-
-<Route author="muzea" example="/cneb/guoneinews" path="/cneb/guoneinews"/>
-
 ## 和风天气
 
 ### 近三天天气
@@ -187,6 +177,48 @@ pageClass: routes
 
 <Route author="calpa" example="/hko/weather" path="/hko/weather"/>
 
+## 中国国家应急广播
+
+### 预警信息
+
+<Route author="muzea nczitzk" example="/cneb/yjxx" path="/cneb/yjxx/:level?/:province?/:city?" :paramsDesc="['灾害级别，见下表，默认为全部', '省份，默认为空，即全国', '城市，默认为空，即全省']">
+
+灾害级别
+
+| 全部 | 红色 | 橙色 | 黄色 | 蓝色 |
+| ---- | ---- | ---- | ---- | ---- |
+|      | 红色 | 橙色 | 黄色 | 蓝色 |
+
+::: tip 提示
+
+若订阅全国的全部预警信息，此时路由为 [`/cneb/yjxx`](https://rsshub.app/cneb/yjxx)。
+
+若订阅全国的 **红色** 预警信息，此时路由为 [`/cneb/yjxx/红色`](https://rsshub.app/cneb/yjxx/红色)。
+
+若订阅 **北京市** 的全部预警信息，此时路由为 [`/cneb/yjxx/北京市`](https://rsshub.app/cneb/yjxx/北京市)。
+
+若订阅 **北京市** 的 **蓝色** 预警信息，此时路由为 [`/cneb/yjxx/北京市/蓝色`](https://rsshub.app/cneb/yjxx/北京市/蓝色)。
+
+若订阅 **广东省** 的 **橙色** 预警信息，此时路由为 [`/cneb/yjxx/广东省/橙色`](https://rsshub.app/cneb/yjxx/广东省/橙色)。
+
+若订阅 **广东省广州市** 的全部预警信息，此时路由为 [`/cneb/yjxx/广东省/广州市`](https://rsshub.app/cneb/yjxx/广东省/广州市)。
+
+若订阅 **广东省广州市** 的 **黄色** 预警信息，此时路由为 [`/cneb/yjxx/广东省/广州市/黄色`](https://rsshub.app/cneb/yjxx/广东省/广州市/黄色)。
+
+:::
+
+</Route>
+
+### 应急新闻
+
+<Route author="nczitzk" example="/cneb/yjxw" path="/cneb/yjxw/:category?" :paramsDesc="['分类，见下表，默认为全部']">
+
+| 全部 | 国内新闻 | 国际新闻 |
+| ---- | -------- | -------- |
+|      | gnxw     | gjxw     |
+
+</Route>
+
 ## 中央气象台
 
 ### 全国气象预警
diff --git a/docs/programming.md b/docs/programming.md
@@ -318,6 +318,10 @@ GitHub 官方也提供了一些 RSS:
 
 <Route author="zhzy0077" example="/github/notifications" path="/github/notifications" radar="1" rssbud="1" selfhost="1"/>
 
+### Gist Commits
+
+<Route author="TonyRL" example="/github/gist/d2c152bb7179d07015f336b1a0582679" path="/github/gist/:gistId" :paramsDesc="['Gist ID']" radar="1" rssbud="1"/>
+
 ## GitLab
 
 ### Explore
diff --git a/lib/router.js b/lib/router.js
@@ -2017,8 +2017,8 @@ router.get('/latexstudio/home', lazyloadRouteHandler('./routes/latexstudio/home'
 router.get('/jskou/:type?', lazyloadRouteHandler('./routes/jskou/index'));
 
 // 国家应急广播
-router.get('/cneb/yjxx', lazyloadRouteHandler('./routes/cneb/yjxx'));
-router.get('/cneb/guoneinews', lazyloadRouteHandler('./routes/cneb/guoneinews'));
+// router.get('/cneb/yjxx', lazyloadRouteHandler('./routes/cneb/yjxx'));
+// router.get('/cneb/guoneinews', lazyloadRouteHandler('./routes/cneb/guoneinews'));
 
 // 邮箱
 router.get('/mail/imap/:email', lazyloadRouteHandler('./routes/mail/imap'));
diff --git a/lib/routes/cneb/guoneinews.js b/lib/routes/cneb/guoneinews.js
diff --git a/lib/routes/cneb/yjxx.js b/lib/routes/cneb/yjxx.js
diff --git a/lib/v2/cneb/maintainer.js b/lib/v2/cneb/maintainer.js
@@ -0,0 +1,4 @@
+module.exports = {
+    '/yjxw/:category?': ['nczitzk'],
+    '/yjxx/:level?/:province?/:city?': ['muzea', 'nczitzk'],
+};
diff --git a/lib/v2/cneb/radar.js b/lib/v2/cneb/radar.js
@@ -0,0 +1,19 @@
+module.exports = {
+    'cneb.gov.cn': {
+        _name: '中国国家应急广播',
+        '.': [
+            {
+                title: '应急新闻',
+                docs: 'https://docs.rsshub.app/forecast.html#zhong-guo-guo-jia-ying-ji-guang-bo',
+                source: ['/yjxw/:category?', '/'],
+                target: '/cneb/yjxw/:category?',
+            },
+            {
+                title: '预警信息',
+                docs: 'https://docs.rsshub.app/forecast.html#zhong-guo-guo-jia-ying-ji-guang-bo',
+                source: ['/yjxx', '/'],
+                target: '/cneb/yjxx',
+            },
+        ],
+    },
+};
diff --git a/lib/v2/cneb/router.js b/lib/v2/cneb/router.js
@@ -0,0 +1,5 @@
+module.exports = function (router) {
+    router.get('/yjxw/:category?', require('./yjxw'));
+    router.get(/\/yjxx([\w-/]+)?/, require('./yjxx'));
+    router.redirect('/guoneinews', '/cneb/yjxw/gnxw');
+};
diff --git a/lib/v2/cneb/yjxw.js b/lib/v2/cneb/yjxw.js
@@ -0,0 +1,72 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const timezone = require('@/utils/timezone');
+const { parseDate } = require('@/utils/parse-date');
+
+const indexs = {
+    gnxw: 0,
+    gjxw: 1,
+};
+
+module.exports = async (ctx) => {
+    const limit = ctx.query.limit ? parseInt(ctx.query.limit) : 400;
+
+    const category = ctx.params.category ?? '';
+    const index = indexs.hasOwnProperty(category) ? indexs[category] : -1;
+
+    const rootUrl = 'http://www.cneb.gov.cn';
+    const currentUrl = `${rootUrl}/yjxw${category ? `/${category}` : ''}`;
+
+    const response = await got({
+        method: 'get',
+        url: currentUrl,
+    });
+
+    const $ = cheerio.load(response.data);
+
+    if (index !== -1) {
+        const otherIndex = Math.abs(index - 1);
+
+        $('.first-data').eq(otherIndex).remove();
+        $('.moreContent').eq(otherIndex).remove();
+    }
+
+    let items = $('.list')
+        .slice(0, limit)
+        .toArray()
+        .map((item) => {
+            item = $(item);
+
+            const a = item.find('a');
+
+            return {
+                title: a.text(),
+                link: a.attr('href'),
+                pubDate: timezone(parseDate(item.find('span').text()), +8),
+            };
+        });
+
+    items = await Promise.all(
+        items.map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                const detailResponse = await got({
+                    method: 'get',
+                    url: item.link,
+                });
+
+                const content = cheerio.load(detailResponse.data);
+
+                item.description = content('.w940').html();
+                item.author = content('.source span').last().text();
+
+                return item;
+            })
+        )
+    );
+
+    ctx.state.data = {
+        title: `国家应急广播 - ${index !== -1 ? $('.select').text() : '新闻'}`,
+        link: currentUrl,
+        item: items,
+    };
+};
diff --git a/lib/v2/cneb/yjxx.js b/lib/v2/cneb/yjxx.js
@@ -0,0 +1,50 @@
+const got = require('@/utils/got');
+const timezone = require('@/utils/timezone');
+const { parseDate } = require('@/utils/parse-date');
+
+module.exports = async (ctx) => {
+    const limit = ctx.query.limit ? parseInt(ctx.query.limit) : 200;
+
+    const options = decodeURI(ctx.path)
+        .replace(/\/yjxx/, '')
+        .split('/');
+
+    options.shift();
+
+    const level = options.find((o) => /.*色$/.test(o)) ?? '';
+    const locations = options.filter((o) => !/.*色$/.test(o)).slice(0, 2);
+
+    const rootUrl = 'http://www.cneb.gov.cn';
+    const apiRootUrl = 'https://gdapi.cnr.cn';
+
+    const currentUrl = `${rootUrl}/yjxx`;
+    const apiUrl = `${apiRootUrl}/yjwnews`;
+
+    const title = `${locations.join('')}${level}`;
+
+    const response = await got({
+        method: 'post',
+        url: apiUrl,
+        json: {
+            size: limit,
+            level: level ? `${level}预警` : '',
+            province: locations.shift(),
+            city: locations.shift(),
+        },
+    });
+
+    const items = response.data.datas.map((item) => ({
+        title: item.doctitle,
+        link: item.docpuburl,
+        author: item.chnlname,
+        description: item.doccontent,
+        pubDate: timezone(parseDate(item.docpubtime), +8),
+    }));
+
+    ctx.state.data = {
+        title: `国家应急广播 - ${title}预警信息`,
+        link: currentUrl,
+        item: items,
+        allowEmpty: true,
+    };
+};
diff --git a/lib/v2/github/gist.js b/lib/v2/github/gist.js
@@ -0,0 +1,35 @@
+const got = require('@/utils/got');
+const config = require('@/config').value;
+const { parseDate } = require('@/utils/parse-date');
+
+module.exports = async (ctx) => {
+    const { gistId } = ctx.params;
+
+    const headers = { Accept: 'application/vnd.github.v3+json' };
+    if (config.github && config.github.access_token) {
+        headers.Authorization = `Bearer ${config.github.access_token}`;
+    }
+
+    const host = 'https://gist.github.com';
+    const apiUrl = `https://api.github.com/gists/${gistId}`;
+
+    const { data: response } = await got(apiUrl, {
+        headers,
+    });
+
+    const items = response.history.map((item, index) => ({
+        title: `${item.user.login} ${index === response.history.length - 1 ? 'created' : 'revised'} this gist`,
+        description: item.change_status.total ? `${item.change_status.additions} additions and ${item.change_status.deletions} deletions` : null,
+        link: `${host}/${gistId}/${item.version}`,
+        pubDate: parseDate(item.committed_at), // e.g. 2022-09-02T11:09:56Z
+    }));
+
+    ctx.state.data = {
+        allowEmpty: true,
+        title: `${response.owner.login} / ${Object.values(response.files)[0].filename}`,
+        description: response.description,
+        image: response.owner.avatar_url,
+        link: `${response.html_url}/revisions`,
+        item: items,
+    };
+};
diff --git a/lib/v2/github/maintainer.js b/lib/v2/github/maintainer.js
@@ -3,6 +3,7 @@ module.exports = {
     '/comments/:user/:repo/:number': ['TonyRL'],
     '/contributors/:user/:repo/:order?/:anon?': ['zoenglinghou'],
     '/file/:user/:repo/:branch/:filepath+': ['zengxs'],
+    '/gist/:gistId': ['TonyRL'],
     '/issue/:user/:repo/:state?/:labels?': ['HenryQW', 'AndreyMZ'],
     '/notifications': ['zhzy0077'],
     '/pull/:user/:repo/:state?': ['hashman', 'TonyRL'],
diff --git a/lib/v2/github/radar.js b/lib/v2/github/radar.js
diff --git a/lib/v2/github/router.js b/lib/v2/github/router.js
diff --git a/package.json b/package.json
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/scripts/prepare.js b/scripts/prepare.js

-Original file line number
+Diff line change
@@ @@ -1,5 +1,6 @@ @@
 .DS_Store
 .env
 +.eslintcache
 .idea
 .log
 .now