refactor creaemember

src/controllers/members.ts

@@ -20,7 +20,7 @@ export async function handleInternalGuildMemberAdd(data: DiscordPayload) {
   guild.memberCount++;
   const member = structures.createMember(
     payload,
-    guild,
+    guild.id,
   );
   guild.members.set(payload.user.id, member);
 
@@ -68,7 +68,7 @@ export async function handleInternalGuildMemberUpdate(data: DiscordPayload) {
   };
   const member = structures.createMember(
     newMemberData,
-    guild,
+    guild.id,
   );
   guild.members.set(payload.user.id, member);
 
@@ -109,7 +109,7 @@ export async function handleInternalGuildMembersChunk(data: DiscordPayload) {
       member.user.id,
       structures.createMember(
         member,
-        guild,
+        guild.id,
       ),
     );
   });

src/controllers/messages.ts

@@ -28,7 +28,7 @@ export async function handleInternalMessageCreate(data: DiscordPayload) {
       payload.author.id,
       structures.createMember(
         { ...payload.member, user: payload.author },
-        guild,
+        guild.id,
       ),
     );
   }
@@ -40,7 +40,7 @@ export async function handleInternalMessageCreate(data: DiscordPayload) {
         mention.id,
         structures.createMember(
           { ...mention.member, user: mention },
-          guild,
+          guild.id,
         ),
       );
     }

src/controllers/misc.ts

@@ -82,7 +82,7 @@ export async function handleInternalVoiceStateUpdate(data: DiscordPayload) {
 
   const member = guild.members.get(payload.user_id) ||
     (payload.member
-      ? structures.createMember(payload.member, guild)
+      ? structures.createMember(payload.member, guild.id)
       : undefined);
   if (!member) return;
 

src/controllers/reactions.ts

@@ -43,7 +43,7 @@ export async function handleInternalMessageReactionAdd(data: DiscordPayload) {
       payload.member.user.id,
       structures.createMember(
         payload.member,
-        guild,
+        guild.id,
       ),
     );
   }
@@ -99,7 +99,7 @@ export async function handleInternalMessageReactionRemove(
       payload.member.user.id,
       structures.createMember(
         payload.member,
-        guild,
+        guild.id,
       ),
     );
   }

src/handlers/guild.ts

@@ -184,7 +184,7 @@ export async function getMember(guildID: string, id: string) {
     endpoints.GUILD_MEMBER(guildID, id),
   ) as MemberCreatePayload;
 
-  const member = structures.createMember(data, guild);
+  const member = structures.createMember(data, guild.id);
   guild.members.set(id, member);
   return member;
 }

src/structures/guild.ts

@@ -88,7 +88,7 @@ export function createGuild(data: CreateGuildPayload, shardID: number) {
   };
 
   data.members.forEach((m) =>
-    guild.members.set(m.user.id, structures.createMember(m, guild))
+    guild.members.set(m.user.id, structures.createMember(m, guild.id))
   );
 
   return guild;

src/structures/member.ts

@@ -1,7 +1,6 @@
 import { MemberCreatePayload } from "../types/member.ts";
-import { Guild } from "./guild.ts";
 
-export function createMember(data: MemberCreatePayload, guild: Guild) {
+export function createMember(data: MemberCreatePayload, guildID: string) {
   const {
     joined_at: joinedAt,
     premium_since: premiumSince,
@@ -27,7 +26,7 @@ export function createMember(data: MemberCreatePayload, guild: Guild) {
     /** The user mention with nickname if possible */
     mention: `<@!${data.user.id}>`,
     /** The guild id where this member exists */
-    guildID: guild.id,
+    guildID,
     /** Whether or not this user has 2FA enabled. */
     mfaEnabled,
     /** The premium type for this user */
@@ -35,8 +34,6 @@ export function createMember(data: MemberCreatePayload, guild: Guild) {
   };
 
   return member;
-};
+}
 
-export interface Member
-  extends
-    Omit<ReturnType<typeof createMember>, "joined_at" | "premium_since"> {}
+export interface Member extends ReturnType<typeof createMember> {}