diff --git a/apps/tools.js b/apps/tools.js index 3fbbb06..263b79d 100644 --- a/apps/tools.js +++ b/apps/tools.js @@ -23,10 +23,12 @@ import { } from "../utils/bilibili.js"; import { downloadM3u8Videos, mergeAcFileToMp4, parseM3u8, parseUrl } from "../utils/acfun.js"; import { - BILI_DEFAULT_INTRO_LEN_LIMIT, COMMON_USER_AGENT, + BILI_DEFAULT_INTRO_LEN_LIMIT, + COMMON_USER_AGENT, DIVIDING_LINE, douyinTypeMap, - HELP_DOC, IMAGE_TRANSLATION_PROMPT, + HELP_DOC, + IMAGE_TRANSLATION_PROMPT, REDIS_YUNZAI_ISOVERSEA, REDIS_YUNZAI_LAGRANGE, SUMMARY_PROMPT, @@ -35,13 +37,13 @@ import { XHS_NO_WATERMARK_HEADER, } from "../constants/constant.js"; import { - checkCommandExists, cleanFilename, + checkCommandExists, + cleanFilename, downloadAudio, downloadImg, estimateReadingTime, formatBiliInfo, retryAxiosReq, - saveJsonToFile, secondsToTime, testProxy, truncateString @@ -63,9 +65,9 @@ import { GENERAL_REQ_LINK, MIYOUSHE_ARTICLE, NETEASE_API_CN, - NETEASE_SONG_DETAIL, NETEASE_SONG_DOWNLOAD, - NETEASE_TEMP_API, QQ_MUSIC_TEMP_API, + NETEASE_TEMP_API, + QQ_MUSIC_TEMP_API, TWITTER_TWEET_INFO, WEIBO_SINGLE_INFO, WEISHI_VIDEO_INFO, @@ -214,6 +216,8 @@ export class tools extends plugin { this.douyinCompression = this.toolsConfig.douyinCompression; // 加载抖音是否开启评论 this.douyinComments = this.toolsConfig.douyinComments; + // 加载小红书Cookie + this.xiaohongshuCookie = this.toolsConfig.xiaohongshuCookie; // 翻译引擎 this.translateEngine = new Translate({ translateAppId: this.toolsConfig.translateAppId, @@ -945,6 +949,8 @@ export class tools extends plugin { id = /explore\/(\w+)/.exec(msgUrl)?.[1] || /discovery\/item\/(\w+)/.exec(msgUrl)?.[1]; } const downloadPath = `${ this.getCurDownloadPath(e) }`; + // 注入ck + XHS_NO_WATERMARK_HEADER.cookie = this.xiaohongshuCookie; // 获取信息 fetch(`${ XHS_REQ_LINK }${ id }`, { headers: XHS_NO_WATERMARK_HEADER, diff --git a/config/tools.yaml b/config/tools.yaml index 13a3a24..735792c 100644 --- a/config/tools.yaml +++ b/config/tools.yaml @@ -13,6 +13,8 @@ douyinCookie: '' # douyin's cookie, 格式:odin_tt=xxx;passport_fe_beating_sta douyinCompression: true # true-压缩,false-不压缩;是否使用压缩视频格式的抖音(默认使用),使用后加速视频发送 douyinComments: false # true-开启评论,false-关闭评论 +xiaohongshuCookie: '' # 2024-8-2后反馈必须使用ck,不然无法解析 + queueConcurrency: 1 # 【目前只涉及哔哩哔哩的下载】根据服务器性能设置可以并发下载的个数,如果你的服务器比较强劲,就选择4~12,较弱就一个一个下载,选择1 videoDownloadConcurrency: 1 # 下载视频是否使用多线程,如果不使用默认是1,如果使用根据服务器进行选择,如果不确定是否可以用4即可,高性能服务器随意4~12都可以,看CPU的实力 diff --git a/guoba.support.js b/guoba.support.js index 1b3495a..60d1957 100644 --- a/guoba.support.js +++ b/guoba.support.js @@ -133,6 +133,17 @@ export function supportGuoba() { component: "Switch", required: false, }, + { + field: "tools.xiaohongshuCookie", + label: "小红书的Cookie", + bottomHelpMessage: + "2024-8-2后反馈必须使用ck,不然无法解析", + component: "Input", + required: false, + componentProps: { + placeholder: "请输入小红书的Cookie", + }, + }, { field: "tools.queueConcurrency", label: "(高级)队列长度",