From 0b2e8981c00eded8aa6e177eac7697fa36df6c2a Mon Sep 17 00:00:00 2001
From: Rory& <root@rory.gay>
Date: Sat, 11 Oct 2025 05:32:32 +0200
Subject: [PATCH] Try to fix duplicate user settings

---
 assets/openapi.json             | Bin 1492150 -> 1492464 bytes
 assets/schemas.json             | Bin 4155039 -> 4174021 bytes
 src/gateway/opcodes/Identify.ts |   1 +
 src/util/entities/User.ts       |   2 +-
 4 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/assets/openapi.json b/assets/openapi.json
index c63c39b95d6827dc8fcf68a2504b0f4db0288c0a..9eed4bc34ccc0b1176d4becf9c2cf2998dfeee1f 100644
GIT binary patch
delta 156
zcmdni8U3L<x}k-!g{g(Pg{6hHg{_6Xg`<VDg{y_Tg{OtLg>MW0qfL_!w2DuccjI@S
zF7SqzWx9S5f7&!(UbF4-oB0<qf+RSn&nw~=-?o*1x&)DGr)}krZ0Ebc55xjMEC|Fx
QKr9TzBHQ^ch_3ho0PEN{@Bjb+

delta 135
zcmey+9lfnHx}k-!g{g(Pg{6hHg{_6Xg`<VDg{y_Tg{OtLg>MW0qfOHTp7MB1S6I$(
zvHkvL{&|ek4sf$fSGXm>I{n85{($MWYy#}t|8C_sm%yp89jFk91%Ox(h=qVy7>Gr-
K|F|If;|l->%{s6E

diff --git a/assets/schemas.json b/assets/schemas.json
index c4e09d0756bb57f59c5067672dc6eb3e7c24ac57..663ebb8c056d889954965ae3948ca35537e0a5a2 100644
GIT binary patch
delta 412
zcmci5KT84u9L903JoT(R&C^V?Og+2oD$BCJN`tfoLEsj(2RSq}1r86mw*8<*dk?`m
zHq=lML@yv}Euq_*vYuDb@PY5}z|(&EQSRUSN)rkOFbEG+c;SN|8Uh%?Fh&rBju65a
zMFa+-h+zzIj3a?0CXm7;rjW)oGRPu#V_tlSThl_ae^4z+QB8Q{_$nI{H|nX#j_plK
zyJm#t>(x}H)3JgQ`ZPJYwhV_=P(-h1G)eCoLAkuEs`7lEk4XPk_sPSl6_>Y1f6Cc=
ziJs)d{mmY>x;>NfPPaExZvNkKU5*NRpk+5Knxz8GkxlcoK#NqQC0eEut<Wl!X^qxt
QgEnc4wyEOSjq2I=AAX6JGynhq

delta 278
zcma*eIZgs$0EXd=I-rAs11RHyxD5{Df-5eliNV6sP}q6{8*3AaH{k#le{7T^SddKS
z0MdB{6I(T*w9@z;!Qv^Om-k=m>Gj8IVKKlUL)aupGRz1LDMlG1O@?t?vgF7!!6XGd
zrkG}iS&Gb2Vx9#SSz@{C-+kP7oGbHqp3j>8n{S)ThjQ8!P0ovMKK;-#&tHDcbS@H&
zcF!%#O4M_Mdh4I-%v^^Vr`?PLsYocRvL@@YAywIwE!mbG*_A!1$-W%Op&UtFj^!k3
I#;3R6e<mSqH~;_u

diff --git a/src/gateway/opcodes/Identify.ts b/src/gateway/opcodes/Identify.ts
index 09e8805f..4bd41d21 100644
--- a/src/gateway/opcodes/Identify.ts
+++ b/src/gateway/opcodes/Identify.ts
@@ -358,6 +358,7 @@ export async function onIdentify(this: WebSocket, data: Payload) {
 	// so for instances that migrated, users may not have a `user_settings` row.
 	let createUserSettingsTime: ElapsedTime | undefined = undefined;
 	if (!user.settings) {
+		console.warn("[WARN] Creating new user settings!")
 		user.settings = new UserSettings();
 		await user.settings.save();
 		createUserSettingsTime = taskSw.getElapsedAndReset();
diff --git a/src/util/entities/User.ts b/src/util/entities/User.ts
index d1b3c709..840c028d 100644
--- a/src/util/entities/User.ts
+++ b/src/util/entities/User.ts
@@ -58,7 +58,7 @@ export enum PrivateUserEnum {
 	purchased_flags,
 	premium_usage_flags,
 	disabled,
-	// settings,	// now a relation
+	settings,
 	// locale
 }
 export type PrivateUserKeys = keyof typeof PrivateUserEnum | PublicUserKeys;