alemonjs 1.0.46 → 1.0.47

package/lib/kook/alemon/message/PUBLIC_GUILD_MESSAGES.js

@@ -49,12 +49,8 @@ export const PUBLIC_GUILD_MESSAGES_KOOK = async (event) => {
         });
         msg = msg.replace(`(met)${item.id}(met)`, '').trim();
     }
-    let isMaster = false;
     const cfg = getBotConfigByKey('kook');
     const masterID = cfg.masterID;
-    if (event.msg_id == masterID) {
-        isMaster = true;
-    }
     let at_user;
     if (at) {
         if (at_users[0] && at_users[0].bot != true) {
@@ -69,7 +65,7 @@ export const PUBLIC_GUILD_MESSAGES_KOOK = async (event) => {
         eventType: 'CREATE',
         isPrivate: true,
         isRecall: false,
-        isMaster: isMaster,
+        isMaster: event.msg_id == masterID ? true : false,
         isGroup: event.channel_type == 'GROUP' ? true : false,
         boundaries: 'private',
         attribute: event.channel_type == 'GROUP' ? 'group' : 'single',

package/lib/ntqq/alemon/message/C2C_MESSAGE_CREATE.js

@@ -5,6 +5,7 @@ import { getBotMsgByNtqq } from '../bot.js';
 import IMGS from 'image-size';
 import { ClientKOA } from '../../../koa/index.js';
 import { AlemonJSError, AlemonJSLog } from '../../../log/user.js';
+import { getBotConfigByKey } from '../../../config/index.js';
 /**
  * 错误打印
  * @param err
@@ -15,9 +16,12 @@ const error = err => {
     return err;
 };
 export const C2C_MESSAGE_CREATE = async (event) => {
+    const cfg = getBotConfigByKey('ntqq');
+    const masterID = cfg.masterID;
     const e = {
         platform: 'ntqq',
         bot: getBotMsgByNtqq(),
+        isMaster: event.author.id == masterID ? true : false,
         event: 'MESSAGES',
         eventType: 'CREATE',
         // 是私

package/lib/ntqq/alemon/message/GROUP_AT_MESSAGE_CREATE.js

@@ -22,9 +22,12 @@ const error = err => {
  * @returns
  */
 export const GROUP_AT_MESSAGE_CREATE = async (event) => {
+    const cfg = getBotConfigByKey('ntqq');
+    const masterID = cfg.masterID;
     const e = {
         platform: 'ntqq',
         bot: getBotMsgByNtqq(),
+        isMaster: event.author.id == masterID ? true : false,
         event: 'MESSAGES',
         eventType: 'CREATE',
         isPrivate: false,
@@ -33,27 +36,6 @@ export const GROUP_AT_MESSAGE_CREATE = async (event) => {
         boundaries: 'publick',
         attribute: 'group'
     };
-    /**
-     * 得到登录配置
-     */
-    const cfg = getBotConfigByKey('ntqq');
-    /**
-     * 得到主人id
-     */
-    const masterID = cfg.masterID;
-    /**
-     * 默认不是主人
-     */
-    e.isMaster = false;
-    /**
-     * 检查身份
-     */
-    if (event.author.id == masterID) {
-        /**
-         * 是主人
-         */
-        e.isMaster = true;
-    }
     /**
      * 消息发送机制
      * @param msg 消息

package/lib/qq/alemon/message/DIRECT_MESSAGE.js

@@ -4,6 +4,7 @@ import { segmentQQ } from '../segment.js';
 import { getBotMsgByQQ } from '../bot.js';
 import { AlemonJSError, AlemonJSLog } from '../../../log/user.js';
 import { AlemonJSEventError, AlemonJSEventLog } from '../../../log/event.js';
+import { getBotConfigByKey } from '../../../config/index.js';
 /**
  * 错误打印
  * @param err
@@ -24,9 +25,12 @@ DIRECT_MESSAGE (1 << 12)
   - DIRECT_MESSAGE_DELETE   // 删除（撤回）消息事件
  */
 export const DIRECT_MESSAGE = async (event) => {
+    const cfg = getBotConfigByKey('qq');
+    const masterID = cfg.masterID;
     const e = {
         platform: 'qq',
         bot: getBotMsgByQQ(),
+        isMaster: event.msg.author.id == masterID ? true : false,
         event: 'MESSAGES',
         eventType: 'CREATE',
         isPrivate: false,

package/lib/villa/alemon/message/MESSAGES.js

@@ -132,19 +132,6 @@ export async function MESSAGES_VILLA(event) {
      * 得到主人id
      */
     const masterID = cfg.masterID;
-    /**
-     * 默认不是主人
-     */
-    let isMaster = false;
-    /**
-     * 检查身份
-     */
-    if (MessageContent.user.id == masterID) {
-        /**
-         * 是主人
-         */
-        isMaster = true;
-    }
     /**
      * 清除 @ 后的消息
      */
@@ -203,7 +190,7 @@ export async function MESSAGES_VILLA(event) {
         /**
          * 是否是机器人主人
          */
-        isMaster: isMaster,
+        isMaster: MessageContent.user.id == masterID ? true : false,
         /*
          * 消息编号 这个消息是可以触发回复api的消息id
          */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alemonjs",
-  "version": "1.0.46",
+  "version": "1.0.47",
   "description": "DOCS https://alemonjs.com/",
   "author": "ningmengchongshui",
   "license": "GPL-2.0",