Merge pull request #2518 from DIYgod/master

[pull] master from diygod:master

.eslintrc.json

@@ -59,7 +59,7 @@
         "unicorn/explicit-length-check": 0,
         "unicorn/filename-case": ["error", { "case": "kebabCase", "ignore": [".*\\.(yaml|yml)$", "RequestInProgress\\.js$"] }],
         "unicorn/new-for-builtins": 0,
-        "unicorn/no-array-callback-reference": 0,
+        "unicorn/no-array-callback-reference": 1,
         "unicorn/no-array-reduce": 1,
         "unicorn/no-await-expression-member": 0,
         "unicorn/no-empty-file": 1,

.github/workflows/test.yml

@@ -15,6 +15,30 @@ permissions:
   contents: read
 
 jobs:
+  fix-pnpmp-lock:
+    # workaround for https://github.com/dependabot/dependabot-core/issues/7258
+    # until https://github.com/pnpm/pnpm/issues/6530 is fixed
+    if: github.triggering_actor == 'dependabot[bot]' && github.event_name == 'pull_request'
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+      contents: write
+    steps:
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v3
+        with:
+          version: 8
+      - uses: actions/setup-node@v4
+        with:
+          node-version: lts/*
+          cache: 'pnpm'
+      - run: |
+          rm pnpm-lock.yaml
+          pnpm i
+      - uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          commit_message: 'chore: fix pnpm install'
+
   vitest:
     runs-on: ubuntu-latest
     timeout-minutes: 10

lib/routes/apnews/rss.ts

@@ -0,0 +1,41 @@
+import { Route } from '@/types';
+import parser from '@/utils/rss-parser';
+import { fetchArticle } from './utils';
+const HOME_PAGE = 'https://apnews.com';
+
+export const route: Route = {
+    path: '/rss/:rss?',
+    categories: ['traditional-media'],
+    example: '/apnews/rss/business',
+    parameters: { rss: 'Route name from the first segment of the corresponding site, or `index` for the front page(default).' },
+    features: {
+        requireConfig: false,
+        requirePuppeteer: false,
+        antiCrawler: false,
+        supportBT: false,
+        supportPodcast: false,
+        supportScihub: false,
+    },
+    radar: [
+        {
+            source: ['apnews.com/:rss'],
+            target: '/rss/:rss',
+        },
+    ],
+    name: 'RSS',
+    maintainers: ['zoenglinghou', 'mjysci', 'TonyRL'],
+    handler,
+};
+
+async function handler(ctx) {
+    const { rss = 'index' } = ctx.req.param();
+    const url = `${HOME_PAGE}/${rss}.rss`;
+    const res = await parser.parseURL(url);
+
+    const items = await Promise.all(res.items.map((item) => fetchArticle(item)));
+
+    return {
+        ...rss,
+        item: items,
+    };
+}

lib/routes/apnews/topics.ts

@@ -1,8 +1,7 @@
 import { Route } from '@/types';
-import cache from '@/utils/cache';
 import got from '@/utils/got';
 import { load } from 'cheerio';
-import timezone from '@/utils/timezone';
+import { fetchArticle } from './utils';
 const HOME_PAGE = 'https://apnews.com';
 
 export const route: Route = {
@@ -44,20 +43,7 @@ async function handler(ctx) {
                 link: $(e).find('a').attr('href'),
             }))
             .filter((e) => typeof e.link === 'string')
-            .map((item) =>
-                cache.tryGet(item.link, async () => {
-                    const { data: response } = await got(item.link);
-                    const $ = load(response);
-                    $('div.Enhancement').remove();
-                    return Object.assign(item, {
-                        pubDate: timezone(new Date($("meta[property='article:published_time']").attr('content')), 0),
-                        updated: timezone(new Date($("meta[property='article:modified_time']").attr('content')), 0),
-                        description: $('div.RichTextStoryBody').html(),
-                        category: $("meta[property='article:section']").attr('content'),
-                        guid: $("meta[name='brightspot.contentId']").attr('content'),
-                    });
-                })
-            )
+            .map((item) => fetchArticle(item))
     );
 
     return {

lib/routes/apnews/utils.ts

@@ -0,0 +1,20 @@
+import cache from '@/utils/cache';
+import ofetch from '@/utils/ofetch';
+import { parseDate } from '@/utils/parse-date';
+import timezone from '@/utils/timezone';
+import { load } from 'cheerio';
+
+export function fetchArticle(item) {
+    return cache.tryGet(item.link, async () => {
+        const data = await ofetch(item.link);
+        const $ = load(data);
+        $('div.Enhancement').remove();
+        return Object.assign(item, {
+            pubDate: timezone(parseDate($("meta[property='article:published_time']").attr('content')), 0),
+            updated: timezone(parseDate($("meta[property='article:modified_time']").attr('content')), 0),
+            description: $('div.RichTextStoryBody').html(),
+            category: $("meta[property='article:section']").attr('content'),
+            guid: $("meta[name='brightspot.contentId']").attr('content'),
+        });
+    });
+}

lib/routes/caixin/templates/article.art

@@ -15,7 +15,7 @@
     <% const video = $('script').text().match(/initPlayer\('(.*?)','(.*?)'\)/); %>
     <% const videoUrl = video[1]; %>
     <% const poster = video[2]; %>
-    <video controls preload="none" poster="{{ poster }}" src="{{ videoUrl }}"></video>
+    <video controls preload="metadata" poster="{{ poster }}" src="{{ videoUrl }}"></video>
     <br>
 {{ /if }}
 

lib/routes/douyin/templates/embed.art

@@ -1,4 +1,4 @@
-<video controls preload="none" referrerpolicy="no-referrer"
+<video controls preload="metadata" referrerpolicy="no-referrer"
 style="width:50%"
 {{ if img }}
 poster="{{ img }}"

lib/routes/fansly/templates/media.art

@@ -1,5 +1,5 @@
 {{ if poster && src }}
-<video controls preload="none" poster="{{ poster.location }}">
+<video controls preload="metadata" poster="{{ poster.location }}">
     <source src="{{ src.location }}" type="video/mp4">
 </video>
 {{ else if src }}

lib/routes/github/pulls.ts

@@ -1,5 +1,5 @@
 import { Route } from '@/types';
-import got from '@/utils/got';
+import ofetch from '@/utils/ofetch';
 import { config } from '@/config';
 import MarkdownIt from 'markdown-it';
 const md = MarkdownIt({
@@ -28,7 +28,7 @@ export const route: Route = {
         },
     ],
     name: 'Repo Pull Requests',
-    maintainers: [],
+    maintainers: ['hashman', 'TonyRL'],
     handler,
 };
 
@@ -45,8 +45,8 @@ async function handler(ctx) {
     if (config.github && config.github.access_token) {
         headers.Authorization = `token ${config.github.access_token}`;
     }
-    const response = await got(url, {
-        searchParams: {
+    const response = await ofetch(url, {
+        query: {
             state,
             labels,
             sort: 'created',
@@ -55,7 +55,7 @@ async function handler(ctx) {
         },
         headers,
     });
-    const data = response.data.filter((item) => item.pull_request);
+    const data = response.filter((item) => item.pull_request);
 
     return {
         allowEmpty: true,

lib/routes/gq/namespace.ts

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

lib/routes/gq/news.ts

@@ -0,0 +1,59 @@
+import { Route } from '@/types';
+import cache from '@/utils/cache';
+import parser from '@/utils/rss-parser';
+import { load } from 'cheerio';
+import { ofetch } from 'ofetch';
+const host = 'https://www.gq.com';
+export const route: Route = {
+    path: '/news',
+    categories: ['traditional-media'],
+    example: '/gq/news',
+    parameters: {},
+    features: {
+        requireConfig: false,
+        requirePuppeteer: false,
+        antiCrawler: false,
+        supportBT: false,
+        supportPodcast: false,
+        supportScihub: false,
+    },
+    radar: [
+        {
+            source: ['gq.com/'],
+        },
+    ],
+    name: 'News',
+    maintainers: ['EthanWng97'],
+    handler,
+};
+
+async function handler() {
+    const rssUrl = `${host}/feed/rss`;
+    const feed = await parser.parseURL(rssUrl);
+    const items = await Promise.all(
+        feed.items.map((item) =>
+            cache.tryGet(item.link, async () => {
+                const data = await ofetch(item.link);
+                const $ = load(data);
+                const description = $('#main-content');
+                description.find('.article-body__footer').remove();
+                description.find('[class*="ContentHeaderContributorImage"]').remove();
+                description.find('h1').remove();
+                return {
+                    title: item.title,
+                    pubDate: item.pubDate,
+                    link: item.link,
+                    category: item.categories,
+                    description: description.html(),
+                };
+            })
+        )
+    );
+
+    return {
+        title: 'GQ',
+        link: host,
+        description: `GQ is the global flagship of men's fashion, the arbiter of cool for anyone who sees the world through the lens of taste and style.`,
+        item: items,
+    };
+}

lib/routes/ifeng/templates/video.art

@@ -1,5 +1,5 @@
 {{ if videoInfo.mobileUrl }}
-<video controls poster="{{ videoInfo.bigPosterUrl }}" preload="none">
+<video controls poster="{{ videoInfo.bigPosterUrl }}" preload="metadata">
     <source src="{{ videoInfo.mobileUrl }}" type="video/mp4">
 </video>
 {{ /if }}

lib/routes/instagram/templates/video.art

@@ -3,6 +3,6 @@
     <br>
 {{ /if }}
 
-<video controls preload="none" poster="{{ image }}" width="{{ video.width }}">
+<video controls preload="metadata" poster="{{ image }}" width="{{ video.width }}">
     <source src="{{ video.url }}" type="video/mp4">
 </video>

lib/routes/ithome/templates/description.art

@@ -0,0 +1,13 @@
+{{ if images }}
+  {{ each images image }}
+    {{ if image?.src }}
+      <figure>
+        <img
+          {{ if image.alt }}
+            alt="{{ image.alt }}"
+          {{ /if }}
+        src="{{ image.src }}">
+      </figure>
+    {{ /if }}
+  {{ /each }}
+{{ /if }}