@satorijs/adapter-discord 4.5.10 → 4.6.0

package/lib/bot.d.ts

@@ -7,8 +7,8 @@ export declare class DiscordBot<C extends Context = Context> extends Bot<C, Disc
     static MessageEncoder: typeof DiscordMessageEncoder;
     static inject: string[];
     http: HTTP;
-    internal: Internal;
-    webhooks: Record<string, Webhook>;
+    internal: Internal<C>;
+    webhooks: Record<string, Webhook | null>;
     webhookLock: Record<string, Promise<Webhook>>;
     commands: Universal.Command[];
     constructor(ctx: C, config: DiscordBot.Config);
@@ -40,15 +40,20 @@ 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;
     }>;
     setGuildMemberRole(guildId: string, userId: string, roleId: string): Promise<void>;
     unsetGuildMemberRole(guildId: string, userId: string, roleId: string): Promise<void>;
+    getGuildMemberRoleList(guildId: string, userId: string, next?: string): Promise<{
+        data: {
+            id: string;
+        }[];
+    }>;
     getGuildRoleList(guildId: string): Promise<{
         data: Universal.GuildRole[];
     }>;

package/lib/index.cjs

@@ -18,15 +18,15 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
-var src_exports = {};
-__export(src_exports, {
+var index_exports = {};
+__export(index_exports, {
   Discord: () => utils_exports,
   DiscordBot: () => DiscordBot,
   DiscordMessageEncoder: () => DiscordMessageEncoder,
   WsClient: () => WsClient,
-  default: () => src_default
+  default: () => index_default
 });
-module.exports = __toCommonJS(src_exports);
+module.exports = __toCommonJS(index_exports);
 
 // src/bot.ts
 var import_core5 = require("@satorijs/core");
@@ -951,6 +951,7 @@ Internal.define({
     PATCH: "modifyGuildRolePositions"
   },
   "/guilds/{guild.id}/roles/{role.id}": {
+    GET: "getGuildRole",
     PATCH: "modifyGuildRole",
     DELETE: "deleteGuildRole"
   }
@@ -1229,8 +1230,8 @@ var decodeUser = /* @__PURE__ */ __name((user) => ({
 var decodeGuildMember = /* @__PURE__ */ __name((member) => ({
   user: member.user && decodeUser(member.user),
   nick: member.nick,
-  roles: member.roles,
-  joinedAt: member.joined_at && new Date(member.joined_at).valueOf()
+  roles: member.roles?.map((id) => ({ id })),
+  joinedAt: member.joined_at ? new Date(member.joined_at).valueOf() : void 0
 }), "decodeGuildMember");
 var decodeGuild = /* @__PURE__ */ __name((data) => ({
   id: data.id,
@@ -1250,7 +1251,7 @@ var decodeRole = /* @__PURE__ */ __name((role) => ({
 }), "decodeRole");
 var encodeRole = /* @__PURE__ */ __name((role) => ({
   ...role,
-  permissions: role.permissions && "" + role.permissions
+  permissions: role.permissions ? "" + role.permissions : void 0
 }), "encodeRole");
 async function decodeMessage(bot, data, message, payload = message, details = true) {
   const { platform } = bot;
@@ -1341,7 +1342,7 @@ async function decodeMessage(bot, data, message, payload = message, details = tr
     message.quote = await bot.getMessage(channel_id, message_id, false);
   }
   message.createdAt = new Date(data.timestamp).valueOf();
-  message.updatedAt = data.edited_timestamp && new Date(data.edited_timestamp).valueOf();
+  message.updatedAt = data.edited_timestamp ? new Date(data.edited_timestamp).valueOf() : void 0;
   if (!payload) return message;
   payload.channel = {
     id: data.channel_id,
@@ -1491,11 +1492,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;
   }
@@ -1608,9 +1619,9 @@ var DiscordMessageEncoder = class extends import_core3.MessageEncoder {
   stack = [new State("message")];
   buffer = "";
   addition = {};
-  figure = null;
+  figure;
   mode = "default";
-  listType = null;
+  listType;
   rows = [];
   async getUrl() {
     const input = this.options?.session?.discord;
@@ -1657,7 +1668,9 @@ var DiscordMessageEncoder = class extends import_core3.MessageEncoder {
       if (this.bot.http.isError(e) && e.response) {
         if (e.response.data?.code === 10015) {
           this.bot.logger.debug("webhook has been deleted, recreating..., %o", e.response.data);
-          if (!this.bot.webhookLock[this.channelId]) this.bot.webhooks[this.channelId] = null;
+          if (!this.bot.webhookLock[this.channelId]) {
+            this.bot.webhooks[this.channelId] = null;
+          }
           await this.ensureWebhook();
           return this.post(data, headers);
         } else {
@@ -1708,7 +1721,7 @@ var DiscordMessageEncoder = class extends import_core3.MessageEncoder {
       headers: { accept: type + "/*" },
       timeout: 1e3
     }).then(
-      (headers) => headers.get("content-type").startsWith(type),
+      (headers) => headers.get("content-type")?.startsWith(type),
       () => false
     );
   }
@@ -1829,7 +1842,7 @@ var DiscordMessageEncoder = class extends import_core3.MessageEncoder {
     } else if (type === "ul" || type === "ol") {
       this.listType = type;
       await this.render(children);
-      this.listType = null;
+      this.listType = void 0;
     } else if (type === "li") {
       if (!this.buffer.endsWith("\n")) this.buffer += "\n";
       if (this.listType === "ol") {
@@ -1837,7 +1850,7 @@ var DiscordMessageEncoder = class extends import_core3.MessageEncoder {
       } else if (this.listType === "ul") {
         this.buffer += "- ";
       }
-      this.render(children);
+      await this.render(children);
       this.buffer += "\n";
     } else if (type === "at") {
       if (attrs.id) {
@@ -2027,6 +2040,7 @@ var WsClient = class extends import_core4.Adapter.WsClient {
     return this.bot.http.ws(url + "/?v=10&encoding=json");
   }
   heartbeat() {
+    if (!this.socket) return;
     this.bot.logger.debug(`heartbeat d ${this._d}`);
     this.socket.send(JSON.stringify({
       op: Gateway.Opcode.HEARTBEAT,
@@ -2240,25 +2254,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) {
@@ -2267,6 +2281,10 @@ var DiscordBot = class extends import_core5.Bot {
   unsetGuildMemberRole(guildId, userId, roleId) {
     return this.internal.removeGuildMemberRole(guildId, userId, roleId);
   }
+  async getGuildMemberRoleList(guildId, userId, next) {
+    const data = await this.internal.getGuildMember(guildId, userId);
+    return { data: data.roles.map((id) => ({ id })) };
+  }
   async getGuildRoleList(guildId) {
     const data = await this.internal.getGuildRoles(guildId);
     return { data: data.map(decodeRole) };
@@ -2320,7 +2338,7 @@ var DiscordBot = class extends import_core5.Bot {
 })(DiscordBot || (DiscordBot = {}));
 
 // src/index.ts
-var src_default = DiscordBot;
+var index_default = DiscordBot;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Discord,

package/lib/message.d.ts

@@ -5,9 +5,9 @@ export declare class DiscordMessageEncoder<C extends Context = Context> extends
     private stack;
     private buffer;
     private addition;
-    private figure;
+    private figure?;
     private mode;
-    private listType;
+    private listType?;
     private rows;
     private getUrl;
     post(data?: any, headers?: any): any;

package/lib/types/gateway.d.ts

@@ -5,7 +5,7 @@ export declare namespace Gateway {
         /** opcode for the payload */
         op: O;
         /** event data */
-        d?: D;
+        d: D;
         /** the event name for this payload */
         t?: T;
         /** sequence number, used for resuming sessions and heartbeats */

package/lib/types/internal.d.ts

@@ -1,7 +1,7 @@
-import { Dict, HTTP } from '@satorijs/core';
+import { Context, Dict, HTTP } from '@satorijs/core';
 import { DiscordBot } from '../bot';
-export declare class Internal {
+export declare class Internal<C extends Context = Context> {
     private bot;
-    constructor(bot: DiscordBot);
+    constructor(bot: DiscordBot<C>);
     static define(routes: Dict<Partial<Record<HTTP.Method, string | string[]>>>): void;
 }

package/lib/types/role.d.ts

@@ -215,6 +215,11 @@ declare module './internal' {
          * @see https://discord.com/developers/docs/resources/guild#modify-guild-role-positions
          */
         modifyGuildRolePositions(guild_id: snowflake, param: Role.Params.ModifyPositions): Promise<Role[]>;
+        /**
+         * Returns a role object for the specified role.
+         * @see https://discord.com/developers/docs/resources/guild#get-guild-role
+         */
+        getGuildRole(guild_id: snowflake, role_id: snowflake): Promise<Role>;
         /**
          * Modify a guild role. Requires the MANAGE_ROLES permission. Returns the updated role on success. Fires a Guild Role Update Gateway event.
          * @see https://discord.com/developers/docs/resources/guild#modify-guild-role

package/lib/utils.d.ts

@@ -10,8 +10,8 @@ export declare const decodeGuild: (data: Discord.Guild) => Universal.Guild;
 export declare const decodeChannel: (data: Discord.Channel) => Universal.Channel;
 export declare const decodeRole: (role: Discord.Role) => Universal.GuildRole;
 export declare const encodeRole: (role: Partial<Universal.GuildRole>) => Partial<Discord.Role>;
-export declare function decodeMessage(bot: DiscordBot, data: Discord.Message, message: Universal.Message, payload?: Universal.MessageLike, details?: boolean): Promise<Universal.Message>;
-export declare function setupMessageGuildId(session: Session, guildId: string): void;
+export declare function decodeMessage<C extends Context = Context>(bot: DiscordBot<C>, data: Discord.Message, message: Universal.Message, payload?: Universal.MessageLike, details?: boolean): Promise<Universal.Message>;
+export declare function setupMessageGuildId(session: Session, guildId?: string): void;
 export declare function adaptSession<C extends Context>(bot: DiscordBot<C>, input: Discord.Gateway.Payload): Promise<C[typeof import("cordis").Context.session]>;
 export declare const encodeCommand: (cmd: Universal.Command) => Discord.ApplicationCommand.Params.Create;
 export declare function encodeCommandOptions(cmd: Universal.Command): Discord.ApplicationCommand.Option[];

package/lib/ws.d.ts

@@ -2,9 +2,9 @@ import { Adapter, Context, Schema } from '@satorijs/core';
 import { DiscordBot } from './bot';
 export declare class WsClient<C extends Context = Context> extends Adapter.WsClient<C, DiscordBot<C>> {
     _d: number;
-    _ping: NodeJS.Timeout;
+    _ping?: NodeJS.Timeout;
     _sessionId: string;
-    _resumeUrl: string;
+    _resumeUrl?: string;
     prepare(): Promise<WebSocket>;
     heartbeat(): void;
     accept(): void;

package/package.json

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

package/src/bot.ts

@@ -12,8 +12,8 @@ export class DiscordBot<C extends Context = Context> extends Bot<C, DiscordBot.C
   static inject = ['http']
 
   public http: HTTP
-  public internal: Internal
-  public webhooks: Record<string, Webhook> = {}
+  public internal: Internal<C>
+  public webhooks: Record<string, Webhook | null> = {}
   public webhookLock: Record<string, Promise<Webhook>> = {}
   public commands: Universal.Command[] = []
 
@@ -122,7 +122,7 @@ export class DiscordBot<C extends Context = Context> extends Bot<C, DiscordBot.C
   async getGuildMemberList(guildId: string, after?: string) {
     const users = await this.internal.listGuildMembers(guildId, { after, limit: 1000 })
     const data = users.map(v => Discord.decodeGuildMember(v))
-    return { data, next: data[999]?.user.id }
+    return { data, next: data[999]?.user!.id }
   }
 
   async getChannel(channelId: string) {
@@ -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 }
   }
 
@@ -188,6 +188,11 @@ export class DiscordBot<C extends Context = Context> extends Bot<C, DiscordBot.C
     return this.internal.removeGuildMemberRole(guildId, userId, roleId)
   }
 
+  async getGuildMemberRoleList(guildId: string, userId: string, next?: string) {
+    const data = await this.internal.getGuildMember(guildId, userId)
+    return { data: data.roles.map(id => ({ id })) }
+  }
+
   async getGuildRoleList(guildId: string) {
     const data = await this.internal.getGuildRoles(guildId)
     return { data: data.map(Discord.decodeRole) }

package/src/message.ts

@@ -19,9 +19,9 @@ export class DiscordMessageEncoder<C extends Context = Context> extends MessageE
   private stack: State[] = [new State('message')]
   private buffer: string = ''
   private addition: Dict = {}
-  private figure: h = null
+  private figure?: h
   private mode: RenderMode = 'default'
-  private listType: 'ol' | 'ul' = null
+  private listType?: 'ol' | 'ul'
   private rows: ActionRow[] = []
   private async getUrl() {
     const input = this.options?.session?.discord
@@ -73,7 +73,9 @@ export class DiscordMessageEncoder<C extends Context = Context> extends MessageE
       if (this.bot.http.isError(e) && e.response) {
         if (e.response.data?.code === 10015) {
           this.bot.logger.debug('webhook has been deleted, recreating..., %o', e.response.data)
-          if (!this.bot.webhookLock[this.channelId]) this.bot.webhooks[this.channelId] = null
+          if (!this.bot.webhookLock[this.channelId]) {
+            this.bot.webhooks[this.channelId] = null
+          }
           await this.ensureWebhook()
           return this.post(data, headers)
         } else {
@@ -134,7 +136,7 @@ export class DiscordMessageEncoder<C extends Context = Context> extends MessageE
       headers: { accept: type + '/*' },
       timeout: 1000,
     }).then(
-      (headers) => headers.get('content-type').startsWith(type),
+      (headers) => headers.get('content-type')?.startsWith(type),
       () => false,
     )
   }
@@ -260,7 +262,7 @@ export class DiscordMessageEncoder<C extends Context = Context> extends MessageE
     } else if (type === 'ul' || type === 'ol') {
       this.listType = type
       await this.render(children)
-      this.listType = null
+      this.listType = undefined
     } else if (type === 'li') {
       if (!this.buffer.endsWith('\n')) this.buffer += '\n'
       if (this.listType === 'ol') {
@@ -268,7 +270,7 @@ export class DiscordMessageEncoder<C extends Context = Context> extends MessageE
       } else if (this.listType === 'ul') {
         this.buffer += '- '
       }
-      this.render(children)
+      await this.render(children)
       this.buffer += '\n'
     } else if (type === 'at') {
       if (attrs.id) {
@@ -343,7 +345,7 @@ export class DiscordMessageEncoder<C extends Context = Context> extends MessageE
         if (this.stack[0].type === 'forward' && this.stack[0].fakeMessageMap[attrs.id]?.length >= 1) {
           // quote to fake message, eg. 1st message has id (in channel or thread), later message quote to it
           replyId = this.stack[0].fakeMessageMap[attrs.id][0].id
-          channelId = this.stack[0].fakeMessageMap[attrs.id][0].channel.id
+          channelId = this.stack[0].fakeMessageMap[attrs.id][0].channel!.id
         }
         const quote = await this.bot.getMessage(channelId, replyId)
         if (!guildId) {

package/src/types/gateway.ts

@@ -6,7 +6,7 @@ export namespace Gateway {
     /** opcode for the payload */
     op: O
     /** event data */
-    d?: D
+    d: D
     /** the event name for this payload */
     t?: T
     /** sequence number, used for resuming sessions and heartbeats */

package/src/types/internal.ts

@@ -1,8 +1,8 @@
-import { Dict, HTTP, makeArray } from '@satorijs/core'
+import { Context, Dict, HTTP, makeArray } from '@satorijs/core'
 import { DiscordBot } from '../bot'
 
-export class Internal {
-  constructor(private bot: DiscordBot) {}
+export class Internal<C extends Context = Context> {
+  constructor(private bot: DiscordBot<C>) {}
 
   static define(routes: Dict<Partial<Record<HTTP.Method, string | string[]>>>) {
     for (const path in routes) {

package/src/types/role.ts

@@ -227,6 +227,11 @@ declare module './internal' {
      * @see https://discord.com/developers/docs/resources/guild#modify-guild-role-positions
      */
     modifyGuildRolePositions(guild_id: snowflake, param: Role.Params.ModifyPositions): Promise<Role[]>
+    /**
+     * Returns a role object for the specified role.
+     * @see https://discord.com/developers/docs/resources/guild#get-guild-role
+     */
+    getGuildRole(guild_id: snowflake, role_id: snowflake): Promise<Role>
     /**
      * Modify a guild role. Requires the MANAGE_ROLES permission. Returns the updated role on success. Fires a Guild Role Update Gateway event.
      * @see https://discord.com/developers/docs/resources/guild#modify-guild-role
@@ -247,6 +252,7 @@ Internal.define({
     PATCH: 'modifyGuildRolePositions',
   },
   '/guilds/{guild.id}/roles/{role.id}': {
+    GET: 'getGuildRole',
     PATCH: 'modifyGuildRole',
     DELETE: 'deleteGuildRole',
   },

package/src/utils.ts

@@ -28,8 +28,8 @@ 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,
-  joinedAt: member.joined_at && new Date(member.joined_at).valueOf(),
+  roles: member.roles?.map(id => ({ id })),
+  joinedAt: member.joined_at ? new Date(member.joined_at).valueOf() : undefined,
 })
 
 export const decodeGuild = (data: Discord.Guild): Universal.Guild => ({
@@ -56,11 +56,11 @@ export const decodeRole = (role: Discord.Role): Universal.GuildRole => ({
 
 export const encodeRole = (role: Partial<Universal.GuildRole>): Partial<Discord.Role> => ({
   ...role,
-  permissions: role.permissions && '' + role.permissions,
+  permissions: role.permissions ? '' + role.permissions : undefined,
 })
 
-export async function decodeMessage(
-  bot: DiscordBot,
+export async function decodeMessage<C extends Context = Context>(
+  bot: DiscordBot<C>,
   data: Discord.Message,
   message: Universal.Message,
   payload: Universal.MessageLike = message,
@@ -167,11 +167,11 @@ export async function decodeMessage(
   // THREAD_STARTER_MESSAGE (21) 事件下，message_reference 有 message_id
   if (details && data.message_reference?.message_id) {
     const { message_id, channel_id } = data.message_reference
-    message.quote = await bot.getMessage(channel_id, message_id, false)
+    message.quote = await bot.getMessage(channel_id!, message_id, false)
   }
 
   message.createdAt = new Date(data.timestamp).valueOf()
-  message.updatedAt = data.edited_timestamp && new Date(data.edited_timestamp).valueOf()
+  message.updatedAt = data.edited_timestamp ? new Date(data.edited_timestamp).valueOf() : undefined
   if (!payload) return message
   payload.channel = {
     id: data.channel_id,
@@ -183,7 +183,7 @@ export async function decodeMessage(
   return message
 }
 
-export function setupMessageGuildId(session: Session, guildId: string) {
+export function setupMessageGuildId(session: Session, guildId?: string) {
   session.guildId = guildId
   session.isDirect = !guildId
   session.subtype = guildId ? 'group' : 'private'
@@ -226,11 +226,11 @@ export async function adaptSession<C extends Context>(bot: DiscordBot<C>, input:
     // if (!session.content) return
   } else if (input.t === 'MESSAGE_UPDATE') {
     session.type = 'message-updated'
-    const message = await bot._getMessage(input.d.channel_id, input.d.id)
+    const message = await bot._getMessage(input.d.channel_id!, input.d.id!)
     // Unlike creates, message updates may contain only a subset of the full message object payload
     // https://discord.com/developers/docs/topics/gateway-events#message-update
     await decodeMessage(bot, message, session.event.message = {}, session.event)
-    const channel = await bot.internal.getChannel(input.d.channel_id)
+    const channel = await bot.internal.getChannel(input.d.channel_id!)
     setupMessageGuildId(session, channel.guild_id)
     // if (!session.content) return
   } else if (input.t === 'MESSAGE_DELETE') {
@@ -279,7 +279,7 @@ export async function adaptSession<C extends Context>(bot: DiscordBot<C>, input:
     session.subtype = input.d.guild_id ? 'group' : 'private'
     session.channelId = input.d.channel_id
     session.guildId = input.d.guild_id
-    session.userId = session.isDirect ? input.d.user.id : input.d.member.user.id
+    session.userId = session.isDirect ? input.d.user!.id : input.d.member!.user!.id
     session.messageId = input.d.id
     session.content = ''
     session.event.argv = decodeArgv(data, command)
@@ -296,7 +296,7 @@ export async function adaptSession<C extends Context>(bot: DiscordBot<C>, input:
     session.subtype = input.d.guild_id ? 'group' : 'private'
     session.channelId = input.d.channel_id
     session.guildId = input.d.guild_id
-    session.userId = session.isDirect ? input.d.user.id : input.d.member.user.id
+    session.userId = session.isDirect ? input.d.user!.id : input.d.member!.user!.id
     session.messageId = input.d.id
     session.content = user_input
   } else if (input.t === 'INTERACTION_CREATE' && input.d.type === Discord.Interaction.Type.MESSAGE_COMPONENT) {
@@ -328,17 +328,27 @@ export async function adaptSession<C extends Context>(bot: DiscordBot<C>, input:
     session.isDirect = !input.d.guild_id
     session.channelId = input.d.channel_id
     session.guildId = input.d.guild_id
-    session.userId = session.isDirect ? input.d.user.id : input.d.member.user.id
+    session.userId = session.isDirect ? input.d.user!.id : input.d.member!.user!.id
     session.messageId = input.d.id
     session.content = ''
     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
   }
@@ -441,5 +451,5 @@ export function encodeCommandOptions(cmd: Universal.Command): Discord.Applicatio
       })
     }
   }
-  return result.sort((a, b) => +b.required - +a.required)
+  return result.sort((a, b) => +b.required! - +a.required!)
 }