koishi-plugin-chatluna-character 0.0.39 → 0.0.41

package/lib/plugins/filter.js

@@ -31,16 +31,15 @@ async function apply(ctx, config) {
         let { messageCount, messageSendProbability } = info;
         logger.debug(`messageCount: ${messageCount}, messageSendProbability: ${messageSendProbability}. content: ${JSON.stringify(message)}`);
         // 检查是否在名单里面
-        if ((copyOfConfig.disableChatLuna &&
-            copyOfConfig.whiteListDisableChatLuna.includes(guildId)) ||
-            !copyOfConfig.disableChatLuna) {
+        if (copyOfConfig.disableChatLuna &&
+            copyOfConfig.whiteListDisableChatLuna.includes(guildId)) {
             // check to last five message is send for bot
             const selfId = session.bot.userId ?? session.bot.selfId ?? '0';
             const guildMessages = ctx.chatluna_character.getMessages(guildId);
+            let maxRecentMessage = 0;
             if (guildMessages == null || guildMessages.length === 0) {
-                return false;
+                maxRecentMessage = 6;
             }
-            let maxRecentMessage = 0;
             while (maxRecentMessage < 5) {
                 const currentMessage = guildMessages[guildMessages?.length - 1 - maxRecentMessage];
                 if (currentMessage == null) {
@@ -60,25 +59,23 @@ async function apply(ctx, config) {
             if (needMute) {
                 logger.debug(`mute content: ${message.content}`);
                 service.mute(session, config.muteTime);
-                return;
             }
         }
-        if (service.isMute(session)) {
-            return;
-        }
+        const isMute = service.isMute(session);
         // 保底必出
-        if (messageCount > maxMessages ||
+        if ((messageCount > maxMessages ||
             messageSendProbability > 1 ||
             session.stripped.appel ||
             (config.isNickname &&
-                currentPreset.nick_name.some((value) => message.content.startsWith(value)))) {
+                currentPreset.nick_name.some((value) => message.content.startsWith(value)))) &&
+            !isMute) {
             info.messageCount = 0;
             info.messageSendProbability = 1;
             exports.groupInfos[session.guildId] = info;
             return true;
         }
         // 按照概率出
-        if (Math.random() > messageSendProbability) {
+        if (Math.random() > messageSendProbability && !isMute) {
             info.messageCount = 0;
             info.messageSendProbability = 1;
             exports.groupInfos[session.guildId] = info;

package/lib/plugins/interception.js

@@ -10,17 +10,16 @@ function apply(ctx, config) {
             return false;
         }
         // 检查是否在名单里面
-        if ((config.disableChatLuna &&
-            config.whiteListDisableChatLuna.includes(guildId)) ||
-            !config.disableChatLuna) {
+        if (config.disableChatLuna &&
+            config.whiteListDisableChatLuna?.includes(guildId)) {
             // check to last five message is send for bot
             const selfId = session.bot.userId ?? session.bot.selfId ?? '0';
             const guildMessages = ctx.chatluna_character.getMessages(guildId);
             if (guildMessages == null || guildMessages.length === 0) {
-                return false;
+                return true;
             }
             let maxRecentMessage = 0;
-            while (maxRecentMessage < 5) {
+            while (maxRecentMessage < 3) {
                 const currentMessage = guildMessages[guildMessages?.length - 1 - maxRecentMessage];
                 if (currentMessage == null) {
                     return false;
@@ -31,7 +30,7 @@ function apply(ctx, config) {
                 maxRecentMessage++;
             }
         }
-        return false;
+        return config.disableChatLuna;
     });
 }
 exports.apply = apply;

package/lib/service/message.js

@@ -197,10 +197,7 @@ function mapElementToString(session, content, elements) {
     for (const element of elements) {
         if (element.type === 'text') {
             const content = element.attrs.content;
-            if (content.trimEnd().length < 1) {
-                continue;
-            }
-            else {
+            if (content.trimEnd().length > 0) {
                 filteredBuffer.push(content);
             }
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chatluna-character",
   "description": "Let the large language model play a role, disguise as a group friend",
-  "version": "0.0.39",
+  "version": "0.0.41",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -51,7 +51,7 @@
   },
   "peerDependencies": {
     "koishi": "^4.16.7",
-    "koishi-plugin-chatluna": "^1.0.0-beta.41"
+    "koishi-plugin-chatluna": "^1.0.0-beta.42"
   },
   "engines": {
     "node": ">=18.0.0"