karin-plugin-kkk 2.21.0 → 2.22.0

package/lib/core_chunk/{main-eqK3KHoJ.js → main-DgimuYt0.js}

@@ -1,6 +1,6 @@
 import { n as __esmMin, o as __toESM, r as __export } from "./rolldown-runtime-BMXAG3ag.js";
-import { $ as init_date_fns, T as zhCN, _n as init_dist, a as Window, an as require_png, cn as require_heic_decode, dn as Chalk, et as fromUnixTime, fn as init_source, gn as Xhshow, hn as axios_default, i as init_lib, ln as require_express, mn as init_axios, n as require_lib, nt as format, on as require_jsQR, pn as AxiosError$1, r as require_qr_code_styling, rt as differenceInSeconds, sn as require_jpeg_js, t as require_dist, tt as formatDistanceToNow, un as require_protobufjs, vn as init_zod, w as init_locale, yn as zod_default } from "./vendor-CYCcUtqE.js";
-import { n as init_client, r as reactServerRender } from "./template-n3eb7E79.js";
+import { $ as init_date_fns, C as zhCN, S as init_locale, _n as init_dist, a as Window, an as require_png, cn as require_heic_decode, dn as Chalk, et as fromUnixTime, fn as init_source, gn as Xhshow, hn as axios_default, i as init_lib, ln as require_express, mn as init_axios, n as require_lib, nt as format, on as require_jsQR, pn as AxiosError$1, r as require_qr_code_styling, rt as differenceInSeconds, sn as require_jpeg_js, t as require_dist, tt as formatDistanceToNow, un as require_protobufjs, vn as init_zod, yn as zod_default } from "./vendor-BcMLByns.js";
+import { n as init_client, r as reactServerRender } from "./template-B9tgdrVz.js";
 import { createRequire } from "node:module";
 import karin$1, { BOT_CONNECT, app, authMiddleware, checkPkgUpdate, checkPort, common, components, config, copyConfigSync, createBadRequestResponse, createNotFoundResponse, createServerErrorResponse, createSuccessResponse, db, defineConfig, ffmpeg, ffprobe, filesByExt, getBot, hooks, karin, karinPathHtml, karinPathTemp, logger, logs, mkdirSync, range, render, requireFileSync, restart, segment, updatePkg, watch } from "node-karin";
 import fs from "node:fs";
@@ -5473,6 +5473,7 @@ var init_Bilibili = __esmMin(() => {
 	init_VideoPlayurlNoLogin();
 	init_WorkComments$2();
 });
+var init_ArticleWork = __esmMin(() => {});
 var init_CommentReply = __esmMin(() => {});
 var init_DyDanmakuList = __esmMin(() => {});
 var init_EmojiList$1 = __esmMin(() => {});
@@ -5489,13 +5490,13 @@ var init_SearchInfo = __esmMin(() => {
 });
 var init_SlidesWork = __esmMin(() => {});
 var init_SuggestWords = __esmMin(() => {});
-var init_TextWork = __esmMin(() => {});
 var init_UserInfo = __esmMin(() => {});
 var init_UserLiveVideos = __esmMin(() => {});
 var init_UserPostVideos = __esmMin(() => {});
 var init_VideoWork = __esmMin(() => {});
 var init_WorkComments$1 = __esmMin(() => {});
 var init_Douyin = __esmMin(() => {
+	init_ArticleWork();
 	init_CommentReply();
 	init_DyDanmakuList();
 	init_EmojiList$1();
@@ -5505,7 +5506,6 @@ var init_Douyin = __esmMin(() => {
 	init_SearchInfo();
 	init_SlidesWork();
 	init_SuggestWords();
-	init_TextWork();
 	init_UserInfo();
 	init_UserLiveVideos();
 	init_UserPostVideos();
@@ -6225,7 +6225,7 @@ var init_Base = __esmMin(() => {
 		} catch (error) {
 			if (options && options.active === false) await event.reply("视频文件上传失败" + JSON.stringify(error, null, 2));
 			logger.error("视频文件上传错误," + String(error));
-			return false;
+			throw error;
 		} finally {
 			const filePath = file.filepath;
 			logger.mark(`临时预览地址：http://localhost:${process.env.HTTP_PORT}/api/kkk/video/${encodeURIComponent(filePath.split("/").pop() ?? "")}`);
@@ -8279,29 +8279,55 @@ var init_ImageDownloader = __esmMin(() => {
 	ImageDownloader = class {
 		axiosInstance;
 		tempDir;
+		maxRetries = 3;
+		retryDelay = 1e3;
 		constructor(axiosInstance, tempDir) {
 			this.axiosInstance = axiosInstance;
 			this.tempDir = tempDir;
 			if (!fs.existsSync(this.tempDir)) fs.mkdirSync(this.tempDir, { recursive: true });
 		}
 		async processImage(imageUrl, title, index) {
-			if (!Config.app.downloadImageLocally) return imageUrl;
+			switch (Config.upload.imageSendMode) {
+				case "base64": try {
+					return await this.downloadAndConvertToBase64(imageUrl);
+				} catch (error) {
+					logger.error(`图片转换 base64 失败，回退到原始 URL: ${imageUrl}`, error);
+					return imageUrl;
+				}
+				case "file": try {
+					const result = await this.downloadImage(imageUrl, title, index);
+					if (result.shouldDelete) this.scheduleDelete(result.filePath);
+					return result.filePath;
+				} catch (error) {
+					logger.error(`图片下载失败，回退到原始 URL: ${imageUrl}`, error);
+					return imageUrl;
+				}
+				case "url":
+				default: return imageUrl;
+			}
+		}
+		async downloadAndConvertToBase64(imageUrl) {
+			const filename = this.generateFilename(imageUrl);
+			const filePath = path.join(this.tempDir, filename);
 			try {
-				const result = await this.downloadImage(imageUrl, title, index);
-				if (result.shouldDelete) this.scheduleDelete(result.filePath);
-				return result.filePath;
-			} catch (error) {
-				logger.error(`图片下载失败，回退到原始 URL: ${imageUrl}`, error);
-				return imageUrl;
+				const response = await this.downloadWithRetry(imageUrl);
+				fs.writeFileSync(filePath, response.data);
+				const base64 = fs.readFileSync(filePath).toString("base64");
+				logger.debug(`图片已下载并转换为 base64: ${imageUrl.substring(0, 50)}...`);
+				return `base64://${base64}`;
+			} finally {
+				if (Config.app.removeCache && fs.existsSync(filePath)) try {
+					fs.unlinkSync(filePath);
+					logger.debug(`临时文件已删除: ${filePath}`);
+				} catch (error) {
+					logger.error(`删除临时文件失败: ${filePath}`, error);
+				}
 			}
 		}
 		async downloadImage(imageUrl, title, index) {
 			const filename = this.generateFilename(imageUrl, title, index);
 			const filePath = path.join(this.tempDir, filename);
-			const response = await this.axiosInstance.get(imageUrl, {
-				responseType: "arraybuffer",
-				timeout: 3e4
-			});
+			const response = await this.downloadWithRetry(imageUrl);
 			fs.writeFileSync(filePath, response.data);
 			logger.debug(`图片已下载: ${filePath}`);
 			return {
@@ -8309,6 +8335,28 @@ var init_ImageDownloader = __esmMin(() => {
 				shouldDelete: true
 			};
 		}
+		async downloadWithRetry(imageUrl, retryCount = 0) {
+			try {
+				const response = await this.axiosInstance.get(imageUrl, {
+					responseType: "arraybuffer",
+					timeout: 3e4
+				});
+				if (retryCount > 0) logger.info(`图片下载成功（重试 ${retryCount} 次后）: ${imageUrl.substring(0, 50)}...`);
+				return response;
+			} catch (error) {
+				if (retryCount < this.maxRetries) {
+					const delay$1 = this.retryDelay * Math.pow(2, retryCount);
+					logger.warn(`图片下载失败，${delay$1}ms 后进行第 ${retryCount + 1}/${this.maxRetries} 次重试: ${imageUrl.substring(0, 50)}...`, error);
+					await this.sleep(delay$1);
+					return this.downloadWithRetry(imageUrl, retryCount + 1);
+				}
+				logger.error(`图片下载失败，已重试 ${this.maxRetries} 次: ${imageUrl}`, error);
+				throw error;
+			}
+		}
+		sleep(ms) {
+			return new Promise((resolve$1) => setTimeout(resolve$1, ms));
+		}
 		generateFilename(imageUrl, title, index) {
 			const ext = this.getExtension(imageUrl);
 			if (Config.app.removeCache) return `tmp_${Date.now()}${index !== void 0 ? `_${index}` : ""}${ext}`;
@@ -11225,12 +11273,6 @@ var init_app_schema = __esmMin(() => {
 				label: "缓存删除",
 				description: "下载的视频缓存自动删除，非必要不修改！"
 			},
-			{
-				key: "downloadImageLocally",
-				type: "switch",
-				label: "本地下载图片",
-				description: "发送图片时由插件本地下载后使用 file 协议传递，而非直接传递 HTTP 链接给上游下载"
-			},
 			{
 				type: "divider",
 				title: "解析优先级设置"
@@ -12622,6 +12664,26 @@ var init_upload_schema = __esmMin(() => {
 				disabled: $or($not("usegroupfile"), $var("sendbase64")),
 				rules: [{ min: 1 }]
 			},
+			{
+				key: "imageSendMode",
+				type: "radio",
+				label: "网络图片发送方式",
+				description: "选择发送网络图片的方式：\n• URL - 直接传递链接给上游（可能因上游网络问题超时）\n• File - 下载后用 file 协议发送（需 Karin 与协议端同系统）\n• Base64 - 转 base64 发送（传输数据增大 1/3，不在同一网络环境可能导致额外带宽成本）",
+				options: [
+					{
+						label: "URL 链接（直接传递）",
+						value: "url"
+					},
+					{
+						label: "File 协议（本地文件）",
+						value: "file"
+					},
+					{
+						label: "Base64（编码传输）",
+						value: "base64"
+					}
+				]
+			},
 			{
 				type: "divider",
 				title: "上传拦截配置"
@@ -13272,22 +13334,27 @@ var init_handler = __esmMin(async () => {
 	};
 	wrapWithErrorHandler = (fn, options) => async (e, next) => {
 		const emojiManager = e ? new EmojiReactionManager(e) : void 0;
+		let processingTimer = null;
+		let successTimer = null;
 		if (emojiManager) {
 			await emojiManager.add("EYES");
-			setTimeout(() => {
+			processingTimer = setTimeout(() => {
 				emojiManager.add("PROCESSING").catch(() => {});
 			}, 1500);
 		}
 		const ctx = logger.runContext(async () => fn(e, next));
 		try {
 			const result = await ctx.run();
-			if (emojiManager) setTimeout(() => {
+			if (emojiManager) successTimer = setTimeout(() => {
 				emojiManager.replace("PROCESSING", "SUCCESS").catch(() => {});
 			}, 1500);
 			return result;
 		} catch (error) {
+			if (processingTimer) clearTimeout(processingTimer);
+			if (successTimer) clearTimeout(successTimer);
 			if (emojiManager) {
-				await emojiManager.clearAll();
+				const processingEmojiId = emojiManager["getPlatformEmojiId"]("PROCESSING");
+				if (emojiManager.has(processingEmojiId)) await emojiManager.remove("PROCESSING");
 				await emojiManager.add("ERROR");
 			}
 			await new Promise((resolve$1) => setTimeout(resolve$1, 100));
@@ -14787,6 +14854,28 @@ const webConfig = defineConfig({
 							rules: [{ min: 1 }],
 							isDisabled: !all.upload.usegroupfile || all.upload.sendbase64
 						}),
+						components.radio.group("imageSendMode", {
+							label: "网络图片发送方式",
+							orientation: "vertical",
+							defaultValue: all.upload.imageSendMode,
+							radio: [
+								components.radio.create("imageSendMode:radio-1", {
+									label: "URL 链接（直接传递）",
+									description: "直接传递 HTTP 链接给上游下载，可能因上游网络问题导致下载超时",
+									value: "url"
+								}),
+								components.radio.create("imageSendMode:radio-2", {
+									label: "File 协议（本地文件）",
+									description: "下载到本地后使用 file 协议发送，需 Karin 与协议端在同一系统",
+									value: "file"
+								}),
+								components.radio.create("imageSendMode:radio-3", {
+									label: "Base64（编码传输）",
+									description: "下载后转换为 base64 发送，传输数据增大约 1/3，不在同一网络环境可能导致额外带宽成本",
+									value: "base64"
+								})
+							]
+						}),
 						components.divider.create("divider-upload-limit", {
 							description: "上传拦截配置",
 							descPosition: 20
@@ -15617,6 +15706,7 @@ var Bilibili = class extends Base {
 						}
 						this.e.reply(await Render("bilibili/dynamic/DYNAMIC_TYPE_DRAW", {
 							image_url: dynamicCARD$1.item.pictures && cover(dynamicCARD$1.item.pictures),
+							title: dynamicInfo.data.data.item.modules.module_dynamic.major.opus.title ?? void 0,
 							text: dynamicInfo.data.data.item.modules.module_dynamic.major ? replacetext(br$3(dynamicInfo.data.data.item.modules.module_dynamic.major.opus?.summary?.text ?? ""), dynamicInfo.data.data.item.modules.module_dynamic.major.opus?.summary?.rich_text_nodes ?? []) : "",
 							dianzan: Count(dynamicInfo.data.data.item.modules.module_stat.like.count),
 							pinglun: Count(dynamicInfo.data.data.item.modules.module_stat.comment.count),
@@ -17008,6 +17098,7 @@ var Bilibilipush = class extends Base {
 						}
 						img$2 = await Render("bilibili/dynamic/DYNAMIC_TYPE_DRAW", {
 							image_url: dycrad.item.pictures && cover(dycrad.item.pictures),
+							title: data$1[dynamicId].Dynamic_Data.modules.module_dynamic.major?.opus?.title ?? void 0,
 							text: replacetext(br$1(data$1[dynamicId].Dynamic_Data.modules.module_dynamic.major?.opus?.summary?.text ?? ""), data$1[dynamicId].Dynamic_Data.modules.module_dynamic.major?.opus?.summary?.rich_text_nodes ?? []),
 							dianzan: Count(data$1[dynamicId].Dynamic_Data.modules.module_stat.like.count),
 							pinglun: Count(data$1[dynamicId].Dynamic_Data.modules.module_stat.comment.count),
@@ -17786,6 +17877,7 @@ var getRelativeTimeFromTimestamp$2 = (timestamp) => {
 	});
 	return format(commentDate, "yyyy-MM-dd");
 };
+await init_date_fns();
 await init_utils$1();
 await init_Config();
 await init_danmaku();
@@ -17810,6 +17902,34 @@ var DouYin = class extends Base {
 		this.forceBurnDanmaku = options?.forceBurnDanmaku ?? false;
 		this.hasProcessedLiveImage = false;
 	}
+	async handleArticleWork(VideoData, _data) {
+		const aweme = VideoData.data.aweme_detail;
+		const content = JSON.parse(aweme.article_info.article_content);
+		const fe_data = JSON.parse(aweme.article_info.fe_data);
+		logger.debug("文章数据提取完成");
+		logger.debug(`文章标题: ${aweme.article_info.article_title}`);
+		logger.debug(`图片数量: ${fe_data.image_list?.length || 0}`);
+		const img$2 = await Render("douyin/article-work", {
+			title: aweme.article_info.article_title,
+			markdown: content.markdown,
+			images: fe_data.image_list || [],
+			read_time: fe_data.read_time || 0,
+			dianzan: Count(aweme.statistics.digg_count),
+			pinglun: Count(aweme.statistics.comment_count),
+			shouchang: Count(aweme.statistics.collect_count),
+			share: Count(aweme.statistics.share_count),
+			create_time: format(fromUnixTime(aweme.create_time), "yyyy-MM-dd HH:mm"),
+			avater_url: aweme.author.avatar_thumb.url_list[0],
+			username: aweme.author.nickname,
+			"抖音号": aweme.author.unique_id || aweme.author.short_id,
+			"获赞": Count(aweme.author.total_favorited),
+			"关注": Count(aweme.author.following_count),
+			"粉丝": Count(aweme.author.follower_count),
+			share_url: `https://www.douyin.com/article/${aweme.aweme_id}`
+		});
+		await this.e.reply(img$2);
+		return true;
+	}
 	async DouyinHandler(data$1) {
 		Config.app.parseTip && this.e.reply("检测到抖音链接，开始解析");
 		switch (this.type) {
@@ -17818,6 +17938,10 @@ var DouYin = class extends Base {
 					aweme_id: data$1.aweme_id,
 					typeMode: "strict"
 				});
+				const aweme_type = VideoData.data.aweme_detail.aweme_type;
+				const isArticle = aweme_type === 163;
+				const isVideo = aweme_type === 0;
+				if (this.is_mp4 === void 0) this.is_mp4 = isVideo;
 				const CommentsData = await this.amagi.douyin.fetcher.fetchWorkComments({
 					aweme_id: data$1.aweme_id,
 					number: Config.douyin.numcomment,
@@ -17828,7 +17952,7 @@ var DouYin = class extends Base {
 				let g_title;
 				let imagenum = 0;
 				const image_res = [];
-				if (this.is_mp4 === false) switch (true) {
+				if (this.is_mp4 === false && !isArticle) switch (true) {
 					case this.is_slides === false && VideoData.data.aweme_detail.images !== null: {
 						const image_data = [];
 						const imageres = [];
@@ -18057,7 +18181,7 @@ var DouYin = class extends Base {
 					} catch (error) {
 						console.log(error);
 					}
-					music_url && this.is_mp4 === false && music_url !== void 0 && !this.hasProcessedLiveImage && await this.e.reply(segment.record(music_url, false));
+					music_url && (this.is_mp4 === false || isArticle) && music_url !== void 0 && !this.hasProcessedLiveImage && await this.e.reply(segment.record(music_url, false));
 				}
 				let FPS;
 				let video = null;
@@ -18079,7 +18203,7 @@ var DouYin = class extends Base {
 				if (Config.douyin.sendContent.includes("info")) if (Config.douyin.videoInfoMode === "text") {
 					const replyContent = [];
 					const { digg_count, share_count, collect_count, comment_count, recommend_count } = VideoData.data.aweme_detail.statistics;
-					const coverUrl = await processImageUrl(this.is_mp4 ? VideoData.data.aweme_detail.video.animated_cover?.url_list[0] ?? VideoData.data.aweme_detail.video.cover.url_list[0] : VideoData.data.aweme_detail.images[0].url_list[0], VideoData.data.aweme_detail.desc);
+					const coverUrl = await processImageUrl(isArticle ? VideoData.data.aweme_detail.video.origin_cover.url_list[0] : this.is_mp4 ? VideoData.data.aweme_detail.video.animated_cover?.url_list[0] ?? VideoData.data.aweme_detail.video.cover.url_list[0] : VideoData.data.aweme_detail.images[0].url_list[0], VideoData.data.aweme_detail.desc);
 					const contentMap = {
 						cover: segment.image(coverUrl),
 						title: segment.text(`\n📺 标题: ${VideoData.data.aweme_detail.desc}\n`),
@@ -18101,7 +18225,7 @@ var DouYin = class extends Base {
 						typeMode: "strict"
 					});
 					const videoInfoImg = await Render("douyin/videoInfo", {
-						desc: VideoData.data.aweme_detail.desc,
+						desc: isArticle ? VideoData.data.aweme_detail.preview_title : VideoData.data.aweme_detail.desc,
 						statistics: VideoData.data.aweme_detail.statistics,
 						aweme_id: VideoData.data.aweme_detail.aweme_id,
 						author: {
@@ -18117,8 +18241,11 @@ var DouYin = class extends Base {
 							gender: userProfile.data.user.gender ?? 0,
 							user_age: userProfile.data.user.user_age ?? 0
 						} : void 0,
-						image_url: this.is_mp4 ? VideoData.data.aweme_detail.video.animated_cover?.url_list[0] ?? VideoData.data.aweme_detail.video.cover_original_scale?.url_list[0] ?? VideoData.data.aweme_detail.video.cover.url_list[0] : VideoData.data.aweme_detail.images[0].url_list[0],
-						cover_size: this.is_mp4 ? VideoData.data.aweme_detail.video.cover ? {
+						image_url: isArticle ? VideoData.data.aweme_detail.video.origin_cover.url_list[0] : this.is_mp4 ? VideoData.data.aweme_detail.video.animated_cover?.url_list[0] ?? VideoData.data.aweme_detail.video.cover_original_scale?.url_list[0] ?? VideoData.data.aweme_detail.video.cover.url_list[0] : VideoData.data.aweme_detail.images[0].url_list[0],
+						cover_size: isArticle ? VideoData.data.aweme_detail.video.origin_cover ? {
+							width: VideoData.data.aweme_detail.video.origin_cover.width,
+							height: VideoData.data.aweme_detail.video.origin_cover.height
+						} : void 0 : this.is_mp4 ? VideoData.data.aweme_detail.video.cover ? {
 							width: VideoData.data.aweme_detail.video.cover_original_scale.width,
 							height: VideoData.data.aweme_detail.video.cover_original_scale.height
 						} : void 0 : VideoData.data.aweme_detail.images?.[0] ? {
@@ -18140,6 +18267,7 @@ var DouYin = class extends Base {
 					});
 					this.e.reply(videoInfoImg);
 				}
+				if (isArticle) await this.handleArticleWork(VideoData, data$1);
 				if (Config.douyin.sendContent.includes("comment")) {
 					const douyinCommentsRes = await douyinComments(CommentsData, Emoji((await this.amagi.douyin.fetcher.fetchEmojiList({ typeMode: "loose" })).data));
 					if (!douyinCommentsRes.CommentsData.length) await this.e.reply("这个作品没有评论 ~");
@@ -18149,7 +18277,7 @@ var DouYin = class extends Base {
 							for (const item of VideoData.data.aweme_detail.suggest_words.suggest_words) if (item.words && item.scene === "comment_top_rec") for (const v of item.words) v.word && suggest.push(v.word);
 						}
 						const img$2 = await Render("douyin/comment", {
-							Type: this.is_mp4 ? "视频" : this.is_slides ? "合辑" : "图集",
+							Type: isArticle ? "文章" : this.is_mp4 ? "视频" : this.is_slides ? "合辑" : "图集",
 							CommentsData: douyinCommentsRes.CommentsData,
 							CommentLength: Config.douyin.realCommentCount ? VideoData.data.aweme_detail.statistics.comment_count : douyinCommentsRes.CommentsData.length ?? 0,
 							share_url: this.is_mp4 ? `https://aweme.snssdk.com/aweme/v1/play/?video_id=${VideoData.data.aweme_detail.video.play_addr.uri}&ratio=1080p&line=0` : VideoData.data.aweme_detail.share_url,
@@ -18178,7 +18306,7 @@ var DouYin = class extends Base {
 						this.e.reply(img$2);
 					}
 				}
-				if (this.is_mp4 && Config.douyin.sendContent.includes("video")) {
+				if (this.is_mp4 && !isArticle && Config.douyin.sendContent.includes("video")) {
 					let danmakuList = [];
 					if ((this.forceBurnDanmaku || Config.douyin.burnDanmaku) && video) try {
 						const duration = video.duration;
@@ -18488,8 +18616,69 @@ var getStringDisplayWidth = (str) => {
 	}
 	return width;
 };
+let DouyinWorkMainType = function(DouyinWorkMainType$1) {
+	DouyinWorkMainType$1["VIDEO"] = "video";
+	DouyinWorkMainType$1["IMAGE"] = "image";
+	DouyinWorkMainType$1["ARTICLE"] = "article";
+	DouyinWorkMainType$1["LIVE"] = "live";
+	DouyinWorkMainType$1["MUSIC"] = "music";
+	DouyinWorkMainType$1["UNKNOWN"] = "unknown";
+	return DouyinWorkMainType$1;
+}({});
+let DouyinImageSubType = function(DouyinImageSubType$1) {
+	DouyinImageSubType$1["GALLERY"] = "gallery";
+	DouyinImageSubType$1["COLLECTION"] = "collection";
+	return DouyinImageSubType$1;
+}({});
+function getWorkTypeInfo(data$1) {
+	if (data$1.aweme_type === 163 || data$1.article_info) return {
+		mainType: DouyinWorkMainType.ARTICLE,
+		isVideo: false,
+		isImage: false,
+		isArticle: true,
+		isGallery: false,
+		isCollection: false,
+		templatePath: "douyin/article-work"
+	};
+	if (data$1.images && data$1.images.length > 0) {
+		const subType = data$1.is_slides === true ? DouyinImageSubType.COLLECTION : DouyinImageSubType.GALLERY;
+		return {
+			mainType: DouyinWorkMainType.IMAGE,
+			subType,
+			isVideo: false,
+			isImage: true,
+			isArticle: false,
+			isGallery: subType === DouyinImageSubType.GALLERY,
+			isCollection: subType === DouyinImageSubType.COLLECTION,
+			templatePath: "douyin/image-work"
+		};
+	}
+	return {
+		mainType: DouyinWorkMainType.VIDEO,
+		isVideo: true,
+		isImage: false,
+		isArticle: false,
+		isGallery: false,
+		isCollection: false,
+		templatePath: "douyin/video-work"
+	};
+}
+function getWorkCoverUrl(workTypeInfo, data$1) {
+	if (workTypeInfo.isVideo && data$1.video) return data$1.video.animated_cover?.url_list[0] ?? data$1.video.cover_original_scale?.url_list[0] ?? data$1.video.cover?.url_list[0] ?? "";
+	if (workTypeInfo.isImage && data$1.images && data$1.images.length > 0) return data$1.images[0].url_list[0] ?? "";
+	if (workTypeInfo.isArticle && data$1.article_info?.article_content) try {
+		return JSON.parse(data$1.article_info.article_content).head_poster_list?.url_list?.[0] ?? "";
+	} catch {
+		return "";
+	}
+	return "";
+}
 const getDouyinID = async (event, url, log = true) => {
-	const longLink = (await axios.get(url, { headers: { "User-Agent": "Apifox/1.0.0 (https://apifox.com)" } })).request.res.responseUrl;
+	const resp = await axios.get(url, {
+		headers: { "User-Agent": "Apifox/1.0.0 (https://apifox.com)" },
+		maxRedirects: 10
+	});
+	const longLink = resp.request?.res?.responseUrl || resp.request?.responseURL || url;
 	let result = {};
 	switch (true) {
 		case longLink.includes("webcast.amemv.com"):
@@ -18505,21 +18694,13 @@ const getDouyinID = async (event, url, log = true) => {
 				room_id: longLink.split("/").pop()
 			};
 			break;
-		case /video\/(\d+)/.test(longLink): {
-			const videoMatch = /video\/(\d+)/.exec(longLink);
-			result = {
-				type: "one_work",
-				aweme_id: videoMatch ? videoMatch[1] : void 0,
-				is_mp4: true
-			};
-			break;
-		}
+		case /video\/(\d+)/.test(longLink):
+		case /article\/(\d+)/.test(longLink):
 		case /note\/(\d+)/.test(longLink): {
-			const noteMatch = /note\/(\d+)/.exec(longLink);
+			const match = /(?:video|article|note)\/(\d+)/.exec(longLink);
 			result = {
 				type: "one_work",
-				aweme_id: noteMatch ? noteMatch[1] : void 0,
-				is_mp4: false
+				aweme_id: match ? match[1] : void 0
 			};
 			break;
 		}
@@ -18528,7 +18709,8 @@ const getDouyinID = async (event, url, log = true) => {
 			result = {
 				type: "one_work",
 				aweme_id: modalMatch ? modalMatch[1] : void 0,
-				is_mp4: true
+				is_mp4: true,
+				work_type: DouyinWorkMainType.VIDEO
 			};
 			break;
 		}
@@ -18871,7 +19053,7 @@ var DouYinpush = class extends Base {
 				if (pushItem.pushType === "favorite") {
 					const authorUserInfo = "author_user_info" in Detail_Data ? Detail_Data.author_user_info : void 0;
 					img$2 = await Render("douyin/favorite-list", {
-						image_url: iddata.is_mp4 ? Detail_Data.video.animated_cover?.url_list[0] ?? Detail_Data.video.cover_original_scale?.url_list[0] ?? Detail_Data.video.cover.url_list[0] : Detail_Data.images[0].url_list[0],
+						image_url: getWorkCoverUrl(getWorkTypeInfo(Detail_Data), Detail_Data),
 						desc: this.desc(Detail_Data, Detail_Data.desc),
 						dianzan: this.count(Detail_Data.statistics.digg_count),
 						pinglun: this.count(Detail_Data.statistics.comment_count),
@@ -18890,7 +19072,7 @@ var DouYinpush = class extends Base {
 				} else if (pushItem.pushType === "recommend") {
 					const authorUserInfo = "author_user_info" in Detail_Data ? Detail_Data.author_user_info : void 0;
 					img$2 = await Render("douyin/recommend-list", {
-						image_url: iddata.is_mp4 ? Detail_Data.video.animated_cover?.url_list[0] ?? Detail_Data.video.cover_original_scale?.url_list[0] ?? Detail_Data.video.cover.url_list[0] : Detail_Data.images[0].url_list[0],
+						image_url: getWorkCoverUrl(getWorkTypeInfo(Detail_Data), Detail_Data),
 						desc: this.desc(Detail_Data, Detail_Data.desc),
 						dianzan: this.count(Detail_Data.statistics.digg_count),
 						pinglun: this.count(Detail_Data.statistics.comment_count),
@@ -18906,45 +19088,72 @@ var DouYinpush = class extends Base {
 						author_douyin_id: authorUserInfo.data.user.unique_id === "" ? authorUserInfo.data.user.short_id : authorUserInfo.data.user.unique_id,
 						share_url: Config.douyin.push.shareType === "web" ? realUrl : `https://aweme.snssdk.com/aweme/v1/play/?video_id=${Detail_Data.video.play_addr.uri}&ratio=1080p&line=0`
 					});
-				} else img$2 = await Render("douyin/dynamic", {
-					image_url: iddata.is_mp4 ? Detail_Data.video.animated_cover?.url_list[0] ?? Detail_Data.video.cover.url_list[0] : Detail_Data.images[0].url_list[0],
-					desc: this.desc(Detail_Data, Detail_Data.desc),
-					dianzan: this.count(Detail_Data.statistics.digg_count),
-					pinglun: this.count(Detail_Data.statistics.comment_count),
-					share: this.count(Detail_Data.statistics.share_count),
-					shouchang: this.count(Detail_Data.statistics.collect_count),
-					create_time: format(fromUnixTime(pushItem.create_time), "yyyy-MM-dd HH:mm"),
-					avater_url: "https://p3-pc.douyinpic.com/aweme/1080x1080/" + Detail_Data.user_info.data.user.avatar_larger.uri,
-					share_url: Config.douyin.push.shareType === "web" ? realUrl : `https://aweme.snssdk.com/aweme/v1/play/?video_id=${Detail_Data.video.play_addr.uri}&ratio=1080p&line=0`,
-					username: Detail_Data.author.nickname,
-					"抖音号": Detail_Data.user_info.data.user.unique_id === "" ? Detail_Data.user_info.data.user.short_id : Detail_Data.user_info.data.user.unique_id,
-					"粉丝": this.count(Detail_Data.user_info.data.user.follower_count),
-					"获赞": this.count(Detail_Data.user_info.data.user.total_favorited),
-					"关注": this.count(Detail_Data.user_info.data.user.following_count),
-					dynamicTYPE: "作品动态推送",
-					cooperation_info: (() => {
-						const raw = Detail_Data.cooperation_info;
-						if (!raw) return void 0;
-						const rawCreators = Array.isArray(raw.co_creators) ? raw.co_creators : [];
-						const author = Detail_Data.author;
-						const authorUid = author?.uid;
-						const authorSecUid = author?.sec_uid;
-						const authorNickname = author?.nickname;
-						const authorInCreators = rawCreators.some((c) => authorUid && c.uid && c.uid === authorUid || authorSecUid && c.sec_uid && c.sec_uid === authorSecUid || authorNickname && c.nickname && c.nickname === authorNickname);
-						const co_creators = rawCreators.map((c) => {
-							const firstUrl = c.avatar_thumb?.url_list?.[0] ?? (c.avatar_thumb?.uri ? `https://p3.douyinpic.com/${c.avatar_thumb.uri}` : void 0);
+				} else {
+					const dynamicTypeLabel = "作品动态推送";
+					const workTypeInfo = getWorkTypeInfo(Detail_Data);
+					const coverUrl = getWorkCoverUrl(workTypeInfo, Detail_Data);
+					if (workTypeInfo.isArticle) {
+						const content = JSON.parse(Detail_Data.article_info.article_content);
+						const fe_data = JSON.parse(Detail_Data.article_info.fe_data);
+						img$2 = await Render("douyin/article-work", {
+							title: Detail_Data.article_info.article_title,
+							markdown: content.markdown,
+							images: fe_data.image_list || [],
+							read_time: fe_data.read_time || 0,
+							dianzan: this.count(Detail_Data.statistics.digg_count),
+							pinglun: this.count(Detail_Data.statistics.comment_count),
+							shouchang: this.count(Detail_Data.statistics.collect_count),
+							share: this.count(Detail_Data.statistics.share_count),
+							create_time: format(fromUnixTime(pushItem.create_time), "yyyy-MM-dd HH:mm"),
+							avater_url: "https://p3-pc.douyinpic.com/aweme/1080x1080/" + Detail_Data.user_info.data.user.avatar_larger.uri,
+							username: Detail_Data.author.nickname,
+							"抖音号": Detail_Data.user_info.data.user.unique_id === "" ? Detail_Data.user_info.data.user.short_id : Detail_Data.user_info.data.user.unique_id,
+							"获赞": this.count(Detail_Data.user_info.data.user.total_favorited),
+							"关注": this.count(Detail_Data.user_info.data.user.following_count),
+							"粉丝": this.count(Detail_Data.user_info.data.user.follower_count),
+							share_url: Detail_Data.share_url,
+							useDarkTheme: false
+						});
+					} else img$2 = await Render(workTypeInfo.templatePath, {
+						image_url: coverUrl,
+						desc: this.desc(Detail_Data, Detail_Data.desc),
+						dianzan: this.count(Detail_Data.statistics.digg_count),
+						pinglun: this.count(Detail_Data.statistics.comment_count),
+						share: this.count(Detail_Data.statistics.share_count),
+						shouchang: this.count(Detail_Data.statistics.collect_count),
+						create_time: format(fromUnixTime(pushItem.create_time), "yyyy-MM-dd HH:mm"),
+						avater_url: "https://p3-pc.douyinpic.com/aweme/1080x1080/" + Detail_Data.user_info.data.user.avatar_larger.uri,
+						share_url: Config.douyin.push.shareType === "web" ? realUrl : `https://aweme.snssdk.com/aweme/v1/play/?video_id=${Detail_Data.video.play_addr.uri}&ratio=1080p&line=0`,
+						username: Detail_Data.author.nickname,
+						"抖音号": Detail_Data.user_info.data.user.unique_id === "" ? Detail_Data.user_info.data.user.short_id : Detail_Data.user_info.data.user.unique_id,
+						"粉丝": this.count(Detail_Data.user_info.data.user.follower_count),
+						"获赞": this.count(Detail_Data.user_info.data.user.total_favorited),
+						"关注": this.count(Detail_Data.user_info.data.user.following_count),
+						dynamicTYPE: dynamicTypeLabel,
+						cooperation_info: (() => {
+							const raw = Detail_Data.cooperation_info;
+							if (!raw) return void 0;
+							const rawCreators = Array.isArray(raw.co_creators) ? raw.co_creators : [];
+							const author = Detail_Data.author;
+							const authorUid = author?.uid;
+							const authorSecUid = author?.sec_uid;
+							const authorNickname = author?.nickname;
+							const authorInCreators = rawCreators.some((c) => authorUid && c.uid && c.uid === authorUid || authorSecUid && c.sec_uid && c.sec_uid === authorSecUid || authorNickname && c.nickname && c.nickname === authorNickname);
+							const co_creators = rawCreators.map((c) => {
+								const firstUrl = c.avatar_thumb?.url_list?.[0] ?? (c.avatar_thumb?.uri ? `https://p3.douyinpic.com/${c.avatar_thumb.uri}` : void 0);
+								return {
+									avatar_thumb: firstUrl ? { url_list: [firstUrl] } : void 0,
+									nickname: c.nickname,
+									role_title: c.role_title
+								};
+							});
 							return {
-								avatar_thumb: firstUrl ? { url_list: [firstUrl] } : void 0,
-								nickname: c.nickname,
-								role_title: c.role_title
+								co_creator_nums: Math.max(Number(raw.co_creator_nums || 0), co_creators.length) + (authorInCreators ? 0 : 1),
+								co_creators
 							};
-						});
-						return {
-							co_creator_nums: Math.max(Number(raw.co_creator_nums || 0), co_creators.length) + (authorInCreators ? 0 : 1),
-							co_creators
-						};
-					})()
-				});
+						})()
+					});
+				}
 			}
 			for (const target of pushItem.targets) {
 				let status = { message_id: "" };
@@ -20250,8 +20459,35 @@ var handleTestDouyinPush = wrapWithErrorHandler(async (e) => {
 			Connection: "keep-alive"
 		}
 	}).getLocation();
-	const img$2 = await Render("douyin/dynamic", {
-		image_url: iddata.is_mp4 ? workInfo.data.aweme_detail.video.animated_cover?.url_list[0] ?? workInfo.data.aweme_detail.video.cover.url_list[0] : workInfo.data.aweme_detail.images[0].url_list[0],
+	const workTypeInfo = getWorkTypeInfo(workInfo.data.aweme_detail);
+	const coverUrl = getWorkCoverUrl(workTypeInfo, workInfo.data.aweme_detail);
+	if (workTypeInfo.isArticle) {
+		const content = JSON.parse(workInfo.data.aweme_detail.article_info.article_content);
+		const fe_data = JSON.parse(workInfo.data.aweme_detail.article_info.fe_data);
+		const img$3 = await Render("douyin/article-work", {
+			title: workInfo.data.aweme_detail.article_info.article_title,
+			markdown: content.markdown,
+			images: fe_data.image_list || [],
+			read_time: fe_data.read_time || 0,
+			dianzan: Common.count(workInfo.data.aweme_detail.statistics.digg_count),
+			pinglun: Common.count(workInfo.data.aweme_detail.statistics.comment_count),
+			shouchang: Common.count(workInfo.data.aweme_detail.statistics.collect_count),
+			share: Common.count(workInfo.data.aweme_detail.statistics.share_count),
+			create_time: format(fromUnixTime(workInfo.data.aweme_detail.create_time), "yyyy-MM-dd HH:mm"),
+			avater_url: "https://p3-pc.douyinpic.com/aweme/1080x1080/" + userProfile.data.user.avatar_larger.uri,
+			username: workInfo.data.aweme_detail.author.nickname,
+			"抖音号": userProfile.data.user.unique_id === "" ? userProfile.data.user.short_id : userProfile.data.user.unique_id,
+			"获赞": Common.count(userProfile.data.user.total_favorited),
+			"关注": Common.count(userProfile.data.user.following_count),
+			"粉丝": Common.count(userProfile.data.user.follower_count),
+			share_url: workInfo.data.aweme_detail.share_url,
+			useDarkTheme: false
+		});
+		e.reply(img$3);
+		return true;
+	}
+	const img$2 = await Render(workTypeInfo.templatePath, {
+		image_url: coverUrl,
 		desc: workInfo.data.aweme_detail.desc,
 		dianzan: Common.count(workInfo.data.aweme_detail.statistics.digg_count),
 		pinglun: Common.count(workInfo.data.aweme_detail.statistics.comment_count),