alemonjs 1.1.12 → 1.1.13

package/lib/core/index.js

@@ -17,3 +17,4 @@ export * from './screenshot.js';
 export * from './typings.js';
 export * from './buffer.js';
 export * from './ip.js';
+export * from './utils.js';

package/lib/core/utils.js

@@ -0,0 +1,11 @@
+/**
+ * 字符串数组转正则
+ * [''] => /^$/
+ * ['abc'] => /^abc$/
+ * ['a','b','c'] => /^(a|b|c)$/
+ * @param APP
+ * @returns
+ */
+export function arrayToRule(APP) {
+    return APP.length == 0 ? /^$/ : new RegExp(APP.join('|'));
+}

package/lib/define/main.js

@@ -89,16 +89,16 @@ export async function defineAlemonConfig(Options) {
                 setBotConfigByKey('qq', {
                     intents: [
                         // 基础事件
-                        AvailableIntentsEventsEnum.GUILDS,
-                        AvailableIntentsEventsEnum.GUILD_MEMBERS,
-                        AvailableIntentsEventsEnum.DIRECT_MESSAGE,
+                        AvailableIntentsEventsEnum.GUILDS, //频道进出
+                        AvailableIntentsEventsEnum.GUILD_MEMBERS, //成员资料
+                        AvailableIntentsEventsEnum.DIRECT_MESSAGE, //私信
                         // 需申请的
-                        AvailableIntentsEventsEnum.AUDIO_ACTION,
-                        AvailableIntentsEventsEnum.MESSAGE_AUDIT,
-                        AvailableIntentsEventsEnum.INTERACTION,
-                        AvailableIntentsEventsEnum.GUILD_MESSAGE_REACTIONS,
+                        AvailableIntentsEventsEnum.AUDIO_ACTION, //音频
+                        AvailableIntentsEventsEnum.MESSAGE_AUDIT, //消息审核
+                        AvailableIntentsEventsEnum.INTERACTION, //互动事件
+                        AvailableIntentsEventsEnum.GUILD_MESSAGE_REACTIONS, //表情表态
                         // 私域特有
-                        AvailableIntentsEventsEnum.GUILD_MESSAGES,
+                        AvailableIntentsEventsEnum.GUILD_MESSAGES, //私域事件
                         AvailableIntentsEventsEnum.FORUMS_EVENT //私域论坛
                     ],
                     ...Options.login.qq
@@ -108,9 +108,9 @@ export async function defineAlemonConfig(Options) {
                 setBotConfigByKey('qq', {
                     intents: [
                         // 基础事件
-                        AvailableIntentsEventsEnum.GUILDS,
-                        AvailableIntentsEventsEnum.GUILD_MEMBERS,
-                        AvailableIntentsEventsEnum.DIRECT_MESSAGE,
+                        AvailableIntentsEventsEnum.GUILDS, //频道进出
+                        AvailableIntentsEventsEnum.GUILD_MEMBERS, //成员资料
+                        AvailableIntentsEventsEnum.DIRECT_MESSAGE, //私信
                         // 公域特有
                         AvailableIntentsEventsEnum.PUBLIC_GUILD_MESSAGES //公域事件
                     ],

package/lib/discord/discord.js

@@ -5,7 +5,7 @@ import { IntentsEnum } from './sdk/index.js';
 export const defineDISCORD = {
     token: '',
     intent: [
-        IntentsEnum.MESSAGE_CONTENT,
+        IntentsEnum.MESSAGE_CONTENT, // 内容是基础
         //
         IntentsEnum.DIRECT_MESSAGES,
         IntentsEnum.DIRECT_MESSAGE_TYPING,

package/lib/discord/sdk/types.js

@@ -19,4 +19,4 @@ export var IntentsEnum;
     IntentsEnum[IntentsEnum["GUILD_SCHEDULED_EVENTS"] = 65536] = "GUILD_SCHEDULED_EVENTS";
     IntentsEnum[IntentsEnum["AUTO_MODERATION_CONFIGURATION"] = 1048576] = "AUTO_MODERATION_CONFIGURATION";
     IntentsEnum[IntentsEnum["AUTO_MODERATION_EXECUTION"] = 2097152] = "AUTO_MODERATION_EXECUTION";
-})(IntentsEnum = IntentsEnum || (IntentsEnum = {}));
+})(IntentsEnum || (IntentsEnum = {}));

package/lib/discord/sdk/wss.js

@@ -19,7 +19,7 @@ export async function createClient(conversation, shard = [0, 1]) {
     });
     const call = async () => {
         wsConn.send(JSON.stringify({
-            op: 1,
+            op: 1, //  op = 1
             d: null // 如果是第一次连接，传null
         }));
         setTimeout(call, heartbeat_interval);

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

@@ -19,7 +19,7 @@ export const DIRECT_MESSAGE = async (event) => {
     const avatar = event.extra.author.avatar;
     // 私聊中 控制器并非私聊接口
     const Message = ClientDirectController({
-        channel_id: event.target_id,
+        channel_id: event.target_id, // 频道号
         open_id: open_id
     });
     const Member = ClientControllerOnMember();
@@ -33,11 +33,11 @@ export const DIRECT_MESSAGE = async (event) => {
             : 'single',
         bot: getBotMsgByKOOK(),
         isMaster: event.extra.author.id == masterID,
-        guild_id: '',
+        guild_id: '', // 频道号
         guild_name: '',
         guild_avatar: '',
         channel_name: event.extra.channel_name,
-        channel_id: event.target_id,
+        channel_id: event.target_id, // 子频道
         attachments: [],
         specials: [],
         //

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

@@ -19,12 +19,12 @@ export const GUILD_MESSAGE_REACTIONS = async (event) => {
     const cfg = getBotConfigByKey('kook');
     const masterID = cfg.masterID;
     const Message = ClientController({
-        channel_id: event.target_id,
+        channel_id: event.target_id, // 子频道
         msg_id: event.msg_id,
         user_id: body.user_id
     });
     const Member = ClientControllerOnMember({
-        guild_id: event.target_id,
+        guild_id: event.target_id, // 频道
         user_id: body.user_id
     });
     const data = await ClientKOOK.userChatCreate(body.user_id).then(res => res?.data);
@@ -38,11 +38,11 @@ export const GUILD_MESSAGE_REACTIONS = async (event) => {
             : 'single',
         bot: getBotMsgByKOOK(),
         isMaster: body.user_id == masterID ? true : false,
-        guild_id: event.target_id,
+        guild_id: event.target_id, // 频道
         guild_name: '',
         guild_avatar: '',
         channel_name: '',
-        channel_id: event.target_id,
+        channel_id: event.target_id, // 子频道
         attachments: [],
         specials: [],
         //
@@ -52,7 +52,7 @@ export const GUILD_MESSAGE_REACTIONS = async (event) => {
         msg: '',
         msg_txt: event.content,
         msg_id: event.msg_id,
-        open_id: data?.code ?? '',
+        open_id: data?.code ?? '', // 私聊标记 空的 需要创建私聊 每次请求都自动创建
         //
         user_id: body.user_id,
         user_name: '',

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

@@ -59,12 +59,12 @@ export const PUBLIC_GUILD_MESSAGES_KOOK = async (event) => {
     const masterID = cfg.masterID;
     const avatar = event.extra.author.avatar;
     const Message = ClientController({
-        channel_id: event.target_id,
+        channel_id: event.target_id, // 子频道
         msg_id: event.msg_id,
         user_id: event.extra.author.id
     });
     const Member = ClientControllerOnMember({
-        guild_id: event.target_id,
+        guild_id: event.target_id, // 频道
         user_id: event.extra.author.id
     });
     const data = await ClientKOOK.userChatCreate(event.extra.author.id).then(res => res?.data);
@@ -78,11 +78,11 @@ export const PUBLIC_GUILD_MESSAGES_KOOK = async (event) => {
             : 'single',
         bot: getBotMsgByKOOK(),
         isMaster: event.extra.author.id == masterID ? true : false,
-        guild_id: event.extra.guild_id,
+        guild_id: event.extra.guild_id, // 频道
         guild_name: '',
         guild_avatar: '',
         channel_name: '',
-        channel_id: event.target_id,
+        channel_id: event.target_id, // 子频道
         attachments: [],
         specials: [],
         //
@@ -92,7 +92,7 @@ export const PUBLIC_GUILD_MESSAGES_KOOK = async (event) => {
         msg,
         msg_txt: event.content,
         msg_id: event.msg_id,
-        open_id: data?.code ?? '',
+        open_id: data?.code ?? '', // 私聊标记 空的 需要创建私聊 每次请求都自动创建
         //
         user_id: event.extra.author.id,
         user_name: event.extra.author.username,

package/lib/kook/sdk/typings.js

@@ -163,7 +163,7 @@ export var ApiEnum;
      * *******
      */
     ApiEnum["GatewayIndex"] = "/api/v3/gateway/index";
-})(ApiEnum = ApiEnum || (ApiEnum = {}));
+})(ApiEnum || (ApiEnum = {}));
 /**
  * 系统数据可枚举
  */

package/lib/login.js

@@ -37,3 +37,40 @@ export function analysis(val) {
     console.info('LOAD BOT', ket);
     return val[ket];
 }
+/**
+ * 为每个配置增加识别出Regex
+ * @param val
+ * @param key
+ * @returns
+ */
+export function analysisRegex(val, key) {
+    // 很多个配置
+    const argv = [...process.argv];
+    const ars = argv.slice(2);
+    // 缓存key
+    let ket = '';
+    for (const item in val) {
+        // item 是key  检查有没有 有则直接得到第一个机器人
+        if (ars.includes(item)) {
+            ket = item;
+            break;
+        }
+    }
+    // 找不到实例
+    if (ket == '') {
+        /**
+         * 找不到实例 取第一个
+         */
+        for (const item in val) {
+            ket = item;
+            break;
+        }
+    }
+    if (ket == '')
+        return /^$/;
+    if (Object.prototype.hasOwnProperty.call(key, ket)) {
+        // 存在
+        return key[ket];
+    }
+    return /^$/;
+}

package/lib/ntqq/sdk/intents.js

@@ -9,16 +9,16 @@
  * 订阅枚举
  */
 export const AvailableIntentsEventsEnum = [
-    'GROUP_AT_MESSAGE_CREATE',
-    'C2C_MESSAGE_CREATE',
-    'FRIEND_ADD',
-    'FRIEND_DEL',
-    'C2C_MSG_REJECT',
-    'GROUP_ADD_ROBOT',
-    'GROUP_DEL_ROBOT',
-    'GROUP_MSG_REJECT',
-    'GROUP_MSG_RECEIVE',
-    'INTERACTION_CREATE',
+    'GROUP_AT_MESSAGE_CREATE', // 群艾特消息
+    'C2C_MESSAGE_CREATE', // 单聊消息
+    'FRIEND_ADD', // 用户添加机器人
+    'FRIEND_DEL', // 用户删除机器人
+    'C2C_MSG_REJECT', // 拒绝机器人主动消息 | 允许机器人主动消息
+    'GROUP_ADD_ROBOT', // 机器人加入群聊
+    'GROUP_DEL_ROBOT', // 机器人退出群聊
+    'GROUP_MSG_REJECT', // 群聊拒绝机器人主动消息
+    'GROUP_MSG_RECEIVE', // 群聊接受机器人主动消息
+    'INTERACTION_CREATE', // 点击回调按钮
     /**
      * 频道
      */

package/lib/ntqq/sdk/wss.js

@@ -51,7 +51,7 @@ export async function createClient(conversation, shard = [0, 1]) {
                     power = setInterval(() => {
                         if (isConnected) {
                             ws.send(JSON.stringify({
-                                op: 1,
+                                op: 1, //  op = 1
                                 d: null // 如果是第一次连接，传null
                             }));
                         }
@@ -88,7 +88,7 @@ export async function createClient(conversation, shard = [0, 1]) {
                  * 发送鉴权
                  */
                 ws.send(JSON.stringify({
-                    op: 2,
+                    op: 2, // op = 2
                     d: {
                         token: `QQBot ${token}`,
                         intents: intents,

package/lib/qq/alemon/direct.js

@@ -143,7 +143,7 @@ export async function directController(msg, open_id, msg_id, select) {
         try {
             return await Client.postDirectImage({
                 id: open_id,
-                msg_id: msg_id,
+                msg_id: msg_id, //消息id, 必须
                 image: msg //buffer
             }).catch(everyoneError);
         }
@@ -166,8 +166,8 @@ export async function directController(msg, open_id, msg_id, select) {
         try {
             return await Client.postDirectImage({
                 id: open_id,
-                msg_id: msg_id,
-                image: msg[isBuffer],
+                msg_id: msg_id, //消息id, 必须
+                image: msg[isBuffer], //buffer
                 content: cont
             }).catch(everyoneError);
         }
@@ -195,7 +195,7 @@ export async function directController(msg, open_id, msg_id, select) {
         if (msg) {
             return await Client.postImage({
                 id: open_id,
-                msg_id: msg_id,
+                msg_id: msg_id, //消息id, 必须
                 image: msg //buffer
             }).catch(everyoneError);
         }

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

@@ -46,7 +46,7 @@ export const CHANNEL = async (event) => {
         isMaster: false,
         attachments: [],
         specials: [],
-        guild_id: event.msg?.guild_id,
+        guild_id: event.msg?.guild_id, // ?
         guild_name: '',
         guild_avatar: '',
         channel_name: '',

package/lib/qq/alemon/reply.js

@@ -15,7 +15,7 @@ export async function replyController(msg, channel_id, msg_id, select) {
         try {
             return await Client.postImage({
                 id: channel_id,
-                msg_id: msg_id,
+                msg_id: msg_id, //消息id, 必须,不然就是主动消息了
                 image: msg //buffer
             }).catch(everyoneError);
         }
@@ -38,8 +38,8 @@ export async function replyController(msg, channel_id, msg_id, select) {
         try {
             return await Client.postImage({
                 id: channel_id,
-                msg_id: msg_id,
-                image: msg[isBuffer],
+                msg_id: msg_id, //消息id, 必须
+                image: msg[isBuffer], //buffer
                 content: cont
             }).catch(everyoneError);
         }
@@ -67,7 +67,7 @@ export async function replyController(msg, channel_id, msg_id, select) {
         if (msg) {
             return await Client.postImage({
                 id: channel_id,
-                msg_id: msg_id,
+                msg_id: msg_id, //消息id, 必须
                 image: msg //buffer
             }).catch(everyoneError);
         }

package/lib/qq/sdk/wss.js

@@ -69,7 +69,7 @@ export async function createClient(callBack, shard = [0, 4]) {
                              */
                             if (isConnected) {
                                 ws.send(JSON.stringify({
-                                    op: 1,
+                                    op: 1, //  op = 1
                                     d: null // 如果是第一次连接，传null
                                 }));
                             }
@@ -100,7 +100,7 @@ export async function createClient(callBack, shard = [0, 4]) {
                      * 发送鉴权
                      */
                     ws.send(JSON.stringify({
-                        op: 2,
+                        op: 2, // op = 2
                         d: {
                             token: `Bot ${appID}.${token}`,
                             intents: getIntentsMask(intents),

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

@@ -10,10 +10,10 @@ import { ClientControllerOnMember, ClientControllerOnMessage } from '../controll
 export async function GUILD_BOT(event) {
     if (process.env?.ALEMONJS_EVENT == 'dev')
         console.info('event', event);
-    const EventData = event.extend_data.EventData;
+    const extendData = event.extendData;
     const guild_id = event.type == 3
-        ? EventData.CreateRobot.villa_id
-        : EventData.DeleteRobot.villa_id;
+        ? extendData.createRobot.villaId
+        : extendData.deleteRobot.villaId;
     const Message = ClientControllerOnMessage({
         guild_id: guild_id,
         channel_id: 0,
@@ -50,7 +50,7 @@ export async function GUILD_BOT(event) {
         at_user: undefined,
         at_users: [],
         msg: '',
-        msg_id: `${event.id}.${event.send_at}`,
+        msg_id: `${event.id}.${event.sendAt}`,
         msg_txt: '',
         open_id: '',
         //
@@ -58,7 +58,7 @@ export async function GUILD_BOT(event) {
         user_name: '',
         user_avatar: '',
         //
-        send_at: event.send_at,
+        send_at: event.sendAt,
         segment: segmentVILLA,
         /**
          * 消息回复
@@ -71,11 +71,11 @@ export async function GUILD_BOT(event) {
                 console.error('VILLA 无私信');
                 return false;
             }
-            const villa_id = select?.guild_id ?? guild_id;
-            const room_id = select?.channel_id ?? false;
-            if (!room_id)
+            const villaId = select?.guild_id ?? guild_id;
+            const roomId = select?.channel_id ?? false;
+            if (!roomId)
                 return false;
-            return await replyController(villa_id, room_id, msg, {
+            return await replyController(villaId, roomId, msg, {
                 quote: select?.quote
             });
         },

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

@@ -11,18 +11,18 @@ import { ClientControllerOnMember, ClientControllerOnMessage } from '../controll
 export async function GUILD_MEMBERS(event) {
     if (process.env?.ALEMONJS_EVENT == 'dev')
         console.info('event', event);
-    const JoinVilla = event.extend_data.EventData.JoinVilla;
+    const JoinVilla = event.extendData.joinVilla;
     const cfg = getBotConfigByKey('villa');
     const masterID = cfg.masterID;
-    const msg_id = `${event.id}.${JoinVilla.join_at}`;
+    const msg_id = `${event.id}.${JoinVilla.joinAt}`;
     const Message = ClientControllerOnMessage({
-        guild_id: JoinVilla.villa_id,
+        guild_id: JoinVilla.villaId,
         channel_id: 0,
         msg_id: msg_id
     });
     const Member = ClientControllerOnMember({
-        guild_id: JoinVilla.villa_id,
-        user_id: String(event.extend_data.EventData.JoinVilla.join_uid)
+        guild_id: JoinVilla.villaId,
+        user_id: String(event.extendData.joinVilla.joinUid)
     });
     /**
      * 制作e消息对象
@@ -38,8 +38,8 @@ export async function GUILD_MEMBERS(event) {
             name: event.robot.template.name,
             avatar: event.robot.template.icon
         },
-        isMaster: masterID == String(JoinVilla.join_uid),
-        guild_id: String(JoinVilla.villa_id),
+        isMaster: masterID == String(JoinVilla.joinUid),
+        guild_id: String(JoinVilla.villaId),
         guild_name: '',
         guild_avatar: '',
         channel_name: '',
@@ -55,10 +55,10 @@ export async function GUILD_MEMBERS(event) {
         msg_txt: '',
         open_id: '',
         //
-        user_avatar: '',
-        user_id: String(event.extend_data.EventData.JoinVilla.join_uid),
-        user_name: event.extend_data.EventData.JoinVilla.join_user_nickname,
-        send_at: JoinVilla.join_at,
+        user_avatar: '', // dodo 可以通过 请求权限获得
+        user_id: String(event.extendData.joinVilla.joinUid),
+        user_name: event.extendData.joinVilla.joinUserNickname,
+        send_at: JoinVilla.joinAt,
         segment: segmentVILLA,
         /**
          * 消息回复
@@ -77,11 +77,11 @@ export async function GUILD_MEMBERS(event) {
                 console.error('VILLA 无私信');
                 return false;
             }
-            const villa_id = select?.guild_id ?? JoinVilla.villa_id;
-            const room_id = select?.channel_id ?? false;
-            if (!room_id)
+            const villaId = select?.guild_id ?? JoinVilla.villaId;
+            const roomId = select?.channel_id ?? false;
+            if (!roomId)
                 return false;
-            return await replyController(villa_id, room_id, msg, {
+            return await replyController(villaId, roomId, msg, {
                 quote: select?.quote
             });
         },

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

@@ -11,17 +11,17 @@ import { ClientControllerOnMember, ClientControllerOnMessage } from '../controll
 export async function GUILD_MESSAGE_REACTIONS(event) {
     if (process.env?.ALEMONJS_EVENT == 'dev')
         console.info('event', event);
-    const AddQuickEmoticon = event.extend_data.EventData.AddQuickEmoticon;
+    const AddQuickEmoticon = event.extendData.addQuickEmoticon;
     const cfg = getBotConfigByKey('villa');
     const masterID = cfg.masterID;
-    const msg_id = `${AddQuickEmoticon.msg_uid}.${event.send_at}`;
+    const msg_id = `${AddQuickEmoticon.msgUid}.${event.sendAt}`;
     const Message = ClientControllerOnMessage({
-        guild_id: AddQuickEmoticon.villa_id,
-        channel_id: AddQuickEmoticon.room_id,
+        guild_id: AddQuickEmoticon.villaId,
+        channel_id: AddQuickEmoticon.roomId,
         msg_id: msg_id
     });
     const Member = ClientControllerOnMember({
-        guild_id: AddQuickEmoticon.villa_id,
+        guild_id: AddQuickEmoticon.villaId,
         user_id: String(AddQuickEmoticon.uid)
     });
     /**
@@ -30,7 +30,7 @@ export async function GUILD_MESSAGE_REACTIONS(event) {
     const e = {
         platform: 'villa',
         event: 'GUILD_MESSAGE_REACTIONS',
-        eventType: event.extend_data.EventData.AddQuickEmoticon.is_cancel
+        eventType: event.extendData.addQuickEmoticon.isCancel
             ? 'DELETE'
             : 'CREATE',
         boundaries: 'publick',
@@ -41,19 +41,19 @@ export async function GUILD_MESSAGE_REACTIONS(event) {
             avatar: event.robot.template.icon
         },
         isMaster: masterID == String(AddQuickEmoticon.uid),
-        guild_id: String(AddQuickEmoticon.villa_id),
+        guild_id: String(AddQuickEmoticon.villaId),
         guild_name: '',
         guild_avatar: '',
         channel_name: '',
-        channel_id: String(AddQuickEmoticon.room_id),
+        channel_id: String(AddQuickEmoticon.roomId),
         attachments: [],
         specials: [
             {
-                emoticon_id: AddQuickEmoticon.emoticon_id,
+                emoticon_id: AddQuickEmoticon.emoticonId,
                 emoticon_type: 0,
                 emoticon: AddQuickEmoticon.emoticon,
-                is_cancel: AddQuickEmoticon?.is_cancel ?? false,
-                msg_uid: AddQuickEmoticon.msg_uid
+                is_cancel: AddQuickEmoticon?.isCancel ?? false,
+                msg_uid: AddQuickEmoticon.msgUid
             }
         ],
         //
@@ -66,9 +66,9 @@ export async function GUILD_MESSAGE_REACTIONS(event) {
         open_id: '',
         //
         user_id: String(AddQuickEmoticon.uid),
-        user_name: '',
-        user_avatar: '',
-        send_at: event.send_at,
+        user_name: '', // dodo 可权限获得
+        user_avatar: '', // dodo 可权限获得
+        send_at: event.sendAt,
         segment: segmentVILLA,
         /**
          * 消息回复
@@ -81,9 +81,9 @@ export async function GUILD_MESSAGE_REACTIONS(event) {
                 console.error('VILLA 无私信');
                 return false;
             }
-            const villa_id = select?.guild_id ?? AddQuickEmoticon.villa_id;
-            const room_id = select?.channel_id ?? AddQuickEmoticon.room_id;
-            return await replyController(villa_id, room_id, msg, {
+            const villaId = select?.guild_id ?? AddQuickEmoticon.villaId;
+            const roomId = select?.channel_id ?? AddQuickEmoticon.roomId;
+            return await replyController(villaId, roomId, msg, {
                 quote: select?.quote
             });
         },

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

@@ -11,11 +11,11 @@ import { ClientControllerOnMessage, ClientControllerOnMember } from '../controll
 export async function MESSAGES(event) {
     if (process.env?.ALEMONJS_EVENT == 'dev')
         console.info('event', event);
-    const SendMessage = event.extend_data.EventData.SendMessage;
+    const SendMessage = event.extendData.sendMessage;
     /**
      * 数据包解析
      */
-    const MessageContent = JSON.parse(event.extend_data.EventData.SendMessage.content);
+    const MessageContent = JSON.parse(event.extendData.sendMessage.content);
     /**
      * 得到特效
      */
@@ -82,17 +82,17 @@ export async function MESSAGES(event) {
     const msg = txt.replace(/(@[^\s]+\s)(?!<)/g, '').trim();
     const cfg = getBotConfigByKey('villa');
     const masterID = cfg.masterID;
-    const msg_id = `${SendMessage.msg_uid}.${SendMessage.send_at}`;
+    const msg_id = `${SendMessage.msgUid}.${SendMessage.sendAt}`;
     /**
      * 制作控制器
      */
     const Message = ClientControllerOnMessage({
-        guild_id: SendMessage.villa_id,
-        channel_id: SendMessage.room_id,
+        guild_id: SendMessage.villaId,
+        channel_id: SendMessage.roomId,
         msg_id: msg_id
     });
     const Member = ClientControllerOnMember({
-        guild_id: SendMessage.villa_id,
+        guild_id: SendMessage.villaId,
         user_id: MessageContent.user.id
     });
     /**
@@ -110,11 +110,11 @@ export async function MESSAGES(event) {
             avatar: event.robot.template.icon
         },
         isMaster: MessageContent.user.id == masterID,
-        guild_id: String(SendMessage.villa_id),
+        guild_id: String(SendMessage.villaId),
         guild_name: '',
         guild_avatar: '',
         channel_name: '',
-        channel_id: String(SendMessage.room_id),
+        channel_id: String(SendMessage.roomId),
         attachments: [],
         specials: [],
         //
@@ -130,7 +130,7 @@ export async function MESSAGES(event) {
         user_name: MessageContent.user.name,
         user_avatar: MessageContent.user.portrait,
         //
-        send_at: SendMessage.send_at,
+        send_at: SendMessage.sendAt,
         segment: segmentVILLA,
         /**
          *消息发送
@@ -143,9 +143,9 @@ export async function MESSAGES(event) {
                 console.error('VILLA 无私信');
                 return false;
             }
-            const villa_id = select?.guild_id ?? SendMessage.villa_id;
-            const room_id = select?.channel_id ?? SendMessage.room_id;
-            return await replyController(villa_id, room_id, msg, {
+            const villaId = select?.guild_id ?? SendMessage.villaId;
+            const roomId = select?.channel_id ?? SendMessage.roomId;
+            return await replyController(villaId, roomId, msg, {
                 quote: select?.quote
             });
         },