From bafee276ba772259a61ef2954f90d262dc46db1f Mon Sep 17 00:00:00 2001
From: suneettipirneni <suneettipirneni@icloud.com>
Date: Tue, 4 Oct 2022 22:17:57 -0400
Subject: [PATCH 1/2] types(Message): remove & this from #inGuild typeguard

---
 packages/discord.js/typings/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/discord.js/typings/index.d.ts b/packages/discord.js/typings/index.d.ts
index 93d44f01b713..f0d5eb6d28c2 100644
--- a/packages/discord.js/typings/index.d.ts
+++ b/packages/discord.js/typings/index.d.ts
@@ -1750,7 +1750,7 @@ export class Message<InGuild extends boolean = boolean> extends Base {
   public toJSON(): unknown;
   public toString(): string;
   public unpin(reason?: string): Promise<Message<InGuild>>;
-  public inGuild(): this is Message<true> & this;
+  public inGuild(): this is Message<true>;
 }
 
 export class AttachmentBuilder {

From 6e13fe8d44e106e778f0782a9be11200767eaeee Mon Sep 17 00:00:00 2001
From: suneettipirneni <suneettipirneni@icloud.com>
Date: Wed, 5 Oct 2022 12:26:11 -0400
Subject: [PATCH 2/2] test: add type test

---
 packages/discord.js/typings/index.test-d.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/discord.js/typings/index.test-d.ts b/packages/discord.js/typings/index.test-d.ts
index fbd6a4c07904..48022353dab0 100644
--- a/packages/discord.js/typings/index.test-d.ts
+++ b/packages/discord.js/typings/index.test-d.ts
@@ -309,6 +309,11 @@ declare const assertIsMessage: (m: Promise<Message>) => void;
 
 client.on('messageCreate', async message => {
   const { client, channel } = message;
+
+  if (!message.inGuild() && message.partial) {
+    expectNotType<never>(message);
+  }
+
   expectType<Client<true>>(client);
   assertIsMessage(channel.send('string'));
   assertIsMessage(channel.send({}));