@satorijs/adapter-discord 4.0.0 → 4.0.1

package/lib/bot.d.ts

@@ -24,18 +24,11 @@ export declare class DiscordBot extends Bot<DiscordBot.Config> {
     }>;
     getUser(userId: string): Promise<Universal.User>;
     getGuildMemberList(guildId: string, after?: string): Promise<{
-        data: Universal.User[];
+        data: Universal.GuildMember[];
         next: string;
     }>;
     getChannel(channelId: string): Promise<Universal.Channel>;
-    getGuildMember(guildId: string, userId: string): Promise<{
-        nickname: string;
-        userId: string;
-        username?: string;
-        avatar?: string;
-        discriminator?: string;
-        isBot?: boolean;
-    }>;
+    getGuildMember(guildId: string, userId: string): Promise<Universal.GuildMember>;
     kickGuildMember(guildId: string, userId: string): Promise<void>;
     getGuild(guildId: string): Promise<Universal.Guild>;
     getGuildList(after?: string): Promise<{
@@ -55,10 +48,10 @@ export declare class DiscordBot extends Bot<DiscordBot.Config> {
     setGuildMemberRole(guildId: string, userId: string, roleId: string): Promise<void>;
     unsetGuildMemberRole(guildId: string, userId: string, roleId: string): Promise<void>;
     getGuildRoleList(guildId: string): Promise<{
-        data: Universal.Role[];
+        data: Universal.GuildRole[];
     }>;
-    createGuildRole(guildId: string, data: Partial<Universal.Role>): Promise<string>;
-    modifyGuildRole(guildId: string, roleId: string, data: Partial<Universal.Role>): Promise<void>;
+    createGuildRole(guildId: string, data: Partial<Universal.GuildRole>): Promise<string>;
+    modifyGuildRole(guildId: string, roleId: string, data: Partial<Universal.GuildRole>): Promise<void>;
     deleteGuildRole(guildId: string, roleId: string): Promise<void>;
     sendPrivateMessage(userId: string, content: Fragment, options?: SendOptions): Promise<string[]>;
     updateCommands(commands: Universal.Command[]): Promise<void>;

package/lib/index.js

@@ -87,6 +87,7 @@ __export(utils_exports, {
   decodeAuthor: () => decodeAuthor,
   decodeChannel: () => decodeChannel,
   decodeGuild: () => decodeGuild,
+  decodeGuildMember: () => decodeGuildMember,
   decodeMessage: () => decodeMessage,
   decodeRole: () => decodeRole,
   decodeUser: () => decodeUser,
@@ -1189,23 +1190,28 @@ var Locale3 = [
 // satori/adapters/discord/src/utils.ts
 var sanitize = /* @__PURE__ */ __name((val) => val.replace(/[\\*_`~|()\[\]]/g, "\\$&").replace(/@everyone/g, () => "\\@everyone").replace(/@here/g, () => "\\@here"), "sanitize");
 var decodeUser = /* @__PURE__ */ __name((user) => ({
+  id: user.id,
+  name: user.username,
   userId: user.id,
   avatar: `https://cdn.discordapp.com/avatars/${user.id}/${user.avatar}.png`,
   username: user.username,
   discriminator: user.discriminator,
   isBot: user.bot || false
 }), "decodeUser");
+var decodeGuildMember = /* @__PURE__ */ __name((member) => ({
+  ...decodeUser(member.user),
+  user: decodeUser(member.user),
+  nickname: member.nick,
+  roles: member.roles,
+  avatar: member.user.avatar
+}), "decodeGuildMember");
 var decodeGuild = /* @__PURE__ */ __name((data) => ({
   id: data.id,
-  name: data.name,
-  guildId: data.id,
-  guildName: data.name
+  name: data.name
 }), "decodeGuild");
 var decodeChannel = /* @__PURE__ */ __name((data) => ({
   id: data.id,
-  name: data.name,
-  channelId: data.id,
-  channelName: data.name
+  name: data.name
 }), "decodeChannel");
 var decodeAuthor = /* @__PURE__ */ __name((author) => ({
   ...decodeUser(author),
@@ -2010,8 +2016,8 @@ var _DiscordBot = class _DiscordBot extends import_satori5.Bot {
   async getGuildMemberList(guildId, after) {
     var _a;
     const users = await this.internal.listGuildMembers(guildId, { after, limit: 1e3 });
-    const data = users.map((v) => decodeUser(v.user));
-    return { data, next: (_a = data[999]) == null ? void 0 : _a.userId };
+    const data = users.map((v) => decodeGuildMember(v));
+    return { data, next: (_a = data[999]) == null ? void 0 : _a.user.id };
   }
   async getChannel(channelId) {
     const data = await this.internal.getChannel(channelId);
@@ -2019,10 +2025,7 @@ var _DiscordBot = class _DiscordBot extends import_satori5.Bot {
   }
   async getGuildMember(guildId, userId) {
     const member = await this.internal.getGuildMember(guildId, userId);
-    return {
-      ...decodeUser(member.user),
-      nickname: member.nick
-    };
+    return decodeGuildMember(member);
   }
   async kickGuildMember(guildId, userId) {
     return this.internal.removeGuildMember(guildId, userId);