alemonjs 1.1.20 → 1.1.21

package/lib/core/conversation.js

@@ -0,0 +1,26 @@
+import { conversationHandlers, deleteConversationState, setConversationState } from './dialogue.js';
+/**
+ * 对话机
+ */
+export const Conversation = {
+    /**
+     * 设置对话状态
+     * @param ID 用户编号
+     * @param state 状态记录
+     */
+    passing: setConversationState,
+    /**
+     * 删除对话状态
+     * @param ID 用户编号
+     */
+    remove: (ID) => {
+        // 删除数据
+        deleteConversationState(ID);
+        // 删除函数
+        conversationHandlers.delete(ID);
+    },
+    /**
+     * 注册对话
+     */
+    add: conversationHandlers.set
+};

package/lib/core/dealmsg.js

@@ -66,7 +66,7 @@ async function synthesis(AppName, AppsObj) {
         if (shield.find(item => item == keys['event']))
             continue;
         // 控制类型
-        const eventType = keys['eventType'] ?? 'CREATE';
+        const typing = keys['typing'] ?? 'CREATE';
         // 不合法
         if (!keys['rule'] ||
             !Array.isArray(keys['rule']) ||
@@ -118,7 +118,7 @@ async function synthesis(AppName, AppsObj) {
                 // 推送
                 plugins[AppName].push({
                     event: event,
-                    eventType: eventType,
+                    typing: typing,
                     reg: String(reg),
                     dsc,
                     doc,
@@ -127,7 +127,7 @@ async function synthesis(AppName, AppsObj) {
                 // 保存
                 Command[event].push({
                     event: event,
-                    eventType: eventType,
+                    typing: typing,
                     reg: new RegExp(reg),
                     priority,
                     fncName,
@@ -140,7 +140,7 @@ async function synthesis(AppName, AppsObj) {
                 // 推送
                 plugins[AppName].push({
                     event: event,
-                    eventType: eventType,
+                    typing: typing,
                     dsc,
                     doc,
                     priority
@@ -148,7 +148,7 @@ async function synthesis(AppName, AppsObj) {
                 // 保存
                 CommandNotMessage[event].push({
                     event: event,
-                    eventType: eventType,
+                    typing: typing,
                     priority: AppPriority && AppPriority < priority ? AppPriority : priority,
                     reg: /./,
                     fncName,
@@ -316,10 +316,19 @@ export async function InstructionMatching(e) {
     /**
      * 对话机
      */
-    const state = await getConversationState(e.user_id);
-    const handler = conversationHandlers.get(e.user_id);
-    if (handler && state) {
-        await handler(e, state);
+    const guild_state = await getConversationState(e.guild_id);
+    const channel_state = await getConversationState(e.channel_id);
+    const user_state = await getConversationState(e.user_id);
+    if (guild_state || channel_state || user_state) {
+        const guild_handler = conversationHandlers.get(e.guild_id);
+        if (guild_handler)
+            await guild_handler(e, guild_state);
+        const channel_handler = conversationHandlers.get(e.channel_id);
+        if (channel_handler)
+            await channel_handler(e, channel_state);
+        const user_handler = conversationHandlers.get(e.user_id);
+        if (user_handler)
+            await user_handler(e, user_state);
         return true;
     }
     let t = false;
@@ -428,7 +437,7 @@ export async function InstructionMatching(e) {
      * 循环所有指令
      */
     for (const data of Command[e.event]) {
-        if (e.eventType != data.eventType ||
+        if (e.typing != data.typing ||
             data.reg === undefined ||
             !data.reg.test(e.msg)) {
             continue;
@@ -502,7 +511,7 @@ export async function typeMessage(e) {
     }
     // 循环查找
     for (const data of CommandNotMessage[e.event]) {
-        if (e.eventType != data.eventType)
+        if (e.typing != data.typing)
             continue;
         try {
             const app = APPCACHE[data.APP];

package/lib/core/dialogue.js

@@ -1,3 +1,8 @@
+/**
+ * 注册对话处理器
+ * @deprecated Conversation.add
+ */
+export const conversationHandlers = new Map();
 /**
  *对话缓存
  */
@@ -26,31 +31,31 @@ const setAsync = async (key, val) => {
 const delAsync = async (key) => {
     delete Sockes[key];
 };
-/**
- * 注册对话处理器
- */
-export const conversationHandlers = new Map();
 /**
  * 获取对话状态
- * @param userId 用户编号
+ * @param ID 编号
  * @returns 对话状态值
+ * @deprecated 不推荐使用
  */
-export const getConversationState = async (userId) => {
-    const state = await getAsync(`conversation-state:${userId}`);
+export const getConversationState = async (ID) => {
+    const state = await getAsync(`conversation-state:${ID}`);
     return state ? JSON.parse(state) : null;
 };
 /**
  * 设置对话状态
- * @param userId 用户编号
+ * @param ID 编号
  * @param state 状态记录
+ * @deprecated Conversation.passing
  */
-export const setConversationState = async (userId, state) => {
-    await setAsync(`conversation-state:${userId}`, JSON.stringify(state));
+export const setConversationState = async (ID, state) => {
+    await setAsync(`conversation-state:${ID}`, JSON.stringify(state));
 };
 /**
  * 删除对话状态
- * @param userId 用户编号
+ * @param ID 编号
+ * @deprecated Conversation.del
  */
-export const deleteConversationState = async (userId) => {
-    await delAsync(`conversation-state:${userId}`);
+export const deleteConversationState = async (ID) => {
+    // 删除数据
+    await delAsync(`conversation-state:${ID}`);
 };

package/lib/core/index.js

@@ -10,6 +10,7 @@ export * from './configs.js';
 export * from './apps.js';
 export * from './cache.js';
 export * from './dialogue.js';
+export * from './conversation.js';
 export * from './qrcode.js';
 export * from './dealmsg.js';
 export * from './puppeteer.js';

package/lib/core/plugin.js

@@ -30,7 +30,7 @@ export class plugin {
     /**
      * 事件类型
      */
-    eventType;
+    typing;
     /**
      * 匹配优先级
      */
@@ -46,7 +46,7 @@ export class plugin {
     /**
      * @param name 类名标记        default app-name
      * @param event 事件类型       default MESSAGES
-     * @param eventType 消息类型   default CREATE
+     * @param typing 消息类型   default CREATE
      * @param priority 优先级      越小优越高 default 9000
      * @param rule.reg 命令正则    RegExp | string
      * @param rule.fnc 命令函数    function
@@ -54,10 +54,10 @@ export class plugin {
      * @param rule.doc 指令文档    doc
      * @param rule.priority 优先级    数字越小优先级越高
      */
-    constructor({ name = 'app-name', event = 'message', eventType = 'CREATE', priority = 9000, rule = [], task }) {
+    constructor({ name = 'app-name', event = 'message', typing = 'CREATE', priority = 9000, rule = [], task }) {
         this.name = name;
         this.event = event;
-        this.eventType = eventType;
+        this.typing = typing;
         this.priority = priority;
         this.rule = rule;
         this.task = {
@@ -185,7 +185,7 @@ export class APlugin {
     /**
      * 事件类型
      */
-    eventType;
+    typing;
     /**
      * 匹配优先级
      */
@@ -201,7 +201,7 @@ export class APlugin {
     /**
      * @param name 类名标记        default app-name
      * @param event 事件类型       default MESSAGES
-     * @param eventType 消息类型   default CREATE
+     * @param typing 消息类型   default CREATE
      * @param priority 优先级      越小优越高 default 9000
      * @param rule.reg 命令正则    RegExp | string
      * @param rule.fnc 命令函数    function
@@ -209,10 +209,10 @@ export class APlugin {
      * @param rule.doc 指令文档    doc
      * @param rule.priority 优先级    数字越小优先级越高
      */
-    constructor({ name = 'app-name', event = 'MESSAGES', eventType = 'CREATE', priority = 9000, rule = [], task }) {
+    constructor({ name = 'app-name', event = 'MESSAGES', typing = 'CREATE', priority = 9000, rule = [], task }) {
         this.name = name;
         this.event = event;
-        this.eventType = eventType;
+        this.typing = typing;
         this.priority = priority;
         this.rule = rule;
         this.task = {

package/lib/core/typings.js

@@ -103,4 +103,4 @@ export const EventEnum = [
 /**
  * 消息判断
  */
-export const EventType = ['CREATE', 'UPDATE', 'DELETE'];
+export const TypingEnum = ['CREATE', 'UPDATE', 'DELETE'];

package/lib/discord/alemon/message/MESSAGE_CREATE.js

@@ -64,7 +64,7 @@ export async function MESSAGE_CREATE(event) {
     const e = {
         platform: 'qq',
         event: 'MESSAGES',
-        eventType: 'CREATE',
+        typing: 'CREATE',
         boundaries: 'publick',
         attribute: 'group',
         bot: getBotMsgByDISCORD(),

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

@@ -26,7 +26,7 @@ export const DIRECT_MESSAGE = async (event) => {
     const e = {
         platform: 'kook',
         event: 'MESSAGES',
-        eventType: 'CREATE',
+        typing: 'CREATE',
         boundaries: 'private',
         attribute: event.channel_type == 'GROUP'
             ? 'group'

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

@@ -31,7 +31,7 @@ export const GUILD_MESSAGE_REACTIONS = async (event) => {
     const e = {
         platform: 'kook',
         event: 'MESSAGES',
-        eventType: 'CREATE',
+        typing: 'CREATE',
         boundaries: 'private',
         attribute: event.channel_type == 'GROUP'
             ? 'group'

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

@@ -71,7 +71,7 @@ export const PUBLIC_GUILD_MESSAGES_KOOK = async (event) => {
     const e = {
         platform: 'kook',
         event: 'MESSAGES',
-        eventType: 'CREATE',
+        typing: 'CREATE',
         boundaries: 'private',
         attribute: event.channel_type == 'GROUP'
             ? 'group'

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

@@ -18,7 +18,7 @@ export const C2C_MESSAGE_CREATE = async (event) => {
     const e = {
         platform: 'ntqq',
         event: 'MESSAGES',
-        eventType: 'CREATE',
+        typing: 'CREATE',
         boundaries: 'publick',
         attribute: 'single',
         bot: getBotMsgByNtqq(),

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

@@ -25,7 +25,7 @@ export const GROUP_AT_MESSAGE_CREATE = async (event) => {
     const e = {
         platform: 'ntqq',
         event: 'MESSAGES',
-        eventType: 'CREATE',
+        typing: 'CREATE',
         boundaries: 'publick',
         attribute: 'group',
         bot: getBotMsgByNtqq(),

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

@@ -21,7 +21,7 @@ export async function DIRECT_MESSAGE(event) {
     const e = {
         platform: 'one',
         event: 'MESSAGES',
-        eventType: 'CREATE',
+        typing: 'CREATE',
         boundaries: 'publick',
         attribute: event.detail_type == 'private'
             ? 'single'

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

@@ -22,7 +22,7 @@ export async function MESSAGES(event) {
     const e = {
         platform: 'one',
         event: 'MESSAGES',
-        eventType: 'CREATE',
+        typing: 'CREATE',
         boundaries: 'publick',
         attribute: event.detail_type == 'private'
             ? 'single'

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

@@ -36,7 +36,7 @@ export const AUDIO_ACTION = async (event) => {
     const e = {
         platform: 'qq',
         event: 'AUDIO_MICROPHONE',
-        eventType: 'CREATE',
+        typing: 'CREATE',
         boundaries: 'publick',
         attribute: 'group',
         bot: getBotMsgByQQ(),
@@ -90,7 +90,7 @@ export const AUDIO_ACTION = async (event) => {
     if (new RegExp(/MIC$/).test(event.eventType)) {
         if (!new RegExp(/ON_MIC$/).test(event.eventType)) {
             // 下麦
-            e.eventType = 'DELETE';
+            e.typing = 'DELETE';
         }
     }
     else {
@@ -98,10 +98,10 @@ export const AUDIO_ACTION = async (event) => {
         e.event = 'AUDIO_FREQUENCY';
         if (!new RegExp(/^AUDIO_START$/).test(event.eventType)) {
             // 音频播放结束时
-            e.eventType = 'DELETE';
+            e.typing = 'DELETE';
         }
     }
     return await typeMessage(e)
-        .then(() => AlemonJSEventLog(e.event, e.eventType))
-        .catch(err => AlemonJSEventError(err, e.event, e.eventType));
+        .then(() => AlemonJSEventLog(e.event, e.typing))
+        .catch(err => AlemonJSEventError(err, e.event, e.typing));
 };

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

@@ -35,7 +35,7 @@ export const CHANNEL = async (event) => {
         event: new RegExp(/^GUILD.*$/).test(event.eventType)
             ? 'GUILD'
             : 'CHANNEL',
-        eventType: new RegExp(/CREATE$/).test(event.eventType)
+        typing: new RegExp(/CREATE$/).test(event.eventType)
             ? 'CREATE'
             : new RegExp(/UPDATE$/).test(event.eventType)
                 ? 'UPDATE'
@@ -96,6 +96,6 @@ export const CHANNEL = async (event) => {
      * 只匹配类型
      */
     return await typeMessage(e)
-        .then(() => AlemonJSEventLog(e.event, e.eventType))
-        .catch(err => AlemonJSEventError(err, e.event, e.eventType));
+        .then(() => AlemonJSEventLog(e.event, e.typing))
+        .catch(err => AlemonJSEventError(err, e.event, e.typing));
 };

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

@@ -28,7 +28,7 @@ export const DIRECT_MESSAGE = async (event) => {
     const e = {
         platform: 'qq',
         event: 'MESSAGES',
-        eventType: 'CREATE',
+        typing: 'CREATE',
         boundaries: 'publick',
         attribute: 'single',
         bot: getBotMsgByQQ(),
@@ -69,13 +69,13 @@ export const DIRECT_MESSAGE = async (event) => {
      * 撤回事件
      */
     if (new RegExp(/^DIRECT_MESSAGE_DELETE$/).test(event.eventType)) {
-        e.eventType = 'DELETE';
+        e.typing = 'DELETE';
         /**
          * 只匹配类型
          */
         return await typeMessage(e)
-            .then(() => AlemonJSEventLog(e.event, e.eventType))
-            .catch(err => AlemonJSEventError(err, e.event, e.eventType));
+            .then(() => AlemonJSEventLog(e.event, e.typing))
+            .catch(err => AlemonJSEventError(err, e.event, e.typing));
     }
     /**
      * 业务处理

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

@@ -42,7 +42,7 @@ export const FORUMS_EVENT = async (event) => {
             : new RegExp(/^FORUM_POST/).test(event.eventType)
                 ? 'FORUMS_POST'
                 : 'FORUMS_REPLY',
-        eventType: new RegExp(/CREATE$/).test(event.eventType)
+        typing: new RegExp(/CREATE$/).test(event.eventType)
             ? 'CREATE'
             : new RegExp(/UPDATE$/).test(event.eventType)
                 ? 'UPDATE'
@@ -100,6 +100,6 @@ export const FORUMS_EVENT = async (event) => {
         Message
     };
     return await typeMessage(e)
-        .then(() => AlemonJSEventLog(e.event, e.eventType))
-        .catch(err => AlemonJSEventError(err, e.event, e.eventType));
+        .then(() => AlemonJSEventLog(e.event, e.typing))
+        .catch(err => AlemonJSEventError(err, e.event, e.typing));
 };

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

@@ -35,7 +35,7 @@ export const GUILD = async (event) => {
         event: new RegExp(/^GUILD.*$/).test(event.eventType)
             ? 'GUILD'
             : 'CHANNEL',
-        eventType: new RegExp(/CREATE$/).test(event.eventType)
+        typing: new RegExp(/CREATE$/).test(event.eventType)
             ? 'CREATE'
             : new RegExp(/UPDATE$/).test(event.eventType)
                 ? 'UPDATE'
@@ -96,6 +96,6 @@ export const GUILD = async (event) => {
      * 只匹配类型
      */
     return await typeMessage(e)
-        .then(() => AlemonJSEventLog(e.event, e.eventType))
-        .catch(err => AlemonJSEventError(err, e.event, e.eventType));
+        .then(() => AlemonJSEventLog(e.event, e.typing))
+        .catch(err => AlemonJSEventError(err, e.event, e.typing));
 };

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

@@ -31,7 +31,7 @@ export const GUILD_MEMBERS = async (event) => {
     const e = {
         platform: 'qq',
         event: 'GUILD_MEMBERS',
-        eventType: new RegExp(/ADD$/).test(event.eventType)
+        typing: new RegExp(/ADD$/).test(event.eventType)
             ? 'CREATE'
             : new RegExp(/UPDATE$/).test(event.eventType)
                 ? 'UPDATE'
@@ -91,6 +91,6 @@ export const GUILD_MEMBERS = async (event) => {
         Message
     };
     return await typeMessage(e)
-        .then(() => AlemonJSEventLog(e.event, e.eventType))
-        .catch(err => AlemonJSEventError(err, e.event, e.eventType));
+        .then(() => AlemonJSEventLog(e.event, e.typing))
+        .catch(err => AlemonJSEventError(err, e.event, e.typing));
 };

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

@@ -39,7 +39,7 @@ export const GUILD_MESSAGES = async (event) => {
     const e = {
         platform: 'qq',
         event: 'MESSAGES',
-        eventType: 'CREATE',
+        typing: 'CREATE',
         boundaries: 'private',
         attribute: 'group',
         bot: getBotMsgByQQ(),
@@ -92,10 +92,10 @@ export const GUILD_MESSAGES = async (event) => {
      * 撤回消息
      */
     if (new RegExp(/DELETE$/).test(event.eventType)) {
-        e.eventType = 'DELETE';
+        e.typing = 'DELETE';
         return await typeMessage(e)
-            .then(() => AlemonJSEventLog(e.event, e.eventType))
-            .catch(err => AlemonJSEventError(err, e.event, e.eventType));
+            .then(() => AlemonJSEventLog(e.event, e.typing))
+            .catch(err => AlemonJSEventError(err, e.event, e.typing));
     }
     // 屏蔽其他机器人的消息
     if (event.msg.author.bot)

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

@@ -30,7 +30,7 @@ export const GUILD_MESSAGE_REACTIONS = async (event) => {
     const e = {
         platform: 'qq',
         event: 'GUILD_MESSAGE_REACTIONS',
-        eventType: new RegExp(/ADD$/).test(event.eventType)
+        typing: new RegExp(/ADD$/).test(event.eventType)
             ? 'CREATE'
             : 'DELETE',
         boundaries: 'publick',
@@ -95,6 +95,6 @@ export const GUILD_MESSAGE_REACTIONS = async (event) => {
      * 只匹配类型
      */
     return await typeMessage(e)
-        .then(() => AlemonJSEventLog(e.event, e.eventType))
-        .catch(err => AlemonJSEventError(err, e.event, e.eventType));
+        .then(() => AlemonJSEventLog(e.event, e.typing))
+        .catch(err => AlemonJSEventError(err, e.event, e.typing));
 };

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

@@ -29,7 +29,7 @@ export const INTERACTION = async (event) => {
     const e = {
         platform: 'qq',
         event: 'INTERACTION',
-        eventType: 'CREATE',
+        typing: 'CREATE',
         boundaries: 'publick',
         attribute: 'group',
         bot: getBotMsgByQQ(),
@@ -84,9 +84,9 @@ export const INTERACTION = async (event) => {
      * 事件匹配
      */
     if (!new RegExp(/CREATE$/).test(event.eventType)) {
-        e.eventType = 'DELETE';
+        e.typing = 'DELETE';
     }
     return await typeMessage(e)
-        .then(() => AlemonJSEventLog(e.event, e.eventType))
-        .catch(err => AlemonJSEventError(err, e.event, e.eventType));
+        .then(() => AlemonJSEventLog(e.event, e.typing))
+        .catch(err => AlemonJSEventError(err, e.event, e.typing));
 };

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

@@ -30,7 +30,7 @@ export const MESSAGE_AUDIT = async (event) => {
     const e = {
         platform: 'qq',
         event: 'MESSAGE_AUDIT',
-        eventType: 'CREATE',
+        typing: 'CREATE',
         boundaries: 'publick',
         attribute: 'group',
         bot: getBotMsgByQQ(),
@@ -84,12 +84,12 @@ export const MESSAGE_AUDIT = async (event) => {
      */
     e.event = 'MESSAGE_AUDIT';
     if (new RegExp(/REJECT$/).test(event.eventType)) {
-        e.eventType = 'DELETE';
+        e.typing = 'DELETE';
     }
     /**
      * 只匹配类型
      */
     return await typeMessage(e)
-        .then(() => AlemonJSEventLog(e.event, e.eventType))
-        .catch(err => AlemonJSEventError(err, e.event, e.eventType));
+        .then(() => AlemonJSEventLog(e.event, e.typing))
+        .catch(err => AlemonJSEventError(err, e.event, e.typing));
 };

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

@@ -41,7 +41,7 @@ export const OPEN_FORUMS_EVENT = async (event) => {
     const e = {
         platform: 'qq',
         event: 'FORUMS_THREAD',
-        eventType: 'CREATE',
+        typing: 'CREATE',
         boundaries: 'publick',
         attribute: 'group',
         bot: getBotMsgByQQ(),
@@ -110,15 +110,15 @@ export const OPEN_FORUMS_EVENT = async (event) => {
      * 类型匹配
      */
     if (new RegExp(/CREATE$/).test(event.eventType)) {
-        e.eventType = 'CREATE';
+        e.typing = 'CREATE';
     }
     else if (new RegExp(/UPDATE$/).test(event.eventType)) {
-        e.eventType = 'UPDATE';
+        e.typing = 'UPDATE';
     }
     else {
-        e.eventType = 'DELETE';
+        e.typing = 'DELETE';
     }
     return await typeMessage(e)
-        .then(() => AlemonJSEventLog(e.event, e.eventType))
-        .catch(err => AlemonJSEventError(err, e.event, e.eventType));
+        .then(() => AlemonJSEventLog(e.event, e.typing))
+        .catch(err => AlemonJSEventError(err, e.event, e.typing));
 };

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

@@ -38,7 +38,7 @@ export const PUBLIC_GUILD_MESSAGES = async (event) => {
     const e = {
         platform: 'qq',
         event: 'MESSAGES',
-        eventType: 'CREATE',
+        typing: 'CREATE',
         boundaries: 'publick',
         attribute: 'group',
         bot: getBotMsgByQQ(),
@@ -93,10 +93,10 @@ export const PUBLIC_GUILD_MESSAGES = async (event) => {
      * 消息撤回
      */
     if (new RegExp(/DELETE$/).test(event.eventType)) {
-        e.eventType = 'DELETE';
+        e.typing = 'DELETE';
         return await typeMessage(e)
-            .then(() => AlemonJSEventLog(e.event, e.eventType))
-            .catch(err => AlemonJSEventError(err, e.event, e.eventType));
+            .then(() => AlemonJSEventLog(e.event, e.typing))
+            .catch(err => AlemonJSEventError(err, e.event, e.typing));
     }
     // 屏蔽其他机器人的消息
     if (event.msg.author.bot)

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

@@ -29,7 +29,7 @@ export async function GUILD_BOT(event) {
     const e = {
         platform: 'villa',
         event: 'GUILD_BOT',
-        eventType: event.type == 3 ? 'CREATE' : 'DELETE',
+        typing: event.type == 3 ? 'CREATE' : 'DELETE',
         boundaries: 'publick',
         attribute: 'group',
         bot: {
@@ -86,6 +86,6 @@ export async function GUILD_BOT(event) {
      * 只匹配类型
      */
     return await typeMessage(e)
-        .then(() => AlemonJSEventLog(e.event, e.eventType))
-        .catch(err => AlemonJSEventError(err, e.event, e.eventType));
+        .then(() => AlemonJSEventLog(e.event, e.typing))
+        .catch(err => AlemonJSEventError(err, e.event, e.typing));
 }

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

@@ -30,7 +30,7 @@ export async function GUILD_MEMBERS(event) {
     const e = {
         platform: 'villa',
         event: 'GUILD_MEMBERS',
-        eventType: 'CREATE',
+        typing: 'CREATE',
         boundaries: 'publick',
         attribute: 'group',
         bot: {
@@ -92,6 +92,6 @@ export async function GUILD_MEMBERS(event) {
      * 只匹配类型
      */
     return await typeMessage(e)
-        .then(() => AlemonJSEventLog(e.event, e.eventType))
-        .catch(err => AlemonJSEventError(err, e.event, e.eventType));
+        .then(() => AlemonJSEventLog(e.event, e.typing))
+        .catch(err => AlemonJSEventError(err, e.event, e.typing));
 }

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

@@ -30,7 +30,7 @@ export async function GUILD_MESSAGE_REACTIONS(event) {
     const e = {
         platform: 'villa',
         event: 'GUILD_MESSAGE_REACTIONS',
-        eventType: event.extendData.addQuickEmoticon.isCancel
+        typing: event.extendData.addQuickEmoticon.isCancel
             ? 'DELETE'
             : 'CREATE',
         boundaries: 'publick',
@@ -94,6 +94,6 @@ export async function GUILD_MESSAGE_REACTIONS(event) {
      * 只匹配类型
      */
     return await typeMessage(e)
-        .then(() => AlemonJSEventLog(e.event, e.eventType))
-        .catch(err => AlemonJSEventError(err, e.event, e.eventType));
+        .then(() => AlemonJSEventLog(e.event, e.typing))
+        .catch(err => AlemonJSEventError(err, e.event, e.typing));
 }

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

@@ -103,7 +103,7 @@ export async function MESSAGES(event) {
         boundaries: 'publick',
         attribute: 'group',
         event: 'MESSAGES',
-        eventType: 'CREATE',
+        typing: 'CREATE',
         bot: {
             id: event.robot.template.id,
             name: event.robot.template.name,

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

@@ -30,7 +30,7 @@ export async function MESSAGE_AUDIT(event) {
     const e = {
         platform: 'villa',
         event: 'MESSAGE_AUDIT',
-        eventType: 'CREATE',
+        typing: 'CREATE',
         boundaries: 'publick',
         attribute: 'group',
         bot: {
@@ -85,6 +85,6 @@ export async function MESSAGE_AUDIT(event) {
      * 只匹配类型
      */
     return await typeMessage(e)
-        .then(() => AlemonJSEventLog(e.event, e.eventType))
-        .catch(err => AlemonJSEventError(err, e.event, e.eventType));
+        .then(() => AlemonJSEventLog(e.event, e.typing))
+        .catch(err => AlemonJSEventError(err, e.event, e.typing));
 }

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

@@ -34,7 +34,7 @@ export async function MESSAGE_BUTTON(event) {
         boundaries: 'publick',
         attribute: 'group',
         event: 'MESSAGES',
-        eventType: 'CREATE',
+        typing: 'CREATE',
         bot: {
             id: event.robot.template.id,
             name: event.robot.template.name,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alemonjs",
-  "version": "1.1.20",
+  "version": "1.1.21",
   "description": "DOCS https://alemonjs.com/",
   "scripts": {
     "dev": "ts-node alemon.config.ts",

package/types/core/conversation.d.ts

@@ -0,0 +1,20 @@
+/**
+ * 对话机
+ */
+export declare const Conversation: {
+    /**
+     * 设置对话状态
+     * @param ID 用户编号
+     * @param state 状态记录
+     */
+    passing: (ID: string, state: import("./dialogue.js").ConversationState) => Promise<void>;
+    /**
+     * 删除对话状态
+     * @param ID 用户编号
+     */
+    remove: (ID: string) => void;
+    /**
+     * 注册对话
+     */
+    add: (key: string, value: import("./dialogue.js").ConversationHandler) => import("./dialogue.js").conversationHandlersMap;
+};

package/types/core/dialogue.d.ts

@@ -1,4 +1,4 @@
-import { type AMessage } from './typings.js';
+import { AMessage } from './typings.js';
 /**
  * 对话处理函数集
  */
@@ -32,22 +32,26 @@ export type ConversationHandler = (e: AMessage, state: ConversationState) => Pro
 export type conversationHandlersMap = Map<string, ConversationHandler>;
 /**
  * 注册对话处理器
+ * @deprecated Conversation.add
  */
 export declare const conversationHandlers: conversationHandlersMap;
 /**
  * 获取对话状态
- * @param userId 用户编号
+ * @param ID 编号
  * @returns 对话状态值
+ * @deprecated 不推荐使用
  */
-export declare const getConversationState: (userId: string) => Promise<ConversationState | null>;
+export declare const getConversationState: (ID: string) => Promise<ConversationState | null>;
 /**
  * 设置对话状态
- * @param userId 用户编号
+ * @param ID 编号
  * @param state 状态记录
+ * @deprecated Conversation.passing
  */
-export declare const setConversationState: (userId: string, state: ConversationState) => Promise<void>;
+export declare const setConversationState: (ID: string, state: ConversationState) => Promise<void>;
 /**
  * 删除对话状态
- * @param userId 用户编号
+ * @param ID 编号
+ * @deprecated Conversation.del
  */
-export declare const deleteConversationState: (userId: string) => Promise<void>;
+export declare const deleteConversationState: (ID: string) => Promise<void>;

package/types/core/index.d.ts

@@ -10,6 +10,7 @@ export * from './configs.js';
 export * from './apps.js';
 export * from './cache.js';
 export * from './dialogue.js';
+export * from './conversation.js';
 export * from './qrcode.js';
 export * from './dealmsg.js';
 export * from './puppeteer.js';

package/types/core/plugin.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" resolution-mode="require"/>
-import { type AMessage, type EventEnum, type EventType } from './typings.js';
+import { type AMessage, type EventEnum, type TypingEnum } from './typings.js';
 /**
  * 定时类型
  */
@@ -14,7 +14,7 @@ interface TaskType {
  */
 export interface PluginInitType {
     event?: (typeof EventEnum)[number];
-    eventType?: (typeof EventType)[number];
+    typing?: (typeof TypingEnum)[number];
     priority?: number;
     name?: string;
     dsc?: string;
@@ -73,7 +73,7 @@ export declare class plugin {
     /**
      * 事件类型
      */
-    eventType?: (typeof EventType)[number];
+    typing?: (typeof TypingEnum)[number];
     /**
      * 匹配优先级
      */
@@ -89,7 +89,7 @@ export declare class plugin {
     /**
      * @param name 类名标记        default app-name
      * @param event 事件类型       default MESSAGES
-     * @param eventType 消息类型   default CREATE
+     * @param typing 消息类型   default CREATE
      * @param priority 优先级      越小优越高 default 9000
      * @param rule.reg 命令正则    RegExp | string
      * @param rule.fnc 命令函数    function
@@ -97,7 +97,7 @@ export declare class plugin {
      * @param rule.doc 指令文档    doc
      * @param rule.priority 优先级    数字越小优先级越高
      */
-    constructor({ name, event, eventType, priority, rule, task }: PluginInitType);
+    constructor({ name, event, typing, priority, rule, task }: PluginInitType);
     /**
      * @param content 内容
      * @param img  图片buffer | 指定图片名
@@ -163,7 +163,7 @@ export declare class APlugin {
     /**
      * 事件类型
      */
-    eventType?: (typeof EventType)[number];
+    typing?: (typeof TypingEnum)[number];
     /**
      * 匹配优先级
      */
@@ -179,7 +179,7 @@ export declare class APlugin {
     /**
      * @param name 类名标记        default app-name
      * @param event 事件类型       default MESSAGES
-     * @param eventType 消息类型   default CREATE
+     * @param typing 消息类型   default CREATE
      * @param priority 优先级      越小优越高 default 9000
      * @param rule.reg 命令正则    RegExp | string
      * @param rule.fnc 命令函数    function
@@ -187,7 +187,7 @@ export declare class APlugin {
      * @param rule.doc 指令文档    doc
      * @param rule.priority 优先级    数字越小优先级越高
      */
-    constructor({ name, event, eventType, priority, rule, task }: PluginInitType);
+    constructor({ name, event, typing, priority, rule, task }: PluginInitType);
     /**
      * @param content 内容
      * @param img  图片buffer | 指定图片名

package/types/core/typings.d.ts

@@ -19,7 +19,7 @@ interface EventBase {
     /**
      * 消息类型
      */
-    eventType: (typeof EventType)[number];
+    typing: (typeof TypingEnum)[number];
 }
 /**
  * 平台枚举
@@ -32,7 +32,7 @@ export declare const EventEnum: readonly ["GUILD", "GUILD_BOT", "CHANNEL", "GUIL
 /**
  * 消息判断
  */
-export declare const EventType: readonly ["CREATE", "UPDATE", "DELETE"];
+export declare const TypingEnum: readonly ["CREATE", "UPDATE", "DELETE"];
 /**
  * 机器人相关
  */