RSCord/ServerSpacebarOld
Archived
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Send user settings proto in gateway ready, if one exists

Browse Source
This commit is contained in:
Rory& 2025-09-30 20:13:23 +02:00
parent 6a3155adba
commit 5f0e5a9d1f
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/gateway/opcodes/Identify.ts
View File

@ -55,10 +55,11 @@ import {
Emoji, Emoji,
Role, Role,
Sticker, Sticker,
VoiceState, VoiceState, UserSettingsProtos,
} from "@spacebar/util"; } from "@spacebar/util";
import { check } from "./instanceOf"; import { check } from "./instanceOf";
import { In } from "typeorm"; import { In } from "typeorm";
import { PreloadedUserSettings } from "discord-protos";
// TODO: user sharding // TODO: user sharding
// TODO: check privileged intents, if defined in the config // TODO: check privileged intents, if defined in the config
@ -245,12 +246,18 @@ export async function onIdentify(this: WebSocket, data: Payload) {
// select relations // select relations
const [ const [
{ result: settingsProtos, elapsed: settingsProtosQueryTime },
{ result: memberGuildChannels, elapsed: queryGuildChannelsTime }, { result: memberGuildChannels, elapsed: queryGuildChannelsTime },
{ result: memberGuildEmojis, elapsed: queryGuildEmojisTime }, { result: memberGuildEmojis, elapsed: queryGuildEmojisTime },
{ result: memberGuildRoles, elapsed: queryGuildRolesTime }, { result: memberGuildRoles, elapsed: queryGuildRolesTime },
{ result: memberGuildStickers, elapsed: queryGuildStickersTime }, { result: memberGuildStickers, elapsed: queryGuildStickersTime },
{ result: memberGuildVoiceStates, elapsed: queryGuildVoiceStatesTime }, { result: memberGuildVoiceStates, elapsed: queryGuildVoiceStatesTime },
] = await Promise.all([ ] = await Promise.all([
timePromise(() =>
UserSettingsProtos.findOne({
where: { user_id: this.user_id },
})
),
timePromise(() => timePromise(() =>
Channel.find({ Channel.find({
where: { guild_id: In(guildIds) }, 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, application: application ? { id: application.id, flags: application.flags } : undefined,
user: user.toPrivateUser(), user: user.toPrivateUser(),
user_settings: user.settings, 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, guilds: this.capabilities.has(Capabilities.FLAGS.CLIENT_STATE_V2) ? guilds.map((x) => new ReadyGuildDTO(x).toJSON()) : guilds,
relationships: user.relationships.map((x) => x.toPublicRelationship()), relationships: user.relationships.map((x) => x.toPublicRelationship()),
read_state: { read_state: {

3
src/util/interfaces/Event.ts
View File

@ -44,6 +44,7 @@ import {
GuildCreateResponse, GuildCreateResponse,
PublicVoiceState, PublicVoiceState,
} from "@spacebar/util"; } from "@spacebar/util";
import { JsonValue } from "@protobuf-ts/runtime";
export interface Event { export interface Event {
guild_id?: string; guild_id?: string;
@ -99,6 +100,8 @@ export interface ReadyEventData {
guild_join_requests?: unknown[]; // ? what is this? this is new guild_join_requests?: unknown[]; // ? what is this? this is new
shard?: [number, number]; shard?: [number, number];
user_settings?: UserSettings; user_settings?: UserSettings;
user_settings_proto?: string;
user_settings_proto_json?: JsonValue;
relationships?: PublicRelationship[]; // TODO relationships?: PublicRelationship[]; // TODO
read_state: { read_state: {
entries: ReadState[]; // TODO entries: ReadState[]; // TODO