make an unsafe sync and fix up joining guilds

Author: MathMan05

src/webpage/guild.ts

@@ -1533,11 +1533,7 @@ class Guild extends SnowFlake {
 				}
 			});
 		} else {
-			Member.new(member, this).then((_) => {
-				if (_) {
-					this.member = _;
-				}
-			});
+			this.member = Member.newUnsafe(member, this);
 		}
 
 		for (const thing of json.channels) {

src/webpage/jsontypes.ts

@@ -1010,6 +1010,14 @@ type roleCreate = {
 type wsjson =
 	| readySuplemental
 	| roleCreate
+	| {
+			op: 0;
+			t: "GUILD_CREATE";
+			d: guildjson & {
+				members: memberjson[];
+			};
+			s: number;
+	  }
 	| {
 			op: 0;
 			d: any;
@@ -1021,7 +1029,6 @@ type wsjson =
 				| "CHANNEL_CREATE"
 				| "CHANNEL_DELETE"
 				| "GUILD_DELETE"
-				| "GUILD_CREATE"
 				| "MESSAGE_REACTION_REMOVE_ALL"
 				| "MESSAGE_REACTION_REMOVE_EMOJI"
 				| "THREAD_CREATE";

src/webpage/localuser.ts

@@ -891,8 +891,12 @@ class Localuser {
 				}
 				case "GUILD_CREATE":
 					(async () => {
-						const guildy = new Guild(temp.d, this, this.user);
+						const m = temp.d.members.find(({id}) => id === this.user.id);
+						const guildy = new Guild(temp.d, this, m ?? this.user);
 						this.guilds.set(guildy.id, guildy);
+						for (const m of temp.d.members) {
+							Member.newUnsafe(m, guildy);
+						}
 						const divy = this.makeGuildIcon(guildy);
 						guildy.HTMLicon = divy;
 						(document.getElementById("guildRail") as HTMLDivElement).insertBefore(

src/webpage/member.ts

@@ -401,6 +401,44 @@ class Member extends SnowFlake {
 	get info() {
 		return this.owner.info;
 	}
+	static newUnsafe(memberjson: memberjson, owner: Guild): Member {
+		let user: User;
+		if (owner.localuser.userMap.has(memberjson.id)) {
+			if (memberjson.user) {
+				new User(memberjson.user, owner.localuser);
+			}
+			user = owner.localuser.userMap.get(memberjson.id) as User;
+		} else if (memberjson.user) {
+			user = new User(memberjson.user, owner.localuser);
+		} else {
+			throw new Error("missing user object of this member");
+		}
+		if (user.members.has(owner)) {
+			let memb = user.members.get(owner);
+			if (memb instanceof Promise) {
+				console.error("uh oh, that was a bad call!");
+				//Welp, this is ignored in sync unsafe
+			} else if (memb === undefined || memb instanceof Promise) {
+				memb = new Member(memberjson, owner);
+				user.members.set(owner, memb);
+				owner.members.add(memb);
+				user.localuser.memberListUpdate();
+				return memb;
+			} else {
+				if (memberjson.presence) {
+					memb.getPresence(memberjson.presence);
+				}
+				memb.update(memberjson);
+				return memb;
+			}
+		}
+
+		const memb = new Member(memberjson, owner);
+		user.members.set(owner, memb);
+		owner.members.add(memb);
+		memb.localuser.memberListUpdate();
+		return memb;
+	}
 	static async new(memberjson: memberjson, owner: Guild): Promise<Member> {
 		let user: User;
 		if (owner.localuser.userMap.has(memberjson.id)) {