karin-plugin-kkk 2.18.3 → 2.19.1

package/lib/core_chunk/{main-DFGREgML.js → main-BZ80CSSD.js}

@@ -1,6 +1,6 @@
 import { n as __esmMin, o as __toESM, r as __export } from "./rolldown-runtime-BMXAG3ag.js";
-import { $t as require_express, G as zhCN, J as init_date_fns, Q as differenceInSeconds, W as init_locale, X as formatDistanceToNow, Y as fromUnixTime, Z as format, a as require_lib, an as axios_default, c as Window, cn as init_zod, en as require_protobufjs, i as require_dist, in as init_axios, ln as zod_default, n as require_jsQR, nn as init_source, o as require_qr_code_styling, on as Xhshow, r as require_heic_convert, rn as AxiosError$1, s as init_lib, sn as init_esm, t as require_png, tn as Chalk } from "./vendor-B-twx8Ds.js";
-import { n as init_client, r as reactServerRender } from "./template-BBVRQ9ag.js";
+import { D as init_locale, O as zhCN, _n as init_zod, a as require_lib, at as format, c as Window, cn as require_express, dn as init_source, fn as AxiosError$1, gn as init_esm, hn as Xhshow, i as require_dist, it as formatDistanceToNow, ln as require_protobufjs, mn as axios_default, n as require_jsQR, nt as init_date_fns, o as require_qr_code_styling, ot as differenceInSeconds, pn as init_axios, r as require_heic_convert, rt as fromUnixTime, s as init_lib, t as require_png, un as Chalk, vn as zod_default } from "./vendor-BsdYKPEs.js";
+import { n as init_client, r as reactServerRender } from "./template-BjkVe9U9.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";
@@ -746,7 +746,7 @@ var init_bilibili$3 = __esmMin(() => {
 		videoDanmaku: "/fetch_danmaku"
 	};
 });
-var DouyinWorkParamsSchema, DouyinCommentParamsSchema, DouyinHotWordsParamsSchema, DouyinSearchParamsSchema, DouyinCommentReplyParamsSchema, DouyinUserParamsSchema, DouyinMusicParamsSchema, DouyinLiveRoomParamsSchema, DouyinQrcodeParamsSchema, DouyinEmojiListParamsSchema, DouyinEmojiProParamsSchema, DouyinDanmakuParamsSchema, DouyinValidationSchemas, DouyinMethodRoutes;
+var DouyinWorkParamsSchema, DouyinCommentParamsSchema, DouyinHotWordsParamsSchema, DouyinSearchParamsSchema, DouyinCommentReplyParamsSchema, DouyinUserParamsSchema, DouyinUserListParamsSchema, DouyinMusicParamsSchema, DouyinLiveRoomParamsSchema, DouyinQrcodeParamsSchema, DouyinEmojiListParamsSchema, DouyinEmojiProParamsSchema, DouyinDanmakuParamsSchema, DouyinValidationSchemas, DouyinMethodRoutes;
 var init_douyin$3 = __esmMin(() => {
 	init_zod();
 	init_utils$3();
@@ -789,9 +789,19 @@ var init_douyin$3 = __esmMin(() => {
 		cursor: zod_default.coerce.number({ error: "游标必须是数字" }).int({ error: "游标必须是整数" }).min(0, { error: "游标不能小于0" }).default(0).optional()
 	});
 	DouyinUserParamsSchema = zod_default.object({
-		methodType: zod_default.enum(["userProfile", "userVideoList"], { error: "方法类型必须是指定的枚举值之一" }),
+		methodType: zod_default.literal("userProfile", { error: "方法类型必须是\"userProfile\"" }),
 		sec_uid: zod_default.string({ error: "用户ID必须是字符串" }).min(1, { error: "用户ID不能为空" })
 	});
+	DouyinUserListParamsSchema = zod_default.object({
+		methodType: zod_default.enum([
+			"userVideoList",
+			"userFavoriteList",
+			"userRecommendList"
+		], { error: "方法类型必须是指定的枚举值之一" }),
+		sec_uid: zod_default.string({ error: "用户ID必须是字符串" }).min(1, { error: "用户ID不能为空" }),
+		number: smartPositiveInteger("获取数量必须是正整数").optional().default(18),
+		max_cursor: zod_default.string({ error: "游标必须是字符串" }).optional()
+	});
 	DouyinMusicParamsSchema = zod_default.object({
 		methodType: zod_default.literal("musicInfo", { error: "方法类型必须是\"musicInfo\"" }),
 		music_id: zod_default.string({ error: "音乐ID必须是字符串" }).min(1, { error: "音乐ID不能为空" })
@@ -834,7 +844,9 @@ var init_douyin$3 = __esmMin(() => {
 		slidesWork: DouyinWorkParamsSchema,
 		comments: DouyinCommentParamsSchema,
 		userProfile: DouyinUserParamsSchema,
-		userVideoList: DouyinUserParamsSchema,
+		userVideoList: DouyinUserListParamsSchema,
+		userFavoriteList: DouyinUserListParamsSchema,
+		userRecommendList: DouyinUserListParamsSchema,
 		suggestWords: DouyinHotWordsParamsSchema,
 		search: DouyinSearchParamsSchema,
 		musicInfo: DouyinMusicParamsSchema,
@@ -855,6 +867,8 @@ var init_douyin$3 = __esmMin(() => {
 		commentReplies: "/fetch_video_comment_replies",
 		userProfile: "/fetch_user_info",
 		userVideoList: "/fetch_user_post_videos",
+		userFavoriteList: "/fetch_user_favorite_list",
+		userRecommendList: "/fetch_user_recommend_list",
 		search: "/fetch_search_info",
 		suggestWords: "/fetch_suggest_words",
 		musicInfo: "/fetch_music_work",
@@ -2354,14 +2368,14 @@ var init_API$1 = __esmMin(() => {
 			return `https://www.douyin.com/aweme/v1/web/aweme/post/?${buildQueryString({
 				...this.getBaseParams(),
 				sec_user_id: data$1.sec_uid,
-				max_cursor: "0",
+				max_cursor: data$1.max_cursor ?? "0",
 				locate_query: "false",
 				show_live_replay_strategy: "1",
 				need_time_list: "1",
 				time_list_query: "0",
 				whale_cut_token: "",
 				cut_version: "1",
-				count: "18",
+				count: data$1.number ?? 18,
 				publish_video_strategy_type: "2",
 				version_code: "170400",
 				version_name: "17.4.0",
@@ -2371,6 +2385,70 @@ var init_API$1 = __esmMin(() => {
 				webid: "7338423850134226495"
 			})}`;
 		}
+		getUserFavoriteList(data$1) {
+			return `https://www-hj.douyin.com/aweme/v1/web/aweme/favorite/?${buildQueryString({
+				...this.getBaseParams(),
+				sec_user_id: data$1.sec_uid,
+				max_cursor: data$1.max_cursor ?? "0",
+				min_cursor: "0",
+				whale_cut_token: "",
+				cut_version: "1",
+				count: data$1.number ?? 18,
+				publish_video_strategy_type: "2",
+				update_version_code: "170400",
+				pc_libra_divert: "Windows",
+				support_h265: "1",
+				support_dash: "1",
+				version_code: "170400",
+				version_name: "17.4.0",
+				screen_width: "2328",
+				screen_height: "1310",
+				round_trip_time: "0",
+				webid: "7487210762873685515"
+			})}`;
+		}
+		getUserRecommendList(data$1) {
+			return `https://www.douyin.com/aweme/v1/web/familiar/recommend/feed/?${buildQueryString({
+				device_platform: "",
+				aid: "6383",
+				channel: "channel_pc_web",
+				sec_user_id: data$1.sec_uid,
+				max_cursor: data$1.max_cursor ?? "0",
+				min_cursor: "0",
+				whale_cut_token: "",
+				count: data$1.number ?? 18,
+				from: "1",
+				update_version_code: "170400",
+				pc_client_type: "1",
+				pc_libra_divert: "Windows",
+				support_h265: "1",
+				support_dash: "1",
+				cpu_core_num: "16",
+				version_code: "170400",
+				version_name: "17.4.0",
+				cookie_enabled: "true",
+				screen_width: "2328",
+				screen_height: "1310",
+				browser_language: "zh-CN",
+				browser_platform: "Win32",
+				browser_name: "Edge",
+				browser_version: this.browserVersion,
+				browser_online: "true",
+				engine_name: "Blink",
+				engine_version: this.browserVersion,
+				os_name: "Windows",
+				os_version: "10",
+				device_memory: "8",
+				platform: "PC",
+				downlink: "10",
+				effective_type: "4g",
+				round_trip_time: "50",
+				webid: "7487210762873685515",
+				msToken: douyinSign.Mstoken(184),
+				verifyFp: fp,
+				fp
+			})}`;
+		}
 		getUserProfile(data$1) {
 			return `https://www.douyin.com/aweme/v1/web/user/profile/other/?${buildQueryString({
 				...this.getBaseParams(),
@@ -2737,17 +2815,93 @@ var init_getdata$3 = __esmMin(() => {
 				});
 			}
 			case "userVideoList": {
-				const url = douyinApiUrls$1.getUserVideoList({ sec_uid: data$1.sec_uid });
-				const customConfig = {
-					...baseRequestConfig,
-					headers: {
-						...baseRequestConfig.headers,
-						...(!requestConfig?.headers || !("Referer" in requestConfig.headers)) && { Referer: `https://www.douyin.com/user/${data$1.sec_uid}` }
-					}
-				};
-				return await GlobalGetData$3(data$1.methodType, {
-					...customConfig,
-					url: buildSignedUrl(url, signType, userAgent)
+				const urlGenerator = (params) => douyinApiUrls$1.getUserVideoList(params);
+				return await fetchPaginatedData({
+					type: data$1.methodType,
+					apiUrlGenerator: urlGenerator,
+					params: {
+						...data$1,
+						max_cursor: data$1.max_cursor
+					},
+					maxPageSize: 18,
+					requestConfig: {
+						...baseRequestConfig,
+						headers: {
+							...baseRequestConfig.headers,
+							...(!requestConfig?.headers || !("Referer" in requestConfig.headers)) && { Referer: `https://www.douyin.com/user/${data$1.sec_uid}` }
+						}
+					},
+					signType,
+					extractList: (resp) => resp.aweme_list ?? [],
+					updateParams: (params, resp) => ({
+						...params,
+						max_cursor: resp.max_cursor?.toString() ?? "0"
+					}),
+					hasMore: (resp) => resp.has_more === 1,
+					formatFinalResponse: (resp, list) => ({
+						...resp,
+						aweme_list: list
+					})
+				});
+			}
+			case "userFavoriteList": {
+				const urlGenerator = (params) => douyinApiUrls$1.getUserFavoriteList(params);
+				return await fetchPaginatedData({
+					type: data$1.methodType,
+					apiUrlGenerator: urlGenerator,
+					params: {
+						...data$1,
+						max_cursor: data$1.max_cursor
+					},
+					maxPageSize: 18,
+					requestConfig: {
+						...baseRequestConfig,
+						headers: {
+							...baseRequestConfig.headers,
+							...(!requestConfig?.headers || !("Referer" in requestConfig.headers)) && { Referer: `https://www.douyin.com/user/${data$1.sec_uid}` }
+						}
+					},
+					signType,
+					extractList: (resp) => resp.aweme_list ?? [],
+					updateParams: (params, resp) => ({
+						...params,
+						max_cursor: resp.max_cursor?.toString() ?? "0"
+					}),
+					hasMore: (resp) => resp.has_more === 1,
+					formatFinalResponse: (resp, list) => ({
+						...resp,
+						aweme_list: list
+					})
+				});
+			}
+			case "userRecommendList": {
+				const urlGenerator = (params) => douyinApiUrls$1.getUserRecommendList(params);
+				return await fetchPaginatedData({
+					type: data$1.methodType,
+					apiUrlGenerator: urlGenerator,
+					params: {
+						...data$1,
+						max_cursor: data$1.max_cursor
+					},
+					maxPageSize: 18,
+					requestConfig: {
+						...baseRequestConfig,
+						headers: {
+							...baseRequestConfig.headers,
+							...(!requestConfig?.headers || !("Referer" in requestConfig.headers)) && { Referer: `https://www.douyin.com/user/${data$1.sec_uid}` }
+						}
+					},
+					signType,
+					extractList: (resp) => resp.aweme_list ?? [],
+					updateParams: (params, resp) => ({
+						...params,
+						max_cursor: resp.max_cursor?.toString() ?? "0"
+					}),
+					hasMore: (resp) => resp.has_more === true,
+					formatFinalResponse: (resp, list) => ({
+						...resp,
+						aweme_list: list
+					})
 				});
 			}
 			case "suggestWords": {
@@ -3240,6 +3394,18 @@ async function fetchUserVideoList(options, cookie, requestConfig) {
 		requestConfig
 	});
 }
+async function fetchUserFavoriteList(options, cookie, requestConfig) {
+	return fetchDouyinInternal("userFavoriteList", options, {
+		cookie,
+		requestConfig
+	});
+}
+async function fetchUserRecommendList(options, cookie, requestConfig) {
+	return fetchDouyinInternal("userRecommendList", options, {
+		cookie,
+		requestConfig
+	});
+}
 var init_user$1 = __esmMin(() => {
 	init_internal$2();
 });
@@ -3294,6 +3460,8 @@ function createBoundDouyinFetcher(cookie, requestConfig) {
 		fetchCommentReplies: (options, reqConfig) => fetchCommentReplies(options, cookie, reqConfig ?? requestConfig),
 		fetchUserProfile: (options, reqConfig) => fetchUserProfile$1(options, cookie, reqConfig ?? requestConfig),
 		fetchUserVideoList: (options, reqConfig) => fetchUserVideoList(options, cookie, reqConfig ?? requestConfig),
+		fetchUserFavoriteList: (options, reqConfig) => fetchUserFavoriteList(options, cookie, reqConfig ?? requestConfig),
+		fetchUserRecommendList: (options, reqConfig) => fetchUserRecommendList(options, cookie, reqConfig ?? requestConfig),
 		searchContent: (options, reqConfig) => searchContent(options, cookie, reqConfig ?? requestConfig),
 		fetchSuggestWords: (options, reqConfig) => fetchSuggestWords(options, cookie, reqConfig ?? requestConfig),
 		fetchMusicInfo: (options, reqConfig) => fetchMusicInfo(options, cookie, reqConfig ?? requestConfig),
@@ -3334,6 +3502,8 @@ var init_douyin$2 = __esmMin(() => {
 		fetchCommentReplies,
 		fetchUserProfile: fetchUserProfile$1,
 		fetchUserVideoList,
+		fetchUserFavoriteList,
+		fetchUserRecommendList,
 		searchContent,
 		fetchSuggestWords,
 		fetchMusicInfo,
@@ -5597,7 +5767,7 @@ var init_src = __esmMin(() => {
 	init_server();
 	init_types$1();
 	init_api_spec();
-	getVersion = () => "6.0.0-beta.0";
+	getVersion = () => "6.0.0-beta.2";
 	VERSION = getVersion();
 	Object.defineProperty(CreateAmagiApp, "version", {
 		value: VERSION,
@@ -5649,6 +5819,121 @@ var init_root = __esmMin(() => {
 		karinVersion: process.env.KARIN_VERSION
 	};
 });
+var amagiClient_exports = __export({
+	AmagiBase: () => AmagiBase,
+	AmagiError: () => AmagiError,
+	bilibiliFetcher: () => bilibiliFetcher,
+	douyinFetcher: () => douyinFetcher,
+	kuaishouFetcher: () => kuaishouFetcher,
+	reloadAmagiConfig: () => reloadAmagiConfig,
+	xiaohongshuFetcher: () => xiaohongshuFetcher
+}, 1);
+var AmagiError, AmagiBase, amagiClientInstance, amagiClient, reloadAmagiConfig, bilibiliFetcher, douyinFetcher, kuaishouFetcher, xiaohongshuFetcher;
+var init_amagiClient = __esmMin(() => {
+	init_src();
+	init_Config();
+	AmagiError = class extends Error {
+		code;
+		data;
+		rawError;
+		constructor(code, message, data$1, rawError) {
+			super(message);
+			this.name = "AmagiError";
+			this.code = code;
+			this.data = data$1;
+			this.rawError = rawError;
+		}
+	};
+	AmagiBase = class {
+		amagi;
+		constructor() {
+			const client = this.createAmagiClient();
+			this.amagi = this.wrapAmagiClient(client);
+		}
+		createAmagiClient = () => Client({
+			cookies: {
+				douyin: Config.cookies.douyin,
+				bilibili: Config.cookies.bilibili,
+				kuaishou: Config.cookies.kuaishou,
+				xiaohongshu: Config.cookies.xiaohongshu
+			},
+			request: {
+				timeout: Config.request.timeout,
+				headers: { "User-Agent": Config.request["User-Agent"] },
+				proxy: Config.request.proxy?.switch ? Config.request.proxy : false
+			}
+		});
+		reloadConfig() {
+			logger.debug("[AmagiClient] 检测到配置变化，正在重载...");
+			const oldCookies = {
+				douyin: Config.cookies.douyin?.substring(0, 20) + "...",
+				bilibili: Config.cookies.bilibili?.substring(0, 20) + "...",
+				kuaishou: Config.cookies.kuaishou?.substring(0, 20) + "...",
+				xiaohongshu: Config.cookies.xiaohongshu?.substring(0, 20) + "..."
+			};
+			const client = this.createAmagiClient();
+			this.amagi = this.wrapAmagiClient(client);
+			const newCookies = {
+				douyin: Config.cookies.douyin?.substring(0, 20) + "...",
+				bilibili: Config.cookies.bilibili?.substring(0, 20) + "...",
+				kuaishou: Config.cookies.kuaishou?.substring(0, 20) + "...",
+				xiaohongshu: Config.cookies.xiaohongshu?.substring(0, 20) + "..."
+			};
+			logger.debug("[AmagiClient] 配置重载完成");
+			logger.debug(`[AmagiClient] Cookie 变化对比:\n${util.inspect({
+				"旧配置": oldCookies,
+				"新配置": newCookies
+			}, {
+				colors: true,
+				depth: 2
+			})}`);
+		}
+		wrapAmagiClient = (client) => {
+			const createProxy = (target) => new Proxy(target, { get(obj, prop) {
+				const value = obj[prop];
+				if (value && typeof value === "object" && !Array.isArray(value)) return createProxy(value);
+				if (typeof value === "function") return async (...args) => {
+					const result = await value.apply(obj, args);
+					const isResultType = (val) => {
+						if (!val || typeof val !== "object") return false;
+						if (!("success" in val) || typeof val.success !== "boolean") return false;
+						if (!("code" in val) || !("message" in val)) return false;
+						return true;
+					};
+					if (isResultType(result)) {
+						if (result.success === true) return result;
+						const errMessage = result.message || result.error?.amagiMessage || "请求失败";
+						const errorDetails = util.inspect({
+							code: result.code,
+							data: result.data,
+							message: errMessage,
+							error: result.error
+						}, {
+							depth: 10,
+							colors: true,
+							compact: false,
+							breakLength: 120,
+							showHidden: true
+						});
+						throw new AmagiError(result.code, errorDetails, result.data, result.error);
+					}
+					return result;
+				};
+				return value;
+			} });
+			return createProxy(client);
+		};
+	};
+	amagiClientInstance = new AmagiBase();
+	amagiClient = amagiClientInstance.amagi;
+	reloadAmagiConfig = () => {
+		amagiClientInstance.reloadConfig();
+	};
+	bilibiliFetcher = amagiClient.bilibili.fetcher;
+	douyinFetcher = amagiClient.douyin.fetcher;
+	kuaishouFetcher = amagiClient.kuaishou.fetcher;
+	xiaohongshuFetcher = amagiClient.xiaohongshu.fetcher;
+});
 var Cfg, configInstance, getConfigInstance, Config;
 var init_Config = __esmMin(() => {
 	init_root();
@@ -5669,7 +5954,17 @@ var init_Config = __esmMin(() => {
 				if (differences) fs.writeFileSync(`${this.dirCfgPath}/${file}`, result.toString({ lineWidth: -1 }));
 			}
 			setTimeout(() => {
-				filesByExt(this.dirCfgPath, ".yaml", "abs").forEach((file) => watch(file, (_old, _now) => {}));
+				filesByExt(this.dirCfgPath, ".yaml", "abs").forEach((file) => watch(file, (_old, _now) => {
+					const fileName = path.basename(file, ".yaml");
+					if (fileName === "cookies" || fileName === "request") {
+						logger.debug(`[Config] 检测到 ${fileName} 配置变化，正在重载 Amagi Client...`);
+						Promise.resolve().then(() => (init_amagiClient(), amagiClient_exports)).then(({ reloadAmagiConfig: reloadAmagiConfig$1 }) => {
+							reloadAmagiConfig$1();
+						}).catch((error) => {
+							logger.error(`[Config] 重载 Amagi Client 失败: ${error}`);
+						});
+					}
+				}));
 			}, 2e3);
 			return this;
 		}
@@ -5852,82 +6147,6 @@ var init_Config = __esmMin(() => {
 	Config = new Proxy({}, { get(target, prop) {
 		return getConfigInstance()[prop];
 	} });
-}), AmagiError, AmagiBase, amagiClient, bilibiliFetcher, douyinFetcher, kuaishouFetcher;
-var init_amagiClient = __esmMin(() => {
-	init_src();
-	init_Config();
-	AmagiError = class extends Error {
-		code;
-		data;
-		rawError;
-		constructor(code, message, data$1, rawError) {
-			super(message);
-			this.name = "AmagiError";
-			this.code = code;
-			this.data = data$1;
-			this.rawError = rawError;
-		}
-	};
-	AmagiBase = class {
-		amagi;
-		constructor() {
-			const client = this.createAmagiClient();
-			this.amagi = this.wrapAmagiClient(client);
-		}
-		createAmagiClient = () => Client({
-			cookies: {
-				douyin: Config.cookies.douyin,
-				bilibili: Config.cookies.bilibili,
-				kuaishou: Config.cookies.kuaishou,
-				xiaohongshu: Config.cookies.xiaohongshu
-			},
-			request: {
-				timeout: Config.request.timeout,
-				headers: { "User-Agent": Config.request["User-Agent"] },
-				proxy: Config.request.proxy?.switch ? Config.request.proxy : false
-			}
-		});
-		wrapAmagiClient = (client) => {
-			const createProxy = (target) => new Proxy(target, { get(obj, prop) {
-				const value = obj[prop];
-				if (value && typeof value === "object" && !Array.isArray(value)) return createProxy(value);
-				if (typeof value === "function") return async (...args) => {
-					const result = await value.apply(obj, args);
-					const isResultType = (val) => {
-						if (!val || typeof val !== "object") return false;
-						if (!("success" in val) || typeof val.success !== "boolean") return false;
-						if (!("code" in val) || !("message" in val)) return false;
-						return true;
-					};
-					if (isResultType(result)) {
-						if (result.success === true) return result;
-						const errMessage = result.message || result.error?.amagiMessage || "请求失败";
-						const errorDetails = util.inspect({
-							code: result.code,
-							data: result.data,
-							message: errMessage,
-							error: result.error
-						}, {
-							depth: 10,
-							colors: true,
-							compact: false,
-							breakLength: 120,
-							showHidden: true
-						});
-						throw new AmagiError(result.code, errorDetails, result.data, result.error);
-					}
-					return result;
-				};
-				return value;
-			} });
-			return createProxy(client);
-		};
-	};
-	amagiClient = new AmagiBase().amagi;
-	bilibiliFetcher = amagiClient.bilibili.fetcher;
-	douyinFetcher = amagiClient.douyin.fetcher;
-	kuaishouFetcher = amagiClient.kuaishou.fetcher;
-	amagiClient.xiaohongshu.fetcher;
 });
 var Base, statBotId$1, Count, uploadFile, downloadVideo, downloadFile, processFilename;
 var init_Base = __esmMin(() => {
@@ -7913,7 +8132,7 @@ var init_bilibili = __esmMin(async () => {
 		async createTables() {
 			for (const query of [
 				`CREATE TABLE IF NOT EXISTS Bots (\n        id TEXT PRIMARY KEY,\n        createdAt TEXT DEFAULT CURRENT_TIMESTAMP,\n        updatedAt TEXT DEFAULT CURRENT_TIMESTAMP\n      )`,
-				`CREATE TABLE IF NOT EXISTS Groups (\n        id TEXT PRIMARY KEY,\n        botId TEXT NOT NULL,\n        createdAt TEXT DEFAULT CURRENT_TIMESTAMP,\n        updatedAt TEXT DEFAULT CURRENT_TIMESTAMP,\n        FOREIGN KEY (botId) REFERENCES Bots(id)\n      )`,
+				`CREATE TABLE IF NOT EXISTS Groups (\n        id TEXT NOT NULL,\n        botId TEXT NOT NULL,\n        createdAt TEXT DEFAULT CURRENT_TIMESTAMP,\n        updatedAt TEXT DEFAULT CURRENT_TIMESTAMP,\n        PRIMARY KEY (id, botId),\n        FOREIGN KEY (botId) REFERENCES Bots(id)\n      )`,
 				`CREATE TABLE IF NOT EXISTS BilibiliUsers (\n        host_mid INTEGER PRIMARY KEY,\n        remark TEXT,\n        filterMode TEXT DEFAULT 'blacklist',\n        createdAt TEXT DEFAULT CURRENT_TIMESTAMP,\n        updatedAt TEXT DEFAULT CURRENT_TIMESTAMP\n      )`,
 				`CREATE TABLE IF NOT EXISTS GroupUserSubscriptions (\n        groupId TEXT,\n        host_mid INTEGER,\n        createdAt TEXT DEFAULT CURRENT_TIMESTAMP,\n        updatedAt TEXT DEFAULT CURRENT_TIMESTAMP,\n        PRIMARY KEY (groupId, host_mid),\n        FOREIGN KEY (groupId) REFERENCES Groups(id),\n        FOREIGN KEY (host_mid) REFERENCES BilibiliUsers(host_mid)\n      )`,
 				`CREATE TABLE IF NOT EXISTS DynamicCaches (\n        id INTEGER PRIMARY KEY AUTOINCREMENT,\n        dynamic_id TEXT NOT NULL,\n        host_mid INTEGER NOT NULL,\n        groupId TEXT NOT NULL,\n        dynamic_type TEXT,\n        createdAt TEXT DEFAULT CURRENT_TIMESTAMP,\n        updatedAt TEXT DEFAULT CURRENT_TIMESTAMP,\n        FOREIGN KEY (host_mid) REFERENCES BilibiliUsers(host_mid),\n        FOREIGN KEY (groupId) REFERENCES Groups(id),\n        UNIQUE(dynamic_id, host_mid, groupId)\n      )`,
@@ -8399,6 +8618,7 @@ var init_douyin = __esmMin(async () => {
 				await fs.promises.mkdir(path.dirname(this.dbPath), { recursive: true });
 				this.db = new sqlite3.Database(this.dbPath);
 				await this.createTables();
+				await this.migrate();
 				logger.debug("[DouyinDB] 数据库模型同步成功");
 				logger.debug("[DouyinDB] 正在同步配置订阅...");
 				logger.debug("[DouyinDB] 配置项数量:", Config.pushlist.douyin?.length || 0);
@@ -8411,15 +8631,33 @@ var init_douyin = __esmMin(async () => {
 			}
 			return this;
 		}
+		async migrate() {
+			try {
+				try {
+					await this.runQuery("SELECT pushType FROM AwemeCaches LIMIT 1");
+				} catch {
+					logger.info("[DouyinDB] 检测到 AwemeCaches 表缺少 pushType 字段，开始执行迁移...");
+					await this.runQuery("ALTER TABLE AwemeCaches ADD COLUMN pushType TEXT DEFAULT 'post'");
+					await this.runQuery("ALTER TABLE AwemeCaches RENAME TO AwemeCaches_old");
+					await this.runQuery(`\n          CREATE TABLE IF NOT EXISTS AwemeCaches (\n            id INTEGER PRIMARY KEY AUTOINCREMENT,\n            aweme_id TEXT NOT NULL,\n            sec_uid TEXT NOT NULL,\n            groupId TEXT NOT NULL,\n            pushType TEXT DEFAULT 'post',\n            createdAt TEXT DEFAULT CURRENT_TIMESTAMP,\n            updatedAt TEXT DEFAULT CURRENT_TIMESTAMP,\n            FOREIGN KEY (sec_uid) REFERENCES DouyinUsers(sec_uid),\n            FOREIGN KEY (groupId) REFERENCES Groups(id),\n            UNIQUE(aweme_id, sec_uid, groupId, pushType)\n          )\n        `);
+					await this.runQuery(`\n          INSERT INTO AwemeCaches (id, aweme_id, sec_uid, groupId, pushType, createdAt, updatedAt)\n          SELECT id, aweme_id, sec_uid, groupId, pushType, createdAt, updatedAt\n          FROM AwemeCaches_old\n        `);
+					await this.runQuery("DROP TABLE AwemeCaches_old");
+					logger.info("[DouyinDB] AwemeCaches 表迁移完成");
+				}
+			} catch (error) {
+				logger.error("[DouyinDB] 数据库迁移失败:", error);
+			}
+		}
 		async createTables() {
 			for (const query of [
 				`CREATE TABLE IF NOT EXISTS Bots (\n        id TEXT PRIMARY KEY,\n        createdAt TEXT DEFAULT CURRENT_TIMESTAMP,\n        updatedAt TEXT DEFAULT CURRENT_TIMESTAMP\n      )`,
-				`CREATE TABLE IF NOT EXISTS Groups (\n        id TEXT PRIMARY KEY,\n        botId TEXT NOT NULL,\n        createdAt TEXT DEFAULT CURRENT_TIMESTAMP,\n        updatedAt TEXT DEFAULT CURRENT_TIMESTAMP,\n        FOREIGN KEY (botId) REFERENCES Bots(id)\n      )`,
+				`CREATE TABLE IF NOT EXISTS Groups (\n        id TEXT NOT NULL,\n        botId TEXT NOT NULL,\n        createdAt TEXT DEFAULT CURRENT_TIMESTAMP,\n        updatedAt TEXT DEFAULT CURRENT_TIMESTAMP,\n        PRIMARY KEY (id, botId),\n        FOREIGN KEY (botId) REFERENCES Bots(id)\n      )`,
 				`CREATE TABLE IF NOT EXISTS DouyinUsers (\n        sec_uid TEXT PRIMARY KEY,\n        short_id TEXT,\n        remark TEXT,\n        living INTEGER DEFAULT 0,\n        filterMode TEXT DEFAULT 'blacklist',\n        createdAt TEXT DEFAULT CURRENT_TIMESTAMP,\n        updatedAt TEXT DEFAULT CURRENT_TIMESTAMP\n      )`,
 				`CREATE TABLE IF NOT EXISTS GroupUserSubscriptions (\n        groupId TEXT,\n        sec_uid TEXT,\n        createdAt TEXT DEFAULT CURRENT_TIMESTAMP,\n        updatedAt TEXT DEFAULT CURRENT_TIMESTAMP,\n        PRIMARY KEY (groupId, sec_uid),\n        FOREIGN KEY (groupId) REFERENCES Groups(id),\n        FOREIGN KEY (sec_uid) REFERENCES DouyinUsers(sec_uid)\n      )`,
-				`CREATE TABLE IF NOT EXISTS AwemeCaches (\n        id INTEGER PRIMARY KEY AUTOINCREMENT,\n        aweme_id TEXT NOT NULL,\n        sec_uid TEXT NOT NULL,\n        groupId TEXT NOT NULL,\n        createdAt TEXT DEFAULT CURRENT_TIMESTAMP,\n        updatedAt TEXT DEFAULT CURRENT_TIMESTAMP,\n        FOREIGN KEY (sec_uid) REFERENCES DouyinUsers(sec_uid),\n        FOREIGN KEY (groupId) REFERENCES Groups(id),\n        UNIQUE(aweme_id, sec_uid, groupId)\n      )`,
+				`CREATE TABLE IF NOT EXISTS AwemeCaches (\n        id INTEGER PRIMARY KEY AUTOINCREMENT,\n        aweme_id TEXT NOT NULL,\n        sec_uid TEXT NOT NULL,\n        groupId TEXT NOT NULL,\n        pushType TEXT DEFAULT 'post',\n        createdAt TEXT DEFAULT CURRENT_TIMESTAMP,\n        updatedAt TEXT DEFAULT CURRENT_TIMESTAMP,\n        FOREIGN KEY (sec_uid) REFERENCES DouyinUsers(sec_uid),\n        FOREIGN KEY (groupId) REFERENCES Groups(id),\n        UNIQUE(aweme_id, sec_uid, groupId, pushType)\n      )`,
 				`CREATE TABLE IF NOT EXISTS FilterWords (\n        id INTEGER PRIMARY KEY AUTOINCREMENT,\n        sec_uid TEXT NOT NULL,\n        word TEXT NOT NULL,\n        createdAt TEXT DEFAULT CURRENT_TIMESTAMP,\n        updatedAt TEXT DEFAULT CURRENT_TIMESTAMP,\n        FOREIGN KEY (sec_uid) REFERENCES DouyinUsers(sec_uid),\n        UNIQUE(sec_uid, word)\n      )`,
-				`CREATE TABLE IF NOT EXISTS FilterTags (\n        id INTEGER PRIMARY KEY AUTOINCREMENT,\n        sec_uid TEXT NOT NULL,\n        tag TEXT NOT NULL,\n        createdAt TEXT DEFAULT CURRENT_TIMESTAMP,\n        updatedAt TEXT DEFAULT CURRENT_TIMESTAMP,\n        FOREIGN KEY (sec_uid) REFERENCES DouyinUsers(sec_uid),\n        UNIQUE(sec_uid, tag)\n      )`
+				`CREATE TABLE IF NOT EXISTS FilterTags (\n        id INTEGER PRIMARY KEY AUTOINCREMENT,\n        sec_uid TEXT NOT NULL,\n        tag TEXT NOT NULL,\n        createdAt TEXT DEFAULT CURRENT_TIMESTAMP,\n        updatedAt TEXT DEFAULT CURRENT_TIMESTAMP,\n        FOREIGN KEY (sec_uid) REFERENCES DouyinUsers(sec_uid),\n        UNIQUE(sec_uid, tag)\n      )`,
+				`CREATE TABLE IF NOT EXISTS ListSnapshots (\n        id INTEGER PRIMARY KEY AUTOINCREMENT,\n        sec_uid TEXT NOT NULL,\n        pushType TEXT NOT NULL,\n        aweme_id TEXT NOT NULL,\n        createdAt TEXT DEFAULT CURRENT_TIMESTAMP,\n        updatedAt TEXT DEFAULT CURRENT_TIMESTAMP,\n        FOREIGN KEY (sec_uid) REFERENCES DouyinUsers(sec_uid),\n        UNIQUE(sec_uid, pushType, aweme_id)\n      )`
 			]) await this.runQuery(query);
 		}
 		runQuery(sql, params = []) {
@@ -8561,36 +8799,47 @@ var init_douyin = __esmMin(async () => {
 			await this.runQuery("DELETE FROM AwemeCaches WHERE groupId = ? AND sec_uid = ?", [groupId, sec_uid]);
 			return result.changes > 0;
 		}
-		async addAwemeCache(aweme_id, sec_uid, groupId) {
-			let cache = await this.getQuery("SELECT * FROM AwemeCaches WHERE aweme_id = ? AND sec_uid = ? AND groupId = ?", [
+		async addAwemeCache(aweme_id, sec_uid, groupId, pushType = "post") {
+			let cache = await this.getQuery("SELECT * FROM AwemeCaches WHERE aweme_id = ? AND sec_uid = ? AND groupId = ? AND pushType = ?", [
 				aweme_id,
 				sec_uid,
-				groupId
+				groupId,
+				pushType
 			]);
 			if (!cache) {
 				const now = (/* @__PURE__ */ new Date()).toISOString();
 				cache = {
-					id: (await this.runQuery("INSERT INTO AwemeCaches (aweme_id, sec_uid, groupId, createdAt, updatedAt) VALUES (?, ?, ?, ?, ?)", [
+					id: (await this.runQuery("INSERT INTO AwemeCaches (aweme_id, sec_uid, groupId, pushType, createdAt, updatedAt) VALUES (?, ?, ?, ?, ?, ?)", [
 						aweme_id,
 						sec_uid,
 						groupId,
+						pushType,
 						now,
 						now
 					])).lastID,
 					aweme_id,
 					sec_uid,
 					groupId,
+					pushType,
 					createdAt: now,
 					updatedAt: now
 				};
 			}
 			return cache;
 		}
-		async isAwemePushed(aweme_id, sec_uid, groupId) {
-			return ((await this.getQuery("SELECT COUNT(*) as count FROM AwemeCaches WHERE aweme_id = ? AND sec_uid = ? AND groupId = ?", [
+		async isAwemePushed(aweme_id, sec_uid, groupId, pushType = "post") {
+			return ((await this.getQuery("SELECT COUNT(*) as count FROM AwemeCaches WHERE aweme_id = ? AND sec_uid = ? AND groupId = ? AND pushType = ?", [
 				aweme_id,
 				sec_uid,
-				groupId
+				groupId,
+				pushType
+			]))?.count || 0) > 0;
+		}
+		async hasHistory(sec_uid, groupId, pushType) {
+			return ((await this.getQuery("SELECT COUNT(*) as count FROM AwemeCaches WHERE sec_uid = ? AND groupId = ? AND pushType = ? LIMIT 1", [
+				sec_uid,
+				groupId,
+				pushType
 			]))?.count || 0) > 0;
 		}
 		async getBotGroups(botId) {
@@ -8871,6 +9120,24 @@ var init_douyin = __esmMin(async () => {
 				}
 			};
 		}
+		async isAwemeInList(aweme_id, sec_uid, pushType) {
+			return ((await this.getQuery("SELECT COUNT(*) as count FROM ListSnapshots WHERE aweme_id = ? AND sec_uid = ? AND pushType = ?", [
+				aweme_id,
+				sec_uid,
+				pushType
+			]))?.count || 0) > 0;
+		}
+		async updateListSnapshot(sec_uid, pushType, aweme_ids) {
+			const now = (/* @__PURE__ */ new Date()).toISOString();
+			await this.runQuery("DELETE FROM ListSnapshots WHERE sec_uid = ? AND pushType = ?", [sec_uid, pushType]);
+			for (const aweme_id of aweme_ids) await this.runQuery("INSERT OR IGNORE INTO ListSnapshots (sec_uid, pushType, aweme_id, createdAt, updatedAt) VALUES (?, ?, ?, ?, ?)", [
+				sec_uid,
+				pushType,
+				aweme_id,
+				now,
+				now
+			]);
+		}
 	};
 });
 var db_exports = __export({
@@ -13564,7 +13831,7 @@ const webConfig = defineConfig({
 				children: [components.accordion.createItem("cfg:cookies", {
 					title: "Cookies 相关",
 					className: "ml-4 mr-4",
-					subtitle: "建议配置，否则大部分功能无法使用，此部分修改后需重启方可生效！",
+					subtitle: "建议配置，否则大部分功能无法使用",
 					children: [
 						components.input.string("douyin", {
 							label: "抖音",
@@ -13578,7 +13845,7 @@ const webConfig = defineConfig({
 						components.input.string("bilibili", {
 							label: "B站",
 							type: "text",
-							description: "请输入你的B站Cookies，不输入则无法使用B站相关功能噢",
+							description: "请输入你的B站Cookies，不输入部分功能将受限噢",
 							defaultValue: all.cookies.bilibili,
 							placeholder: "",
 							rules: void 0,
@@ -14058,6 +14325,38 @@ const webConfig = defineConfig({
 							isRequired: false,
 							description: "博主的抖音名称"
 						}),
+						components.divider.create("push:douyin:divider-pushTypes", {
+							description: "推送类型配置",
+							descPosition: 20
+						}),
+						components.checkbox.group("pushTypes", {
+							label: "推送类型",
+							description: "选择要推送的内容类型，可多选",
+							orientation: "horizontal",
+							color: "warning",
+							checkbox: [
+								components.checkbox.create("pushTypes:checkbox:post", {
+									label: "作品列表",
+									description: "推送博主发布的作品",
+									value: "post"
+								}),
+								components.checkbox.create("pushTypes:checkbox:favorite", {
+									label: "喜欢列表",
+									description: "推送博主喜欢的作品",
+									value: "favorite"
+								}),
+								components.checkbox.create("pushTypes:checkbox:recommend", {
+									label: "推荐列表",
+									description: "推送博主的推荐作品",
+									value: "recommend"
+								}),
+								components.checkbox.create("pushTypes:checkbox:live", {
+									label: "直播",
+									description: "推送博主开播通知",
+									value: "live"
+								})
+							]
+						}),
 						components.divider.create("push:douyin:divider-1", {
 							description: "过滤系统",
 							descPosition: 20
@@ -14197,16 +14496,26 @@ const webConfig = defineConfig({
 		cleanFlattenedFields(mergeCfg);
 		let success = false;
 		let isChange = false;
+		let needReloadAmagi = false;
 		for (const key of Object.keys(mergeCfg)) {
 			const configValue = mergeCfg[key];
 			if (configValue && typeof configValue === "object" && Object.keys(configValue).length > 0) {
 				isChange = deepEqual(configValue, oldAllCfg[key]);
 				if (isChange) {
-					if (await Config.ModifyPro(key, configValue)) success = true;
+					if (await Config.ModifyPro(key, configValue)) {
+						success = true;
+						if (key === "cookies" || key === "request") needReloadAmagi = true;
+					}
 				}
 			}
 		}
 		await Config.syncConfigToDatabase();
+		if (needReloadAmagi) try {
+			const { reloadAmagiConfig: reloadAmagiConfig$1 } = await Promise.resolve().then(() => (init_amagiClient(), amagiClient_exports));
+			reloadAmagiConfig$1();
+		} catch (error) {
+			logger.error(`[WebConfig] 重载 Amagi Client 失败: ${error}`);
+		}
 		return {
 			mergeCfg,
 			formatCfg,
@@ -16538,7 +16847,7 @@ const douyinComments = async (data$1, emojidata) => {
 		const replyCommentsList = [];
 		if (replyComment.data.comments && replyComment.data.comments.length > 0) for (const reply of replyComment.data.comments) {
 			const replyItem = reply;
-			const replyUserintextlongid = replyItem.text_extra && replyItem.text_extra[0] && replyItem.text_extra[0].sec_uid ? replyItem.text_extra.map((extra) => extra.sec_uid) : null;
+			const replyUserintextlongid = replyItem.text_extra && replyItem.text_extra[0] && replyItem.text_extra[0].sec_uid ? replyItem.text_extra.filter((extra) => extra.sec_uid).map((extra) => extra.sec_uid) : null;
 			const processedReplyText = await processAtUsers$1(replyItem.text, replyUserintextlongid);
 			const replyImageUrl = replyItem.image_list?.[0]?.origin_url?.url_list?.[0];
 			const replyStickerUrl = replyItem.sticker?.animate_url?.url_list?.[0];
@@ -16624,6 +16933,7 @@ var DouYin = class extends Base {
 	is_mp4;
 	is_slides;
 	forceBurnDanmaku;
+	hasProcessedLiveImage;
 	get botadapter() {
 		return this.e.bot?.adapter?.name;
 	}
@@ -16634,6 +16944,7 @@ var DouYin = class extends Base {
 		this.is_mp4 = iddata?.is_mp4;
 		this.is_slides = false;
 		this.forceBurnDanmaku = options?.forceBurnDanmaku ?? false;
+		this.hasProcessedLiveImage = false;
 	}
 	async DouyinHandler(data$1) {
 		if (Config.app.EmojiReply && !this.e.isPrivate) try {
@@ -16664,36 +16975,121 @@ var DouYin = class extends Base {
 						const imageres = [];
 						let image_url = "";
 						const images = VideoData.data.aweme_detail.images ?? [];
-						for (const [index, imageItem] of images.entries()) {
-							image_url = imageItem.url_list[2] || imageItem.url_list[1];
+						if (images.some((item) => item.clip_type !== 2)) {
+							const processedImages = [];
+							const temp = [];
 							g_title = VideoData.data.aweme_detail.preview_title.substring(0, 50).replace(/[\\/:*?"<>|\r\n]/g, " ");
-							imageres.push(segment.image(image_url));
-							imagenum++;
-							if (Config.app.removeCache === false) {
-								mkdirSync(`${Common.tempDri.images}${g_title}`);
-								const path$1 = `${Common.tempDri.images}${g_title}/${index + 1}.png`;
-								await new Network({
-									url: image_url,
-									type: "arraybuffer"
-								}).getData().then((data$2) => fs.promises.writeFile(path$1, Buffer.from(data$2)));
+							let mp3Path = "";
+							if (VideoData.data.aweme_detail.music.play_url.uri === "") mp3Path = JSON.parse(VideoData.data.aweme_detail.music.extra).original_song_url;
+							else mp3Path = VideoData.data.aweme_detail.music.play_url.uri;
+							const liveimgbgm = await downloadFile(mp3Path, {
+								title: `Douyin_tmp_A_${Date.now()}.mp3`,
+								headers: this.headers
+							});
+							temp.push(liveimgbgm);
+							const mergeMode = Config.douyin.liveImageMergeMode ?? "independent";
+							let bgmContext = null;
+							if (mergeMode === "continuous") bgmContext = await createLiveImageContext(liveimgbgm.filepath);
+							for (const [index, imageItem] of images.entries()) {
+								imagenum++;
+								if (imageItem.clip_type === 2) {
+									image_url = imageItem.url_list[2] || imageItem.url_list[1];
+									processedImages.push(segment.image(image_url));
+									if (Config.app.removeCache === false) {
+										mkdirSync(`${Common.tempDri.images}${g_title}`);
+										const path$1 = `${Common.tempDri.images}${g_title}/${index + 1}.png`;
+										await new Network({
+											url: image_url,
+											type: "arraybuffer"
+										}).getData().then((data$2) => fs.promises.writeFile(path$1, Buffer.from(data$2)));
+									}
+									continue;
+								}
+								const liveimg = await downloadFile(`https://aweme.snssdk.com/aweme/v1/play/?video_id=${imageItem.video.play_addr_h264.uri}&ratio=1080p&line=0`, {
+									title: `Douyin_tmp_V_${Date.now()}.mp4`,
+									headers: this.headers
+								});
+								if (liveimg.filepath) {
+									const outputPath = Common.tempDri.video + `Douyin_Result_${Date.now()}.mp4`;
+									let success;
+									const loopCount = imageItem.clip_type === 4 ? 1 : 3;
+									if (mergeMode === "continuous" && bgmContext) {
+										const result = await mergeLiveImageContinuous({
+											videoPath: liveimg.filepath,
+											outputPath,
+											loopCount
+										}, bgmContext);
+										success = result.success;
+										bgmContext = result.context;
+									} else success = await mergeLiveImageIndependent({
+										videoPath: liveimg.filepath,
+										outputPath,
+										loopCount
+									}, liveimgbgm.filepath);
+									if (success) {
+										const filePath = Common.tempDri.video + `tmp_${Date.now()}.mp4`;
+										fs.renameSync(outputPath, filePath);
+										logger.mark(`视频文件重命名完成: ${outputPath.split("/").pop()} -> ${filePath.split("/").pop()}`);
+										logger.mark("正在尝试删除缓存文件");
+										await Common.removeFile(liveimg.filepath, true);
+										temp.push({
+											filepath: filePath,
+											totalBytes: 0
+										});
+										processedImages.push(segment.video("file://" + filePath));
+										if (imageItem.clip_type === 5 && imageItem.url_list?.[0]) processedImages.push(segment.image(imageItem.url_list[0]));
+									} else await Common.removeFile(liveimg.filepath, true);
+								}
 							}
+							const Element = common.makeForward(processedImages, this.e.sender.userId, this.e.sender.nick);
+							try {
+								await this.e.bot.sendForwardMsg(this.e.contact, Element, {
+									source: "图集内容",
+									summary: `查看${Element.length}张图片/视频消息`,
+									prompt: "抖音图集解析结果",
+									news: [{ text: "点击查看解析结果" }]
+								});
+							} catch (error) {
+								await this.e.reply(JSON.stringify(error, null, 2));
+							} finally {
+								for (const item of temp) await Common.removeFile(item.filepath, true);
+							}
+							this.hasProcessedLiveImage = true;
+						} else {
+							for (const [index, imageItem] of images.entries()) {
+								image_url = imageItem.url_list[2] || imageItem.url_list[1];
+								g_title = VideoData.data.aweme_detail.preview_title.substring(0, 50).replace(/[\\/:*?"<>|\r\n]/g, " ");
+								imageres.push(segment.image(image_url));
+								imagenum++;
+								if (Config.app.removeCache === false) {
+									mkdirSync(`${Common.tempDri.images}${g_title}`);
+									const path$1 = `${Common.tempDri.images}${g_title}/${index + 1}.png`;
+									await new Network({
+										url: image_url,
+										type: "arraybuffer"
+									}).getData().then((data$2) => fs.promises.writeFile(path$1, Buffer.from(data$2)));
+								}
+							}
+							const res = common.makeForward(imageres, this.e.sender.userId, this.e.sender.nick);
+							image_data.push(res);
+							image_res.push(image_data);
+							if (imageres.length === 1) await this.e.reply(segment.image(image_url));
+							else await this.e.bot.sendForwardMsg(this.e.contact, res, {
+								source: "图片合集",
+								summary: `查看${res.length}张图片消息`,
+								prompt: "抖音图集解析结果",
+								news: [{ text: "点击查看解析结果" }]
+							});
 						}
-						const res = common.makeForward(imageres, this.e.sender.userId, this.e.sender.nick);
-						image_data.push(res);
-						image_res.push(image_data);
-						if (imageres.length === 1) await this.e.reply(segment.image(image_url));
-						else await this.e.bot.sendForwardMsg(this.e.contact, res, {
-							source: "图片合集",
-							summary: `查看${res.length}张图片消息`,
-							prompt: "抖音图集解析结果",
-							news: [{ text: "点击查看解析结果" }]
-						});
 						break;
 					}
 					case VideoData.data.aweme_detail.is_slides === true && VideoData.data.aweme_detail.images !== null: {
 						const images = [];
 						const temp = [];
-						const liveimgbgm = await downloadFile(VideoData.data.aweme_detail.music.play_url.uri, {
+						let mp3Path = "";
+						if (VideoData.data.aweme_detail.music.play_url.uri === "") mp3Path = JSON.parse(VideoData.data.aweme_detail.music.extra).original_song_url;
+						else mp3Path = VideoData.data.aweme_detail.music.play_url.uri;
+						const liveimgbgm = await downloadFile(mp3Path, {
 							title: `Douyin_tmp_A_${Date.now()}.mp3`,
 							headers: this.headers
 						});
@@ -16716,18 +17112,19 @@ var DouYin = class extends Base {
 							if (liveimg.filepath) {
 								const outputPath = Common.tempDri.video + `Douyin_Result_${Date.now()}.mp4`;
 								let success;
+								const loopCount = item.clip_type === 4 ? 1 : 3;
 								if (mergeMode === "continuous" && bgmContext) {
 									const result = await mergeLiveImageContinuous({
 										videoPath: liveimg.filepath,
 										outputPath,
-										loopCount: 3
+										loopCount
 									}, bgmContext);
 									success = result.success;
 									bgmContext = result.context;
 								} else success = await mergeLiveImageIndependent({
 									videoPath: liveimg.filepath,
 									outputPath,
-									loopCount: 3
+									loopCount
 								}, liveimgbgm.filepath);
 								if (success) {
 									const filePath = Common.tempDri.video + `tmp_${Date.now()}.mp4`;
@@ -16740,6 +17137,7 @@ var DouYin = class extends Base {
 										totalBytes: 0
 									});
 									images.push(segment.video("file://" + filePath));
+									if (item.clip_type === 5 && item.url_list?.[0]) images.push(segment.image(item.url_list[0]));
 								} else await Common.removeFile(liveimg.filepath, true);
 							}
 						}
@@ -16760,7 +17158,10 @@ var DouYin = class extends Base {
 					}
 				}
 				if (VideoData.data.aweme_detail.music) {
-					const music_url = VideoData.data.aweme_detail.music.play_url.uri;
+					const music = VideoData.data.aweme_detail.music;
+					let music_url = "";
+					if (music.play_url.uri === "") music_url = JSON.parse(music.extra).original_song_url;
+					else music_url = music.play_url.uri;
 					if (this.is_mp4 === false && Config.app.removeCache === false && music_url !== void 0) try {
 						const path$1 = Common.tempDri.images + `${g_title}/BGM.mp3`;
 						await new Network({
@@ -16770,7 +17171,7 @@ var DouYin = class extends Base {
 					} catch (error) {
 						console.log(error);
 					}
-					music_url && this.is_mp4 === false && music_url !== void 0 && await this.e.reply(segment.record(music_url, false));
+					music_url && this.is_mp4 === false && music_url !== void 0 && !this.hasProcessedLiveImage && await this.e.reply(segment.record(music_url, false));
 				}
 				let FPS;
 				let video = null;
@@ -17265,6 +17666,197 @@ const getDouyinID = async (event, url, log = true) => {
 	log && console.log(result);
 	return result;
 };
+await init_module();
+await init_amagiClient();
+async function processFavoriteList(contentList, sec_uid, userinfo, item, targets, force = false) {
+	const pushType = "favorite";
+	const listName = "喜欢列表";
+	const result = [];
+	const groupHistoryStatus = /* @__PURE__ */ new Map();
+	for (const target of targets) {
+		const hasHistory = await douyinDBInstance.hasHistory(sec_uid, target.groupId, pushType);
+		groupHistoryStatus.set(target.groupId, hasHistory);
+	}
+	for (const [index, aweme] of contentList.entries()) {
+		const validTargets = [];
+		for (const target of targets) if (!await douyinDBInstance.isAwemePushed(aweme.aweme_id, sec_uid, target.groupId, pushType)) {
+			const hasHistory = groupHistoryStatus.get(target.groupId);
+			if (force || hasHistory || index === 0) validTargets.push(target);
+			else {
+				await douyinDBInstance.addAwemeCache(aweme.aweme_id, sec_uid, target.groupId, pushType);
+				logger.debug(`新订阅群组 ${target.groupId} 跳过旧作品 ${aweme.aweme_id} 并已标记为已读`);
+			}
+		}
+		if (validTargets.length === 0) continue;
+		let authorUserInfo;
+		try {
+			if (aweme.author?.sec_uid) {
+				authorUserInfo = await douyinFetcher.fetchUserProfile({
+					sec_uid: aweme.author.sec_uid,
+					typeMode: "strict"
+				});
+				logger.debug(`获取作品作者 ${aweme.author.nickname} 的用户信息成功`);
+			}
+		} catch (error) {
+			logger.warn(`获取作品作者用户信息失败: ${error}`);
+		}
+		result.push({
+			remark: item.remark,
+			sec_uid,
+			create_time: aweme.create_time,
+			targets: validTargets,
+			pushType,
+			Detail_Data: {
+				...aweme,
+				user_info: userinfo,
+				author_user_info: authorUserInfo
+			},
+			avatar_img: "https://p3-pc.douyinpic.com/aweme/1080x1080/" + userinfo.data.user.avatar_larger.uri,
+			living: false
+		});
+		logger.debug(`发现新${listName}作品：${aweme.aweme_id}`);
+	}
+	await douyinDBInstance.updateListSnapshot(sec_uid, pushType, contentList.map((a) => a.aweme_id));
+	return result;
+}
+await init_module();
+async function processLiveStream(sec_uid, userinfo, item, targets, amagi) {
+	const pushType = "live";
+	const liveStatus = await douyinDBInstance.getLiveStatus(sec_uid);
+	if (userinfo.data.user.live_status === 1) {
+		const UserInfoData = await amagi.douyin.fetcher.fetchUserProfile({
+			sec_uid: userinfo.data.user.sec_uid,
+			typeMode: "strict"
+		});
+		if (!UserInfoData.data.user?.live_status || UserInfoData.data.user.live_status !== 1) {
+			logger.error((UserInfoData?.data?.user?.nickname ?? "用户") + "当前未在直播");
+			return null;
+		}
+		if (!UserInfoData.data.user.room_data) {
+			logger.error("未获取到直播间信息！");
+			return null;
+		}
+		const room_data = JSON.parse(UserInfoData.data.user.room_data);
+		const liveInfo = await amagi.douyin.fetcher.fetchLiveRoomInfo({
+			room_id: UserInfoData.data.user.room_id_str,
+			web_rid: room_data.owner.web_rid,
+			typeMode: "strict"
+		});
+		if (!liveStatus.living) {
+			await douyinDBInstance.updateLiveStatus(sec_uid, true);
+			logger.info(`用户 ${item.remark ?? sec_uid} 开播了`);
+			return {
+				remark: item.remark,
+				sec_uid,
+				create_time: Date.now(),
+				targets,
+				pushType,
+				Detail_Data: {
+					user_info: userinfo,
+					room_data: JSON.parse(userinfo.data.user.room_data),
+					live_data: liveInfo,
+					liveStatus: {
+						liveStatus: "open",
+						isChanged: true,
+						isliving: true
+					}
+				},
+				avatar_img: "https://p3-pc.douyinpic.com/aweme/1080x1080/" + userinfo.data.user.avatar_larger.uri,
+				living: true
+			};
+		}
+	} else if (liveStatus.living) {
+		await douyinDBInstance.updateLiveStatus(sec_uid, false);
+		logger.info(`用户 ${item.remark ?? sec_uid} 已关播，更新直播状态`);
+	}
+	return null;
+}
+await init_date_fns();
+await init_module();
+async function processPostList(contentList, sec_uid, userinfo, item, targets) {
+	const pushType = "post";
+	const listName = "作品列表";
+	const result = [];
+	for (const aweme of contentList) {
+		const nowSeconds = Math.floor(Date.now() / 1e3);
+		const createTime = aweme.create_time;
+		const timeDifference = nowSeconds - createTime;
+		const is_top = aweme.is_top === 1;
+		const timeDiffHours = Math.round(timeDifference / 3600 * 100) / 100;
+		logger.trace(`\n      前期获取该作品基本信息：\n      推送类型：${pushType}（${listName}）\n      作者：${aweme.author.nickname}\n      作品ID：${aweme.aweme_id}\n      发布时间：${format(fromUnixTime(aweme.create_time), "yyyy-MM-dd HH:mm")}\n      发布时间戳（s）：${createTime}\n      当前时间戳（s）：${nowSeconds}\n      时间差（s）：${timeDifference}s (${timeDiffHours}h)\n      是否置顶：${is_top}\n      是否在一天内：${timeDifference < 86400 ? logger.green("true") : logger.red("false")}\n      `);
+		if (is_top && timeDifference < 86400 || timeDifference < 86400 && !is_top) {
+			const validTargets = [];
+			for (const target of targets) if (!await douyinDBInstance.isAwemePushed(aweme.aweme_id, sec_uid, target.groupId, pushType)) validTargets.push(target);
+			if (validTargets.length > 0) result.push({
+				remark: item.remark,
+				sec_uid,
+				create_time: aweme.create_time,
+				targets: validTargets,
+				pushType,
+				Detail_Data: {
+					...aweme,
+					user_info: userinfo
+				},
+				avatar_img: "https://p3-pc.douyinpic.com/aweme/1080x1080/" + userinfo.data.user.avatar_larger.uri,
+				living: false
+			});
+		}
+	}
+	return result;
+}
+await init_module();
+await init_amagiClient();
+async function processRecommendList(contentList, sec_uid, userinfo, item, targets, force = false) {
+	const pushType = "recommend";
+	const listName = "推荐列表";
+	const result = [];
+	const groupHistoryStatus = /* @__PURE__ */ new Map();
+	for (const target of targets) {
+		const hasHistory = await douyinDBInstance.hasHistory(sec_uid, target.groupId, pushType);
+		groupHistoryStatus.set(target.groupId, hasHistory);
+	}
+	for (const [index, aweme] of contentList.entries()) {
+		const validTargets = [];
+		for (const target of targets) if (!await douyinDBInstance.isAwemePushed(aweme.aweme_id, sec_uid, target.groupId, pushType)) {
+			const hasHistory = groupHistoryStatus.get(target.groupId);
+			if (force || hasHistory || index === 0) validTargets.push(target);
+			else {
+				await douyinDBInstance.addAwemeCache(aweme.aweme_id, sec_uid, target.groupId, pushType);
+				logger.debug(`新订阅群组 ${target.groupId} 跳过旧作品 ${aweme.aweme_id} 并已标记为已读`);
+			}
+		}
+		if (validTargets.length === 0) continue;
+		let authorUserInfo;
+		try {
+			if (aweme.author?.sec_uid) {
+				authorUserInfo = await douyinFetcher.fetchUserProfile({
+					sec_uid: aweme.author.sec_uid,
+					typeMode: "strict"
+				});
+				logger.debug(`获取作品作者 ${aweme.author.nickname} 的用户信息成功`);
+			}
+		} catch (error) {
+			logger.warn(`获取作品作者用户信息失败: ${error}`);
+		}
+		result.push({
+			remark: item.remark,
+			sec_uid,
+			create_time: aweme.create_time,
+			targets: validTargets,
+			pushType,
+			Detail_Data: {
+				...aweme,
+				user_info: userinfo,
+				author_user_info: authorUserInfo
+			},
+			avatar_img: "https://p3-pc.douyinpic.com/aweme/1080x1080/" + userinfo.data.user.avatar_larger.uri,
+			living: false
+		});
+		logger.debug(`发现新${listName}作品：${aweme.aweme_id}`);
+	}
+	await douyinDBInstance.updateListSnapshot(sec_uid, pushType, contentList.map((a) => a.aweme_id));
+	return result;
+}
 await init_date_fns();
 await init_module();
 await init_Config();
@@ -17290,6 +17882,7 @@ var DouYinpush = class extends Base {
 		const deletedCount = await cleanOldDynamicCache("douyin");
 		if (deletedCount > 0) logger.info(`已清理 ${deletedCount} 条过期的抖音作品缓存记录`);
 		if (await this.checkremark()) return true;
+		this.ensureConfigFields(Config.pushlist.douyin);
 		const registeredBotIds = karin$1.getAllBotID();
 		const filteredPushList = this.filterPushListByRegisteredBots(Config.pushlist.douyin, registeredBotIds);
 		if (filteredPushList.length === 0) {
@@ -17301,6 +17894,30 @@ var DouYinpush = class extends Base {
 		if (this.force) return await this.forcepush(data$1);
 		else return await this.getdata(data$1);
 	}
+	ensureConfigFields(pushList) {
+		if (!pushList || pushList.length === 0) return;
+		let hasChanges = false;
+		for (const item of pushList) {
+			if (!item.pushTypes || item.pushTypes.length === 0) {
+				item.pushTypes = [
+					"post",
+					"live",
+					"favorite",
+					"recommend"
+				];
+				hasChanges = true;
+				logger.info(`为用户 ${item.remark ?? item.sec_uid} 自动补全推送类型：作品列表、直播、收藏、推荐`);
+			}
+			if (item.switch === void 0) {
+				item.switch = true;
+				hasChanges = true;
+			}
+		}
+		if (hasChanges) {
+			Config.Modify("pushlist", "douyin", pushList);
+			logger.info("已自动补全配置文件中缺失的字段并保存");
+		}
+	}
 	filterPushListByRegisteredBots(pushList, registeredBotIds) {
 		if (!pushList || pushList.length === 0) return [];
 		const registeredSet = new Set(registeredBotIds);
@@ -17327,18 +17944,20 @@ var DouYinpush = class extends Base {
 	async getdata(data$1) {
 		if (Object.keys(data$1).length === 0) return true;
 		for (const awemeId in data$1) {
-			logger.mark(`\n        ${logger.blue("开始处理并渲染抖音动态图片")}\n        ${logger.blue("博主")}: ${logger.green(data$1[awemeId].remark)} \n        ${logger.cyan("作品id")}：${logger.yellow(awemeId)}\n        ${logger.cyan("访问地址")}：${logger.green("https://www.douyin.com/video/" + awemeId)}`);
 			const pushItem = data$1[awemeId];
+			const actualAwemeId = awemeId.replace(/^(post|favorite|recommend|live)_/, "");
+			const pushTypeLabel = pushItem.pushType === "post" ? "作品列表" : pushItem.pushType === "favorite" ? "喜欢列表" : pushItem.pushType === "recommend" ? "推荐列表" : "直播";
+			logger.mark(`\n        ${logger.blue("开始处理并渲染抖音动态图片")}\n        ${logger.blue("博主")}: ${logger.green(pushItem.remark)} \n        ${logger.blue("推送类型")}: ${logger.magenta(pushTypeLabel)}\n        ${logger.cyan("作品id")}：${logger.yellow(actualAwemeId)}\n        ${logger.cyan("访问地址")}：${logger.green("https://www.douyin.com/video/" + actualAwemeId)}`);
 			const Detail_Data = pushItem.Detail_Data;
 			const skip = await skipDynamic(pushItem);
-			skip && logger.warn(`作品 https://www.douyin.com/video/${awemeId} 已被处理，跳过`);
+			skip && logger.warn(`作品 https://www.douyin.com/video/${actualAwemeId} 已被处理，跳过`);
 			let img$2 = [];
 			let iddata = {
 				is_mp4: true,
 				type: "one_work"
 			};
 			if (!skip) iddata = await getDouyinID(this.e, Detail_Data.share_url ?? "https://live.douyin.com/" + Detail_Data.room_data?.owner.web_rid, false);
-			if (!skip) if (pushItem.living && "room_data" in pushItem.Detail_Data && Detail_Data.live_data) img$2 = await Render("douyin/live", {
+			if (!skip) if (pushItem.pushType === "live" && "room_data" in pushItem.Detail_Data && Detail_Data.live_data) img$2 = await Render("douyin/live", {
 				image_url: Detail_Data.live_data.data.data.data[0]?.cover?.url_list[0] ?? Detail_Data.live_data.data.data.qrcode_url,
 				text: Detail_Data.live_data.data.data.data[0]?.title ?? "",
 				liveinf: `${Detail_Data.live_data.data.data.partition_road_map?.partition?.title ?? Detail_Data.live_data.data.data.data[0]?.title ?? "获取失败"} | 房间号: ${Detail_Data.room_data.owner.web_rid}`,
@@ -17360,7 +17979,45 @@ var DouYinpush = class extends Base {
 						Connection: "keep-alive"
 					}
 				}).getLocation();
-				img$2 = await Render("douyin/dynamic", {
+				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.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),
+						tuijian: this.count(Detail_Data.statistics.recommend_count),
+						create_time: format(fromUnixTime(pushItem.create_time), "yyyy-MM-dd HH:mm"),
+						liker_username: pushItem.remark,
+						liker_avatar: "https://p3-pc.douyinpic.com/aweme/1080x1080/" + Detail_Data.user_info.data.user.avatar_larger.uri,
+						liker_douyin_id: Detail_Data.user_info.data.user.unique_id === "" ? Detail_Data.user_info.data.user.short_id : Detail_Data.user_info.data.user.unique_id,
+						author_username: Detail_Data.author.nickname,
+						author_avatar: "https://p3-pc.douyinpic.com/aweme/1080x1080/" + authorUserInfo.data.user.avatar_larger.uri,
+						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 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.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),
+						tuijian: this.count(Detail_Data.statistics.recommend_count),
+						create_time: format(fromUnixTime(pushItem.create_time), "yyyy-MM-dd HH:mm"),
+						recommender_username: pushItem.remark,
+						recommender_avatar: "https://p3-pc.douyinpic.com/aweme/1080x1080/" + Detail_Data.user_info.data.user.avatar_larger.uri,
+						recommender_douyin_id: Detail_Data.user_info.data.user.unique_id === "" ? Detail_Data.user_info.data.user.short_id : Detail_Data.user_info.data.user.unique_id,
+						author_username: Detail_Data.author.nickname,
+						author_avatar: "https://p3-pc.douyinpic.com/aweme/1080x1080/" + authorUserInfo.data.user.avatar_larger.uri,
+						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),
@@ -17375,6 +18032,7 @@ var DouYinpush = class extends Base {
 					"粉丝": 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;
@@ -17405,7 +18063,7 @@ var DouYinpush = class extends Base {
 				if (!skip) {
 					const Contact = karin$1.contactGroup(groupId);
 					status = await karin$1.sendMsg(botId, Contact, img$2 ? [...img$2] : []);
-					if (pushItem.living && "room_data" in pushItem.Detail_Data && status.message_id) await douyinDBInstance.updateLiveStatus(pushItem.sec_uid, true);
+					if (pushItem.pushType === "live" && "room_data" in pushItem.Detail_Data && status.message_id) await douyinDBInstance.updateLiveStatus(pushItem.sec_uid, true);
 					if (Config.douyin.push.parsedynamic && status.message_id) {
 						logger.debug(`开始解析作品，类型为：${iddata.is_mp4 ? "视频" : "图集"}`);
 						if (iddata.is_mp4) try {
@@ -17434,19 +18092,186 @@ var DouYinpush = class extends Base {
 							throw new Error(`下载视频失败: ${error}`);
 						}
 						else if (!iddata.is_mp4 && iddata.type === "one_work") {
-							const imageres = [];
-							let image_url;
-							for (const item of Detail_Data.images) {
-								image_url = item.url_list[2] ?? item.url_list[1];
-								imageres.push(segment.image(image_url));
+							if (Detail_Data.is_slides === true && Detail_Data.images) {
+								const images = [];
+								const temp = [];
+								let mp3Path = "";
+								if (Detail_Data.music.play_url.uri === "") mp3Path = JSON.parse(Detail_Data.music.extra).original_song_url;
+								else mp3Path = Detail_Data.music.play_url.uri;
+								const liveimgbgm = await downloadFile(mp3Path, {
+									title: `Douyin_tmp_A_${Date.now()}.mp3`,
+									headers: douyinBaseHeaders
+								});
+								temp.push(liveimgbgm);
+								const images1 = Detail_Data.images ?? [];
+								if (!images1.length) logger.debug("未获取到合辑的图片数据");
+								const mergeMode = Config.douyin.liveImageMergeMode ?? "independent";
+								let bgmContext = null;
+								if (mergeMode === "continuous") {
+									const { createLiveImageContext: createLiveImageContext$1 } = await init_utils$1().then(() => utils_exports);
+									bgmContext = await createLiveImageContext$1(liveimgbgm.filepath);
+								}
+								for (const item of images1) {
+									if (item.clip_type === 2) {
+										images.push(segment.image(item.url_list[0]));
+										continue;
+									}
+									const liveimg = await downloadFile(`https://aweme.snssdk.com/aweme/v1/play/?video_id=${item.video.play_addr_h264.uri}&ratio=1080p&line=0`, {
+										title: `Douyin_tmp_V_${Date.now()}.mp4`,
+										headers: douyinBaseHeaders
+									});
+									if (liveimg.filepath) {
+										const { Common: Common$1, mergeLiveImageContinuous: mergeLiveImageContinuous$1, mergeLiveImageIndependent: mergeLiveImageIndependent$1 } = await init_utils$1().then(() => utils_exports);
+										const outputPath = Common$1.tempDri.video + `Douyin_Result_${Date.now()}.mp4`;
+										let success;
+										const loopCount = item.clip_type === 4 ? 1 : 3;
+										if (mergeMode === "continuous" && bgmContext) {
+											const result = await mergeLiveImageContinuous$1({
+												videoPath: liveimg.filepath,
+												outputPath,
+												loopCount
+											}, bgmContext);
+											success = result.success;
+											bgmContext = result.context;
+										} else success = await mergeLiveImageIndependent$1({
+											videoPath: liveimg.filepath,
+											outputPath,
+											loopCount
+										}, liveimgbgm.filepath);
+										if (success) {
+											const fs$1 = await import("node:fs");
+											const filePath = Common$1.tempDri.video + `tmp_${Date.now()}.mp4`;
+											fs$1.default.renameSync(outputPath, filePath);
+											logger.mark(`视频文件重命名完成: ${outputPath.split("/").pop()} -> ${filePath.split("/").pop()}`);
+											logger.mark("正在尝试删除缓存文件");
+											await Common$1.removeFile(liveimg.filepath, true);
+											temp.push({
+												filepath: filePath,
+												totalBytes: 0
+											});
+											images.push(segment.video("file://" + filePath));
+											if (item.clip_type === 5 && item.url_list?.[0]) images.push(segment.image(item.url_list[0]));
+										} else await Common$1.removeFile(liveimg.filepath, true);
+									}
+								}
+								const bot = karin$1.getBot(botId);
+								const Element = common.makeForward(images, botId, bot.account.name);
+								try {
+									await bot.sendForwardMsg(Contact, Element, {
+										source: "合辑内容",
+										summary: `查看${Element.length}张图片/视频消息`,
+										prompt: "抖音合辑解析结果",
+										news: [{ text: "点击查看解析结果" }]
+									});
+								} catch (error) {
+									logger.error(`发送合辑失败: ${error}`);
+								} finally {
+									for (const item of temp) {
+										const { Common: Common$1 } = await init_utils$1().then(() => utils_exports);
+										await Common$1.removeFile(item.filepath, true);
+									}
+								}
+							} else if (Detail_Data.images) if (Detail_Data.images.some((item) => item.clip_type !== 2)) {
+								const processedImages = [];
+								const temp = [];
+								let mp3Path = "";
+								if (Detail_Data.music.play_url.uri === "") mp3Path = JSON.parse(Detail_Data.music.extra).original_song_url;
+								else mp3Path = Detail_Data.music.play_url.uri;
+								const liveimgbgm = await downloadFile(mp3Path, {
+									title: `Douyin_tmp_A_${Date.now()}.mp3`,
+									headers: douyinBaseHeaders
+								});
+								temp.push(liveimgbgm);
+								const mergeMode = Config.douyin.liveImageMergeMode ?? "independent";
+								let bgmContext = null;
+								if (mergeMode === "continuous") {
+									const { createLiveImageContext: createLiveImageContext$1 } = await init_utils$1().then(() => utils_exports);
+									bgmContext = await createLiveImageContext$1(liveimgbgm.filepath);
+								}
+								for (const item of Detail_Data.images) {
+									if (item.clip_type === 2) {
+										const image_url = item.url_list[2] ?? item.url_list[1];
+										processedImages.push(segment.image(image_url));
+										continue;
+									}
+									const liveimg = await downloadFile(`https://aweme.snssdk.com/aweme/v1/play/?video_id=${item.video.play_addr_h264.uri}&ratio=1080p&line=0`, {
+										title: `Douyin_tmp_V_${Date.now()}.mp4`,
+										headers: douyinBaseHeaders
+									});
+									if (liveimg.filepath) {
+										const { Common: Common$1, mergeLiveImageContinuous: mergeLiveImageContinuous$1, mergeLiveImageIndependent: mergeLiveImageIndependent$1 } = await init_utils$1().then(() => utils_exports);
+										const outputPath = Common$1.tempDri.video + `Douyin_Result_${Date.now()}.mp4`;
+										let success;
+										const loopCount = item.clip_type === 4 ? 1 : 3;
+										if (mergeMode === "continuous" && bgmContext) {
+											const result = await mergeLiveImageContinuous$1({
+												videoPath: liveimg.filepath,
+												outputPath,
+												loopCount
+											}, bgmContext);
+											success = result.success;
+											bgmContext = result.context;
+										} else success = await mergeLiveImageIndependent$1({
+											videoPath: liveimg.filepath,
+											outputPath,
+											loopCount
+										}, liveimgbgm.filepath);
+										if (success) {
+											const fs$1 = await import("node:fs");
+											const filePath = Common$1.tempDri.video + `tmp_${Date.now()}.mp4`;
+											fs$1.default.renameSync(outputPath, filePath);
+											logger.mark(`视频文件重命名完成: ${outputPath.split("/").pop()} -> ${filePath.split("/").pop()}`);
+											logger.mark("正在尝试删除缓存文件");
+											await Common$1.removeFile(liveimg.filepath, true);
+											temp.push({
+												filepath: filePath,
+												totalBytes: 0
+											});
+											processedImages.push(segment.video("file://" + filePath));
+											if (item.clip_type === 5 && item.url_list?.[0]) processedImages.push(segment.image(item.url_list[0]));
+										} else await Common$1.removeFile(liveimg.filepath, true);
+									}
+								}
+								const bot = karin$1.getBot(botId);
+								const Element = common.makeForward(processedImages, botId, bot.account.name);
+								try {
+									await bot.sendForwardMsg(Contact, Element, {
+										source: "图集内容",
+										summary: `查看${Element.length}张图片/视频消息`,
+										prompt: "抖音图集解析结果",
+										news: [{ text: "点击查看解析结果" }]
+									});
+								} catch (error) {
+									logger.error(`发送图集失败: ${error}`);
+								} finally {
+									for (const item of temp) {
+										const { Common: Common$1 } = await init_utils$1().then(() => utils_exports);
+										await Common$1.removeFile(item.filepath, true);
+									}
+								}
+							} else {
+								const imageres = [];
+								let image_url;
+								for (const item of Detail_Data.images) {
+									image_url = item.url_list[2] ?? item.url_list[1];
+									imageres.push(segment.image(image_url));
+								}
+								const bot = karin$1.getBot(botId);
+								if (imageres.length === 1) await bot.sendMsg(Contact, [segment.image(image_url)]);
+								else {
+									const forwardMsg = common.makeForward(imageres, botId, bot.account.name);
+									await bot.sendForwardMsg(Contact, forwardMsg, {
+										source: "图片合集",
+										summary: `查看${forwardMsg.length}张图片消息`,
+										prompt: "抖音图集解析结果",
+										news: [{ text: "点击查看解析结果" }]
+									});
+								}
 							}
-							const bot = karin$1.getBot(botId);
-							const forwardMsg = common.makeForward(imageres, botId, bot.account.name);
-							await bot.sendForwardMsg(Contact, forwardMsg);
 						}
 					}
 				}
-				if (skip || !pushItem.living && status.message_id) await douyinDBInstance.addAwemeCache(awemeId, pushItem.sec_uid, groupId);
+				if (skip || pushItem.pushType !== "live" && status.message_id) await douyinDBInstance.addAwemeCache(actualAwemeId, pushItem.sec_uid, groupId, pushItem.pushType);
 			} catch (error) {
 				throw new Error(`${error}`);
 			}
@@ -17460,11 +18285,8 @@ var DouYinpush = class extends Base {
 			for (const item of filteredUserList) {
 				await common.sleep(2e3);
 				const sec_uid = item.sec_uid;
-				logger.debug(`开始获取用户：${item.remark}（${sec_uid}）的主页作品列表`);
-				const videolist = await this.amagi.douyin.fetcher.fetchUserVideoList({
-					sec_uid,
-					typeMode: "strict"
-				});
+				const pushTypes = item.pushTypes || ["post"];
+				logger.debug(`开始获取用户：${item.remark}（${sec_uid}）的内容，推送类型：${pushTypes.join(", ")}`);
 				const userinfo = await this.amagi.douyin.fetcher.fetchUserProfile({
 					sec_uid,
 					typeMode: "strict"
@@ -17481,74 +18303,73 @@ var DouYinpush = class extends Base {
 					logger.warn(`${item.remark}（${sec_uid}）${userinfo.data.user.special_state_info.title}`);
 					continue;
 				}
-				if (videolist.data.aweme_list.length > 0) for (const aweme of videolist.data.aweme_list) {
-					const nowSeconds = Math.floor(Date.now() / 1e3);
-					const createTime = aweme.create_time;
-					const timeDifference = nowSeconds - createTime;
-					const is_top = aweme.is_top === 1;
-					let shouldPush = false;
-					const timeDiffHours = Math.round(timeDifference / 3600 * 100) / 100;
-					logger.trace(`\n              前期获取该作品基本信息：\n              作者：${aweme.author.nickname}\n              作品ID：${aweme.aweme_id}\n              发布时间：${format(fromUnixTime(aweme.create_time), "yyyy-MM-dd HH:mm")}\n              发布时间戳（s）：${createTime}\n              当前时间戳（s）：${nowSeconds}\n              时间差（s）：${timeDifference}s (${timeDiffHours}h)\n              是否置顶：${is_top}\n              是否处于开播：${userinfo.data.user?.live_status === 1 ? logger.green("true") : logger.red("false")}\n              是否在一天内：${timeDifference < 86400 ? logger.green("true") : logger.red("false")}\n              `);
-					if (is_top && timeDifference < 86400 || timeDifference < 86400 && !is_top) {
-						if (!await this.checkIfAlreadyPushed(aweme.aweme_id, sec_uid, targets.map((t) => t.groupId))) shouldPush = true;
+				for (const pushType of pushTypes) {
+					await common.sleep(1e3);
+					if (pushType === "live") {
+						const liveItem = await processLiveStream(sec_uid, userinfo, item, targets, this.amagi);
+						if (liveItem) willbepushlist[`live_${sec_uid}`] = liveItem;
+						continue;
+					}
+					let contentList = [];
+					let listName = "";
+					switch (pushType) {
+						case "post":
+							listName = "作品列表";
+							contentList = (await this.amagi.douyin.fetcher.fetchUserVideoList({
+								sec_uid,
+								number: 5,
+								typeMode: "strict"
+							})).data.aweme_list || [];
+							break;
+						case "favorite":
+							listName = "喜欢列表";
+							const favoritelist = await this.amagi.douyin.fetcher.fetchUserFavoriteList({
+								sec_uid,
+								number: 5,
+								typeMode: "strict"
+							});
+							if (favoritelist.data.aweme_list.length === 0) logger.warn(`${item.remark}(${item.short_id}) 获取到的喜欢列表数量为零！此博主可能未公开他/她的喜欢列表`);
+							contentList = favoritelist.data.aweme_list || [];
+							break;
+						case "recommend":
+							listName = "推荐列表";
+							const recommendlist = await this.amagi.douyin.fetcher.fetchUserRecommendList({
+								sec_uid,
+								number: 5,
+								typeMode: "strict"
+							});
+							if (recommendlist.data.aweme_list.length === 0) logger.warn(`${item.remark}(${item.short_id}) 获取到的推荐列表数量为零！此博主可能未公开他/她的推荐列表`);
+							contentList = recommendlist.data.aweme_list || [];
+							break;
+					}
+					logger.debug(`获取到 ${item.remark} 的${listName}，共 ${contentList.length} 条`);
+					if (contentList.length > 0) {
+						let pushItems = [];
+						switch (pushType) {
+							case "post":
+								pushItems = await processPostList(contentList, sec_uid, userinfo, item, targets);
+								break;
+							case "favorite":
+								pushItems = await processFavoriteList(contentList, sec_uid, userinfo, item, targets, this.force);
+								break;
+							case "recommend":
+								pushItems = await processRecommendList(contentList, sec_uid, userinfo, item, targets, this.force);
+								break;
+						}
+						for (const pushItem of pushItems) {
+							const key = `${pushType}_${pushItem.Detail_Data.aweme_id}`;
+							willbepushlist[key] = pushItem;
+						}
 					}
-					if (shouldPush) willbepushlist[aweme.aweme_id] = {
-						remark: item.remark,
-						sec_uid,
-						create_time: aweme.create_time,
-						targets,
-						Detail_Data: {
-							...aweme,
-							user_info: userinfo
-						},
-						avatar_img: "https://p3-pc.douyinpic.com/aweme/1080x1080/" + userinfo.data.user.avatar_larger.uri,
-						living: false
-					};
-				}
-				const liveStatus = await douyinDBInstance.getLiveStatus(sec_uid);
-				if (userinfo.data.user.live_status === 1) {
-					const UserInfoData = await this.amagi.douyin.fetcher.fetchUserProfile({
-						sec_uid: userinfo.data.user.sec_uid,
-						typeMode: "strict"
-					});
-					if (!UserInfoData.data.user?.live_status || UserInfoData.data.user.live_status !== 1) logger.error((UserInfoData?.data?.user?.nickname ?? "用户") + "当前未在直播");
-					if (!UserInfoData.data.user.room_data) logger.error("未获取到直播间信息！");
-					const room_data = JSON.parse(UserInfoData.data.user.room_data);
-					const liveInfo = await this.amagi.douyin.fetcher.fetchLiveRoomInfo({
-						room_id: UserInfoData.data.user.room_id_str,
-						web_rid: room_data.owner.web_rid,
-						typeMode: "strict"
-					});
-					if (!liveStatus.living) willbepushlist[`live_${sec_uid}`] = {
-						remark: item.remark,
-						sec_uid,
-						create_time: Date.now(),
-						targets,
-						Detail_Data: {
-							user_info: userinfo,
-							room_data: JSON.parse(userinfo.data.user.room_data),
-							live_data: liveInfo,
-							liveStatus: {
-								liveStatus: "open",
-								isChanged: true,
-								isliving: true
-							}
-						},
-						avatar_img: "https://p3-pc.douyinpic.com/aweme/1080x1080/" + userinfo.data.user.avatar_larger.uri,
-						living: true
-					};
-				} else if (liveStatus.living) {
-					await douyinDBInstance.updateLiveStatus(sec_uid, false);
-					logger.info(`用户 ${item.remark ?? sec_uid} 已关播，更新直播状态`);
 				}
 			}
 		} catch (error) {
-			throw new Error(`获取抖音用户主页作品列表失败: ${error}`);
+			throw new Error(`获取抖音用户内容列表失败: ${error}`);
 		}
 		return willbepushlist;
 	}
-	async checkIfAlreadyPushed(aweme_id, sec_uid, groupIds) {
-		for (const groupId of groupIds) if (!await douyinDBInstance.isAwemePushed(aweme_id, sec_uid, groupId)) return false;
+	async checkIfAlreadyPushed(aweme_id, sec_uid, groupIds, pushType = "post") {
+		for (const groupId of groupIds) if (!await douyinDBInstance.isAwemePushed(aweme_id, sec_uid, groupId, pushType)) return false;
 		return true;
 	}
 	async setting(data$1) {
@@ -17593,6 +18414,7 @@ var DouYinpush = class extends Base {
 					}
 				} else {
 					existingItem.group_id.push(`${groupId}:${botId}`);
+					if (!existingItem.pushTypes || existingItem.pushTypes.length === 0) existingItem.pushTypes = ["post", "live"];
 					if (!isSubscribed) await douyinDBInstance.subscribeDouyinUser(groupId, botId, sec_uid, user_shortid, UserInfoData.data.user.nickname);
 					await this.e.reply(`群：${groupInfo.groupName}(${groupId})\n添加成功！${UserInfoData.data.user.nickname}\n抖音号：${user_shortid}`);
 					if (Config.douyin.push.switch === false) await this.e.reply("请发送「#设置抖音推送开启」以进行推送");
@@ -17604,7 +18426,8 @@ var DouYinpush = class extends Base {
 					sec_uid,
 					group_id: [`${groupId}:${botId}`],
 					remark: UserInfoData.data.user.nickname,
-					short_id: user_shortid
+					short_id: user_shortid,
+					pushTypes: ["post", "live"]
 				});
 				if (!isSubscribed) await douyinDBInstance.subscribeDouyinUser(groupId, botId, sec_uid, user_shortid, UserInfoData.data.user.nickname);
 				await this.e.reply(`群：${groupInfo.groupName}(${groupId})\n添加成功！${UserInfoData.data.user.nickname}\n抖音号：${user_shortid}`);
@@ -17632,7 +18455,9 @@ var DouYinpush = class extends Base {
 				sec_uid,
 				typeMode: "strict"
 			});
-			const switchStatus = (Config.pushlist.douyin?.find((item) => item.sec_uid === sec_uid))?.switch !== false;
+			const configItem = Config.pushlist.douyin?.find((item) => item.sec_uid === sec_uid);
+			const switchStatus = configItem?.switch !== false;
+			const pushTypes = configItem?.pushTypes || ["post"];
 			renderOpt.push({
 				avatar_img: userInfo.data.user.avatar_larger.url_list[0],
 				username: userInfo.data.user.nickname,
@@ -17640,7 +18465,8 @@ var DouYinpush = class extends Base {
 				fans: this.count(userInfo.data.user.follower_count),
 				total_favorited: this.count(userInfo.data.user.total_favorited),
 				following_count: this.count(userInfo.data.user.following_count),
-				switch: switchStatus
+				switch: switchStatus,
+				pushTypes
 			});
 		}
 		const img$2 = await Render("douyin/userlist", {