fix: ChatGPT 黑白名单忘了做

Tsuk1ko · Dec 16, 2022 · 557a3d6 · 557a3d6
1 parent 01c83b3
commit 557a3d6
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ## 2022
 
+### 12-17 v3.1.2
+
+- 修复 ChatGPT 黑白名单不生效问题
+- 优化 ChatGPT 回答多余字符过滤
+
 ### 12-17 v3.1.1
 
 - 修复 ChatGPT prompt 可能含有非文本内容的问题

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cq-picsearcher-bot",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "description": "二次元搜图机器人",
   "main": "index.js",
   "private": true,

diff --git a/src/plugin/chatgpt.mjs b/src/plugin/chatgpt.mjs
@@ -1,10 +1,24 @@
 import AxiosProxy from '../utils/axiosProxy.mjs';
+import emitter from '../utils/emitter.mjs';
 import { retryAsync } from '../utils/retry.mjs';
 
+let blackGroup = new Set();
+let whiteGroup = new Set();
+
+emitter.onConfigLoad(() => {
+  blackGroup = new Set(global.config.bot.chatgpt.blackGroup);
+  whiteGroup = new Set(global.config.bot.chatgpt.whiteGroup);
+});
+
 export default async context => {
   const config = global.config.bot.chatgpt;
   if (!config.enable) return false;
 
+  if (context.group_id) {
+    if (blackGroup.has(context.group_id)) return false;
+    if (whiteGroup.size && !whiteGroup.has(context.group_id)) return false;
+  }
+
   if (!config.apiKey) {
     global.replyMsg(context, '未配置 APIKey', false, true);
     return false;