diff --git a/src/api/routes/users/#user_id/messages.ts b/src/api/routes/users/#user_id/messages.ts
index 04708cfd..9ce0b369 100644
--- a/src/api/routes/users/#user_id/messages.ts
+++ b/src/api/routes/users/#user_id/messages.ts
@@ -17,8 +17,9 @@
*/
import { route } from "@spacebar/api";
-import { Config, DmMessagesResponseSchema, Message, User } from "@spacebar/util";
+import { Config, Message, User } from "@spacebar/util";
import { Request, Response, Router } from "express";
+import { DmMessagesResponseSchema } from "@spacebar/schemas"
const router = Router({ mergeParams: true });
router.get(
diff --git a/src/api/routes/users/#user_id/profile.ts b/src/api/routes/users/#user_id/profile.ts
index 30b4fb01..95940004 100644
--- a/src/api/routes/users/#user_id/profile.ts
+++ b/src/api/routes/users/#user_id/profile.ts
@@ -28,13 +28,12 @@ import {
PublicUser,
PublicUserProjection,
Relationship,
- RelationshipType,
User,
- UserProfileModifySchema,
UserUpdateEvent,
} from "@spacebar/util";
import { Request, Response, Router } from "express";
import { In } from "typeorm";
+import { RelationshipType, UserProfileModifySchema } from "@spacebar/schemas"
const router: Router = Router({ mergeParams: true });
diff --git a/src/api/routes/users/#user_id/relationships.ts b/src/api/routes/users/#user_id/relationships.ts
index e4af351f..c86b11aa 100644
--- a/src/api/routes/users/#user_id/relationships.ts
+++ b/src/api/routes/users/#user_id/relationships.ts
@@ -17,8 +17,9 @@
*/
import { route } from "@spacebar/api";
-import { User, UserRelationsResponse } from "@spacebar/util";
+import { User } from "@spacebar/util";
import { Request, Response, Router } from "express";
+import { UserRelationsResponse } from "@spacebar/schemas"
const router: Router = Router({ mergeParams: true });
diff --git a/src/api/routes/users/@me/channels.ts b/src/api/routes/users/@me/channels.ts
index 5ee36da1..fa9ffe70 100644
--- a/src/api/routes/users/@me/channels.ts
+++ b/src/api/routes/users/@me/channels.ts
@@ -17,13 +17,9 @@
*/
import { route } from "@spacebar/api";
-import {
- Channel,
- DmChannelCreateSchema,
- DmChannelDTO,
- Recipient,
-} from "@spacebar/util";
+import { Channel, DmChannelDTO, Recipient } from "@spacebar/util";
import { Request, Response, Router } from "express";
+import { DmChannelCreateSchema } from "@spacebar/schemas"
const router: Router = Router({ mergeParams: true });
diff --git a/src/api/routes/users/@me/collectibles-marketing.ts b/src/api/routes/users/@me/collectibles-marketing.ts
index 131f4370..c9f1a1d1 100644
--- a/src/api/routes/users/@me/collectibles-marketing.ts
+++ b/src/api/routes/users/@me/collectibles-marketing.ts
@@ -18,7 +18,7 @@
import { route } from "@spacebar/api";
import { Request, Response, Router } from "express";
-import { CollectiblesMarketingResponse } from "@spacebar/util";
+import { CollectiblesMarketingResponse } from "@spacebar/schemas";
const router = Router({ mergeParams: true });
diff --git a/src/api/routes/users/@me/connections/#connection_name/#connection_id/index.ts b/src/api/routes/users/@me/connections/#connection_name/#connection_id/index.ts
index f499d24d..f4b6ab14 100644
--- a/src/api/routes/users/@me/connections/#connection_name/#connection_id/index.ts
+++ b/src/api/routes/users/@me/connections/#connection_name/#connection_id/index.ts
@@ -17,13 +17,9 @@
*/
import { route } from "@spacebar/api";
-import {
- ConnectedAccount,
- ConnectionUpdateSchema,
- DiscordApiErrors,
- emitEvent,
-} from "@spacebar/util";
+import { ConnectedAccount, DiscordApiErrors, emitEvent } from "@spacebar/util";
import { Request, Response, Router } from "express";
+import { ConnectionUpdateSchema } from "@spacebar/schemas"
const router = Router({ mergeParams: true });
// TODO: connection update schema
diff --git a/src/api/routes/users/@me/guilds/#guild_id/settings.ts b/src/api/routes/users/@me/guilds/#guild_id/settings.ts
index 9d78773d..593006f6 100644
--- a/src/api/routes/users/@me/guilds/#guild_id/settings.ts
+++ b/src/api/routes/users/@me/guilds/#guild_id/settings.ts
@@ -21,9 +21,9 @@ import {
Channel,
Member,
OrmUtils,
- UserGuildSettingsSchema,
} from "@spacebar/util";
import { Request, Response, Router } from "express";
+import { UserGuildSettingsSchema } from "@spacebar/schemas"
const router = Router({ mergeParams: true });
diff --git a/src/api/routes/users/@me/index.ts b/src/api/routes/users/@me/index.ts
index d05e1812..4d4c64b9 100644
--- a/src/api/routes/users/@me/index.ts
+++ b/src/api/routes/users/@me/index.ts
@@ -25,11 +25,11 @@ import {
handleFile,
PrivateUserProjection,
User,
- UserModifySchema,
UserUpdateEvent,
} from "@spacebar/util";
import bcrypt from "bcrypt";
import { Request, Response, Router } from "express";
+import { UserModifySchema } from "@spacebar/schemas"
const router: Router = Router({ mergeParams: true });
diff --git a/src/api/routes/users/@me/mfa/codes-verification.ts b/src/api/routes/users/@me/mfa/codes-verification.ts
index 953648fb..6dba4bb0 100644
--- a/src/api/routes/users/@me/mfa/codes-verification.ts
+++ b/src/api/routes/users/@me/mfa/codes-verification.ts
@@ -19,12 +19,12 @@
import { route } from "@spacebar/api";
import {
BackupCode,
- CodesVerificationSchema,
DiscordApiErrors,
User,
generateMfaBackupCodes,
} from "@spacebar/util";
import { Request, Response, Router } from "express";
+import { CodesVerificationSchema } from "@spacebar/schemas"
const router = Router({ mergeParams: true });
diff --git a/src/api/routes/users/@me/mfa/codes.ts b/src/api/routes/users/@me/mfa/codes.ts
index 48f3d268..389dc01d 100644
--- a/src/api/routes/users/@me/mfa/codes.ts
+++ b/src/api/routes/users/@me/mfa/codes.ts
@@ -21,11 +21,11 @@ import {
BackupCode,
FieldErrors,
generateMfaBackupCodes,
- MfaCodesSchema,
User,
} from "@spacebar/util";
import bcrypt from "bcrypt";
import { Request, Response, Router } from "express";
+import { MfaCodesSchema } from "@spacebar/schemas"
const router = Router({ mergeParams: true });
diff --git a/src/api/routes/users/@me/mfa/totp/disable.ts b/src/api/routes/users/@me/mfa/totp/disable.ts
index 8ec65736..b266fcfe 100644
--- a/src/api/routes/users/@me/mfa/totp/disable.ts
+++ b/src/api/routes/users/@me/mfa/totp/disable.ts
@@ -19,13 +19,13 @@
import { route } from "@spacebar/api";
import {
BackupCode,
- TotpDisableSchema,
User,
generateToken,
} from "@spacebar/util";
import { Request, Response, Router } from "express";
import { HTTPError } from "lambert-server";
import { verifyToken } from "node-2fa";
+import { TotpDisableSchema } from "@spacebar/schemas"
const router = Router({ mergeParams: true });
diff --git a/src/api/routes/users/@me/mfa/totp/enable.ts b/src/api/routes/users/@me/mfa/totp/enable.ts
index 774c7487..3d6f4a80 100644
--- a/src/api/routes/users/@me/mfa/totp/enable.ts
+++ b/src/api/routes/users/@me/mfa/totp/enable.ts
@@ -18,7 +18,6 @@
import { route } from "@spacebar/api";
import {
- TotpEnableSchema,
User,
generateMfaBackupCodes,
generateToken,
@@ -27,6 +26,7 @@ import bcrypt from "bcrypt";
import { Request, Response, Router } from "express";
import { HTTPError } from "lambert-server";
import { verifyToken } from "node-2fa";
+import { TotpEnableSchema } from "@spacebar/schemas"
const router = Router({ mergeParams: true });
diff --git a/src/api/routes/users/@me/mfa/webauthn/credentials/index.ts b/src/api/routes/users/@me/mfa/webauthn/credentials/index.ts
index 78c7470d..1225cd34 100644
--- a/src/api/routes/users/@me/mfa/webauthn/credentials/index.ts
+++ b/src/api/routes/users/@me/mfa/webauthn/credentials/index.ts
@@ -18,21 +18,19 @@
import { route } from "@spacebar/api";
import {
- CreateWebAuthnCredentialSchema,
DiscordApiErrors,
FieldErrors,
- GenerateWebAuthnCredentialsSchema,
generateWebAuthnTicket,
SecurityKey,
User,
verifyWebAuthnToken,
WebAuthn,
- WebAuthnPostSchema,
} from "@spacebar/util";
import bcrypt from "bcrypt";
import { Request, Response, Router } from "express";
import { ExpectedAttestationResult } from "fido2-lib";
import { HTTPError } from "lambert-server";
+import { CreateWebAuthnCredentialSchema, GenerateWebAuthnCredentialsSchema, WebAuthnPostSchema } from "@spacebar/schemas"
const router = Router({ mergeParams: true });
const isGenerateSchema = (
diff --git a/src/api/routes/users/@me/relationships.ts b/src/api/routes/users/@me/relationships.ts
index 76746e3f..7b1780be 100644
--- a/src/api/routes/users/@me/relationships.ts
+++ b/src/api/routes/users/@me/relationships.ts
@@ -24,12 +24,12 @@ import {
Relationship,
RelationshipAddEvent,
RelationshipRemoveEvent,
- RelationshipType,
User,
emitEvent,
} from "@spacebar/util";
import { Request, Response, Router } from "express";
import { HTTPError } from "lambert-server";
+import { RelationshipType } from "@spacebar/schemas"
const router = Router({ mergeParams: true });
diff --git a/src/api/routes/users/@me/settings-proto/1.ts b/src/api/routes/users/@me/settings-proto/1.ts
index 2eea291a..2ae3a55b 100644
--- a/src/api/routes/users/@me/settings-proto/1.ts
+++ b/src/api/routes/users/@me/settings-proto/1.ts
@@ -21,14 +21,11 @@ import { Request, Response, Router } from "express";
import {
emitEvent,
OrmUtils,
- SettingsProtoJsonResponse,
- SettingsProtoResponse,
- SettingsProtoUpdateJsonSchema,
- SettingsProtoUpdateSchema,
UserSettingsProtos,
} from "@spacebar/util";
import { PreloadedUserSettings } from "discord-protos";
import { JsonValue } from "@protobuf-ts/runtime";
+import { SettingsProtoJsonResponse, SettingsProtoResponse, SettingsProtoUpdateJsonSchema, SettingsProtoUpdateSchema } from "@spacebar/schemas"
const router: Router = Router({ mergeParams: true });
diff --git a/src/api/routes/users/@me/settings-proto/2.ts b/src/api/routes/users/@me/settings-proto/2.ts
index 34cd3bfc..bfbcc81a 100644
--- a/src/api/routes/users/@me/settings-proto/2.ts
+++ b/src/api/routes/users/@me/settings-proto/2.ts
@@ -21,14 +21,11 @@ import { Request, Response, Router } from "express";
import {
emitEvent,
OrmUtils,
- SettingsProtoJsonResponse,
- SettingsProtoResponse,
- SettingsProtoUpdateJsonSchema,
- SettingsProtoUpdateSchema,
UserSettingsProtos,
} from "@spacebar/util";
import { FrecencyUserSettings } from "discord-protos";
import { JsonValue } from "@protobuf-ts/runtime";
+import { SettingsProtoJsonResponse, SettingsProtoResponse, SettingsProtoUpdateJsonSchema, SettingsProtoUpdateSchema } from "@spacebar/schemas"
const router: Router = Router({ mergeParams: true });
diff --git a/src/api/routes/users/@me/settings.ts b/src/api/routes/users/@me/settings.ts
index 26d2f21b..82ca5add 100644
--- a/src/api/routes/users/@me/settings.ts
+++ b/src/api/routes/users/@me/settings.ts
@@ -17,8 +17,9 @@
*/
import { route } from "@spacebar/api";
-import { User, UserSettings, UserSettingsSchema } from "@spacebar/util";
+import { User, UserSettings } from "@spacebar/util";
import { Request, Response, Router } from "express";
+import { UserSettingsSchema } from "@spacebar/schemas"
const router = Router({ mergeParams: true });
@@ -66,7 +67,7 @@ router.patch(
});
if (!user.settings)
- user.settings = UserSettings.create(body);
+ user.settings = UserSettings.create(body as Partial<UserSettings>);
else
user.settings.assign(body);
|
