From bb9b185823ac349708adcc8046d1daf413cd8aaf Mon Sep 17 00:00:00 2001
From: Androz <androz2091@gmail.com>
Date: Thu, 21 May 2020 20:00:22 +0200
Subject: [PATCH 1/3] fix: update message#member property with full member
 object

---
 module/shardingManager.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/shardingManager.ts b/module/shardingManager.ts
index 3ab37cc8d..8435fa558 100644
--- a/module/shardingManager.ts
+++ b/module/shardingManager.ts
@@ -346,6 +346,7 @@ function handleDiscordPayload(data: DiscordPayload) {
               guild,
             ),
           );
+          message.member = guild?.members.get(options.author.id);
         }
 
         options.mentions.forEach((mention) => {

From b1c698d19f9c2a7f7b54847f4d8b485e24caa172 Mon Sep 17 00:00:00 2001
From: Androz2091 <androz2091@gmail.com>
Date: Thu, 21 May 2020 20:42:47 +0200
Subject: [PATCH 2/3] Revert "fix: update message#member property with full
 member object"

This reverts commit bb9b185823ac349708adcc8046d1daf413cd8aaf.
---
 module/shardingManager.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/module/shardingManager.ts b/module/shardingManager.ts
index 8435fa558..3ab37cc8d 100644
--- a/module/shardingManager.ts
+++ b/module/shardingManager.ts
@@ -346,7 +346,6 @@ function handleDiscordPayload(data: DiscordPayload) {
               guild,
             ),
           );
-          message.member = guild?.members.get(options.author.id);
         }
 
         options.mentions.forEach((mention) => {

From bef34857c908868c4477d15fbfcaf285001d0a7d Mon Sep 17 00:00:00 2001
From: Androz2091 <androz2091@gmail.com>
Date: Thu, 21 May 2020 20:49:06 +0200
Subject: [PATCH 3/3] Add guild and member methods to message object

---
 structures/message.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/structures/message.ts b/structures/message.ts
index 2e424816f..b27af644a 100644
--- a/structures/message.ts
+++ b/structures/message.ts
@@ -29,6 +29,8 @@ export function createMessage(data: MessageCreateOptions) {
       ? Date.parse(data.edited_timestamp)
       : undefined,
     channel: cache.channels.get(data.channel_id)!,
+    guild: () => data.guild_id ? cache.guilds.get(data.guild_id) : undefined,
+    member: () => message.guild()?.members.get(data.author.id)!,
 
     /** Delete a message */
     delete: (reason?: string) => {