diff --git a/src/api/routes/users/@me/settings-proto/1.ts b/src/api/routes/users/@me/settings-proto/1.ts
index a0559c26..6f58b422 100644
--- a/src/api/routes/users/@me/settings-proto/1.ts
+++ b/src/api/routes/users/@me/settings-proto/1.ts
@@ -18,14 +18,10 @@
import { route } from "@spacebar/api";
import { Request, Response, Router } from "express";
-import {
- emitEvent,
- OrmUtils,
- UserSettingsProtos,
-} from "@spacebar/util";
+import { emitEvent, OrmUtils, UserSettingsProtos } from "@spacebar/util";
import { PreloadedUserSettings } from "discord-protos";
import { JsonValue } from "@protobuf-ts/runtime";
-import { SettingsProtoJsonResponse, SettingsProtoResponse, SettingsProtoUpdateJsonSchema, SettingsProtoUpdateSchema } from "@spacebar/schemas"
+import { SettingsProtoJsonResponse, SettingsProtoResponse, SettingsProtoUpdateJsonSchema, SettingsProtoUpdateSchema } from "@spacebar/schemas";
const router: Router = Router({ mergeParams: true });
@@ -41,8 +37,7 @@ router.get(
query: {
atomic: {
type: "boolean",
- description:
- "Whether to try to apply the settings update atomically (default false)",
+ description: "Whether to try to apply the settings update atomically (default false)",
},
},
}),
@@ -50,9 +45,7 @@ router.get(
const userSettings = await UserSettingsProtos.getOrDefault(req.user_id);
res.json({
- settings: PreloadedUserSettings.toBase64(
- userSettings.userSettings!,
- ),
+ settings: PreloadedUserSettings.toBase64(userSettings.userSettings!),
} as SettingsProtoResponse);
},
);
@@ -68,17 +61,11 @@ router.patch(
},
}),
async (req: Request, res: Response) => {
- const { settings, required_data_version } =
- req.body as SettingsProtoUpdateSchema;
+ const { settings, required_data_version } = req.body as SettingsProtoUpdateSchema;
const { atomic } = req.query;
const updatedSettings = PreloadedUserSettings.fromBase64(settings);
- const resultObj = await patchUserSettings(
- req.user_id,
- updatedSettings,
- required_data_version,
- atomic == "true",
- );
+ const resultObj = await patchUserSettings(req.user_id, updatedSettings, required_data_version, atomic == "true");
res.json({
settings: PreloadedUserSettings.toBase64(resultObj.settings),
@@ -119,23 +106,16 @@ router.patch(
query: {
atomic: {
type: "boolean",
- description:
- "Whether to try to apply the settings update atomically (default false)",
+ description: "Whether to try to apply the settings update atomically (default false)",
},
},
}),
async (req: Request, res: Response) => {
- const { settings, required_data_version } =
- req.body as SettingsProtoUpdateJsonSchema;
+ const { settings, required_data_version } = req.body as SettingsProtoUpdateJsonSchema;
const { atomic } = req.query;
const updatedSettings = PreloadedUserSettings.fromJson(settings);
- const resultObj = await patchUserSettings(
- req.user_id,
- updatedSettings,
- required_data_version,
- atomic == "true",
- );
+ const resultObj = await patchUserSettings(req.user_id, updatedSettings, required_data_version, atomic == "true");
res.json({
settings: PreloadedUserSettings.toJson(resultObj.settings),
@@ -146,20 +126,11 @@ router.patch(
//#endregion
-async function patchUserSettings(
- userId: string,
- updatedSettings: PreloadedUserSettings,
- required_data_version: number | undefined,
- atomic: boolean = false,
-) {
+async function patchUserSettings(userId: string, updatedSettings: PreloadedUserSettings, required_data_version: number | undefined, atomic: boolean = false) {
const userSettings = await UserSettingsProtos.getOrDefault(userId);
let settings = userSettings.userSettings!;
- if (
- required_data_version &&
- settings.versions &&
- settings.versions.dataVersion > required_data_version
- ) {
+ if (required_data_version && settings.versions && settings.versions.dataVersion > required_data_version) {
return {
settings: settings,
out_of_date: true,
@@ -167,24 +138,15 @@ async function patchUserSettings(
}
if ((process.env.LOG_PROTO_UPDATES || process.env.LOG_PROTO_SETTINGS_UPDATES) && process.env.LOG_PROTO_SETTINGS_UPDATES !== "false")
- console.log(
- `Updating user settings for user ${userId} with atomic=${atomic}:`,
- updatedSettings,
- );
+ console.log(`Updating user settings for user ${userId} with atomic=${atomic}:`, updatedSettings);
if (!atomic) {
settings = PreloadedUserSettings.fromJson(
- Object.assign(
- PreloadedUserSettings.toJson(settings) as object,
- PreloadedUserSettings.toJson(updatedSettings) as object,
- ) as JsonValue,
+ Object.assign(PreloadedUserSettings.toJson(settings) as object, PreloadedUserSettings.toJson(updatedSettings) as object) as JsonValue,
);
} else {
settings = PreloadedUserSettings.fromJson(
- OrmUtils.mergeDeep(
- PreloadedUserSettings.toJson(settings) as object,
- PreloadedUserSettings.toJson(updatedSettings) as object,
- ) as JsonValue,
+ OrmUtils.mergeDeep(PreloadedUserSettings.toJson(settings) as object, PreloadedUserSettings.toJson(updatedSettings) as object) as JsonValue,
);
}
@@ -202,14 +164,14 @@ async function patchUserSettings(
data: {
settings: {
proto: PreloadedUserSettings.toBase64(settings),
- type: 1
+ type: 1,
},
json_settings: {
proto: PreloadedUserSettings.toJson(settings),
- type: "user_settings"
+ type: "user_settings",
},
partial: false, // Unsure how this should behave
- }
+ },
});
// This should also send a USER_SETTINGS_UPDATE event, but that isn't sent
// when using the USER_SETTINGS_PROTOS capability, so we ignore it for now.
|
