@azimiao/koishi-plugin-cafe-bot-exp 0.0.38 → 0.0.40

package/lib/index.js

@@ -40,7 +40,7 @@ module.exports = __toCommonJS(src_exports);
 var import_url = require("url");
 
 // package.json
-var version = "0.0.38";
+var version = "0.0.40";
 
 // src/index.ts
 var import_censor = require("@koishijs/censor");
@@ -528,7 +528,8 @@ var CafeBotQuizConfig = import_koishi3.Schema.object({
   imgWidth: import_koishi3.Schema.number().description("QQ图像宽度").default(0),
   imgHeight: import_koishi3.Schema.number().description("QQ图像高度").default(0),
   disableDriectMD: import_koishi3.Schema.boolean().description("j禁用私聊 MD 回复").default(true),
-  disableDirectMDReply: import_koishi3.Schema.string().default("暂不支持私聊回复哦，请从群聊@我吧")
+  disableDirectMDReply: import_koishi3.Schema.string().default("暂不支持私聊回复哦，请从群聊@我吧"),
+  disableMDAt: import_koishi3.Schema.boolean().description("在md回复中禁用@").default(false)
 }).description("答题配置");
 
 // src/common/CafeTimeTools.ts
@@ -662,7 +663,6 @@ async function apply2(ctx, config) {
       return;
     }
     var dailyNameKey = DailySeededName(argv.session.userId);
-    argv.session.user;
     if (quizDataIds == null || quizDataIds.length <= 0) {
       await argv.session?.send(`${At(argv)}超级计算机『卡佩尔』发生核心故障😵(导力网络异常波动)`);
       return;
@@ -701,7 +701,7 @@ async function apply2(ctx, config) {
         params: [
           {
             key: "user",
-            values: [argv.session && !argv.session.isDirect ? `<qqbot-at-user id="${argv.session.userId}">` : ""]
+            values: [config.disableMDAt ? "" : argv.session && !argv.session.isDirect ? `<qqbot-at-user id="${argv.session.userId}" />` : ""]
             // 群聊@,私聊不@
           },
           {
@@ -752,21 +752,26 @@ async function apply2(ctx, config) {
     }
     if (argv.session.qq) {
       try {
-        if (argv.session.isDirect) {
+        if (argv.session.event.guild?.id) {
+          logger2?.info(`public msg,use sendMessage,guild id:${argv.session.event.guild.id},channelId:${argv.session.channelId}`);
+          await argv.session.qq.sendMessage(argv.session.channelId, msgQQ);
+        } else if (argv.session.event.user?.id) {
           if (config.disableDirectMDReply) {
             await ctx.cache.delete("question", argv.session.userId);
+            todayCount--;
+            await ctx.cache.set("todayCache", dailyNameKey, todayCount, cacheTimeoutTime * 1e3);
             await argv.session?.send(`${At(argv)}${config.disableDirectMDReply}`);
             return;
           }
-          logger2?.info("private msg,use sendPrivateMessage,channelId:" + argv.session.channelId);
-          await argv.session.qq.sendPrivateMessage(argv.session.channelId, msgQQ);
-        } else {
-          await argv.session.qq.sendMessage(argv.session.channelId, msgQQ);
+          logger2?.info(`private msg,use sendPrivateMessage,userId:${argv.session.event.user.id}`);
+          await argv.session.qq.sendPrivateMessage(argv.session.event.user.id, msgQQ);
         }
       } catch (error) {
         logger2?.error("发送QQ MD 消息失败:" + error);
         logger2?.error(JSON.stringify(msgQQ));
         await ctx.cache.delete("question", argv.session.userId);
+        todayCount--;
+        await ctx.cache.set("todayCache", dailyNameKey, todayCount, cacheTimeoutTime * 1e3);
         await argv.session?.send(`${At(argv)}超级计算机『卡佩尔』发生核心故障😵(~~~)`);
       }
     } else {

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@azimiao/koishi-plugin-cafe-bot-exp",
     "description": "cafe bot experiment",
-    "version": "0.0.38",
+    "version": "0.0.40",
     "main": "lib/index.js",
     "typings": "lib/index.d.ts",
     "repository": {