@alemonjs/qq-bot 2.1.7 → 2.1.9

package/lib/config.d.ts

@@ -7,4 +7,4 @@ export type Options = {
     hideUnsupported?: boolean | number;
 } & sdkOptions;
 export declare const getQQBotConfig: () => Options;
-export declare const getMaster: (UserId: string) => readonly [boolean, string];
+export declare const getMaster: (UserId: string) => readonly [any, string];

package/lib/config.js

@@ -6,14 +6,17 @@ const getQQBotConfig = () => {
     return value[platform] || {};
 };
 const getMaster = (UserId) => {
+    const values = getConfigValue() || {};
+    const mainMasterKey = values.master_key || [];
+    const mainMasterId = values.master_id || [];
     const config = getQQBotConfig();
-    const master_key = config.master_key || [];
-    const master_id = config.master_id || [];
+    const masterKey = config.master_key || [];
+    const masterId = config.master_id || [];
     const UserKey = useUserHashKey({
         Platform: platform,
         UserId: UserId
     });
-    const is = master_key.includes(UserKey) || master_id.includes(UserId);
+    const is = mainMasterKey.includes(UserKey) || mainMasterId.includes(UserId) || masterKey.includes(UserKey) || masterId.includes(UserId);
     return [is, UserKey];
 };
 

package/lib/format.js

@@ -1,6 +1,7 @@
 const markdownToText = (items, hideUnsupported) => {
-    if (Number(hideUnsupported) >= 4)
+    if (Number(hideUnsupported) >= 4) {
         return '';
+    }
     return items
         .map(item => {
         switch (item.type) {
@@ -17,8 +18,9 @@ const markdownToText = (items, hideUnsupported) => {
                 return item.value;
             case 'MD.link': {
                 const v = item.value;
-                if (Number(hideUnsupported) >= 3)
+                if (Number(hideUnsupported) >= 3) {
                     return '';
+                }
                 return Number(hideUnsupported) >= 2 ? v.url : `${v.text}( ${v.url} )`;
             }
             case 'MD.image':
@@ -48,8 +50,9 @@ const markdownToText = (items, hideUnsupported) => {
             case 'MD.content':
                 return item.value;
             case 'MD.button':
-                if (Number(hideUnsupported) >= 3)
+                if (Number(hideUnsupported) >= 3) {
                     return '';
+                }
                 if (Number(hideUnsupported) >= 2) {
                     return item.options?.data || String(item.value);
                 }
@@ -64,8 +67,9 @@ const buttonsToText = (rows) => {
     return rows.map((row) => row.value.map((btn) => `[${btn.value}]`).join(' ')).join('\n');
 };
 const markdownRawToText = (raw, hideUnsupported) => {
-    if (Number(hideUnsupported) >= 4)
+    if (Number(hideUnsupported) >= 4) {
         return '';
+    }
     let text = raw;
     text = text.replace(/!\[([^\]]*)\]\([^)]*\)/g, hideUnsupported ? '' : '[图片]');
     text = text.replace(/\[([^\]]*)\]\(([^)]*)\)/g, Number(hideUnsupported) >= 2 ? '$2' : '$1');
@@ -86,8 +90,9 @@ const markdownRawToText = (raw, hideUnsupported) => {
     return text;
 };
 const dataEnumToText = (item, hideUnsupported) => {
-    if (Number(hideUnsupported) >= 4)
+    if (Number(hideUnsupported) >= 4) {
         return '';
+    }
     switch (item.type) {
         case 'MarkdownOriginal':
             return markdownRawToText(String(item.value), hideUnsupported);

package/lib/register.js

@@ -748,6 +748,299 @@ const register = (client) => {
                 const res = await api.active.send.user(userId, paramFormat);
                 consume(res);
             }
+            else if (data.action === 'message.delete') {
+                const channelId = data.payload.ChannelId;
+                const messageId = data.payload.MessageId;
+                const res = await client
+                    .channelsMessagesDelete(channelId, messageId)
+                    .then(r => createResult(ResultCode.Ok, data.action, r))
+                    .catch(err => createResult(ResultCode.Fail, data.action, err));
+                consume([res]);
+            }
+            else if (data.action === 'message.pin') {
+                const res = await client
+                    .channelsPinsPut(data.payload.ChannelId, data.payload.MessageId)
+                    .then(r => createResult(ResultCode.Ok, data.action, r))
+                    .catch(err => createResult(ResultCode.Fail, data.action, err));
+                consume([res]);
+            }
+            else if (data.action === 'message.unpin') {
+                const res = await client
+                    .channelsPinsDelete(data.payload.ChannelId, data.payload.MessageId)
+                    .then(r => createResult(ResultCode.Ok, data.action, r))
+                    .catch(err => createResult(ResultCode.Fail, data.action, err));
+                consume([res]);
+            }
+            else if (data.action === 'reaction.add') {
+                const res = await client
+                    .channelsMessagesReactionsPut(data.payload.ChannelId, data.payload.MessageId, 1, data.payload.EmojiId)
+                    .then(r => createResult(ResultCode.Ok, data.action, r))
+                    .catch(err => createResult(ResultCode.Fail, data.action, err));
+                consume([res]);
+            }
+            else if (data.action === 'reaction.remove') {
+                const res = await client
+                    .channelsMessagesReactionsDelete(data.payload.ChannelId, data.payload.MessageId, 1, data.payload.EmojiId)
+                    .then(r => createResult(ResultCode.Ok, data.action, r))
+                    .catch(err => createResult(ResultCode.Fail, data.action, err));
+                consume([res]);
+            }
+            else if (data.action === 'message.get') {
+                const res = await client
+                    .channelsMessagesById(data.payload.ChannelId, data.payload.MessageId)
+                    .then(r => createResult(ResultCode.Ok, data.action, r))
+                    .catch(err => createResult(ResultCode.Fail, data.action, err));
+                consume([res]);
+            }
+            else if (data.action === 'member.info') {
+                const guildId = data.payload.params?.guildId ?? data.payload.GuildId;
+                const userId = data.payload.params?.userId ?? data.payload.UserId;
+                const res = await client
+                    .guildsMembersMessage(guildId, userId)
+                    .then(r => createResult(ResultCode.Ok, data.action, r))
+                    .catch(err => createResult(ResultCode.Fail, data.action, err));
+                consume([res]);
+            }
+            else if (data.action === 'member.list') {
+                const guildId = data.payload.GuildId;
+                const after = data.payload.params?.After ?? '0';
+                const limit = data.payload.params?.Limit ?? 100;
+                const res = await client
+                    .guildsMembers(guildId, { after, limit })
+                    .then(r => createResult(ResultCode.Ok, data.action, r))
+                    .catch(err => createResult(ResultCode.Fail, data.action, err));
+                consume([res]);
+            }
+            else if (data.action === 'member.kick') {
+                const res = await client
+                    .guildsMembersDelete(data.payload.GuildId, data.payload.UserId)
+                    .then(r => createResult(ResultCode.Ok, data.action, r))
+                    .catch(err => createResult(ResultCode.Fail, data.action, err));
+                consume([res]);
+            }
+            else if (data.action === 'member.ban') {
+                const guildId = data.payload.GuildId;
+                const userId = data.payload.UserId;
+                const duration = data.payload.params?.duration ?? 0;
+                const mute_seconds = String(duration > 0 ? duration : 604800);
+                const res = await client
+                    .guildsMemberMute(guildId, userId, { mute_seconds })
+                    .then(r => createResult(ResultCode.Ok, data.action, r))
+                    .catch(err => createResult(ResultCode.Fail, data.action, err));
+                consume([res]);
+            }
+            else if (data.action === 'member.unban') {
+                const res = await client
+                    .guildsMemberMute(data.payload.GuildId, data.payload.UserId, { mute_seconds: '0' })
+                    .then(r => createResult(ResultCode.Ok, data.action, r))
+                    .catch(err => createResult(ResultCode.Fail, data.action, err));
+                consume([res]);
+            }
+            else if (data.action === 'member.mute') {
+                const guildId = data.payload.GuildId;
+                const userId = data.payload.UserId;
+                const duration = data.payload.params?.duration ?? 0;
+                const mute_seconds = String(duration);
+                const res = await client
+                    .guildsMemberMute(guildId, userId, { mute_seconds })
+                    .then(r => createResult(ResultCode.Ok, data.action, r))
+                    .catch(err => createResult(ResultCode.Fail, data.action, err));
+                consume([res]);
+            }
+            else if (data.action === 'guild.info') {
+                const res = await client
+                    .guilds(data.payload.GuildId)
+                    .then(r => createResult(ResultCode.Ok, data.action, r))
+                    .catch(err => createResult(ResultCode.Fail, data.action, err));
+                consume([res]);
+            }
+            else if (data.action === 'guild.list') {
+                const res = await client
+                    .usersMeGuilds({ before: '', after: '', limit: 100 })
+                    .then(r => createResult(ResultCode.Ok, data.action, r))
+                    .catch(err => createResult(ResultCode.Fail, data.action, err));
+                consume([res]);
+            }
+            else if (data.action === 'guild.mute') {
+                const guildId = data.payload.GuildId;
+                const duration = data.payload.params?.duration ?? 0;
+                const mute_seconds = String(duration);
+                const res = await client
+                    .guildsMuteAll(guildId, { mute_seconds })
+                    .then(r => createResult(ResultCode.Ok, data.action, r))
+                    .catch(err => createResult(ResultCode.Fail, data.action, err));
+                consume([res]);
+            }
+            else if (data.action === 'channel.info') {
+                const res = await client
+                    .channels(data.payload.ChannelId)
+                    .then(r => createResult(ResultCode.Ok, data.action, r))
+                    .catch(err => createResult(ResultCode.Fail, data.action, err));
+                consume([res]);
+            }
+            else if (data.action === 'channel.list') {
+                const res = await client
+                    .guildsChannels(data.payload.GuildId)
+                    .then(r => createResult(ResultCode.Ok, data.action, r))
+                    .catch(err => createResult(ResultCode.Fail, data.action, err));
+                consume([res]);
+            }
+            else if (data.action === 'channel.create') {
+                const guildId = data.payload.GuildId;
+                const params = data.payload.params;
+                const res = await client
+                    .guildsChannelsCreate(guildId, { name: params.name, type: params.type ? Number(params.type) : 0, position: 0, parent_id: params.parentId ?? '' })
+                    .then(r => createResult(ResultCode.Ok, data.action, r))
+                    .catch(err => createResult(ResultCode.Fail, data.action, err));
+                consume([res]);
+            }
+            else if (data.action === 'channel.update') {
+                const channelId = data.payload.ChannelId;
+                const params = data.payload.params;
+                const res = await client
+                    .guildsChannelsUpdate(channelId, { name: params.name ?? '', position: params.position ?? 0 })
+                    .then(r => createResult(ResultCode.Ok, data.action, r))
+                    .catch(err => createResult(ResultCode.Fail, data.action, err));
+                consume([res]);
+            }
+            else if (data.action === 'channel.delete') {
+                const res = await client
+                    .guildsChannelsdelete(data.payload.ChannelId, {})
+                    .then(r => createResult(ResultCode.Ok, data.action, r))
+                    .catch(err => createResult(ResultCode.Fail, data.action, err));
+                consume([res]);
+            }
+            else if (data.action === 'role.list') {
+                const res = await client
+                    .guildsRoles(data.payload.GuildId)
+                    .then(r => createResult(ResultCode.Ok, data.action, r))
+                    .catch(err => createResult(ResultCode.Fail, data.action, err));
+                consume([res]);
+            }
+            else if (data.action === 'role.create') {
+                const params = data.payload.params;
+                const res = await client
+                    .guildsRolesPost(data.payload.GuildId, { name: params.name, color: params.color })
+                    .then(r => createResult(ResultCode.Ok, data.action, r))
+                    .catch(err => createResult(ResultCode.Fail, data.action, err));
+                consume([res]);
+            }
+            else if (data.action === 'role.update') {
+                const params = data.payload.params;
+                const res = await client
+                    .guildsRolesPatch(data.payload.GuildId, data.payload.RoleId, { name: params.name, color: params.color })
+                    .then(r => createResult(ResultCode.Ok, data.action, r))
+                    .catch(err => createResult(ResultCode.Fail, data.action, err));
+                consume([res]);
+            }
+            else if (data.action === 'role.delete') {
+                const res = await client
+                    .guildsRolesDelete(data.payload.GuildId, data.payload.RoleId)
+                    .then(r => createResult(ResultCode.Ok, data.action, r))
+                    .catch(err => createResult(ResultCode.Fail, data.action, err));
+                consume([res]);
+            }
+            else if (data.action === 'role.assign') {
+                const res = await client
+                    .guildsRolesMembersPut(data.payload.GuildId, '', data.payload.UserId, data.payload.RoleId)
+                    .then(r => createResult(ResultCode.Ok, data.action, r))
+                    .catch(err => createResult(ResultCode.Fail, data.action, err));
+                consume([res]);
+            }
+            else if (data.action === 'role.remove') {
+                const res = await client
+                    .guildsRolesMembersDelete(data.payload.GuildId, '', data.payload.UserId, data.payload.RoleId)
+                    .then(r => createResult(ResultCode.Ok, data.action, r))
+                    .catch(err => createResult(ResultCode.Fail, data.action, err));
+                consume([res]);
+            }
+            else if (data.action === 'file.send.channel') {
+                const res = await client
+                    .postRichMediaByGroup(data.payload.ChannelId, {
+                    file_type: data.payload.params?.file_type ?? 1,
+                    url: data.payload.params?.url,
+                    file_data: data.payload.params?.file_data,
+                    srv_send_msg: data.payload.params?.srv_send_msg ?? false
+                })
+                    .then(r => createResult(ResultCode.Ok, data.action, r))
+                    .catch(err => createResult(ResultCode.Fail, data.action, err));
+                consume([res]);
+            }
+            else if (data.action === 'file.send.user') {
+                const res = await client
+                    .postRichMediaByUser(data.payload.UserId, {
+                    file_type: data.payload.params?.file_type ?? 1,
+                    url: data.payload.params?.url,
+                    file_data: data.payload.params?.file_data,
+                    srv_send_msg: data.payload.params?.srv_send_msg ?? false
+                })
+                    .then(r => createResult(ResultCode.Ok, data.action, r))
+                    .catch(err => createResult(ResultCode.Fail, data.action, err));
+                consume([res]);
+            }
+            else if (data.action === 'me.guilds') {
+                const res = await client
+                    .usersMeGuilds({ before: '', after: '', limit: 100 })
+                    .then(r => createResult(ResultCode.Ok, data.action, r))
+                    .catch(err => createResult(ResultCode.Fail, data.action, err));
+                consume([res]);
+            }
+            else if (data.action === 'media.send.channel') {
+                consume([createResult(ResultCode.Warn, 'media.send.channel not directly supported, use message.send with format', null)]);
+            }
+            else if (data.action === 'media.send.user') {
+                const userId = data.payload.UserId;
+                const params = data.payload.params;
+                const fileType = params?.type === 'image' ? 1 : params?.type === 'video' ? 2 : params?.type === 'audio' ? 3 : 4;
+                const res = await client
+                    .postRichMediaByUser(userId, { file_type: fileType, url: params?.url, file_data: params?.data })
+                    .then(r => createResult(ResultCode.Ok, data.action, r))
+                    .catch(err => createResult(ResultCode.Fail, data.action, err));
+                consume([res]);
+            }
+            else if (data.action === 'media.upload') {
+                consume([createResult(ResultCode.Warn, 'media.upload not supported, use media.send.user or media.send.channel', null)]);
+            }
+            else if (data.action === 'permission.get') {
+                const res = await client
+                    .channelsPermissions(data.payload.ChannelId, data.payload.UserId)
+                    .then(r => createResult(ResultCode.Ok, data.action, r))
+                    .catch(err => createResult(ResultCode.Fail, data.action, err));
+                consume([res]);
+            }
+            else if (data.action === 'permission.set') {
+                const params = data.payload.params;
+                const res = await client
+                    .channelsPermissionsPut(data.payload.ChannelId, data.payload.UserId, params?.allow ?? '0', params?.deny ?? '0')
+                    .then(r => createResult(ResultCode.Ok, data.action, r))
+                    .catch(err => createResult(ResultCode.Fail, data.action, err));
+                consume([res]);
+            }
+            else if (data.action === 'reaction.list') {
+                const res = await client
+                    .channelsMessagesReactionsUsers(data.payload.ChannelId, data.payload.MessageId, 1, data.payload.EmojiId, { limit: data.payload.params?.limit ?? 20 })
+                    .then(r => createResult(ResultCode.Ok, data.action, r))
+                    .catch(err => createResult(ResultCode.Fail, data.action, err));
+                consume([res]);
+            }
+            else if (data.action === 'channel.announce') {
+                const guildId = data.payload.GuildId;
+                const params = data.payload.params;
+                if (params?.remove) {
+                    const res = await client
+                        .guildsAnnouncesDelete(guildId, params?.messageId ?? 'all')
+                        .then(r => createResult(ResultCode.Ok, data.action, r))
+                        .catch(err => createResult(ResultCode.Fail, data.action, err));
+                    consume([res]);
+                }
+                else {
+                    const res = await client
+                        .guildsAnnounces(guildId, { message_id: params?.messageId, channel_id: params?.channelId })
+                        .then(r => createResult(ResultCode.Ok, data.action, r))
+                        .catch(err => createResult(ResultCode.Fail, data.action, err));
+                    consume([res]);
+                }
+            }
             else {
                 consume([createResult(ResultCode.Fail, '未知请求，请尝试升级版本', null)]);
             }

package/lib/sdk/api.d.ts

@@ -70,28 +70,28 @@ export declare class QQBotAPI {
     channels(channel_id: string): Promise<any>;
     guildsChannelsCreate(guild_id: string, data: {
         name: string;
-        type: number;
-        sub_type: number;
-        position: number;
-        parent_id: string;
-        private_type: number;
-        private_user_ids: string[];
-        speak_permission: number;
-        application_id: string;
+        type?: number;
+        sub_type?: number;
+        position?: number;
+        parent_id?: string;
+        private_type?: number;
+        private_user_ids?: string[];
+        speak_permission?: number;
+        application_id?: string;
     }): Promise<any>;
     guildsChannelsUpdate(channel_id: string, data: {
-        name: string;
-        position: number;
-        parent_id: string;
-        private_type: number;
-        speak_permission: number;
+        name?: string;
+        position?: number;
+        parent_id?: string;
+        private_type?: number;
+        speak_permission?: number;
     }): Promise<any>;
-    guildsChannelsdelete(channel_id: string, data: {
-        name: string;
-        position: number;
-        parent_id: string;
-        private_type: number;
-        speak_permission: number;
+    guildsChannelsdelete(channel_id: string, data?: {
+        name?: string;
+        position?: number;
+        parent_id?: string;
+        private_type?: number;
+        speak_permission?: number;
     }): Promise<any>;
     channelsChannelOnlineNums(channel_id: string): Promise<any>;
     guildsMembers(guild_id: string, params: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alemonjs/qq-bot",
-  "version": "2.1.7",
+  "version": "2.1.9",
   "description": "阿柠檬qq-bot平台连接",
   "author": "lemonade",
   "license": "MIT",
@@ -10,6 +10,7 @@
     "build": "lvy build"
   },
   "dependencies": {
+    "@noble/curves": "^1.7.0",
     "axios": "^1.4.0",
     "file-type": "^18.5.0",
     "form-data": "^4.0.0",
@@ -21,9 +22,8 @@
     "mime-types": "^2.1.35",
     "public-ip": "^6.0.1",
     "qrcode": "^1.5.3",
-    "ws": "^8.13.0",
     "uuid": "^11.0.3",
-    "@noble/curves": "^1.7.0"
+    "ws": "^8.13.0"
   },
   "peerDependencies": {
     "alemonjs": "^2.1.0-alpha.15"
@@ -73,5 +73,6 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/lemonade-lab/alemonjs.git"
-  }
-}
+  },
+  "gitHead": "743b70375f728a1584ae149bbadcd04378540ade"
+}