rsshub 1.0.0-master.fdb1381 → 1.0.0-master.fdb4325

package/lib/routes/telegram/stickerpack.ts

@@ -2,6 +2,7 @@ import { Route, ViewType } from '@/types';
 import ofetch from '@/utils/ofetch';
 import { config } from '@/config';
 import ConfigNotFoundError from '@/errors/types/config-not-found';
+import cache from '@/utils/cache';
 
 export const route: Route = {
     path: '/stickerpack/:name',
@@ -27,20 +28,28 @@ async function handler(ctx) {
         throw new ConfigNotFoundError('Telegram Sticker Pack RSS is disabled due to the lack of <a href="https://docs.rsshub.app/deploy/config#route-specific-configurations">relevant config</a>');
     }
     const name = ctx.req.param('name');
+    const token = config.telegram.token;
+    const response = await ofetch(`https://api.telegram.org/bot${token}/getStickerSet?name=${name}`);
 
-    const response = await ofetch(`https://api.telegram.org/bot${config.telegram.token}/getStickerSet?name=${name}`, {
-        method: 'get',
-    });
+    const list = response.result.stickers.map((item) => ({
+        title: item.emoji,
+        description: item.file_id,
+        guid: item.file_id,
+    }));
 
-    const data = response.data.result;
+    const items = await Promise.all(
+        list.map((item) =>
+            cache.tryGet(`telegram:stickerpack:${item.guid}`, async () => {
+                const response = await ofetch(`https://api.telegram.org/bot${token}/getFile?file_id=${item.guid}`);
+                item.description = `<img src="https://api.telegram.org/file/bot${token}/${response.result.file_path}" />`;
+                return item;
+            })
+        )
+    );
 
     return {
-        title: `${data.title} - Telegram Sticker Pack`,
+        title: `${response.result.title} - Telegram Sticker Pack`,
         link: `https://t.me/addstickers/${name}`,
-        item: data.stickers.map((item) => ({
-            title: item.emoji,
-            description: item.file_id,
-            guid: item.file_id,
-        })),
+        item: items,
     };
 }

package/lib/routes/telegram/tglib/client.ts

@@ -53,25 +53,25 @@ function ExpandInlineBytes(bytes) {
         return [];
     }
     const header = Buffer.from([
-        0xff, 0xd8, 0xff, 0xe0, 0x00, 0x10, 0x4a, 0x46, 0x49, 0x46, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0xff, 0xdb, 0x00, 0x43, 0x00, 0x28, 0x1c, 0x1e, 0x23, 0x1e, 0x19, 0x28, 0x23, 0x21, 0x23, 0x2d, 0x2b,
-        0x28, 0x30, 0x3c, 0x64, 0x41, 0x3c, 0x37, 0x37, 0x3c, 0x7b, 0x58, 0x5d, 0x49, 0x64, 0x91, 0x80, 0x99, 0x96, 0x8f, 0x80, 0x8c, 0x8a, 0xa0, 0xb4, 0xe6, 0xc3, 0xa0, 0xaa, 0xda, 0xad, 0x8a, 0x8c, 0xc8, 0xff, 0xcb, 0xda, 0xee,
-        0xf5, 0xff, 0xff, 0xff, 0x9b, 0xc1, 0xff, 0xff, 0xff, 0xfa, 0xff, 0xe6, 0xfd, 0xff, 0xf8, 0xff, 0xdb, 0x00, 0x43, 0x01, 0x2b, 0x2d, 0x2d, 0x3c, 0x35, 0x3c, 0x76, 0x41, 0x41, 0x76, 0xf8, 0xa5, 0x8c, 0xa5, 0xf8, 0xf8, 0xf8,
-        0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8,
-        0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xff, 0xc0, 0x00, 0x11, 0x08, 0x00, 0x00, 0x00, 0x00, 0x03, 0x01, 0x22, 0x00, 0x02, 0x11, 0x01, 0x03, 0x11, 0x01, 0xff, 0xc4, 0x00, 0x1f, 0x00, 0x00, 0x01, 0x05,
-        0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0xff, 0xc4, 0x00, 0xb5, 0x10, 0x00, 0x02, 0x01, 0x03, 0x03, 0x02, 0x04,
-        0x03, 0x05, 0x05, 0x04, 0x04, 0x00, 0x00, 0x01, 0x7d, 0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12, 0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07, 0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xa1, 0x08, 0x23, 0x42, 0xb1, 0xc1,
-        0x15, 0x52, 0xd1, 0xf0, 0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0a, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a,
-        0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96,
-        0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7,
-        0xd8, 0xd9, 0xda, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xff, 0xc4, 0x00, 0x1f, 0x01, 0x00, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-        0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0xff, 0xc4, 0x00, 0xb5, 0x11, 0x00, 0x02, 0x01, 0x02, 0x04, 0x04, 0x03, 0x04, 0x07, 0x05, 0x04, 0x04, 0x00,
-        0x01, 0x02, 0x77, 0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21, 0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 0x71, 0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91, 0xa1, 0xb1, 0xc1, 0x09, 0x23, 0x33, 0x52, 0xf0, 0x15, 0x62,
-        0x72, 0xd1, 0x0a, 0x16, 0x24, 0x34, 0xe1, 0x25, 0xf1, 0x17, 0x18, 0x19, 0x1a, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57,
-        0x58, 0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a,
-        0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xe2,
-        0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xff, 0xda, 0x00, 0x0c, 0x03, 0x01, 0x00, 0x02, 0x11, 0x03, 0x11, 0x00, 0x3f, 0x00,
+        0xFF, 0xD8, 0xFF, 0xE0, 0x00, 0x10, 0x4A, 0x46, 0x49, 0x46, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0xFF, 0xDB, 0x00, 0x43, 0x00, 0x28, 0x1C, 0x1E, 0x23, 0x1E, 0x19, 0x28, 0x23, 0x21, 0x23, 0x2D, 0x2B,
+        0x28, 0x30, 0x3C, 0x64, 0x41, 0x3C, 0x37, 0x37, 0x3C, 0x7B, 0x58, 0x5D, 0x49, 0x64, 0x91, 0x80, 0x99, 0x96, 0x8F, 0x80, 0x8C, 0x8A, 0xA0, 0xB4, 0xE6, 0xC3, 0xA0, 0xAA, 0xDA, 0xAD, 0x8A, 0x8C, 0xC8, 0xFF, 0xCB, 0xDA, 0xEE,
+        0xF5, 0xFF, 0xFF, 0xFF, 0x9B, 0xC1, 0xFF, 0xFF, 0xFF, 0xFA, 0xFF, 0xE6, 0xFD, 0xFF, 0xF8, 0xFF, 0xDB, 0x00, 0x43, 0x01, 0x2B, 0x2D, 0x2D, 0x3C, 0x35, 0x3C, 0x76, 0x41, 0x41, 0x76, 0xF8, 0xA5, 0x8C, 0xA5, 0xF8, 0xF8, 0xF8,
+        0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8,
+        0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xFF, 0xC0, 0x00, 0x11, 0x08, 0x00, 0x00, 0x00, 0x00, 0x03, 0x01, 0x22, 0x00, 0x02, 0x11, 0x01, 0x03, 0x11, 0x01, 0xFF, 0xC4, 0x00, 0x1F, 0x00, 0x00, 0x01, 0x05,
+        0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0xFF, 0xC4, 0x00, 0xB5, 0x10, 0x00, 0x02, 0x01, 0x03, 0x03, 0x02, 0x04,
+        0x03, 0x05, 0x05, 0x04, 0x04, 0x00, 0x00, 0x01, 0x7D, 0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12, 0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07, 0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xA1, 0x08, 0x23, 0x42, 0xB1, 0xC1,
+        0x15, 0x52, 0xD1, 0xF0, 0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0A, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A,
+        0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x92, 0x93, 0x94, 0x95, 0x96,
+        0x97, 0x98, 0x99, 0x9A, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0xB7, 0xB8, 0xB9, 0xBA, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7,
+        0xD8, 0xD9, 0xDA, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFF, 0xC4, 0x00, 0x1F, 0x01, 0x00, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+        0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0xFF, 0xC4, 0x00, 0xB5, 0x11, 0x00, 0x02, 0x01, 0x02, 0x04, 0x04, 0x03, 0x04, 0x07, 0x05, 0x04, 0x04, 0x00,
+        0x01, 0x02, 0x77, 0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21, 0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 0x71, 0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91, 0xA1, 0xB1, 0xC1, 0x09, 0x23, 0x33, 0x52, 0xF0, 0x15, 0x62,
+        0x72, 0xD1, 0x0A, 0x16, 0x24, 0x34, 0xE1, 0x25, 0xF1, 0x17, 0x18, 0x19, 0x1A, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x53, 0x54, 0x55, 0x56, 0x57,
+        0x58, 0x59, 0x5A, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9A,
+        0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0xB7, 0xB8, 0xB9, 0xBA, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, 0xE2,
+        0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFF, 0xDA, 0x00, 0x0C, 0x03, 0x01, 0x00, 0x02, 0x11, 0x03, 0x11, 0x00, 0x3F, 0x00,
     ]);
-    const footer = Buffer.from([0xff, 0xd9]);
+    const footer = Buffer.from([0xFF, 0xD9]);
     const real = Buffer.alloc(header.length + bytes.length + footer.length);
     header.copy(real);
     bytes.copy(real, header.length, 3);

package/lib/routes/tencent/news/author.ts

@@ -54,44 +54,47 @@ async function handler(ctx): Promise<Data> {
             const author = item.source;
             const abstract = item.abstract;
 
-            return item.articletype === '4'
-                ? {
-                      title,
-                      description: abstract,
-                      link: itemUrl,
-                      author,
-                      pubDate,
-                  }
-                : cache.tryGet(itemUrl, async () => {
-                      const response = await got(itemUrl);
-                      const $ = load(response.data);
-                      const data = JSON.parse(
-                          $('script:contains("window.DATA")')
-                              .text()
-                              .match(/window\.DATA = ({.+});/)[1]
-                      );
-                      const $data = load(data.originContent?.text || '', null, false);
-                      if ($data) {
-                          // Not video page
-                          $data('*')
-                              .contents()
-                              .filter((_, elem) => elem.type === 'comment')
-                              .replaceWith((_, elem) =>
-                                  art(path.join(__dirname, '../templates/news/image.art'), {
-                                      attribute: elem.data.trim(),
-                                      originAttribute: data.originAttribute,
-                                  })
-                              );
-                      }
+            if (item.articletype === '4' || item.articletype === '118') {
+                // Video
+                return {
+                    title,
+                    description: `<a href=${item.url}><img src="${item.articletype === '4' ? item.miniProShareImage : item.miniVideoPic}" style="width: 100%"></a>`,
+                    link: itemUrl,
+                    author,
+                    pubDate,
+                };
+            }
 
-                      return {
-                          title,
-                          description: $data.html() || abstract,
-                          link: itemUrl,
-                          author,
-                          pubDate,
-                      };
-                  });
+            return cache.tryGet(itemUrl, async () => {
+                const response = await got(itemUrl);
+                const $ = load(response.data);
+                const data = JSON.parse(
+                    $('script:contains("window.DATA")')
+                        .text()
+                        .match(/window\.DATA = ({.+});/)[1]
+                );
+                const $data = load(data.originContent?.text || '', null, false);
+                if ($data) {
+                    // Not video page
+                    $data('*')
+                        .contents()
+                        .filter((_, elem) => elem.type === 'comment')
+                        .replaceWith((_, elem) =>
+                            art(path.join(__dirname, '../templates/news/image.art'), {
+                                attribute: elem.data.trim(),
+                                originAttribute: data.originAttribute,
+                            })
+                        );
+                }
+
+                return {
+                    title,
+                    description: $data.html() || abstract,
+                    link: itemUrl,
+                    author,
+                    pubDate,
+                };
+            });
         })
     );
 

package/lib/routes/tencent/pvp/newsindex.ts

@@ -54,8 +54,8 @@ export const route: Route = {
     maintainers: ['Jeason0228', 'HenryQW'],
     handler,
     description: `| 全部 | 热门 | 新闻 | 公告 | 活动 | 赛事 | 优化 |
-  | ---- | ---- | ---- | ---- | ---- | ---- | ---- |
-  | all  | rm   | xw   | gg   | hd   | ss   | yh   |`,
+| ---- | ---- | ---- | ---- | ---- | ---- | ---- |
+| all  | rm   | xw   | gg   | hd   | ss   | yh   |`,
 };
 
 async function handler(ctx) {

package/lib/routes/tesla/cx.ts

@@ -26,80 +26,80 @@ export const route: Route = {
     maintainers: ['simonsmh', 'nczitzk'],
     handler,
     description: `| 充电免停 | 酒店 | 美食 | 生活方式 |
-  | -------- | ---- | ---- | -------- |
+| -------- | ---- | ---- | -------- |
 
 ::: tip
   分类为 **充电免停** 时，城市参数不起作用
 :::
 
 <details>
-  <summary>可选城市</summary>
+<summary>可选城市</summary>
 
-  | 成都 | 深圳 | 洛阳 | 北京 | 南京 | 绍兴 |
-  | ---- | ---- | ---- | ---- | ---- | ---- |
+| 成都 | 深圳 | 洛阳 | 北京 | 南京 | 绍兴 |
+| ---- | ---- | ---- | ---- | ---- | ---- |
 
-  | 西安 | 上海 | 阿坝藏族羌族自治州 | 重庆 | 郑州 | 天津 |
-  | ---- | ---- | ------------------ | ---- | ---- | ---- |
+| 西安 | 上海 | 阿坝藏族羌族自治州 | 重庆 | 郑州 | 天津 |
+| ---- | ---- | ------------------ | ---- | ---- | ---- |
 
-  | 晋中 | 三亚 | 湖州 | 苏州 | 扬州 | 秦皇岛 |
-  | ---- | ---- | ---- | ---- | ---- | ------ |
+| 晋中 | 三亚 | 湖州 | 苏州 | 扬州 | 秦皇岛 |
+| ---- | ---- | ---- | ---- | ---- | ------ |
 
-  | 长沙 | 武汉 | 安阳 | 温州 | 瑞安 | 石家庄 |
-  | ---- | ---- | ---- | ---- | ---- | ------ |
+| 长沙 | 武汉 | 安阳 | 温州 | 瑞安 | 石家庄 |
+| ---- | ---- | ---- | ---- | ---- | ------ |
 
-  | 佛山 | 广州 | 杭州 | 烟台 | 沧州 | 张家港 |
-  | ---- | ---- | ---- | ---- | ---- | ------ |
+| 佛山 | 广州 | 杭州 | 烟台 | 沧州 | 张家港 |
+| ---- | ---- | ---- | ---- | ---- | ------ |
 
-  | 金华 | 临沧 | 大理 | 南昌 | 贵阳 | 信阳 |
-  | ---- | ---- | ---- | ---- | ---- | ---- |
+| 金华 | 临沧 | 大理 | 南昌 | 贵阳 | 信阳 |
+| ---- | ---- | ---- | ---- | ---- | ---- |
 
-  | 张家口 | 铜仁 | 沈阳 | 合肥 | 黔东 | 高邮 |
-  | ------ | ---- | ---- | ---- | ---- | ---- |
+| 张家口 | 铜仁 | 沈阳 | 合肥 | 黔东 | 高邮 |
+| ------ | ---- | ---- | ---- | ---- | ---- |
 
-  | 三河 | 安顺 | 莆田 | 阳江 | 南宁 | 台州 |
-  | ---- | ---- | ---- | ---- | ---- | ---- |
+| 三河 | 安顺 | 莆田 | 阳江 | 南宁 | 台州 |
+| ---- | ---- | ---- | ---- | ---- | ---- |
 
-  | 余姚 | 淄博 | 三明 | 中山 | 宁波 | 厦门 |
-  | ---- | ---- | ---- | ---- | ---- | ---- |
+| 余姚 | 淄博 | 三明 | 中山 | 宁波 | 厦门 |
+| ---- | ---- | ---- | ---- | ---- | ---- |
 
-  | 永康 | 慈溪 | 台山 | 福州 | 无锡 | 宜昌 |
-  | ---- | ---- | ---- | ---- | ---- | ---- |
+| 永康 | 慈溪 | 台山 | 福州 | 无锡 | 宜昌 |
+| ---- | ---- | ---- | ---- | ---- | ---- |
 
-  | 泉州 | 肇庆 | 太仓 | 珠海 | 邢台 | 衡水 |
-  | ---- | ---- | ---- | ---- | ---- | ---- |
+| 泉州 | 肇庆 | 太仓 | 珠海 | 邢台 | 衡水 |
+| ---- | ---- | ---- | ---- | ---- | ---- |
 
-  | 温岭 | 宜兴 | 东莞 | 威海 | 南通 | 舟山 |
-  | ---- | ---- | ---- | ---- | ---- | ---- |
+| 温岭 | 宜兴 | 东莞 | 威海 | 南通 | 舟山 |
+| ---- | ---- | ---- | ---- | ---- | ---- |
 
-  | 都匀 | 长治 | 江阴 | 云浮 | 常州 | 唐山 |
-  | ---- | ---- | ---- | ---- | ---- | ---- |
+| 都匀 | 长治 | 江阴 | 云浮 | 常州 | 唐山 |
+| ---- | ---- | ---- | ---- | ---- | ---- |
 
-  | 平湖 | 商丘 | 保定 | 泰州 | 青岛 | 龙口 |
-  | ---- | ---- | ---- | ---- | ---- | ---- |
+| 平湖 | 商丘 | 保定 | 泰州 | 青岛 | 龙口 |
+| ---- | ---- | ---- | ---- | ---- | ---- |
 
-  | 泰安 | 岳阳 | 惠州 | 徐州 | 哈尔滨 | 潍坊 |
-  | ---- | ---- | ---- | ---- | ------ | ---- |
+| 泰安 | 岳阳 | 惠州 | 徐州 | 哈尔滨 | 潍坊 |
+| ---- | ---- | ---- | ---- | ------ | ---- |
 
-  | 大同 | 嘉兴 | 毕节 | 临汾 | 江门 | 诸暨 |
-  | ---- | ---- | ---- | ---- | ---- | ---- |
+| 大同 | 嘉兴 | 毕节 | 临汾 | 江门 | 诸暨 |
+| ---- | ---- | ---- | ---- | ---- | ---- |
 
-  | 儋州 | 衢州 | 大连 | 昆山 | 靖江 | 常熟 |
-  | ---- | ---- | ---- | ---- | ---- | ---- |
+| 儋州 | 衢州 | 大连 | 昆山 | 靖江 | 常熟 |
+| ---- | ---- | ---- | ---- | ---- | ---- |
 
-  | 罗定 | 丽江 | 晋江 | 乐清 | 茂名 | 福清 |
-  | ---- | ---- | ---- | ---- | ---- | ---- |
+| 罗定 | 丽江 | 晋江 | 乐清 | 茂名 | 福清 |
+| ---- | ---- | ---- | ---- | ---- | ---- |
 
-  | 廊坊 | 兰溪 | 汕尾 | 滨州 | 昆明 | 玉环 |
-  | ---- | ---- | ---- | ---- | ---- | ---- |
+| 廊坊 | 兰溪 | 汕尾 | 滨州 | 昆明 | 玉环 |
+| ---- | ---- | ---- | ---- | ---- | ---- |
 
-  | 绵阳 | 漳州 | 德州 | 聊城 | 龙岩 | 临沂 |
-  | ---- | ---- | ---- | ---- | ---- | ---- |
+| 绵阳 | 漳州 | 德州 | 聊城 | 龙岩 | 临沂 |
+| ---- | ---- | ---- | ---- | ---- | ---- |
 
-  | 新沂 | 桐乡 | 迪庆藏族自治州 | 汕头 | 潮州 | 驻马店 |
-  | ---- | ---- | -------------- | ---- | ---- | ------ |
+| 新沂 | 桐乡 | 迪庆藏族自治州 | 汕头 | 潮州 | 驻马店 |
+| ---- | ---- | -------------- | ---- | ---- | ------ |
 
-  | 曲阜 | 郴州 | 济源 | 兴义 |
-  | ---- | ---- | ---- | ---- |
+| 曲阜 | 郴州 | 济源 | 兴义 |
+| ---- | ---- | ---- | ---- |
 </details>`,
 };
 
@@ -134,7 +134,7 @@ async function handler(ctx) {
             pageSize: limit,
             pageNumber: 0,
             benefitCategoryId: categoryObject?.id ?? undefined,
-            category: categoryObject ? undefined : category === '充电免停' ? 2 : undefined,
+            category: categoryObject ? undefined : (category === '充电免停' ? 2 : undefined),
             city,
         },
     });

package/lib/routes/test/index.ts

@@ -416,6 +416,6 @@ async function handler(ctx) {
         item,
         allowEmpty: ctx.req.param('id') === 'allow_empty',
         description:
-            ctx.req.param('id') === 'complicated' ? '<img src="http://mock.com/DIYgod/DIYgod/RSSHub">' : ctx.req.param('id') === 'multimedia' ? '<video src="http://mock.com/DIYgod/DIYgod/RSSHub"></video>' : 'A test route for RSSHub',
+            ctx.req.param('id') === 'complicated' ? '<img src="http://mock.com/DIYgod/DIYgod/RSSHub">' : (ctx.req.param('id') === 'multimedia' ? '<video src="http://mock.com/DIYgod/DIYgod/RSSHub"></video>' : 'A test route for RSSHub'),
     };
 }

package/lib/routes/tgbus/list.ts

@@ -33,8 +33,8 @@ export const route: Route = {
     maintainers: ['Xzonn'],
     handler,
     description: `| 最新资讯 | 游戏评测 | 游戏视频 | 巴士首页特稿 | 硬件资讯 |
-  | -------- | -------- | -------- | ------------ | -------- |
-  | news     | review   | video    | special      | hardware |`,
+| -------- | -------- | -------- | ------------ | -------- |
+| news     | review   | video    | special      | hardware |`,
 };
 
 async function handler(ctx) {

package/lib/routes/the/index.ts

@@ -121,19 +121,19 @@ export const route: Route = {
   你还可以搜索关键字。\`/search/中国\` 搜索关键字 [中国](https://the.bi/s/?s=中国)。在这种情况下，路径是 [\`/the/search/中国\`](https://rsshub.app/the/search/中国).
 :::
 
-  | 分类                                           | ID                                                               |
-  | ---------------------------------------------- | ---------------------------------------------------------------- |
-  | [时局图](https://the.bi/s/rawj7o4ypewv94)      | [rawj7o4ypewv94](https://rsshub.app/the/category/rawj7o4ypewv94) |
-  | [剩余价值](https://the.bi/s/rawmw7dsta2jew)    | [rawmw7dsta2jew](https://rsshub.app/the/category/rawmw7dsta2jew) |
-  | [打江山](https://the.bi/s/rawbcvxkktdkq8)      | [rawbcvxkktdkq8](https://rsshub.app/the/category/rawbcvxkktdkq8) |
-  | [中国经济](https://the.bi/s/raw4krvx85dh27)    | [raw4krvx85dh27](https://rsshub.app/the/category/raw4krvx85dh27) |
-  | [水深火热](https://the.bi/s/rawtn8jpsc6uvv)    | [rawtn8jpsc6uvv](https://rsshub.app/the/category/rawtn8jpsc6uvv) |
-  | [东升西降](https://the.bi/s/rawai5kd4z15il)    | [rawai5kd4z15il](https://rsshub.app/the/category/rawai5kd4z15il) |
-  | [大局 & 大棋](https://the.bi/s/raw2efkzejrsx8) | [raw2efkzejrsx8](https://rsshub.app/the/category/raw2efkzejrsx8) |
-  | [境外势力](https://the.bi/s/rawmpalhnlphuc)    | [rawmpalhnlphuc](https://rsshub.app/the/category/rawmpalhnlphuc) |
-  | [副刊](https://the.bi/s/rawxght2jr2u5z)        | [rawxght2jr2u5z](https://rsshub.app/the/category/rawxght2jr2u5z) |
-  | [天高地厚](https://the.bi/s/rawrsnh9zakqdx)    | [rawrsnh9zakqdx](https://rsshub.app/the/category/rawrsnh9zakqdx) |
-  | [Oyster](https://the.bi/s/rawdhl9hugdfn9)      | [rawdhl9hugdfn9](https://rsshub.app/the/category/rawdhl9hugdfn9) |
+| 分类                                           | ID                                                               |
+| ---------------------------------------------- | ---------------------------------------------------------------- |
+| [时局图](https://the.bi/s/rawj7o4ypewv94)      | [rawj7o4ypewv94](https://rsshub.app/the/category/rawj7o4ypewv94) |
+| [剩余价值](https://the.bi/s/rawmw7dsta2jew)    | [rawmw7dsta2jew](https://rsshub.app/the/category/rawmw7dsta2jew) |
+| [打江山](https://the.bi/s/rawbcvxkktdkq8)      | [rawbcvxkktdkq8](https://rsshub.app/the/category/rawbcvxkktdkq8) |
+| [中国经济](https://the.bi/s/raw4krvx85dh27)    | [raw4krvx85dh27](https://rsshub.app/the/category/raw4krvx85dh27) |
+| [水深火热](https://the.bi/s/rawtn8jpsc6uvv)    | [rawtn8jpsc6uvv](https://rsshub.app/the/category/rawtn8jpsc6uvv) |
+| [东升西降](https://the.bi/s/rawai5kd4z15il)    | [rawai5kd4z15il](https://rsshub.app/the/category/rawai5kd4z15il) |
+| [大局 & 大棋](https://the.bi/s/raw2efkzejrsx8) | [raw2efkzejrsx8](https://rsshub.app/the/category/raw2efkzejrsx8) |
+| [境外势力](https://the.bi/s/rawmpalhnlphuc)    | [rawmpalhnlphuc](https://rsshub.app/the/category/rawmpalhnlphuc) |
+| [副刊](https://the.bi/s/rawxght2jr2u5z)        | [rawxght2jr2u5z](https://rsshub.app/the/category/rawxght2jr2u5z) |
+| [天高地厚](https://the.bi/s/rawrsnh9zakqdx)    | [rawrsnh9zakqdx](https://rsshub.app/the/category/rawrsnh9zakqdx) |
+| [Oyster](https://the.bi/s/rawdhl9hugdfn9)      | [rawdhl9hugdfn9](https://rsshub.app/the/category/rawdhl9hugdfn9) |
   `,
     categories: ['new-media'],
 

package/lib/routes/theatlantic/news.ts

@@ -24,8 +24,8 @@ export const route: Route = {
     maintainers: ['EthanWng97', 'pseudoyu'],
     handler,
     description: `| Popular      | Latest | Politics | Technology | Business |
-  | ------------ | ------ | -------- | ---------- | -------- |
-  | most-popular | latest | politics | technology | business |
+| ------------ | ------ | -------- | ---------- | -------- |
+| most-popular | latest | politics | technology | business |
 
   More categories (except photo) can be found within the navigation bar at [https://www.theatlantic.com](https://www.theatlantic.com)`,
 };

package/lib/routes/theblock/index.ts

@@ -0,0 +1,142 @@
+import { Route, Data } from '@/types';
+import cache from '@/utils/cache';
+import ofetch from '@/utils/ofetch';
+import { parseDate } from '@/utils/parse-date';
+import { load } from 'cheerio';
+import logger from '@/utils/logger';
+
+export const route: Route = {
+    path: '/category/:category',
+    categories: ['finance'],
+    example: '/theblock/category/crypto-ecosystems',
+    parameters: { category: 'News category' },
+    features: {
+        requireConfig: false,
+        requirePuppeteer: false,
+        antiCrawler: false,
+        supportBT: false,
+        supportPodcast: false,
+        supportScihub: false,
+    },
+    name: 'Category',
+    maintainers: ['pseudoyu'],
+    handler,
+    radar: [
+        {
+            source: ['theblock.co/category/:category'],
+            target: '/category/:category',
+        },
+    ],
+    description: 'Get latest news from TheBlock by category. Note that due to website limitations, only article summaries may be available.',
+};
+
+async function handler(ctx): Promise<Data> {
+    const category = ctx.req.param('category');
+    const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 10;
+
+    const apiUrl = `https://www.theblock.co/api/category/${category}`;
+
+    try {
+        const response = await ofetch(apiUrl);
+
+        // Extract articles from the nested data structure
+        const articles = response.data?.articles || [];
+
+        if (!articles.length) {
+            throw new Error(`No articles found for category: ${category}`);
+        }
+
+        const items = await Promise.all(
+            articles.slice(0, limit).map((article) =>
+                cache.tryGet(`theblock:article:${article.url}`, async () => {
+                    try {
+                        // Try to get the full article
+                        const articleResponse = await ofetch(`https://www.theblock.co/api/post/${article.id}/`);
+
+                        const post = articleResponse.post;
+                        const $ = load(post.body, null, false);
+
+                        // If we successfully got the article content
+                        if (post.body.length) {
+                            // Remove unwanted elements
+                            $('.copyright').remove();
+
+                            let fullText = '';
+
+                            if (article.thumbnail) {
+                                fullText += `<p><img src="${post.thumbnail}" alt="${article.title}"></p>`;
+                            }
+                            fullText += post.intro + $.html();
+
+                            if (fullText) {
+                                return {
+                                    title: article.title,
+                                    link: article.url,
+                                    pubDate: parseDate(post.published),
+                                    description: fullText,
+                                    author: article.authors?.map((a) => a.name).join(', ') || 'TheBlock',
+                                    category: [...new Set([post.categories.name, ...post.categories.map((cat) => cat.name), ...post.tags.map((tag) => tag.name)])],
+                                    guid: article.url,
+                                    image: article.thumbnail,
+                                };
+                            }
+                        }
+
+                        // If we couldn't extract specific content, fall back to a summary-based approach
+                        logger.info(`Using summary-based approach for article: ${article.url}`);
+                        return createSummaryItem(article);
+                    } catch (error: any) {
+                        // If we got a 403 error or any other error, use summary approach
+                        logger.warn(`Couldn't fetch full content for ${article.url}: ${error.message}`);
+                        return createSummaryItem(article);
+                    }
+                })
+            )
+        );
+
+        return {
+            title: `TheBlock - ${category.charAt(0).toUpperCase() + category.slice(1).replaceAll('-', ' ')}`,
+            link: `https://www.theblock.co/category/${category}`,
+            item: items,
+            description: `Latest articles from TheBlock in the ${category} category`,
+            language: 'en',
+        } as Data;
+    } catch (error: any) {
+        logger.error(`Error in TheBlock handler: ${error.message}`);
+        throw error;
+    }
+}
+
+// Helper function to create a summary-based item when full content isn't available
+function createSummaryItem(article: any) {
+    let description = '';
+
+    // Add thumbnail if available
+    if (article.thumbnail) {
+        description += `<p><img src="${article.thumbnail}" alt="${article.title}"></p>`;
+    }
+
+    // Add subheading if available
+    if (article.subheading) {
+        description += `<p><strong>${article.subheading}</strong></p>`;
+    }
+
+    // Add preview if available
+    if (article.preview) {
+        description += `<p>${article.preview}</p>`;
+    }
+
+    // Add link to original article
+    description += `<p><a href="${article.url}">Read the full article at TheBlock</a></p>`;
+
+    return {
+        title: article.title,
+        link: article.url,
+        pubDate: parseDate(article.publishedFormatted, 'MMMM D, YYYY, h:mmA [EST]'),
+        description,
+        author: article.authors?.map((a) => a.name).join(', ') || 'TheBlock',
+        category: article.primaryCategory?.name || [],
+        guid: article.url,
+        image: article.thumbnail,
+    };
+}

package/lib/routes/theblock/namespace.ts

@@ -0,0 +1,7 @@
+import type { Namespace } from '@/types';
+
+export const namespace: Namespace = {
+    name: 'TheBlock',
+    url: 'theblock.co',
+    lang: 'en',
+};

package/lib/routes/theblockbeats/index.ts

@@ -80,12 +80,12 @@ export const route: Route = {
         },
     ],
     description: `|    快讯   |   文章  |
-  | :-------: | :-----: |
-  | newsflash | article |
+| :-------: | :-----: |
+| newsflash | article |
 
-  | 全部 | 深度 | 精选 | 热点追踪 |
-  | :--: | :--: | :--: | :---: |
-  |     | -2  | 1    |  2     |`,
+| 全部 | 深度 | 精选 | 热点追踪 |
+| :--: | :--: | :--: | :---: |
+|     | -2  | 1    |  2     |`,
 };
 
 async function handler(ctx) {

package/lib/routes/thecover/channel.ts

@@ -41,8 +41,8 @@ export const route: Route = {
     maintainers: ['yuxinliu-alex'],
     handler,
     description: `| 天下 | 四川 | 辟谣 | 国际 | 云招考 | 30 秒 | 拍客 | 体育 | 国内 | 帮扶铁军 | 文娱 | 宽窄 | 商业 | 千面 | 封面号 |
-  | ---- | ---- | ---- | ---- | ------ | ----- | ---- | ---- | ---- | -------- | ---- | ---- | ---- | ---- | ------ |
-  | 3892 | 3560 | 3909 | 3686 | 11     | 3902  | 3889 | 3689 | 1    | 4002     | 12   | 46   | 4    | 21   | 17     |`,
+| ---- | ---- | ---- | ---- | ------ | ----- | ---- | ---- | ---- | -------- | ---- | ---- | ---- | ---- | ------ |
+| 3892 | 3560 | 3909 | 3686 | 11     | 3902  | 3889 | 3689 | 1    | 4002     | 12   | 46   | 4    | 21   | 17     |`,
 };
 
 async function handler(ctx) {