From b4a8f412a11af7962bfc360e6a86fae426c88b0b Mon Sep 17 00:00:00 2001
From: "Jaron (aider)" <jaron@fishhat.dev>
Date: Sat, 15 Feb 2025 12:00:28 -0600
Subject: [PATCH] feat: Add channel property to HydratedMessage and
 HydratedContext types

---
 src/types/context.ts | 4 +++-
 src/types/message.ts | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/types/context.ts b/src/types/context.ts
index b427e75..1598989 100644
--- a/src/types/context.ts
+++ b/src/types/context.ts
@@ -4,6 +4,7 @@ import { hydrate, hydrator, type Hydrateable, type Hydrated } from "../services/
 import { isNil, exists } from "../utils";
 import { fromDiscord, InteractionResponseType, type Expectation } from "./common";
 import type { Guild } from "./guild";
+import { Channel } from "./channel";
 import type { InteractionPayload } from "./handler";
 import { type DiscordMessage, Message, type MessagePayload } from "./message";
 /**
@@ -28,6 +29,7 @@ import { type DiscordMessage, Message, type MessagePayload } from "./message";
 export type HydratedContext<T extends Array<Expectation>> = Context & {
     guild: Extract<Expectation.Guild, T[number]> extends never ? undefined : Guild;
     message: Extract<Expectation.Message, T[number]> extends never ? undefined : Message;
+    channel: Extract<Expectation.Channel, T[number]> extends never ? undefined : Channel;
 };
 
 export type ContextData =
@@ -174,4 +176,4 @@ export class Context<D extends ContextData = ContextData> {
     public defer = async () => {
         return this.ack(InteractionResponseType.DeferredMessage);
     };
-}
\ No newline at end of file
+}
diff --git a/src/types/message.ts b/src/types/message.ts
index e977f45..3c77fde 100644
--- a/src/types/message.ts
+++ b/src/types/message.ts
@@ -3,6 +3,7 @@ import { GatewayObject } from './base';
 import { fromDiscord, Trait, type Expectation, type Expects } from './common';
 import type { Embed } from './embed';
 import type { Guild } from './guild';
+import { Channel } from './channel';
 import { type DiscordUser, User } from './user';
 
 export type Component = Partial<Button | SelectMenu> & {
@@ -88,7 +89,7 @@ export enum ComponentType {
 }
 
 export type HydratedMessage<T extends Array<Expectation>> = MessagePayload & {
-    // channel: Extract<Expectation.Channel, T[number]> extends never ? undefined : Channel;
+    channel: Extract<Expectation.Channel, T[number]> extends never ? undefined : Channel;
     reference: Extract<Expectation.Message, T[number]> extends never ? undefined : MessagePayload;
     guild: Extract<Expectation.Guild, T[number]> extends never ? undefined : Guild;
 }