From 159d26541dea96be924fd1578722853310e79258 Mon Sep 17 00:00:00 2001
From: Skillz <gankstarsleague@gmail.com>
Date: Tue, 11 Feb 2020 14:49:18 -0500
Subject: [PATCH] some small fixes

---
 structures/guild.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/structures/guild.ts b/structures/guild.ts
index f6d6c2af4..cdada2e19 100644
--- a/structures/guild.ts
+++ b/structures/guild.ts
@@ -93,9 +93,9 @@ interface Guild {
   /** The verification level required for the guild */
   verification_level: number
   /** The roles in the guild */
-  roles: Role[]
+  roles: Map<string, Role>
   /** The custom guild emojis */
-  emojis: Emoji[]
+  emojis: Map<string, Emoji>
   /** Enabled guild features */
   features: GuildFeatures[]
   /** Required MFA level for the guild */
@@ -110,9 +110,9 @@ interface Guild {
   unavailable: boolean
   /** Total number of members in this guild */
   member_count: number
-  voice_states: VoiceState[]
+  voice_states: Map<string, Voice_State>
   /** Users in the guild */
-  members: Member[]
+  members: Map<string, Member>
   /** Channels in the guild */
   channels: Channel[]
   presences: Presence[]
@@ -478,11 +478,11 @@ export interface PrunePayload {
 export const createGuild = (data: CreateGuildPayload, client: Client) => {
   const guild: Guild = {
     ...data,
-    roles: data.roles.map(role => create_role(role)),
-    emojis: data.emojis.map(emoji => create_emoji(emoji)),
+    roles: new Map(data.roles.map(r => [r.id, create_role(r)])),
+    emojis: new Map(data.emojis.map(e => [e.id, create_emoji(e)])),
     joinedAt: Date.parse(data.joined_at),
-    voiceStates: data.voice_states.map(voiceState => createVoiceState(voiceState)),
-    members: data.members.map(member => createMember(member)),
+    voiceStates: new Map(data.voice_states.map(vs => [vs.id, create_voice_state(vs)])),
+    members: new Map(data.members.map(m => [m.id, create_member(m)])),
     channels: data.channels.map(channel => create_channel(channel)),
     presences: data.presences.map(presence => createPresence(presence)),
     icon_url: (size, format) =>