rsshub 1.0.0-master.f9ec483 → 1.0.0-master.fa04a11

package/lib/routes/behance/templates/description.art

@@ -0,0 +1,23 @@
+{{ if description.length }}
+    {{ description }}<br>
+{{ /if }}
+
+{{ each modules module }}
+    {{ if module.__typename === 'ImageModule' }}
+        <figure>
+            <img src="{{ module.imageSizes.allAvailable[0].url }}" alt="{{ module.altText }}">
+            {{ if module.caption.length }}<figcaption>{{ module.caption }}</figcaption>{{ /if }}
+        </figure>
+    {{ else if module.__typename === 'TextModule' }}
+        {{@ module.text }}
+    {{ else if module.__typename === 'MediaCollectionModule' }}
+        {{ each module.components comp }}
+            <img src="https://mir-s3-cdn-cf.behance.net/project_modules/source/{{ comp.filename }}">
+        {{ /each }}
+    {{ else if module.__typename === 'EmbedModule' }}
+        {{@ module.fluidEmbed || module.originalEmbed }}
+    {{ else }}
+        UNHANDLED MODULE: {{ module.__typename }}
+    {{ /if }}
+    <br>
+{{ /each }}

package/lib/routes/behance/user.ts

@@ -1,8 +1,13 @@
 import { Route, ViewType } from '@/types';
 import cache from '@/utils/cache';
-import got from '@/utils/got';
-import { load } from 'cheerio';
+import ofetch from '@/utils/ofetch';
 import { parseDate } from '@/utils/parse-date';
+import crypto from 'node:crypto';
+import path from 'node:path';
+import { art } from '@/utils/render';
+import { getCurrentPath } from '@/utils/helpers';
+import { getAppreciatedQuery, getProfileProjectsAndSelectionsQuery, getProjectPageQuery } from './queries';
+const __dirname = getCurrentPath(import.meta.url);
 
 export const route: Route = {
     path: '/:user/:type?',
@@ -34,66 +39,84 @@ export const route: Route = {
     description: `Behance user's profile URL, like [https://www.behance.net/mishapetrick](https://www.behance.net/mishapetrick) the username will be \`mishapetrick\`。`,
 };
 
+const getUserProfile = async (nodes, user) =>
+    (await cache.tryGet(`behance:profile:${user}`, () => {
+        const profile = nodes.flatMap((item) => item.owners).find((owner) => owner.username === user);
+
+        return Promise.resolve({
+            displayName: profile.displayName,
+            id: profile.id,
+            link: profile.url,
+            image: profile.images.size_50.url.replace('/user/50/', '/user/source/'),
+        });
+    })) as { displayName: string; id: string; link: string; image: string };
+
 async function handler(ctx) {
-    const user = ctx.req.param('user') ?? '';
-    const type = ctx.req.param('type') ?? 'projects';
+    const { user, type = 'projects' } = ctx.req.param();
 
-    const response = await got({
-        method: 'get',
-        url: `https://www.behance.net/${user}/${type}`, // 接口只获取12个项目
-        headers: {
-            'X-Requested-With': 'XMLHttpRequest',
+    const uuid = crypto.randomUUID();
+    const headers = {
+        Cookie: `gk_suid=${Math.random().toString().substring(2, 10)}, gki=; originalReferrer=; bcp=${uuid}`,
+        'X-BCP': uuid,
+        'X-Requested-With': 'XMLHttpRequest',
+    };
+
+    const response = await ofetch('https://www.behance.net/v3/graphql', {
+        method: 'POST',
+        headers,
+        body: {
+            query: type === 'projects' ? getProfileProjectsAndSelectionsQuery : getAppreciatedQuery,
+            variables: {
+                username: user,
+                after: '',
+            },
         },
     });
-    const data = response.data;
-    let list;
-    if (type === 'projects') {
-        list = data.profile.activeSection.work.projects.slice(0, 12);
-    }
-    if (type === 'appreciated') {
-        list = data.profile.activeSection.appreciations.appreciations.slice(0, 12);
-    }
-    const articledata = await Promise.all(
-        list.map(async (item) => {
-            if (type === 'appreciated') {
-                item = item.project;
-            }
-            const url = `${item.url}?ilo0=1`;
-            const description = await cache.tryGet(url, async () => {
-                const response2 = await got({
-                    method: 'get',
-                    url,
+
+    const nodes = type === 'projects' ? response.data.user.profileProjects.nodes : response.data.user.appreciatedProjects.nodes;
+    const list = nodes.map((item) => ({
+        title: item.name,
+        link: item.url,
+        author: item.owners.map((owner) => owner.displayName).join(', '),
+        image: item.covers.size_202.url.replace('/202/', '/source/'),
+        pubDate: item.publishedOn ? parseDate(item.publishedOn, 'X') : undefined,
+        category: item.fields?.map((field) => field.label.toLowerCase()),
+        projectId: item.id,
+    }));
+
+    const profile = await getUserProfile(nodes, user);
+
+    const items = await Promise.all(
+        list.map((item) =>
+            cache.tryGet(item.link, async () => {
+                const response = await ofetch('https://www.behance.net/v3/graphql', {
+                    method: 'POST',
+                    headers,
+                    body: {
+                        query: getProjectPageQuery,
+                        variables: {
+                            projectId: item.projectId,
+                        },
+                    },
                 });
-                const articleHtml = response2.data;
-                const $2 = load(articleHtml);
-                $2('.ImageElement-root-kir').remove();
-                $2('.embed-dimensions').remove();
-                $2('script.js-lightbox-slide-content').each((_, elem) => {
-                    elem = $2(elem);
-                    elem.replaceWith(elem.html());
+                const project = response.data.project;
+
+                item.description = art(path.join(__dirname, 'templates/description.art'), {
+                    description: project.description,
+                    modules: project.allModules,
                 });
-                const content = $2('div.project-styles').html();
-                const single = {
-                    content,
-                };
-                return single;
-            });
-            return description;
-        })
+                item.category = [...new Set([...(item.category || []), ...(project.tags?.map((tag) => tag.title.toLowerCase()) || [])])];
+                item.pubDate = item.pubDate || (project.publishedOn ? parseDate(project.publishedOn, 'X') : undefined);
+
+                return item;
+            })
+        )
     );
+
     return {
-        title: `${data.profile.owner.first_name} ${data.profile.owner.last_name}'s ${type}`,
-        link: data.profile.owner.url,
-        item: list.map((item, index) => {
-            if (type === 'appreciated') {
-                item = item.project;
-            }
-            return {
-                title: item.name,
-                description: articledata[index].content,
-                link: item.url,
-                pubDate: parseDate(item.published_on * 1000),
-            };
-        }),
+        title: `${profile.displayName}'s ${type}`,
+        link: `https://www.behance.net/${user}/${type}`,
+        image: profile.image,
+        item: items,
     };
 }

package/lib/routes/beijingprice/index.ts

@@ -108,9 +108,9 @@ export const route: Route = {
     handler,
     example: '/beijingprice/jgzx/xwzx',
     parameters: { category: '分类，默认为 `jgzx/xwzx` 即新闻资讯，可在对应分类页 URL 中找到' },
-    description: `:::tip
+    description: `::: tip
   若订阅 [新闻资讯](https://www.beijingprice.cn/jgzx/xwzx/)，网址为 \`https://www.beijingprice.cn/jgzx/xwzx/\`。截取 \`https://beijingprice.cn/\` 到末尾 \`/\` 的部分 \`jgzx/xwzx\` 作为参数填入，此时路由为 [\`/beijingprice/jgzx/xwzx\`](https://rsshub.app/beijingprice/jgzx/xwzx)。
-  :::
+:::
 
   #### [价格资讯](https://www.beijingprice.cn/jgzx/xwzx/)
 

package/lib/routes/bilibili/article.ts

@@ -1,8 +1,10 @@
 import { Route } from '@/types';
 import got from '@/utils/got';
 import cache from './cache';
-
+import cacheGeneral from '@/utils/cache';
+import { load } from 'cheerio';
 import { parseDate } from '@/utils/parse-date';
+
 export const route: Route = {
     path: '/user/article/:uid',
     categories: ['social-media'],
@@ -21,8 +23,8 @@ export const route: Route = {
             source: ['space.bilibili.com/:uid'],
         },
     ],
-    name: 'UP 主专栏',
-    maintainers: ['lengthmin', 'Qixingchen'],
+    name: 'UP 主图文',
+    maintainers: ['lengthmin', 'Qixingchen', 'hyoban'],
     handler,
 };
 
@@ -31,24 +33,45 @@ async function handler(ctx) {
     const name = await cache.getUsernameFromUID(uid);
     const response = await got({
         method: 'get',
-        url: `https://api.bilibili.com/x/space/article?mid=${uid}&pn=1&ps=10&sort=publish_time&jsonp=jsonp`,
+        url: `https://api.bilibili.com/x/polymer/web-dynamic/v1/opus/feed/space?host_mid=${uid}`,
         headers: {
-            Referer: `https://space.bilibili.com/${uid}/`,
+            Referer: `https://space.bilibili.com/${uid}/article`,
         },
     });
     const data = response.data.data;
-    const title = `${name} 的 bilibili 专栏`;
+    const title = `${name} 的 bilibili 图文`;
     const link = `https://space.bilibili.com/${uid}/article`;
-    const description = `${name} 的 bilibili 专栏`;
+    const description = `${name} 的 bilibili 图文`;
+    const cookie = await cache.getCookie();
+
     const item = await Promise.all(
-        data.articles.map(async (item) => {
-            const { url: art_url, description: eDescription } = await cache.getArticleDataFromCvid(item.id, uid);
-            const publishDate = parseDate(item.publish_time * 1000);
+        data.items.map(async (item) => {
+            const link = 'https:' + item.jump_url;
+            const data = await cacheGeneral.tryGet(
+                link,
+                async () =>
+                    (
+                        await got({
+                            method: 'get',
+                            url: link,
+                            headers: {
+                                Referer: `https://space.bilibili.com/${uid}/article`,
+                                Cookie: cookie,
+                            },
+                        })
+                    ).data
+            );
+
+            const $ = load(data as string);
+            const description = $('.opus-module-content').html();
+            const pubDate = $('.opus-module-author__pub__text').text().replace('编辑于 ', '');
+
             const single = {
-                title: item.title,
-                link: art_url,
-                description: eDescription,
-                pubDate: publishDate,
+                title: item.content,
+                link,
+                description: description || item.content,
+                // 2019年11月11日 08:50
+                pubDate: pubDate ? parseDate(pubDate, 'YYYY年MM月DD日 HH:mm') : undefined,
             };
             return single;
         })

package/lib/routes/bilibili/dynamic.ts

@@ -19,10 +19,11 @@ export const route: Route = {
 | 键         | 含义                              | 接受的值       | 默认值 |
 | ---------- | --------------------------------- | -------------- | ------ |
 | showEmoji  | 显示或隐藏表情图片                | 0/1/true/false | false  |
-| embed      | 默认开启内嵌视频                  | 任意值         |        |
+| embed      | 默认开启内嵌视频                  | 0/1/true/false |  true  |
 | useAvid    | 视频链接使用 AV 号 (默认为 BV 号) | 0/1/true/false | false  |
 | directLink | 使用内容直链                      | 0/1/true/false | false  |
 | hideGoods  | 隐藏带货动态                      | 0/1/true/false | false  |
+| offset     | 偏移状态                         | string         | ""  |
 
 用例：\`/bilibili/user/dynamic/2267573/showEmoji=1&embed=0&useAvid=1\``,
     },
@@ -117,6 +118,7 @@ const getIframe = (data?: Modules, embed: boolean = true) => {
     if (aid === undefined && bvid === undefined) {
         return '';
     }
+    // 不通过 utils.renderUGCDescription 渲染 img/description 以兼容其他格式的动态
     return utils.renderUGCDescription(embed, '', '', aid, undefined, bvid);
 };
 
@@ -146,7 +148,10 @@ const getImgs = (data?: Modules) => {
     if (major[type]?.cover) {
         imgUrls.push(major[type].cover);
     }
-    return imgUrls.map((url) => `<img src="${url}">`).join('');
+    return imgUrls
+        .filter(Boolean)
+        .map((url) => `<img src="${url}">`)
+        .join('');
 };
 
 const getUrl = (item?: Item2, useAvid = false) => {
@@ -226,15 +231,16 @@ async function handler(ctx) {
     const uid = ctx.req.param('uid');
     const routeParams = Object.fromEntries(new URLSearchParams(ctx.req.param('routeParams')));
     const showEmoji = fallback(undefined, queryToBoolean(routeParams.showEmoji), false);
-    const embed = !ctx.req.param('embed');
+    const embed = fallback(undefined, queryToBoolean(routeParams.embed), true);
     const displayArticle = ctx.req.query('mode') === 'fulltext';
+    const offset = fallback(undefined, routeParams.offset, '');
     const useAvid = fallback(undefined, queryToBoolean(routeParams.useAvid), false);
     const directLink = fallback(undefined, queryToBoolean(routeParams.directLink), false);
     const hideGoods = fallback(undefined, queryToBoolean(routeParams.hideGoods), false);
 
     const cookie = await cacheIn.getCookie();
 
-    const params = utils.addDmVerifyInfo(`host_mid=${uid}&platform=web&features=itemOpusStyle,listOnlyfans,opusBigCover,onlyfansVote`, utils.getDmImgList());
+    const params = utils.addDmVerifyInfo(`offset=${offset}&host_mid=${uid}&platform=web&features=itemOpusStyle,listOnlyfans,opusBigCover,onlyfansVote`, utils.getDmImgList());
     const response = await got(`https://api.bilibili.com/x/polymer/web-dynamic/v1/feed/space?${params}`, {
         headers: {
             Referer: `https://space.bilibili.com/${uid}/`,
@@ -255,7 +261,12 @@ async function handler(ctx) {
 
     const rssItems = await Promise.all(
         items
-            .filter((item) => !hideGoods || item.modules.module_dynamic?.additional?.type !== 'ADDITIONAL_TYPE_GOODS')
+            .filter((item) => {
+                if (hideGoods) {
+                    return item.modules.module_dynamic?.additional?.type !== 'ADDITIONAL_TYPE_GOODS';
+                }
+                return true;
+            })
             .map(async (item) => {
                 // const parsed = JSONbig.parse(item.card);
 
@@ -354,10 +365,9 @@ async function handler(ctx) {
                 // 换行处理
                 description = description.replaceAll('\r\n', '<br>').replaceAll('\n', '<br>');
                 originDescription = originDescription.replaceAll('\r\n', '<br>').replaceAll('\n', '<br>');
-
-                const descriptions = [description, originDescription, urlText, originUrlText, getIframe(data, embed), getIframe(origin, embed), getImgs(data), getImgs(origin)]
-                    .filter(Boolean)
+                const descriptions = [description, getIframe(data, embed), getImgs(data), urlText, originDescription, getIframe(origin, embed), getImgs(origin), originUrlText]
                     .map((e) => e?.trim())
+                    .filter(Boolean)
                     .join('<br>');
 
                 return {

package/lib/routes/bilibili/followers.ts

@@ -35,9 +35,9 @@ export const route: Route = {
     name: 'UP 主粉丝',
     maintainers: ['Qixingchen'],
     handler,
-    description: `:::warning
+    description: `::: warning
   UP 主粉丝现在需要 b 站登录后的 Cookie 值，所以只能自建，详情见部署页面的配置模块。
-  :::`,
+:::`,
 };
 
 async function handler(ctx) {

package/lib/routes/bilibili/followings-article.ts

@@ -29,9 +29,9 @@ export const route: Route = {
     name: '用户关注专栏',
     maintainers: ['woshiluo'],
     handler,
-    description: `:::warning
+    description: `::: warning
   用户动态需要 b 站登录后的 Cookie 值，所以只能自建，详情见部署页面的配置模块。
-  :::`,
+:::`,
 };
 
 async function handler(ctx) {

package/lib/routes/bilibili/followings-dynamic.ts

@@ -18,7 +18,7 @@ export const route: Route = {
 | 键         | 含义                              | 接受的值       | 默认值 |
 | ---------- | --------------------------------- | -------------- | ------ |
 | showEmoji  | 显示或隐藏表情图片                | 0/1/true/false | false  |
-| embed      | 默认开启内嵌视频                  | 任意值         |        |
+| embed      | 默认开启内嵌视频                  | 0/1/true/false |  true  |
 | useAvid    | 视频链接使用 AV 号 (默认为 BV 号) | 0/1/true/false | false  |
 | directLink | 使用内容直链                      | 0/1/true/false | false  |
 | hideGoods  | 隐藏带货动态                      | 0/1/true/false | false  |
@@ -45,9 +45,9 @@ export const route: Route = {
     name: '用户关注动态',
     maintainers: ['TigerCubDen', 'JimenezLi'],
     handler,
-    description: `:::warning
+    description: `::: warning
   用户动态需要 b 站登录后的 Cookie 值，所以只能自建，详情见部署页面的配置模块。
-  :::`,
+:::`,
 };
 
 async function handler(ctx) {
@@ -55,7 +55,7 @@ async function handler(ctx) {
     const routeParams = querystring.parse(ctx.req.param('routeParams'));
 
     const showEmoji = fallback(undefined, queryToBoolean(routeParams.showEmoji), false);
-    const embed = !ctx.req.param('embed');
+    const embed = fallback(undefined, queryToBoolean(routeParams.embed), true);
     const displayArticle = fallback(undefined, queryToBoolean(routeParams.displayArticle), false);
 
     const name = await cache.getUsernameFromUID(uid);

package/lib/routes/bilibili/followings-video.ts

@@ -31,9 +31,9 @@ export const route: Route = {
     name: '用户关注视频动态',
     maintainers: ['LogicJake'],
     handler,
-    description: `:::warning
+    description: `::: warning
   用户动态需要 b 站登录后的 Cookie 值，所以只能自建，详情见部署页面的配置模块。
-  :::`,
+:::`,
 };
 
 async function handler(ctx) {

package/lib/routes/bilibili/followings.ts

@@ -36,9 +36,9 @@ export const route: Route = {
     name: 'UP 主关注用户',
     maintainers: ['Qixingchen'],
     handler,
-    description: `:::warning
+    description: `::: warning
   UP 主关注用户现在需要 b 站登录后的 Cookie 值，所以只能自建，详情见部署页面的配置模块。
-  :::`,
+:::`,
 };
 
 async function handler(ctx) {

package/lib/routes/bilibili/hot-search.ts

@@ -18,7 +18,7 @@ export const route: Route = {
     },
     radar: [
         {
-            source: ['www.bilibili.com/'],
+            source: ['www.bilibili.com/', 'm.bilibili.com/'],
         },
     ],
     name: '热搜',

package/lib/routes/bilibili/live-area.ts

@@ -17,9 +17,9 @@ export const route: Route = {
     name: '直播分区',
     maintainers: ['Qixingchen'],
     handler,
-    description: `:::warning
+    description: `::: warning
   由于接口未提供开播时间，如果直播间未更换标题与分区，将视为一次。如果直播间更换分区与标题，将视为另一项
-  :::`,
+:::`,
 };
 
 async function handler(ctx) {

package/lib/routes/bilibili/manga-followings.ts

@@ -29,9 +29,9 @@ export const route: Route = {
     name: '用户追漫更新',
     maintainers: ['yindaheng98'],
     handler,
-    description: `:::warning
+    description: `::: warning
   用户追漫需要 b 站登录后的 Cookie 值，所以只能自建，详情见部署页面的配置模块。
-  :::`,
+:::`,
 };
 
 async function handler(ctx) {

package/lib/routes/bilibili/manga-update.ts

@@ -28,6 +28,8 @@ async function handler(ctx) {
     const comic_id = ctx.req.param('comicid').startsWith('mc') ? ctx.req.param('comicid').replace('mc', '') : ctx.req.param('comicid');
     const link = `https://manga.bilibili.com/detail/mc${comic_id}`;
 
+    const spi_response = await got('https://api.bilibili.com/x/frontend/finger/spi');
+
     const response = await got({
         method: 'POST',
         url: `https://manga.bilibili.com/twirp/comic.v2.Comic/ComicDetail?device=pc&platform=web`,
@@ -36,6 +38,7 @@ async function handler(ctx) {
         },
         headers: {
             Referer: link,
+            Cookie: `buvid3=${spi_response.data.data.b_3}; buvid4=${spi_response.data.data.b_4}`,
         },
     });
     const data = response.data.data;