fix: unique member key

NezuChan · Mar 2, 2024 · 98de0db · 98de0db
1 parent 9a117db
commit 98de0db
Show file tree

Hide file tree

Showing 13 changed files with 31 additions and 22 deletions.
diff --git a/packages/core/src/Structures/Base.ts b/packages/core/src/Structures/Base.ts
@@ -3,7 +3,7 @@ import type { Client } from "./Client.js";
 
 export class Base<RawType> {
     public constructor(
-        protected readonly data: RawType & { id?: Snowflake; },
+        protected readonly data: RawType & { id?: Snowflake | null; },
         public client: Client
     ) {}
 

diff --git a/packages/core/src/Structures/Client.ts b/packages/core/src/Structures/Client.ts
@@ -118,7 +118,7 @@ export class Client extends EventEmitter {
                         pending: member.pending,
                         premiumSince: member.premium_since
                     }).onConflictDoUpdate({
-                        target: schema.members.id,
+                        target: [schema.members.id, schema.members.guildId],
                         set: {
                             avatar: sql`EXCLUDED.avatar`,
                             flags: sql`EXCLUDED.flags`,

diff --git a/packages/core/src/Structures/GuildMember.ts b/packages/core/src/Structures/GuildMember.ts
@@ -10,7 +10,7 @@ import type { VoiceState } from "./VoiceState.js";
 
 export class GuildMember extends Base<InferSelectModel<typeof members>> {
     public get id(): string {
-        return this.data.id;
+        return this.data.id as unknown as string;
     }
 
     public get guildId(): string | null {

diff --git a/...hema/drizzle/0000_last_omega_sentinel.sql → ...anao-schema/drizzle/0000_grey_mach_iv.sql b/...hema/drizzle/0000_last_omega_sentinel.sql → ...anao-schema/drizzle/0000_grey_mach_iv.sql
@@ -1,6 +1,6 @@
 CREATE TABLE IF NOT EXISTS "members" (
-	"id" text NOT NULL,
-	"guild_id" text NOT NULL,
+	"id" text,
+	"guild_id" text,
 	"nick" text,
 	"avatar" text,
 	"flags" integer,
@@ -9,7 +9,8 @@ CREATE TABLE IF NOT EXISTS "members" (
 	"deaf" boolean,
 	"mute" boolean,
 	"pending" boolean,
-	"communication_disabled_until" text
+	"communication_disabled_until" text,
+	CONSTRAINT "members_id_guild_id" PRIMARY KEY("id","guild_id")
 );
 --> statement-breakpoint
 CREATE TABLE IF NOT EXISTS "users" (
@@ -33,7 +34,7 @@ CREATE TABLE IF NOT EXISTS "member_roles" (
 	"member_id" text NOT NULL,
 	"role_id" text NOT NULL,
 	"guild_id" text NOT NULL,
-	CONSTRAINT "voice_states_member_id_role_id_guild_id" PRIMARY KEY("member_id","role_id")
+	CONSTRAINT "voice_states_member_id_role_id" PRIMARY KEY("member_id","role_id")
 );
 --> statement-breakpoint
 CREATE TABLE IF NOT EXISTS "roles" (

diff --git a/packages/kanao-schema/drizzle/meta/0000_snapshot.json b/packages/kanao-schema/drizzle/meta/0000_snapshot.json
@@ -1,5 +1,5 @@
 {
-  "id": "4882b47c-3c42-49a4-bdba-74babb63547b",
+  "id": "f7401341-0beb-4c78-a112-bf04a92a185f",
   "prevId": "00000000-0000-0000-0000-000000000000",
   "version": "5",
   "dialect": "pg",
@@ -12,13 +12,13 @@
           "name": "id",
           "type": "text",
           "primaryKey": false,
-          "notNull": true
+          "notNull": false
         },
         "guild_id": {
           "name": "guild_id",
           "type": "text",
           "primaryKey": false,
-          "notNull": true
+          "notNull": false
         },
         "nick": {
           "name": "nick",
@@ -77,7 +77,15 @@
       },
       "indexes": {},
       "foreignKeys": {},
-      "compositePrimaryKeys": {},
+      "compositePrimaryKeys": {
+        "members_id_guild_id": {
+          "name": "members_id_guild_id",
+          "columns": [
+            "id",
+            "guild_id"
+          ]
+        }
+      },
       "uniqueConstraints": {}
     },
     "users": {
@@ -200,8 +208,8 @@
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {
-        "voice_states_member_id_role_id_guild_id": {
-          "name": "voice_states_member_id_role_id_guild_id",
+        "voice_states_member_id_role_id": {
+          "name": "voice_states_member_id_role_id",
           "columns": [
             "member_id",
             "role_id"

diff --git a/packages/kanao-schema/drizzle/meta/_journal.json b/packages/kanao-schema/drizzle/meta/_journal.json
@@ -5,8 +5,8 @@
     {
       "idx": 0,
       "version": "5",
-      "when": 1709349389002,
-      "tag": "0000_last_omega_sentinel",
+      "when": 1709350996171,
+      "tag": "0000_grey_mach_iv",
       "breakpoints": true
     }
   ]

diff --git a/packages/kanao-schema/src/Schema/roles.ts b/packages/kanao-schema/src/Schema/roles.ts
@@ -16,7 +16,7 @@ export const memberRoles = pgTable("member_roles", {
     roleId: text("role_id").notNull(),
     guildId: text("guild_id").notNull()
 }, table => ({
-    pkWithCustomName: primaryKey({ name: "voice_states_member_id_role_id_guild_id", columns: [table.memberId, table.roleId] })
+    pkWithCustomName: primaryKey({ name: "voice_states_member_id_role_id", columns: [table.memberId, table.roleId] })
 }));
 
 export const memberRolesRelations = relations(memberRoles, ({ one }) => ({

diff --git a/services/kanao-cache/src/Listeners/Caches/GuildMembers/GuildMemberAddListener.ts b/services/kanao-cache/src/Listeners/Caches/GuildMembers/GuildMemberAddListener.ts
@@ -54,7 +54,7 @@ export class GuildMemberAddListener extends Listener {
             pending: payload.data.d.pending,
             premiumSince: payload.data.d.premium_since
         }).onConflictDoUpdate({
-            target: members.id,
+            target: [members.id, members.guildId],
             set: {
                 avatar: sql`EXCLUDED.avatar`,
                 flags: sql`EXCLUDED.flags`,

diff --git a/services/kanao-cache/src/Listeners/Caches/GuildMembers/GuildMemberUpdateListener.ts b/services/kanao-cache/src/Listeners/Caches/GuildMembers/GuildMemberUpdateListener.ts
@@ -54,7 +54,7 @@ export class GuildMemberUpdateListener extends Listener {
                 pending: payload.data.d.pending,
                 premiumSince: payload.data.d.premium_since
             }).onConflictDoUpdate({
-                target: members.id,
+                target: [members.id, members.guildId],
                 set: {
                     avatar: sql`EXCLUDED.avatar`,
                     flags: sql`EXCLUDED.flags`,

diff --git a/services/kanao-cache/src/Listeners/Caches/GuildMembers/GuildMembersChunkListener.ts b/services/kanao-cache/src/Listeners/Caches/GuildMembers/GuildMembersChunkListener.ts
@@ -66,7 +66,7 @@ export class GuildMembersChunkListener extends Listener {
                             guildId: payload.data.d.guild_id
                         }))
                     ).onConflictDoUpdate({
-                        target: members.id,
+                        target: [members.id, members.guildId],
                         set: {
                             avatar: sql`EXCLUDED.avatar`,
                             communicationDisabledUntil: sql`EXCLUDED.premium_since`,

diff --git a/services/kanao-cache/src/Listeners/Caches/Guilds/GuildCreateListener.ts b/services/kanao-cache/src/Listeners/Caches/Guilds/GuildCreateListener.ts
@@ -173,7 +173,7 @@ export class GuildCreateListener extends Listener {
                 joinedAt: bot.joined_at,
                 premiumSince: bot.premium_since
             }).onConflictDoUpdate({
-                target: members.id,
+                target: [members.id, members.guildId],
                 set: {
                     avatar: sql`EXCLUDED.avatar`,
                     flags: sql`EXCLUDED.flags`,

diff --git a/services/kanao-cache/src/Listeners/Caches/Messages/MessageCreateListener.ts b/services/kanao-cache/src/Listeners/Caches/Messages/MessageCreateListener.ts
@@ -65,7 +65,7 @@ export class MessageCreateListener extends Listener {
                 pending: payload.data.d.member.pending,
                 premiumSince: payload.data.d.member.premium_since
             }).onConflictDoUpdate({
-                target: members.id,
+                target: [members.id, members.guildId],
                 set: {
                     avatar: sql`EXCLUDED.avatar`,
                     flags: sql`EXCLUDED.flags`,

diff --git a/services/kanao-cache/src/Listeners/Caches/Voices/VoiceStateUpdateListener.ts b/services/kanao-cache/src/Listeners/Caches/Voices/VoiceStateUpdateListener.ts
@@ -47,7 +47,7 @@ export class VoiceStateUpdateListener extends Listener {
                 nick: payload.data.d.member.nick,
                 pending: payload.data.d.member.pending,
                 premiumSince: payload.data.d.member.premium_since
-            }).onConflictDoNothing({ target: members.id });
+            }).onConflictDoNothing({ target: [members.id, members.guildId] });
 
             if (payload.data.d.member.roles.length > 0) {
                 await this.container.client.drizzle.insert(memberRoles).values(payload.data.d.member.roles.map(role => ({