dsh-fish-soul 0.11.1 → 0.11.2

package/lib/client.js

@@ -348,7 +348,7 @@ window.__ModuleLoader__.load({
 			const [busy, setBusy] = react.useState(false);
 			const [form, setForm, patch] = useForm(data, () => ({
 				enabled: qq.enabled === true, wsUrl: qq.wsUrl ?? "ws://127.0.0.1:3001", accessToken: "", masterQqUin: data.masterQqUin ?? "",
-				groupAllowList: (qq.groupAllowList ?? []).join(", "), followUpCount: qq.followUpCount ?? 3, followUpSeconds: qq.followUpSeconds ?? 120,
+				groupAllowList: (qq.groupAllowList ?? []).join(", "), allGroups: qq.allGroups === true, followUpCount: qq.followUpCount ?? 3, followUpSeconds: qq.followUpSeconds ?? 120,
 				callNames: (qq.callNames ?? []).join(", "), ij: { ...(qq.interject ?? {}), chance: Math.round((qq.interject?.chance ?? 0.05) * 100), keywords: (qq.interject?.keywords ?? []).join(", ") }
 			}));
 			if (!data || !form) return null;
@@ -358,7 +358,7 @@ window.__ModuleLoader__.load({
 				setForm(next);
 				const res = await api("POST", "/channels/qq-config", {
 					enabled: next.enabled, wsUrl: next.wsUrl, ...(next.accessToken !== "" ? { accessToken: next.accessToken } : {}),
-					masterQqUin: next.masterQqUin, groupAllowList: split(next.groupAllowList),
+					masterQqUin: next.masterQqUin, groupAllowList: split(next.groupAllowList), allGroups: next.allGroups === true,
 					followUpCount: Number(next.followUpCount), followUpSeconds: Number(next.followUpSeconds), callNames: split(next.callNames),
 					interject: { enabled: next.ij.enabled === true, chance: Number(next.ij.chance) / 100, cooldownMinutes: Number(next.ij.cooldownMinutes), maxPerHour: Number(next.ij.maxPerHour), keywords: split(next.ij.keywords) }
 				});
@@ -387,7 +387,8 @@ window.__ModuleLoader__.load({
 					form.enabled ? Row({ title: "SnowLuma 地址" }, field("wsUrl", { placeholder: "ws://127.0.0.1:3001" })) : null,
 					form.enabled ? Row({ title: "访问令牌" }, h(Secret, { label: "访问令牌", value: form.accessToken, placeholder: qq.hasToken ? qq.tokenMasked : "accessToken", onChange: (e) => patch({ accessToken: e.target.value }), onBlur: () => { if (form.accessToken !== "") save(); } })) : null,
 					form.enabled ? Row({ title: "主人 QQ" }, field("masterQqUin", { inputMode: "numeric" })) : null,
-					form.enabled ? Row({ title: "只在这些群" }, field("groupAllowList", { placeholder: "全部群" })) : null,
+					form.enabled ? Row({ title: "所有群" }, h(Switch, { label: "所有群", checked: form.allGroups, onChange: (v) => save({ allGroups: v }) }), Muted(form.allGroups ? "任何群里 @ 都回" : "只回下面列的群")) : null,
+					form.enabled && !form.allGroups ? Row({ title: "只在这些群" }, field("groupAllowList", { placeholder: "群号，逗号分隔；空 = 谁都不回" })) : null,
 					form.enabled ? Row({ title: "点名后接着听" },
 						Num({ min: 0, max: 20, value: form.followUpCount, "aria-label": "条数", onChange: (e) => patch({ followUpCount: e.target.value }), onBlur: () => save() }), Muted("条"),
 						Num({ min: 0, max: 1800, value: form.followUpSeconds, "aria-label": "秒数", onChange: (e) => patch({ followUpSeconds: e.target.value }), onBlur: () => save() }), Muted("秒")) : null,

package/lib/config-schema.js

@@ -9,7 +9,8 @@ export function fishSoulConfigSchema(z) {
 			enabled: z.boolean().default(false),
 			wsUrl: z.string().default('ws://127.0.0.1:3001'), // SnowLuma OneBot 11 正向 WS（Universal）
 			accessToken: z.string().default(''),
-			groupAllowList: z.array(z.string()).default([]), // 空 = 所有群（仍然只听点名）
+			groupAllowList: z.array(z.string()).default([]), // 白名单：空 = 谁都不放行（默认拒绝）；群要在这里列出才会被回应
+			allGroups: z.boolean().default(false), // 显式放开：true = 所有群（仍然只听点名）
 			followUpCount: z.number().default(3),
 			followUpSeconds: z.number().default(120),
 			batchMs: z.number().default(1500),

package/lib/gateway.js

@@ -158,6 +158,7 @@ export class ChatGateway {
 		return {
 			enabled: q.enabled === true,
 			groupAllowList: Array.isArray(q.groupAllowList) ? q.groupAllowList.map(String) : [],
+			allGroups: q.allGroups === true,
 			followUpCount: Number.isFinite(Number(q.followUpCount)) ? Number(q.followUpCount) : 3,
 			followUpSeconds: Number.isFinite(Number(q.followUpSeconds)) ? Number(q.followUpSeconds) : 120,
 			batchMs: Number.isFinite(Number(q.batchMs)) ? Number(q.batchMs) : 1500,
@@ -523,8 +524,10 @@ export class ChatGateway {
 		setKv(this.db, `qq.cursor.${channelId}`, { timeMs, messageId });
 	}
 
+	// 默认拒绝：白名单为空、也没显式打开 allGroups 时，任何群都不放行。
 	groupAllowed(groupId, cfg) {
-		return cfg.groupAllowList.length === 0 || cfg.groupAllowList.includes(String(groupId));
+		if (cfg.allGroups === true) return true;
+		return cfg.groupAllowList.includes(String(groupId));
 	}
 
 	/** OneBot 事件入口（实时推送和断线补拉共用）。 */

package/lib/routes.js

@@ -432,6 +432,7 @@ export function registerRoutes(ctx, deps) {
 							hasToken: Boolean(q.accessToken),
 							tokenMasked: maskKey(q.accessToken ?? ''),
 							groupAllowList: Array.isArray(q.groupAllowList) ? q.groupAllowList : [],
+							allGroups: q.allGroups === true,
 							followUpCount: q.followUpCount ?? 3,
 							followUpSeconds: q.followUpSeconds ?? 120,
 							callNames: Array.isArray(q.callNames) ? q.callNames : [],
@@ -473,6 +474,7 @@ export function registerRoutes(ctx, deps) {
 						...(typeof body.accessToken === 'string' && body.accessToken !== '' ? { accessToken: body.accessToken.trim() } : {}),
 						...(body.clearToken === true ? { accessToken: '' } : {}),
 						groupAllowList: groups,
+						allGroups: body.allGroups === undefined ? cur.allGroups === true : body.allGroups === true,
 						followUpCount: Math.min(20, Math.max(0, Math.floor(Number(body.followUpCount ?? cur.followUpCount ?? 3)) || 0)),
 						followUpSeconds: Math.min(1800, Math.max(0, Math.floor(Number(body.followUpSeconds ?? cur.followUpSeconds ?? 120)) || 0)),
 						callNames: Array.isArray(body.callNames) ? body.callNames.map((x) => String(x).trim()).filter(Boolean).slice(0, 10) : (cur.callNames ?? []),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-fish-soul",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "description": "鱼 · 人格、按人记忆（可纠正、有印象、能导入旧聊天记录）、日程自走与主动开口，直连 SnowLuma 收发 QQ（群里会自己插话），B站 / 抖音小号私信与自己刷视频；按功能选模型并统计用量花费，能听会说 QQ 语音、收藏表情包、学群里的梗，可选上网查；心情影响说话、去 AI 味、每个群的设定、按聊天选模型、每晚写日记（DSH 插件，单角色 feiyu）",
   "type": "module",
   "main": "./lib/index.js",