@satorijs/adapter-discord 4.5.11 → 4.6.1

package/lib/bot.d.ts

@@ -40,10 +40,10 @@ export declare class DiscordBot<C extends Context = Context> extends Bot<C, Disc
     getChannelList(guildId: string): Promise<{
         data: Universal.Channel[];
     }>;
-    createReaction(channelId: string, messageId: string, emoji: string): Promise<void>;
-    deleteReaction(channelId: string, messageId: string, emoji: string, userId?: string): Promise<void>;
-    clearReaction(channelId: string, messageId: string, emoji?: string): Promise<void>;
-    getReactionList(channelId: string, messageId: string, emoji: string, after?: string): Promise<{
+    createReaction(channelId: string, messageId: string, emojiId: string): Promise<void>;
+    deleteReaction(channelId: string, messageId: string, emojiId: string, userId?: string): Promise<void>;
+    clearReaction(channelId: string, messageId: string, emojiId?: string): Promise<void>;
+    getReactionList(channelId: string, messageId: string, emojiId: string, after?: string): Promise<{
         data: Universal.User[];
         next: string;
     }>;

package/lib/index.cjs

@@ -90,6 +90,7 @@ var Internal = class _Internal {
   constructor(bot) {
     this.bot = bot;
   }
+  bot;
   static {
     __name(this, "Internal");
   }
@@ -1230,7 +1231,7 @@ var decodeUser = /* @__PURE__ */ __name((user) => ({
 var decodeGuildMember = /* @__PURE__ */ __name((member) => ({
   user: member.user && decodeUser(member.user),
   nick: member.nick,
-  roles: member.roles,
+  roles: member.roles?.map((id) => ({ id })),
   joinedAt: member.joined_at ? new Date(member.joined_at).valueOf() : void 0
 }), "decodeGuildMember");
 var decodeGuild = /* @__PURE__ */ __name((data) => ({
@@ -1426,6 +1427,35 @@ async function adaptSession(bot, input) {
     session.type = "guild-role-added";
     session.guildId = input.d.guild_id;
     session.roleId = input.d.role_id;
+  } else if (input.t === "GUILD_MEMBER_ADD") {
+    session.type = "guild-member-added";
+    session.guildId = input.d.guild_id;
+    session.userId = input.d.user?.id;
+    session.event.member = decodeGuildMember(input.d);
+    if (session.event.member.user) {
+      session.event.user = session.event.member.user;
+      delete session.event.member.user;
+    }
+    session.timestamp = input.d.joined_at ? new Date(input.d.joined_at).valueOf() : Date.now();
+  } else if (input.t === "GUILD_MEMBER_REMOVE") {
+    session.type = "guild-member-removed";
+    session.guildId = input.d.guild_id;
+    session.userId = input.d.user.id;
+    session.event.user = decodeUser(input.d.user);
+  } else if (input.t === "GUILD_MEMBER_UPDATE") {
+    session.type = "guild-member-updated";
+    session.guildId = input.d.guild_id;
+    session.userId = input.d.user?.id;
+    session.event.member = decodeGuildMember({
+      user: input.d.user,
+      nick: input.d.nick,
+      roles: input.d.roles,
+      joined_at: input.d.joined_at
+    });
+    if (session.event.member.user) {
+      session.event.user = session.event.member.user;
+      delete session.event.member.user;
+    }
   } else if (input.t === "INTERACTION_CREATE" && input.d.type === Interaction.Type.APPLICATION_COMMAND) {
     const data = input.d.data;
     const command = bot.commands.find((cmd) => cmd.name === data.name);
@@ -1492,11 +1522,21 @@ async function adaptSession(bot, input) {
     session.event.button = {
       id
     };
+  } else if (input.t === "CHANNEL_CREATE") {
+    session.type = "channel-added";
+    session.guildId = input.d.guild_id;
+    session.channelId = input.d.id;
+    session.event.channel = decodeChannel(input.d);
   } else if (input.t === "CHANNEL_UPDATE") {
     session.type = "channel-updated";
     session.guildId = input.d.guild_id;
-    session.subtype = input.d.guild_id ? "group" : "private";
     session.channelId = input.d.id;
+    session.event.channel = decodeChannel(input.d);
+  } else if (input.t === "CHANNEL_DELETE") {
+    session.type = "channel-removed";
+    session.guildId = input.d.guild_id;
+    session.channelId = input.d.id;
+    session.event.channel = decodeChannel(input.d);
   } else {
     return;
   }
@@ -1592,6 +1632,7 @@ var State = class {
   constructor(type) {
     this.type = type;
   }
+  type;
   static {
     __name(this, "State");
   }
@@ -2244,25 +2285,25 @@ var DiscordBot = class extends import_core5.Bot {
     const channels = await this.internal.getGuildChannels(guildId);
     return { data: channels.map(decodeChannel) };
   }
-  createReaction(channelId, messageId, emoji) {
-    return this.internal.createReaction(channelId, messageId, emoji);
+  createReaction(channelId, messageId, emojiId) {
+    return this.internal.createReaction(channelId, messageId, emojiId);
   }
-  deleteReaction(channelId, messageId, emoji, userId) {
+  deleteReaction(channelId, messageId, emojiId, userId) {
     if (!userId) {
-      return this.internal.deleteOwnReaction(channelId, messageId, emoji);
+      return this.internal.deleteOwnReaction(channelId, messageId, emojiId);
     } else {
-      return this.internal.deleteUserReaction(channelId, messageId, emoji, userId);
+      return this.internal.deleteUserReaction(channelId, messageId, emojiId, userId);
     }
   }
-  clearReaction(channelId, messageId, emoji) {
-    if (!emoji) {
+  clearReaction(channelId, messageId, emojiId) {
+    if (!emojiId) {
       return this.internal.deleteAllReactions(channelId, messageId);
     } else {
-      return this.internal.deleteAllReactionsForEmoji(channelId, messageId, emoji);
+      return this.internal.deleteAllReactionsForEmoji(channelId, messageId, emojiId);
     }
   }
-  async getReactionList(channelId, messageId, emoji, after) {
-    const data = await this.internal.getReactions(channelId, messageId, emoji, { after, limit: 100 });
+  async getReactionList(channelId, messageId, emojiId, after) {
+    const data = await this.internal.getReactions(channelId, messageId, emojiId, { after, limit: 100 });
     return { data: data.map(decodeUser), next: data[99]?.id };
   }
   setGuildMemberRole(guildId, userId, roleId) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@satorijs/adapter-discord",
   "description": "Discord Adapter for Satorijs",
-  "version": "4.5.11",
+  "version": "4.6.1",
   "type": "module",
   "main": "lib/index.cjs",
   "typings": "lib/index.d.ts",
@@ -33,10 +33,10 @@
     "chat"
   ],
   "devDependencies": {
-    "@satorijs/core": "^4.5.2",
+    "@satorijs/core": "^4.6.0",
     "cordis": "^3.18.1"
   },
   "peerDependencies": {
-    "@satorijs/core": "^4.5.2"
+    "@satorijs/core": "^4.6.0"
   }
 }

package/src/bot.ts

@@ -155,28 +155,28 @@ export class DiscordBot<C extends Context = Context> extends Bot<C, DiscordBot.C
     return { data: channels.map(Discord.decodeChannel) }
   }
 
-  createReaction(channelId: string, messageId: string, emoji: string) {
-    return this.internal.createReaction(channelId, messageId, emoji)
+  createReaction(channelId: string, messageId: string, emojiId: string) {
+    return this.internal.createReaction(channelId, messageId, emojiId)
   }
 
-  deleteReaction(channelId: string, messageId: string, emoji: string, userId?: string) {
+  deleteReaction(channelId: string, messageId: string, emojiId: string, userId?: string) {
     if (!userId) {
-      return this.internal.deleteOwnReaction(channelId, messageId, emoji)
+      return this.internal.deleteOwnReaction(channelId, messageId, emojiId)
     } else {
-      return this.internal.deleteUserReaction(channelId, messageId, emoji, userId)
+      return this.internal.deleteUserReaction(channelId, messageId, emojiId, userId)
     }
   }
 
-  clearReaction(channelId: string, messageId: string, emoji?: string) {
-    if (!emoji) {
+  clearReaction(channelId: string, messageId: string, emojiId?: string) {
+    if (!emojiId) {
       return this.internal.deleteAllReactions(channelId, messageId)
     } else {
-      return this.internal.deleteAllReactionsForEmoji(channelId, messageId, emoji)
+      return this.internal.deleteAllReactionsForEmoji(channelId, messageId, emojiId)
     }
   }
 
-  async getReactionList(channelId: string, messageId: string, emoji: string, after?: string) {
-    const data = await this.internal.getReactions(channelId, messageId, emoji, { after, limit: 100 })
+  async getReactionList(channelId: string, messageId: string, emojiId: string, after?: string) {
+    const data = await this.internal.getReactions(channelId, messageId, emojiId, { after, limit: 100 })
     return { data: data.map(Discord.decodeUser), next: data[99]?.id }
   }
 

package/src/utils.ts

@@ -28,7 +28,7 @@ export const decodeUser = (user: Discord.User): Universal.User => ({
 export const decodeGuildMember = (member: Partial<Discord.GuildMember>): Universal.GuildMember => ({
   user: member.user && decodeUser(member.user),
   nick: member.nick,
-  roles: member.roles,
+  roles: member.roles?.map(id => ({ id })),
   joinedAt: member.joined_at ? new Date(member.joined_at).valueOf() : undefined,
 })
 
@@ -267,6 +267,35 @@ export async function adaptSession<C extends Context>(bot: DiscordBot<C>, input:
     session.type = 'guild-role-added'
     session.guildId = input.d.guild_id
     session.roleId = input.d.role_id
+  } else if (input.t === 'GUILD_MEMBER_ADD') {
+    session.type = 'guild-member-added'
+    session.guildId = input.d.guild_id
+    session.userId = input.d.user?.id
+    session.event.member = decodeGuildMember(input.d)
+    if (session.event.member.user) {
+      session.event.user = session.event.member.user
+      delete session.event.member.user
+    }
+    session.timestamp = input.d.joined_at ? new Date(input.d.joined_at).valueOf() : Date.now()
+  } else if (input.t === 'GUILD_MEMBER_REMOVE') {
+    session.type = 'guild-member-removed'
+    session.guildId = input.d.guild_id
+    session.userId = input.d.user.id
+    session.event.user = decodeUser(input.d.user)
+  } else if (input.t === 'GUILD_MEMBER_UPDATE') {
+    session.type = 'guild-member-updated'
+    session.guildId = input.d.guild_id
+    session.userId = input.d.user?.id
+    session.event.member = decodeGuildMember({
+      user: input.d.user,
+      nick: input.d.nick,
+      roles: input.d.roles,
+      joined_at: input.d.joined_at,
+    })
+    if (session.event.member.user) {
+      session.event.user = session.event.member.user
+      delete session.event.member.user
+    }
   } else if (input.t === 'INTERACTION_CREATE' && input.d.type === Discord.Interaction.Type.APPLICATION_COMMAND) {
     const data = input.d.data as Discord.InteractionData.ApplicationCommand
     const command = bot.commands.find(cmd => cmd.name === data.name)
@@ -334,11 +363,21 @@ export async function adaptSession<C extends Context>(bot: DiscordBot<C>, input:
     session.event.button = {
       id,
     }
+  } else if (input.t === 'CHANNEL_CREATE') {
+    session.type = 'channel-added'
+    session.guildId = input.d.guild_id
+    session.channelId = input.d.id
+    session.event.channel = decodeChannel(input.d)
   } else if (input.t === 'CHANNEL_UPDATE') {
     session.type = 'channel-updated'
     session.guildId = input.d.guild_id
-    session.subtype = input.d.guild_id ? 'group' : 'private'
     session.channelId = input.d.id
+    session.event.channel = decodeChannel(input.d)
+  } else if (input.t === 'CHANNEL_DELETE') {
+    session.type = 'channel-removed'
+    session.guildId = input.d.guild_id
+    session.channelId = input.d.id
+    session.event.channel = decodeChannel(input.d)
   } else {
     return
   }