From d1d72451e4eaa20e05d25b50e63be0c41c78124c Mon Sep 17 00:00:00 2001
From: MathMan05 <mathmanrm@gmail.com>
Date: Fri, 14 Mar 2025 11:49:22 -0500
Subject: [PATCH] remove dupe code and fix bot bug

---
 src/webpage/member.ts | 34 ++++++----------------------------
 1 file changed, 6 insertions(+), 28 deletions(-)

diff --git a/src/webpage/member.ts b/src/webpage/member.ts
index 3b2aae9..c7f0f76 100644
--- a/src/webpage/member.ts
+++ b/src/webpage/member.ts
@@ -27,34 +27,7 @@ class Member extends SnowFlake {
 		if (this.localuser.userMap.has(this?.id)) {
 			this.user = this.localuser.userMap.get(this?.id) as User;
 		}
-		for (const key of Object.keys(memberjson)) {
-			if (key === "guild" || key === "owner" || key === "user") {
-				continue;
-			}
-
-			if (key === "roles") {
-				for (const strrole of memberjson.roles) {
-					const role = this.guild.roleids.get(strrole);
-					if (!role) continue;
-					this.roles.push(role);
-				}
-				continue;
-			}
-			if (key === "presence") {
-				this.getPresence(memberjson.presence);
-				continue;
-			}
-			(this as any)[key] = (memberjson as any)[key];
-		}
-
-		const everyone = this.guild.roleids.get(this.guild.id);
-		if (everyone && this.roles.indexOf(everyone) === -1) {
-			this.roles.push(everyone);
-		}
-
-		this.roles.sort((a, b) => {
-			return this.guild.roles.indexOf(a) - this.guild.roles.indexOf(b);
-		});
+		this.update(memberjson);
 	}
 	remove() {
 		this.user.members.delete(this.guild);
@@ -336,6 +309,11 @@ class Member extends SnowFlake {
 			(this as any)[key] = (memberjson as any)[key];
 		}
 
+		const everyone = this.guild.roleids.get(this.guild.id);
+		if (everyone && this.roles.indexOf(everyone) === -1) {
+			this.roles.push(everyone);
+		}
+
 		this.roles.sort((a, b) => {
 			return this.guild.roles.indexOf(a) - this.guild.roles.indexOf(b);
 		});