Merge pull request #645 from DIYgod/master

[pull] master from diygod:master

lib/routes/newrank/wechat.ts

@@ -25,7 +25,7 @@ export const route: Route = {
         supportScihub: false,
     },
     name: '微信公众号',
-    maintainers: ['lessmoe'],
+    maintainers: ['lessmoe', 'pseudoyu'],
     handler,
 };
 
@@ -70,16 +70,21 @@ async function handler(ctx) {
             xyz: utils.decrypt_wechat_detail_xyz(uid, nonce),
         },
     });
+
     const name = response.data.value.user.name;
     const realTimeArticles = utils.flatten(response.data.value.realTimeArticles);
     const articles = utils.flatten(response.data.value.articles);
     const newArticles = [...realTimeArticles, ...articles];
+
     const items = newArticles.map((item) => ({
+        id: item.id,
         title: item.title,
         description: '',
         link: item.url,
         pubDate: item.publicTime,
     }));
+
+    // TODO: link is empty
     await Promise.all(items.map((item) => finishArticleItem(item)));
 
     return {

lib/routes/parliament.uk/namespace.ts

@@ -3,5 +3,7 @@ import type { Namespace } from '@/types';
 export const namespace: Namespace = {
     name: 'UK Parliament',
     url: 'parliament.uk',
+    categories: ['government'],
+    description: 'The UK Parliament has two Houses that work on behalf of UK citizens to check and challenge the work of Government, make and shape effective laws, and debate/make decisions on the big issues of the day.',
     lang: 'en',
 };

lib/routes/parliament.uk/petitions.ts

@@ -0,0 +1,191 @@
+import path from 'node:path';
+
+import { type Context } from 'hono';
+import { load, type CheerioAPI } from 'cheerio';
+
+import { type DataItem, type Route, type Data, ViewType } from '@/types';
+import { getCurrentPath } from '@/utils/helpers';
+import { parseDate } from '@/utils/parse-date';
+import { art } from '@/utils/render';
+import ofetch from '@/utils/ofetch';
+
+const __dirname = getCurrentPath(import.meta.url);
+
+export const handler = async (ctx: Context): Promise<Data> => {
+    const { state = 'all' } = ctx.req.param();
+    const limit: number = Number.parseInt(ctx.req.query('limit') ?? '50', 10);
+
+    const rootUrl: string = 'https://petition.parliament.uk';
+    const targetUrl: string = new URL(`petitions?state=${state}`, rootUrl).href;
+    const jsonUrl: string = new URL('petitions.json', rootUrl).href;
+
+    const response = await ofetch(targetUrl);
+    const $: CheerioAPI = load(response);
+    const language: string = $('html').prop('lang') ?? 'en';
+
+    const jsonResponse = await ofetch(jsonUrl, {
+        query: {
+            page: 1,
+            state,
+        },
+    });
+
+    const items = jsonResponse.data.slice(0, limit).map((item): DataItem => {
+        const attributes = item.attributes;
+
+        const title = attributes.action;
+        const description = art(path.join(__dirname, 'templates/description.art'), {
+            intro: attributes.background,
+            description: attributes.additional_details,
+        });
+        const guid = `parliament.uk-petition-${item.id}`;
+
+        const author: DataItem['author'] = attributes.creator_name;
+
+        const extraLinks = attributes.departments?.map((link) => ({
+            url: link.url,
+            type: 'related',
+            content_html: link.name,
+        }));
+
+        return {
+            title,
+            description,
+            pubDate: parseDate(attributes.created_at),
+            link: new URL(`petitions/${item.id}`, rootUrl).href,
+            category: [...new Set([...(attributes.topics ?? []), ...(attributes.departments?.map((d) => d.name) ?? [])])].filter(Boolean),
+            author,
+            guid,
+            id: guid,
+            content: {
+                html: description,
+                text: attributes.background,
+            },
+            updated: parseDate(attributes.updated_at),
+            language,
+            _extra: {
+                links: extraLinks?.length ? extraLinks : undefined,
+            },
+        };
+    });
+
+    const feedImage = $('meta[property="og:image"]').prop('content');
+
+    return {
+        title: $('h1.page-title').text(),
+        description: $('meta[property="twitter:description"]').prop('content'),
+        link: targetUrl,
+        item: items,
+        allowEmpty: true,
+        image: feedImage,
+        author: $('meta[name="msapplication-tooltip"]').prop('content'),
+        language,
+        id: $('meta[property="og:url"]').prop('content'),
+    };
+};
+
+export const route: Route = {
+    path: '/petitions/:state?',
+    name: 'Petitions',
+    url: 'petition.parliament.uk',
+    maintainers: ['nczitzk'],
+    handler,
+    example: '/parliament.uk/petitions/all',
+    parameters: {
+        state: 'State, `all` by default, see below',
+    },
+    description: `:::tip
+If you subscribe to [Recent petitions](https://petition.parliament.uk/petitions?state=recent)，where the URL is \`https://petition.parliament.uk/petitions?state=recent\`, use the value of \`state\` as the parameter to fill in. Therefore, the route will be [\`/parliament.uk/petitions/recent\`](https://rsshub.app/parliament.uk/petitions/recent).
+:::
+
+<details>
+  <summary>More states</summary>
+
+| Name                            | ID                |
+| ------------------------------- | ----------------- |
+| All petitions                   | all               |
+| Open petitions                  | open              |
+| Recent petitions                | recent            |
+| Closed petitions                | closed            |
+| Rejected petitions              | rejected          |
+| Awaiting government response    | awaiting_response |
+| Government responses            | with_response     |
+| Awaiting a debate in Parliament | awaiting_debate   |
+| Debated in Parliament           | debated           |
+| Not debated in Parliament       | not_debated       |
+
+</details>
+    `,
+    categories: ['government'],
+    features: {
+        requireConfig: false,
+        requirePuppeteer: false,
+        antiCrawler: false,
+        supportRadar: true,
+        supportBT: false,
+        supportPodcast: false,
+        supportScihub: false,
+    },
+    radar: [
+        {
+            source: ['petition.parliament.uk/petitions'],
+            target: (_, url) => {
+                const urlObj = new URL(url);
+                const state = urlObj.searchParams.get('state');
+
+                return `/parliament.uk/petitions${state ? `/${state}` : ''}`;
+            },
+        },
+        {
+            title: 'All petitions',
+            source: ['petition.parliament.uk/petitions'],
+            target: '/petitions/all',
+        },
+        {
+            title: 'Open petitions',
+            source: ['petition.parliament.uk/petitions'],
+            target: '/petitions/open',
+        },
+        {
+            title: 'Recent petitions',
+            source: ['petition.parliament.uk/petitions'],
+            target: '/petitions/recent',
+        },
+        {
+            title: 'Closed petitions',
+            source: ['petition.parliament.uk/petitions'],
+            target: '/petitions/closed',
+        },
+        {
+            title: 'Rejected petitions',
+            source: ['petition.parliament.uk/petitions'],
+            target: '/petitions/rejected',
+        },
+        {
+            title: 'Awaiting government response',
+            source: ['petition.parliament.uk/petitions'],
+            target: '/petitions/awaiting_response',
+        },
+        {
+            title: 'Government responses',
+            source: ['petition.parliament.uk/petitions'],
+            target: '/petitions/with_response',
+        },
+        {
+            title: 'Awaiting a debate in Parliament',
+            source: ['petition.parliament.uk/petitions'],
+            target: '/petitions/awaiting_debate',
+        },
+        {
+            title: 'Debated in Parliament',
+            source: ['petition.parliament.uk/petitions'],
+            target: '/petitions/debated',
+        },
+        {
+            title: 'Not debated in Parliament',
+            source: ['petition.parliament.uk/petitions'],
+            target: '/petitions/not_debated',
+        },
+    ],
+    view: ViewType.Articles,
+};

lib/routes/parliament.uk/templates/description.art

@@ -0,0 +1,7 @@
+{{ if intro }}
+  <blockquote>{{ intro }}</blockquote>
+{{ /if }}
+
+{{ if description }}
+  <p>{{ description }}<p>
+{{ /if }}

lib/routes/twitter/api/index.ts

@@ -3,6 +3,7 @@ import mobileApi from './mobile-api/api';
 import webApi from './web-api/api';
 import { config } from '@/config';
 
+const enableThirdPartyApi = config.twitter.thirdPartyApi;
 const enableMobileApi = config.twitter.username && config.twitter.password;
 const enableWebApi = config.twitter.authToken;
 
@@ -35,7 +36,9 @@ let api: {
     getHomeLatestTimeline: () => null,
 };
 
-if (enableWebApi) {
+if (enableThirdPartyApi) {
+    api = webApi;
+} else if (enableWebApi) {
     api = webApi;
 } else if (enableMobileApi) {
     api = mobileApi;

lib/utils/wechat-mp.ts

@@ -623,19 +623,21 @@ const fetchArticle = (url: string, bypassHostCheck: boolean = false) => {
  * @return {Promise<object>} - The incoming `item` object, with the article and its metadata filled in.
  */
 const finishArticleItem = async (item, setMpNameAsAuthor = false, skipLink = false) => {
-    const fetchedItem = await fetchArticle(item.link);
-    for (const key in fetchedItem) {
-        switch (key) {
-            case 'author':
-                item.author = setMpNameAsAuthor
-                    ? fetchedItem.mpName || item.author // the Official Account itself. if your route return articles from different accounts, you may want to use this
-                    : fetchedItem.author || item.author; // the real author of the article. if your route return articles from a certain account, use this
-                break;
-            case 'link':
-                item.link = skipLink ? item.link : fetchedItem.link || item.link;
-                break;
-            default:
-                item[key] = item[key] || fetchedItem[key];
+    if (item.link) {
+        const fetchedItem = await fetchArticle(item.link);
+        for (const key in fetchedItem) {
+            switch (key) {
+                case 'author':
+                    item.author = setMpNameAsAuthor
+                        ? fetchedItem.mpName || item.author // the Official Account itself. if your route return articles from different accounts, you may want to use this
+                        : fetchedItem.author || item.author; // the real author of the article. if your route return articles from a certain account, use this
+                    break;
+                case 'link':
+                    item.link = skipLink ? item.link : fetchedItem.link || item.link;
+                    break;
+                default:
+                    item[key] = item[key] || fetchedItem[key];
+            }
         }
     }
     return item;

package.json

@@ -53,7 +53,7 @@
         "@bbob/html": "4.2.0",
         "@bbob/preset-html5": "4.2.0",
         "@hono/node-server": "1.13.7",
-        "@hono/zod-openapi": "0.18.1",
+        "@hono/zod-openapi": "0.18.2",
         "@notionhq/client": "2.2.15",
         "@opentelemetry/api": "1.9.0",
         "@opentelemetry/exporter-prometheus": "0.55.0",
@@ -171,7 +171,7 @@
         "@typescript-eslint/parser": "8.16.0",
         "@vercel/nft": "0.27.6",
         "@vitest/coverage-v8": "2.0.5",
-        "discord-api-types": "0.37.109",
+        "discord-api-types": "0.37.110",
         "eslint": "9.15.0",
         "eslint-config-prettier": "9.1.0",
         "eslint-nibble": "8.1.0",