diff --git a/src/gateway/opcodes/Identify.ts b/src/gateway/opcodes/Identify.ts index 9f33435..3f3164f 100644 --- a/src/gateway/opcodes/Identify.ts +++ b/src/gateway/opcodes/Identify.ts @@ -55,10 +55,11 @@ 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,6 +246,7 @@ // select relations const [ + { result: settingsProtos, elapsed: settingsProtosQueryTime }, { result: memberGuildChannels, elapsed: queryGuildChannelsTime }, { result: memberGuildEmojis, elapsed: queryGuildEmojisTime }, { result: memberGuildRoles, elapsed: queryGuildRolesTime }, @@ -252,6 +254,11 @@ { result: memberGuildVoiceStates, elapsed: queryGuildVoiceStatesTime }, ] = await Promise.all([ timePromise(() => + UserSettingsProtos.findOne({ + where: { user_id: this.user_id }, + }) + ), + timePromise(() => Channel.find({ where: { guild_id: In(guildIds) }, order: { guild_id: "ASC" }, @@ -510,6 +517,8 @@ 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 7ddb1fb..6692d33 100644 --- a/src/util/interfaces/Event.ts +++ b/src/util/interfaces/Event.ts @@ -44,6 +44,7 @@ GuildCreateResponse, PublicVoiceState, } from "@spacebar/util"; +import { JsonValue } from "@protobuf-ts/runtime"; export interface Event { guild_id?: string; @@ -99,6 +100,8 @@ 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