alemonjs 1.1.13 → 1.1.15

package/lib/discord/alemon/conversation.js

@@ -29,7 +29,6 @@ export function conversation(t, d) {
     }
     else if (t == 'GUILD_CREATE') {
         // 频道信息创建
-        // console.log(d)
     }
     else if (t == 'MESSAGE_CREATE') {
         // 消息创建

package/lib/discord/alemon/reply.js

@@ -10,13 +10,7 @@ import { everyoneError } from '../../log/index.js';
  */
 export async function replyController(msg, channel_id, select) {
     if (Buffer.isBuffer(msg)) {
-        try {
-            return await Client.channelsMessagesImage(channel_id, msg);
-        }
-        catch (err) {
-            console.error(err);
-            return err;
-        }
+        return await Client.channelsMessagesImage(channel_id, msg).catch(everyoneError);
     }
     // arr & find buffer
     if (Array.isArray(msg) && msg.find(item => Buffer.isBuffer(item))) {
@@ -29,13 +23,7 @@ export async function replyController(msg, channel_id, select) {
         })
             .filter(element => typeof element === 'string')
             .join('');
-        try {
-            return await Client.channelsMessagesImage(channel_id, msg[isBuffer], cont);
-        }
-        catch (err) {
-            console.error(err);
-            return err;
-        }
+        return await Client.channelsMessagesImage(channel_id, msg[isBuffer], cont).catch(everyoneError);
     }
     const content = Array.isArray(msg)
         ? msg.join('')
@@ -51,7 +39,7 @@ export async function replyController(msg, channel_id, select) {
         const getUrl = match[1];
         const msg = await getUrlbuffer(getUrl);
         if (msg) {
-            return await Client.channelsMessagesImage(channel_id, msg);
+            return await Client.channelsMessagesImage(channel_id, msg).catch(everyoneError);
         }
     }
     return Client.channelsMessages(channel_id, {

package/lib/kook/alemon/controller.js

@@ -1,11 +1,14 @@
 import { ClientKOOK } from '../sdk/index.js';
 import { replyController } from './reply.js';
 import { getBotConfigByKey } from '../../config/index.js';
+import { everyoneError } from '../../log/index.js';
 export const Controller = {
     Member: ({ guild_id, user_id }) => {
         return {
             information: async () => {
-                const data = await ClientKOOK.userView(guild_id, user_id).then(res => res.data);
+                const data = await ClientKOOK.userView(guild_id, user_id)
+                    .then(res => res.data)
+                    .catch(everyoneError);
                 if (data) {
                     const cfg = getBotConfigByKey('qq');
                     const masterID = cfg.masterID;
@@ -79,7 +82,7 @@ export const Controller = {
                         type: 3,
                         target_id: channel_id,
                         content: file
-                    });
+                    }).catch(everyoneError);
                 }
                 const ret = await ClientKOOK.postFile(file, name);
                 if (!ret)
@@ -88,7 +91,7 @@ export const Controller = {
                     type: 3,
                     target_id: channel_id,
                     content: ret.data.url
-                });
+                }).catch(everyoneError);
             },
             video: async (file, name) => {
                 if (typeof file == 'string') {
@@ -96,7 +99,7 @@ export const Controller = {
                         type: 3,
                         target_id: channel_id,
                         content: file
-                    });
+                    }).catch(everyoneError);
                 }
                 const ret = await ClientKOOK.postFile(file, name);
                 if (!ret)
@@ -105,7 +108,7 @@ export const Controller = {
                     type: 3,
                     target_id: channel_id,
                     content: ret.data.url
-                });
+                }).catch(everyoneError);
             },
             card: async (msg) => {
                 return [
@@ -121,7 +124,7 @@ export const Controller = {
                 limit: 20
             }) => {
                 // 该消息下 指定emoji的所有用户
-                return await ClientKOOK.messageReactionList({ msg_id, emoji });
+                return await ClientKOOK.messageReactionList({ msg_id, emoji }).catch(everyoneError);
             },
             article: async (msg) => {
                 return false;

package/lib/kook/alemon/direct.js

@@ -138,22 +138,16 @@ export async function directController(msg, channel_id, open_id) {
      * isbuffer
      */
     if (Buffer.isBuffer(msg)) {
-        try {
-            const ret = await ClientKOOK.postImage(msg);
-            if (ret && ret.data) {
-                return await ClientKOOK.createDirectMessage({
-                    type: 2,
-                    target_id: channel_id,
-                    chat_code: open_id,
-                    content: ret.data.url
-                }).catch(everyoneError);
-            }
-            return false;
-        }
-        catch (err) {
-            console.error(err);
-            return err;
+        const ret = await ClientKOOK.postImage(msg);
+        if (ret && ret.data) {
+            return await ClientKOOK.createDirectMessage({
+                type: 2,
+                target_id: channel_id,
+                chat_code: open_id,
+                content: ret.data.url
+            }).catch(everyoneError);
         }
+        return false;
     }
     /**
      * string[] arr and find buffer
@@ -171,7 +165,7 @@ export async function directController(msg, channel_id, open_id) {
             .filter(element => typeof element === 'string')
             .join('');
         // 转存
-        const ret = await ClientKOOK.postImage(msg[isBuffer]);
+        const ret = await ClientKOOK.postImage(msg[isBuffer]).catch(everyoneError);
         if (!ret)
             return false;
         // 私聊
@@ -180,7 +174,7 @@ export async function directController(msg, channel_id, open_id) {
             target_id: channel_id,
             chat_code: open_id,
             content: content
-        });
+        }).catch(everyoneError);
         return await ClientKOOK.createDirectMessage({
             type: 2,
             target_id: channel_id,

package/lib/kook/alemon/reply.js

@@ -13,21 +13,15 @@ export async function replyController(msg, channel_id) {
      * isbuffer
      */
     if (Buffer.isBuffer(msg)) {
-        try {
-            const ret = await ClientKOOK.postImage(msg);
-            if (ret && ret.data) {
-                return await ClientKOOK.createMessage({
-                    type: 2,
-                    target_id: channel_id,
-                    content: ret.data.url
-                }).catch(everyoneError);
-            }
-            return false;
-        }
-        catch (err) {
-            console.error(err);
-            return err;
+        const ret = await ClientKOOK.postImage(msg);
+        if (ret && ret.data) {
+            return await ClientKOOK.createMessage({
+                type: 2,
+                target_id: channel_id,
+                content: ret.data.url
+            }).catch(everyoneError);
         }
+        return false;
     }
     /**
      * string[] arr and find buffer
@@ -45,7 +39,7 @@ export async function replyController(msg, channel_id) {
             .filter(element => typeof element === 'string')
             .join('');
         // 转存
-        const ret = await ClientKOOK.postImage(msg[isBuffer]);
+        const ret = await ClientKOOK.postImage(msg[isBuffer]).catch(everyoneError);
         if (!ret)
             return false;
         if (ret?.data) {
@@ -53,7 +47,7 @@ export async function replyController(msg, channel_id) {
                 type: 9,
                 target_id: channel_id,
                 content: content
-            }).catch(err => err);
+            }).catch(everyoneError);
             return await ClientKOOK.createMessage({
                 type: 2,
                 target_id: channel_id,
@@ -76,7 +70,7 @@ export async function replyController(msg, channel_id) {
         const msg = await getUrlbuffer(getUrl);
         if (!msg)
             return false;
-        const ret = await ClientKOOK.postImage(msg);
+        const ret = await ClientKOOK.postImage(msg).catch(everyoneError);
         if (!ret)
             return false;
         if (msg && ret) {

package/lib/ntqq/alemon/group/controller.js

@@ -1,5 +1,6 @@
 import { replyController } from './reply.js';
 import { ClientNTQQ } from '../../sdk/index.js';
+import { everyoneError } from '../../../log/index.js';
 export const Controller = {
     Member: () => {
         return {
@@ -54,7 +55,7 @@ export const Controller = {
                         msg_id,
                         msg_type: 7,
                         msg_seq: ClientNTQQ.getMsgSeq(msg_id)
-                    });
+                    }).catch(everyoneError);
                 }
                 return false;
             },
@@ -72,7 +73,7 @@ export const Controller = {
                         msg_id,
                         msg_type: 7,
                         msg_seq: ClientNTQQ.getMsgSeq(msg_id)
-                    });
+                    }).catch(everyoneError);
                 }
                 return false;
             },
@@ -86,7 +87,7 @@ export const Controller = {
                         msg_id,
                         ...item,
                         msg_seq: ClientNTQQ.getMsgSeq(msg_id)
-                    }));
+                    }).catch(everyoneError));
                 }
                 return arr;
             },

package/lib/ntqq/alemon/group/direct.js

@@ -204,28 +204,24 @@ export async function directController(msg, open_id, msg_id) {
         })
             .filter(element => typeof element === 'string')
             .join('');
-        try {
-            const url = await ClientKOA.getFileUrl(msg[isBuffer]);
-            if (!url)
-                return false;
-            return await ClientNTQQ.usersOpenMessages(open_id, {
-                content: '',
-                media: {
-                    file_info: await ClientNTQQ.postRichMediaByGroup(open_id, {
-                        srv_send_msg: false,
-                        file_type: 1,
-                        url: url
-                    }).then(res => res.file_info)
-                },
-                msg_id,
-                msg_type: 7,
-                msg_seq: ClientNTQQ.getMsgSeq(msg_id)
-            }).catch(everyoneError);
-        }
-        catch (err) {
-            console.error(err);
-            return err;
-        }
+        const url = await ClientKOA.getFileUrl(msg[isBuffer]);
+        if (!url)
+            return false;
+        return await ClientNTQQ.usersOpenMessages(open_id, {
+            content: cont,
+            media: {
+                file_info: await ClientNTQQ.postRichMediaByGroup(open_id, {
+                    srv_send_msg: false,
+                    file_type: 1,
+                    url: url
+                })
+                    .then(res => res.file_info)
+                    .catch(everyoneError)
+            },
+            msg_id,
+            msg_type: 7,
+            msg_seq: ClientNTQQ.getMsgSeq(msg_id)
+        }).catch(everyoneError);
     }
     const content = Array.isArray(msg)
         ? msg.join('')

package/lib/ntqq/alemon/group/reply.js

@@ -11,28 +11,24 @@ import { everyoneError } from '../../../log/index.js';
 export async function replyController(msg, guild_id, msg_id) {
     // is buffer
     if (Buffer.isBuffer(msg)) {
-        try {
-            const url = await ClientKOA.getFileUrl(msg);
-            if (!url)
-                return false;
-            return await ClientNTQQ.groupOpenMessages(guild_id, {
-                content: '',
-                media: {
-                    file_info: await ClientNTQQ.postRichMediaByGroup(guild_id, {
-                        srv_send_msg: false,
-                        file_type: 1,
-                        url
-                    }).then(res => res.file_info)
-                },
-                msg_id,
-                msg_type: 7,
-                msg_seq: ClientNTQQ.getMsgSeq(msg_id)
-            }).catch(everyoneError);
-        }
-        catch (err) {
-            console.error(err);
-            return err;
-        }
+        const url = await ClientKOA.getFileUrl(msg);
+        if (!url)
+            return false;
+        return await ClientNTQQ.groupOpenMessages(guild_id, {
+            content: '',
+            media: {
+                file_info: await ClientNTQQ.postRichMediaByGroup(guild_id, {
+                    srv_send_msg: false,
+                    file_type: 1,
+                    url
+                })
+                    .then(res => res.file_info)
+                    .catch(everyoneError)
+            },
+            msg_id,
+            msg_type: 7,
+            msg_seq: ClientNTQQ.getMsgSeq(msg_id)
+        }).catch(everyoneError);
     }
     if (Array.isArray(msg) && msg.find(item => Buffer.isBuffer(item))) {
         const isBuffer = msg.findIndex(item => Buffer.isBuffer(item));
@@ -44,28 +40,24 @@ export async function replyController(msg, guild_id, msg_id) {
         })
             .filter(element => typeof element === 'string')
             .join('');
-        try {
-            const url = await ClientKOA.getFileUrl(msg[isBuffer]);
-            if (!url)
-                return false;
-            return await ClientNTQQ.groupOpenMessages(guild_id, {
-                content: cont,
-                media: {
-                    file_info: await ClientNTQQ.postRichMediaByGroup(guild_id, {
-                        srv_send_msg: false,
-                        file_type: 1,
-                        url
-                    }).then(res => res.file_info)
-                },
-                msg_id,
-                msg_type: 7,
-                msg_seq: ClientNTQQ.getMsgSeq(msg_id)
-            }).catch(everyoneError);
-        }
-        catch (err) {
-            console.error(err);
-            return err;
-        }
+        const url = await ClientKOA.getFileUrl(msg[isBuffer]);
+        if (!url)
+            return false;
+        return await ClientNTQQ.groupOpenMessages(guild_id, {
+            content: cont,
+            media: {
+                file_info: await ClientNTQQ.postRichMediaByGroup(guild_id, {
+                    srv_send_msg: false,
+                    file_type: 1,
+                    url
+                })
+                    .then(res => res.file_info)
+                    .catch(everyoneError)
+            },
+            msg_id,
+            msg_type: 7,
+            msg_seq: ClientNTQQ.getMsgSeq(msg_id)
+        }).catch(everyoneError);
     }
     const content = Array.isArray(msg)
         ? msg.join('')
@@ -86,7 +78,9 @@ export async function replyController(msg, guild_id, msg_id) {
                     srv_send_msg: false,
                     file_type: 1,
                     url: getUrl
-                }).then(res => res.file_info)
+                })
+                    .then(res => res.file_info)
+                    .catch(everyoneError)
             },
             msg_id,
             msg_type: 7,

package/lib/qq/alemon/controller.js

@@ -1,6 +1,7 @@
 import { replyController } from './reply.js';
 import { getBotConfigByKey } from '../../config/index.js';
 import { directController } from './direct.js';
+import { everyoneError } from '../../log/index.js';
 export const Controller = {
     Member: ({ guild_id, user_id, channel_id }) => {
         return {
@@ -11,7 +12,8 @@ export const Controller = {
             information: async () => {
                 const data = await ClientQQ.guildApi
                     .guildMember(guild_id, user_id)
-                    .then(res => res.data);
+                    .then(res => res.data)
+                    .catch(everyoneError);
                 if (data) {
                     const cfg = getBotConfigByKey('qq');
                     const masterID = cfg.masterID;
@@ -35,21 +37,27 @@ export const Controller = {
              */
             mute: async (option) => {
                 if (option.cancel) {
-                    return await ClientQQ.muteApi.muteMember(guild_id, user_id, {
+                    return await ClientQQ.muteApi
+                        .muteMember(guild_id, user_id, {
                         seconds: String(option.time ?? 60000 / 1000)
-                    });
+                    })
+                        .catch(everyoneError);
                 }
                 else {
-                    return await ClientQQ.muteApi.muteMember(guild_id, user_id, {
+                    return await ClientQQ.muteApi
+                        .muteMember(guild_id, user_id, {
                         seconds: '0'
-                    });
+                    })
+                        .catch(everyoneError);
                 }
             },
             /**
              * 踢出
              */
             remove: async () => {
-                return await ClientQQ.guildApi.deleteGuildMember(guild_id, user_id);
+                return await ClientQQ.guildApi
+                    .deleteGuildMember(guild_id, user_id)
+                    .catch(everyoneError);
             },
             /**
              * 身分组
@@ -59,10 +67,14 @@ export const Controller = {
              */
             operate: async (role_id, add = true) => {
                 if (add) {
-                    return await ClientQQ.memberApi.memberAddRole(guild_id, role_id, user_id, channel_id);
+                    return await ClientQQ.memberApi
+                        .memberAddRole(guild_id, role_id, user_id, channel_id)
+                        .catch(everyoneError);
                 }
                 else {
-                    return await ClientQQ.memberApi.memberDeleteRole(guild_id, role_id, user_id, channel_id);
+                    return await ClientQQ.memberApi
+                        .memberDeleteRole(guild_id, role_id, user_id, channel_id)
+                        .catch(everyoneError);
                 }
             }
         };
@@ -74,14 +86,14 @@ export const Controller = {
                     return await directController(content, open_id, msg_id, {
                         open_id: open_id,
                         user_id: user_id
-                    });
+                    }).catch(everyoneError);
                 }
-                return await replyController(content, channel_id, msg_id);
+                return await replyController(content, channel_id, msg_id).catch(everyoneError);
             },
             quote: async (content) => {
                 return await replyController(content, channel_id, msg_id, {
                     quote: msg_id
-                });
+                }).catch(everyoneError);
             },
             /**
              * 更新信息
@@ -92,39 +104,53 @@ export const Controller = {
                 return false;
             },
             withdraw: async (hideTip = true) => {
-                return await ClientQQ.messageApi.deleteMessage(channel_id, msg_id, hideTip);
+                return await ClientQQ.messageApi
+                    .deleteMessage(channel_id, msg_id, hideTip)
+                    .catch(everyoneError);
             },
             pinning: async (cancel) => {
                 if (cancel) {
-                    return await ClientQQ.pinsMessageApi.deletePinsMessage(channel_id, msg_id);
+                    return await ClientQQ.pinsMessageApi
+                        .deletePinsMessage(channel_id, msg_id)
+                        .catch(everyoneError);
                 }
-                return await ClientQQ.pinsMessageApi.putPinsMessage(channel_id, msg_id);
+                return await ClientQQ.pinsMessageApi
+                    .putPinsMessage(channel_id, msg_id)
+                    .catch(everyoneError);
             },
             forward: async () => {
                 return false;
             },
             horn: async (cancel) => {
                 if (cancel) {
-                    return await ClientQQ.announceApi.deleteGuildAnnounce(guild_id, msg_id);
+                    return await ClientQQ.announceApi
+                        .deleteGuildAnnounce(guild_id, msg_id)
+                        .catch(everyoneError);
                 }
-                return await ClientQQ.announceApi.postGuildAnnounce(guild_id, channel_id, msg_id);
+                return await ClientQQ.announceApi
+                    .postGuildAnnounce(guild_id, channel_id, msg_id)
+                    .catch(everyoneError);
             },
             emoji: async (msg, cancel) => {
                 const arr = [];
                 if (cancel) {
                     for (const item of msg) {
-                        arr.push(await ClientQQ.reactionApi.deleteReaction(channel_id, {
+                        arr.push(await ClientQQ.reactionApi
+                            .deleteReaction(channel_id, {
                             message_id: msg_id,
                             ...item
-                        }));
+                        })
+                            .catch(everyoneError));
                     }
                     return arr;
                 }
                 for (const item of msg) {
-                    arr.push(await ClientQQ.reactionApi.postReaction(channel_id, {
+                    arr.push(await ClientQQ.reactionApi
+                        .postReaction(channel_id, {
                         message_id: msg_id,
                         ...item
-                    }));
+                    })
+                        .catch(everyoneError));
                 }
                 return arr;
             },
@@ -148,10 +174,12 @@ export const Controller = {
                 // 卡片消息
                 const arr = [];
                 for (const item of msg) {
-                    arr.push(await ClientQQ.messageApi.postMessage(channel_id, {
+                    arr.push(await ClientQQ.messageApi
+                        .postMessage(channel_id, {
                         msg_id: msg_id,
                         ...item
-                    }));
+                    })
+                        .catch(everyoneError));
                 }
                 return arr;
             },
@@ -159,7 +187,9 @@ export const Controller = {
                 cookie: '',
                 limit: 20
             }) => {
-                return await ClientQQ.reactionApi.getReactionUserList(channel_id, reactionObj, options);
+                return await ClientQQ.reactionApi
+                    .getReactionUserList(channel_id, reactionObj, options)
+                    .catch(everyoneError);
             },
             article: async (msg) => {
                 return false;

package/lib/qq/alemon/direct.js

@@ -37,10 +37,10 @@ const Controller = {
     Message: ({ open_id, msg_id }) => {
         return {
             reply: async (content) => {
-                return await directController(content, open_id, msg_id);
+                return await directController(content, open_id, msg_id).catch(everyoneError);
             },
             quote: async (content) => {
-                return await directController(content, open_id, msg_id);
+                return await directController(content, open_id, msg_id).catch(everyoneError);
             },
             /**
              * 更新信息
@@ -129,10 +129,12 @@ export const ClientControllerOnMember = () => {
  */
 export async function directController(msg, open_id, msg_id, select) {
     if (select?.open_id && select?.user_id) {
-        const { data: { guild_id } } = await ClientQQ.directMessageApi.createDirectMessage({
+        const { data: { guild_id } } = await ClientQQ.directMessageApi
+            .createDirectMessage({
             source_guild_id: select?.open_id,
             recipient_id: select?.user_id
-        });
+        })
+            .catch(everyoneError);
         if (!guild_id)
             return false;
         open_id = guild_id;
@@ -140,17 +142,11 @@ export async function directController(msg, open_id, msg_id, select) {
     // isBuffer
     // if withdraw == 0 ， false 不撤回
     if (Buffer.isBuffer(msg)) {
-        try {
-            return await Client.postDirectImage({
-                id: open_id,
-                msg_id: msg_id, //消息id, 必须
-                image: msg //buffer
-            }).catch(everyoneError);
-        }
-        catch (err) {
-            console.error(err);
-            return err;
-        }
+        return await Client.postDirectImage({
+            id: open_id,
+            msg_id: msg_id, //消息id, 必须
+            image: msg //buffer
+        }).catch(everyoneError);
     }
     // arr && find buffer
     if (Array.isArray(msg) && msg.find(item => Buffer.isBuffer(item))) {
@@ -163,18 +159,12 @@ export async function directController(msg, open_id, msg_id, select) {
         })
             .filter(element => typeof element === 'string')
             .join('');
-        try {
-            return await Client.postDirectImage({
-                id: open_id,
-                msg_id: msg_id, //消息id, 必须
-                image: msg[isBuffer], //buffer
-                content: cont
-            }).catch(everyoneError);
-        }
-        catch (err) {
-            console.error(err);
-            return err;
-        }
+        return await Client.postDirectImage({
+            id: open_id,
+            msg_id: msg_id, //消息id, 必须
+            image: msg[isBuffer], //buffer
+            content: cont
+        }).catch(everyoneError);
     }
     const content = Array.isArray(msg)
         ? msg.join('')