From 5f0e5a9d1fe8adff21d48deb5840169f89125553 Mon Sep 17 00:00:00 2001
From: Rory& <root@rory.gay>
Date: Tue, 30 Sep 2025 20:13:23 +0200
Subject: [PATCH] Send user settings proto in gateway ready, if one exists

---
 src/gateway/opcodes/Identify.ts | 11 ++++++++++-
 src/util/interfaces/Event.ts    |  3 +++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/gateway/opcodes/Identify.ts b/src/gateway/opcodes/Identify.ts
index 9f334358..3f3164fc 100644
--- a/src/gateway/opcodes/Identify.ts
+++ b/src/gateway/opcodes/Identify.ts
@@ -55,10 +55,11 @@ import {
 	Emoji,
 	Role,
 	Sticker,
-	VoiceState,
+	VoiceState, UserSettingsProtos,
 } from "@spacebar/util";
 import { check } from "./instanceOf";
 import { In } from "typeorm";
+import { PreloadedUserSettings } from "discord-protos";
 
 // TODO: user sharding
 // TODO: check privileged intents, if defined in the config
@@ -245,12 +246,18 @@ export async function onIdentify(this: WebSocket, data: Payload) {
 
 	// select relations
 	const [
+		{ result: settingsProtos, elapsed: settingsProtosQueryTime },
 		{ result: memberGuildChannels, elapsed: queryGuildChannelsTime },
 		{ result: memberGuildEmojis, elapsed: queryGuildEmojisTime },
 		{ result: memberGuildRoles, elapsed: queryGuildRolesTime },
 		{ result: memberGuildStickers, elapsed: queryGuildStickersTime },
 		{ result: memberGuildVoiceStates, elapsed: queryGuildVoiceStatesTime },
 	] = await Promise.all([
+		timePromise(() =>
+			UserSettingsProtos.findOne({
+				where: { user_id: this.user_id },
+			})
+		),
 		timePromise(() =>
 			Channel.find({
 				where: { guild_id: In(guildIds) },
@@ -510,6 +517,8 @@ export async function onIdentify(this: WebSocket, data: Payload) {
 		application: application ? { id: application.id, flags: application.flags } : undefined,
 		user: user.toPrivateUser(),
 		user_settings: user.settings,
+		user_settings_proto: settingsProtos?.userSettings ? PreloadedUserSettings.toBase64(settingsProtos.userSettings) : undefined,
+		user_settings_proto_json: settingsProtos?.userSettings ? PreloadedUserSettings.toJson(settingsProtos.userSettings) : undefined,
 		guilds: this.capabilities.has(Capabilities.FLAGS.CLIENT_STATE_V2) ? guilds.map((x) => new ReadyGuildDTO(x).toJSON()) : guilds,
 		relationships: user.relationships.map((x) => x.toPublicRelationship()),
 		read_state: {
diff --git a/src/util/interfaces/Event.ts b/src/util/interfaces/Event.ts
index 7ddb1fbe..6692d33e 100644
--- a/src/util/interfaces/Event.ts
+++ b/src/util/interfaces/Event.ts
@@ -44,6 +44,7 @@ import {
 	GuildCreateResponse,
 	PublicVoiceState,
 } from "@spacebar/util";
+import { JsonValue } from "@protobuf-ts/runtime";
 
 export interface Event {
 	guild_id?: string;
@@ -99,6 +100,8 @@ export interface ReadyEventData {
 	guild_join_requests?: unknown[]; // ? what is this? this is new
 	shard?: [number, number];
 	user_settings?: UserSettings;
+	user_settings_proto?: string;
+	user_settings_proto_json?: JsonValue;
 	relationships?: PublicRelationship[]; // TODO
 	read_state: {
 		entries: ReadState[]; // TODO