@bilibili-notify/dynamic 0.0.1-alpha.0 → 0.0.1-alpha.1

package/lib/index.cjs

@@ -471,16 +471,20 @@ var DynamicEngine = class {
 					text: aiComment ?? `${name}发布了一条动态${dUrl ? `：${dUrl}` : ""}`
 				}];
 				await this.push.broadcastDynamic(uid, segments, "dynamic");
-				if (this.config.pushImgsInDynamic && item.type === "DYNAMIC_TYPE_DRAW") {
+				const subForImgs = this.dynamicSubManager.get(uid);
+				if ((subForImgs?.imageGroupEnable ?? this.config.imageGroup.enable) && item.type === "DYNAMIC_TYPE_DRAW") {
 					const major = item.modules?.module_dynamic?.major;
 					const urls = [];
 					for (const it of major?.draw?.items ?? []) if (it.src) urls.push(it.src);
 					for (const pic of major?.opus?.pics ?? []) if (pic.url) urls.push(pic.url);
-					if (urls.length) await this.push.broadcastDynamic(uid, [{
-						type: "image-group",
-						forward: true,
-						urls
-					}], "dynamic-images");
+					if (urls.length) {
+						const forward = (subForImgs?.imageGroupForward ?? this.config.imageGroup.forward) && urls.length > 1;
+						await this.push.broadcastDynamic(uid, [{
+							type: "image-group",
+							forward,
+							urls
+						}], "dynamic-images");
+					}
 				}
 				markOk(uid, postTime);
 			} catch (e) {

package/lib/index.d.cts

@@ -164,6 +164,16 @@ interface SubItemView {
   };
   /** Per-UP AI 覆盖；undefined 时使用 CommentaryGenerator 的全局 config。 */
   aiOverride?: CommentaryCallOverride;
+  /**
+   * Per-UP 是否推送动态图集图片;undefined 继承 engine config `imageGroup.enable`。
+   * Adapter 折叠 `Subscription.overrides.imageGroup.enable` 后填入。
+   */
+  imageGroupEnable?: boolean;
+  /**
+   * Per-UP 图集合并转发开关;undefined 继承 engine config `imageGroup.forward`。
+   * 单图永远不走合并转发(在 engine 内已守卫)。
+   */
+  imageGroupForward?: boolean;
 }
 type SubscriptionsView = Record<string, SubItemView>;
 type SubManagerView = Map<string, SubItemView>;
@@ -202,8 +212,16 @@ interface DynamicEngineConfig {
   dynamicCron: string;
   /** 视频动态时是否将 URL 替换为 BV 号。 */
   dynamicVideoUrlToBV: boolean;
-  /** 是否额外推送 DYNAMIC_TYPE_DRAW 中的图集（forward message）。 */
-  pushImgsInDynamic: boolean;
+  /**
+   * DYNAMIC_TYPE_DRAW 图集图片推送行为。enable=false 时跳过图集广播,
+   * 只发文本/卡片。forward=true 时走合并转发(聊天记录卡片,走 OneBot
+   * send_group_forward_msg,部分 OneBot 实现/NapCat 长消息通道不稳);
+   * forward=false 多图合并到一条普通 send_group_msg。单图永远不走合并转发。
+   */
+  imageGroup: {
+    enable: boolean;
+    forward: boolean;
+  };
   /** 内容过滤配置（含 notify：被屏蔽时是否通知）。 */
   filter: DynamicFilterConfig & {
     notify?: boolean;

package/lib/index.d.mts

@@ -164,6 +164,16 @@ interface SubItemView {
   };
   /** Per-UP AI 覆盖；undefined 时使用 CommentaryGenerator 的全局 config。 */
   aiOverride?: CommentaryCallOverride;
+  /**
+   * Per-UP 是否推送动态图集图片;undefined 继承 engine config `imageGroup.enable`。
+   * Adapter 折叠 `Subscription.overrides.imageGroup.enable` 后填入。
+   */
+  imageGroupEnable?: boolean;
+  /**
+   * Per-UP 图集合并转发开关;undefined 继承 engine config `imageGroup.forward`。
+   * 单图永远不走合并转发(在 engine 内已守卫)。
+   */
+  imageGroupForward?: boolean;
 }
 type SubscriptionsView = Record<string, SubItemView>;
 type SubManagerView = Map<string, SubItemView>;
@@ -202,8 +212,16 @@ interface DynamicEngineConfig {
   dynamicCron: string;
   /** 视频动态时是否将 URL 替换为 BV 号。 */
   dynamicVideoUrlToBV: boolean;
-  /** 是否额外推送 DYNAMIC_TYPE_DRAW 中的图集（forward message）。 */
-  pushImgsInDynamic: boolean;
+  /**
+   * DYNAMIC_TYPE_DRAW 图集图片推送行为。enable=false 时跳过图集广播,
+   * 只发文本/卡片。forward=true 时走合并转发(聊天记录卡片,走 OneBot
+   * send_group_forward_msg,部分 OneBot 实现/NapCat 长消息通道不稳);
+   * forward=false 多图合并到一条普通 send_group_msg。单图永远不走合并转发。
+   */
+  imageGroup: {
+    enable: boolean;
+    forward: boolean;
+  };
   /** 内容过滤配置（含 notify：被屏蔽时是否通知）。 */
   filter: DynamicFilterConfig & {
     notify?: boolean;

package/lib/index.mjs

@@ -470,16 +470,20 @@ var DynamicEngine = class {
 					text: aiComment ?? `${name}发布了一条动态${dUrl ? `：${dUrl}` : ""}`
 				}];
 				await this.push.broadcastDynamic(uid, segments, "dynamic");
-				if (this.config.pushImgsInDynamic && item.type === "DYNAMIC_TYPE_DRAW") {
+				const subForImgs = this.dynamicSubManager.get(uid);
+				if ((subForImgs?.imageGroupEnable ?? this.config.imageGroup.enable) && item.type === "DYNAMIC_TYPE_DRAW") {
 					const major = item.modules?.module_dynamic?.major;
 					const urls = [];
 					for (const it of major?.draw?.items ?? []) if (it.src) urls.push(it.src);
 					for (const pic of major?.opus?.pics ?? []) if (pic.url) urls.push(pic.url);
-					if (urls.length) await this.push.broadcastDynamic(uid, [{
-						type: "image-group",
-						forward: true,
-						urls
-					}], "dynamic-images");
+					if (urls.length) {
+						const forward = (subForImgs?.imageGroupForward ?? this.config.imageGroup.forward) && urls.length > 1;
+						await this.push.broadcastDynamic(uid, [{
+							type: "image-group",
+							forward,
+							urls
+						}], "dynamic-images");
+					}
 				}
 				markOk(uid, postTime);
 			} catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bilibili-notify/dynamic",
-  "version": "0.0.1-alpha.0",
+  "version": "0.0.1-alpha.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/Akokk0/bilibili-notify"
@@ -29,9 +29,9 @@
     "cron": "^3.1.7",
     "luxon": "^3.5.0",
     "@bilibili-notify/ai": "^0.0.1-alpha.0",
-    "@bilibili-notify/api": "^0.2.0-alpha.0",
-    "@bilibili-notify/internal": "^0.1.0-alpha.0",
-    "@bilibili-notify/image": "^0.0.1-alpha.0"
+    "@bilibili-notify/api": "^0.2.0-alpha.1",
+    "@bilibili-notify/internal": "^0.1.0-alpha.1",
+    "@bilibili-notify/image": "^0.0.1-alpha.1"
   },
   "devDependencies": {
     "@types/luxon": "^3.4.2"