diff --git a/src/api/routes/applications/#application_id/bot/index.ts b/src/api/routes/applications/#application_id/bot/index.ts
index 0928af37..db1d0253 100644
--- a/src/api/routes/applications/#application_id/bot/index.ts
+++ b/src/api/routes/applications/#application_id/bot/index.ts
@@ -19,7 +19,6 @@
import { route } from "@spacebar/api";
import {
Application,
- BotModifySchema,
DiscordApiErrors,
User,
createAppBotUser,
@@ -29,6 +28,7 @@ import {
import { Request, Response, Router } from "express";
import { HTTPError } from "lambert-server";
import { verifyToken } from "node-2fa";
+import { BotModifySchema } from "@spacebar/schemas"
const router: Router = Router({ mergeParams: true });
diff --git a/src/api/routes/applications/#application_id/index.ts b/src/api/routes/applications/#application_id/index.ts
index d6ba26fe..6701f867 100644
--- a/src/api/routes/applications/#application_id/index.ts
+++ b/src/api/routes/applications/#application_id/index.ts
@@ -19,7 +19,6 @@
import { route } from "@spacebar/api";
import {
Application,
- ApplicationModifySchema,
DiscordApiErrors,
Guild,
handleFile,
@@ -27,6 +26,7 @@ import {
import { Request, Response, Router } from "express";
import { HTTPError } from "lambert-server";
import { verifyToken } from "node-2fa";
+import { ApplicationModifySchema } from "@spacebar/schemas"
const router: Router = Router({ mergeParams: true });
diff --git a/src/api/routes/applications/index.ts b/src/api/routes/applications/index.ts
index 54a01aa9..77f02fc1 100644
--- a/src/api/routes/applications/index.ts
+++ b/src/api/routes/applications/index.ts
@@ -19,13 +19,13 @@
import { route } from "@spacebar/api";
import {
Application,
- ApplicationCreateSchema,
Config,
User,
createAppBotUser,
trimSpecial,
} from "@spacebar/util";
import { Request, Response, Router } from "express";
+import { ApplicationCreateSchema } from "@spacebar/schemas"
const router: Router = Router({ mergeParams: true });
diff --git a/src/api/routes/attachments/refresh-urls.ts b/src/api/routes/attachments/refresh-urls.ts
index b04c12cc..76954c77 100644
--- a/src/api/routes/attachments/refresh-urls.ts
+++ b/src/api/routes/attachments/refresh-urls.ts
@@ -18,11 +18,11 @@
import { route } from "@spacebar/api";
import {
- RefreshUrlsRequestSchema,
getUrlSignature,
NewUrlSignatureData,
} from "@spacebar/util";
import { Request, Response, Router } from "express";
+import { RefreshUrlsRequestSchema } from "@spacebar/schemas"
const router = Router({ mergeParams: true });
router.post(
diff --git a/src/api/routes/auth/forgot.ts b/src/api/routes/auth/forgot.ts
index 5b4a83cf..12bc9cb0 100644
--- a/src/api/routes/auth/forgot.ts
+++ b/src/api/routes/auth/forgot.ts
@@ -17,8 +17,9 @@
*/
import { getIpAdress, route, verifyCaptcha } from "@spacebar/api";
-import { Config, Email, ForgotPasswordSchema, User } from "@spacebar/util";
+import { Config, Email, User } from "@spacebar/util";
import { Request, Response, Router } from "express";
+import { ForgotPasswordSchema } from "@spacebar/schemas"
const router = Router({ mergeParams: true });
router.post(
diff --git a/src/api/routes/auth/login.ts b/src/api/routes/auth/login.ts
index e76bb658..06e3fe43 100644
--- a/src/api/routes/auth/login.ts
+++ b/src/api/routes/auth/login.ts
@@ -20,7 +20,6 @@ import { getIpAdress, route, verifyCaptcha } from "@spacebar/api";
import {
Config,
FieldErrors,
- LoginSchema,
User,
WebAuthn,
generateToken,
@@ -29,6 +28,7 @@ import {
import bcrypt from "bcrypt";
import crypto from "crypto";
import { Request, Response, Router } from "express";
+import { LoginSchema } from "@spacebar/schemas"
const router: Router = Router({ mergeParams: true });
export default router;
@@ -47,8 +47,7 @@ router.post(
},
}),
async (req: Request, res: Response) => {
- const { login, password, captcha_key, undelete } =
- req.body as LoginSchema;
+ const { login, password, captcha_key, undelete } = req.body as LoginSchema;
const config = Config.get();
diff --git a/src/api/routes/auth/mfa/totp.ts b/src/api/routes/auth/mfa/totp.ts
index 225fd62e..cc6e8a25 100644
--- a/src/api/routes/auth/mfa/totp.ts
+++ b/src/api/routes/auth/mfa/totp.ts
@@ -17,10 +17,11 @@
*/
import { route } from "@spacebar/api";
-import { BackupCode, TotpSchema, User, generateToken } from "@spacebar/util";
+import { BackupCode, User, generateToken } from "@spacebar/util";
import { Request, Response, Router } from "express";
import { HTTPError } from "lambert-server";
import { verifyToken } from "node-2fa";
+import { TotpSchema } from "@spacebar/schemas"
const router = Router({ mergeParams: true });
router.post(
diff --git a/src/api/routes/auth/mfa/webauthn.ts b/src/api/routes/auth/mfa/webauthn.ts
index d904373d..80ff57f0 100644
--- a/src/api/routes/auth/mfa/webauthn.ts
+++ b/src/api/routes/auth/mfa/webauthn.ts
@@ -23,11 +23,11 @@ import {
User,
verifyWebAuthnToken,
WebAuthn,
- WebAuthnTotpSchema,
} from "@spacebar/util";
import { Request, Response, Router } from "express";
import { ExpectedAssertionResult } from "fido2-lib";
import { HTTPError } from "lambert-server";
+import { WebAuthnTotpSchema } from "@spacebar/schemas"
const router = Router({ mergeParams: true });
function toArrayBuffer(buf: Buffer) {
diff --git a/src/api/routes/auth/register.ts b/src/api/routes/auth/register.ts
index 2a048866..2db60abd 100644
--- a/src/api/routes/auth/register.ts
+++ b/src/api/routes/auth/register.ts
@@ -27,7 +27,6 @@ import {
Config,
FieldErrors,
Invite,
- RegisterSchema,
User,
ValidRegistrationToken,
generateToken,
@@ -36,6 +35,7 @@ import bcrypt from "bcrypt";
import { Request, Response, Router } from "express";
import { HTTPError } from "lambert-server";
import { MoreThan } from "typeorm";
+import { RegisterSchema } from "@spacebar/schemas"
const router: Router = Router({ mergeParams: true });
diff --git a/src/api/routes/auth/reset.ts b/src/api/routes/auth/reset.ts
index 90df676a..b14eb379 100644
--- a/src/api/routes/auth/reset.ts
+++ b/src/api/routes/auth/reset.ts
@@ -22,11 +22,11 @@ import {
Email,
FieldErrors,
generateToken,
- PasswordResetSchema,
User,
} from "@spacebar/util";
import bcrypt from "bcrypt";
import { Request, Response, Router } from "express";
+import { PasswordResetSchema } from "@spacebar/schemas"
const router = Router({ mergeParams: true });
diff --git a/src/api/routes/auth/verify/view-backup-codes-challenge.ts b/src/api/routes/auth/verify/view-backup-codes-challenge.ts
index 1889aaaf..811de508 100644
--- a/src/api/routes/auth/verify/view-backup-codes-challenge.ts
+++ b/src/api/routes/auth/verify/view-backup-codes-challenge.ts
@@ -17,9 +17,10 @@
*/
import { route } from "@spacebar/api";
-import { BackupCodesChallengeSchema, FieldErrors, User } from "@spacebar/util";
+import { FieldErrors, User } from "@spacebar/util";
import bcrypt from "bcrypt";
import { Request, Response, Router } from "express";
+import { BackupCodesChallengeSchema } from "@spacebar/schemas"
const router = Router({ mergeParams: true });
router.post(
diff --git a/src/api/routes/channels/#channel_id/attachments.ts b/src/api/routes/channels/#channel_id/attachments.ts
index df9af9af..2c08931e 100644
--- a/src/api/routes/channels/#channel_id/attachments.ts
+++ b/src/api/routes/channels/#channel_id/attachments.ts
@@ -21,13 +21,12 @@ import {
Channel,
Config,
Permissions,
- UploadAttachmentRequestSchema,
- UploadAttachmentResponseSchema,
User,
} from "@spacebar/util";
import { Request, Response, Router } from "express";
-import { CloudAttachment } from "../../../../util/entities/CloudAttachment";
+import { CloudAttachment } from "@spacebar/util";
import fetch from "node-fetch-commonjs";
+import { UploadAttachmentRequestSchema, UploadAttachmentResponseSchema } from "@spacebar/schemas"
const router: Router = Router({ mergeParams: true });
diff --git a/src/api/routes/channels/#channel_id/directory-entries.ts b/src/api/routes/channels/#channel_id/directory-entries.ts
index ef01fb40..c07b1f75 100644
--- a/src/api/routes/channels/#channel_id/directory-entries.ts
+++ b/src/api/routes/channels/#channel_id/directory-entries.ts
@@ -17,7 +17,7 @@
*/
import { route } from "@spacebar/api";
-import { HubDirectoryEntriesResponse } from "@spacebar/util";
+import { HubDirectoryEntriesResponse } from "@spacebar/schemas";
import { Request, Response, Router } from "express";
const router = Router({ mergeParams: true });
diff --git a/src/api/routes/channels/#channel_id/greet.ts b/src/api/routes/channels/#channel_id/greet.ts
index 2052dd43..399e30a2 100644
--- a/src/api/routes/channels/#channel_id/greet.ts
+++ b/src/api/routes/channels/#channel_id/greet.ts
@@ -17,9 +17,10 @@
*/
import { route } from "@spacebar/api";
-import { Channel, emitEvent, GreetRequestSchema, Message, MessageCreateEvent, MessageType, Permissions, Sticker } from "@spacebar/util";
+import { Channel, emitEvent, Message, MessageCreateEvent, Permissions, Sticker } from "@spacebar/util";
import { Request, Response, Router } from "express";
import { In } from "typeorm";
+import { GreetRequestSchema, MessageType } from "@spacebar/schemas"
const router: Router = Router({ mergeParams: true });
diff --git a/src/api/routes/channels/#channel_id/index.ts b/src/api/routes/channels/#channel_id/index.ts
index 9efbfe89..cc43790a 100644
--- a/src/api/routes/channels/#channel_id/index.ts
+++ b/src/api/routes/channels/#channel_id/index.ts
@@ -20,7 +20,6 @@ import { route } from "@spacebar/api";
import {
Channel,
ChannelDeleteEvent,
- ChannelModifySchema,
ChannelType,
ChannelUpdateEvent,
Recipient,
@@ -28,6 +27,7 @@ import {
handleFile,
} from "@spacebar/util";
import { Request, Response, Router } from "express";
+import { ChannelModifySchema } from "@spacebar/schemas"
const router: Router = Router({ mergeParams: true });
// TODO: delete channel
diff --git a/src/api/routes/channels/#channel_id/invites.ts b/src/api/routes/channels/#channel_id/invites.ts
index 086c1eb3..b6ce0721 100644
--- a/src/api/routes/channels/#channel_id/invites.ts
+++ b/src/api/routes/channels/#channel_id/invites.ts
@@ -17,9 +17,10 @@
*/
import { randomString, route } from "@spacebar/api";
-import { Channel, Guild, Invite, InviteCreateEvent, InviteCreateSchema, PublicInviteRelation, User, emitEvent, isTextChannel } from "@spacebar/util";
+import { Channel, Guild, Invite, InviteCreateEvent, PublicInviteRelation, User, emitEvent, isTextChannel } from "@spacebar/util";
import { Request, Response, Router } from "express";
import { HTTPError } from "lambert-server";
+import { InviteCreateSchema } from "@spacebar/schemas"
const router: Router = Router({ mergeParams: true });
diff --git a/src/api/routes/channels/#channel_id/messages/#message_id/index.ts b/src/api/routes/channels/#channel_id/messages/#message_id/index.ts
index 2439894d..bf35dc3d 100644
--- a/src/api/routes/channels/#channel_id/messages/#message_id/index.ts
+++ b/src/api/routes/channels/#channel_id/messages/#message_id/index.ts
@@ -21,9 +21,7 @@ import {
Channel,
Message,
MessageCreateEvent,
- MessageCreateSchema,
MessageDeleteEvent,
- MessageEditSchema,
MessageUpdateEvent,
Snowflake,
SpacebarApiErrors,
@@ -32,13 +30,12 @@ import {
getRights,
uploadFile,
NewUrlUserSignatureData,
- MessageCreateAttachment,
- MessageCreateCloudAttachment,
} from "@spacebar/util";
import { Request, Response, Router } from "express";
import { HTTPError } from "lambert-server";
import multer from "multer";
import { handleMessage, postHandleMessage, route } from "../../../../../util";
+import { MessageCreateAttachment, MessageCreateCloudAttachment, MessageCreateSchema, MessageEditSchema } from "@spacebar/schemas"
const router = Router({ mergeParams: true });
// TODO: message content/embed string length limit
diff --git a/src/api/routes/channels/#channel_id/messages/#message_id/reactions.ts b/src/api/routes/channels/#channel_id/messages/#message_id/reactions.ts
index f99d2145..97e7e6b0 100644
--- a/src/api/routes/channels/#channel_id/messages/#message_id/reactions.ts
+++ b/src/api/routes/channels/#channel_id/messages/#message_id/reactions.ts
@@ -28,7 +28,6 @@ import {
MessageReactionRemoveAllEvent,
MessageReactionRemoveEmojiEvent,
MessageReactionRemoveEvent,
- PartialEmoji,
PublicMemberProjection,
PublicUserProjection,
User,
@@ -36,9 +35,10 @@ import {
import { Request, Response, Router } from "express";
import { HTTPError } from "lambert-server";
import { In } from "typeorm";
+import { PartialEmoji } from "@spacebar/schemas"
const router = Router({ mergeParams: true });
-// TODO: check if emoji is really an unicode emoji or a prperly encoded external emoji
+// TODO: check if emoji is really an unicode emoji or a properly encoded external emoji
function getEmoji(emoji: string): PartialEmoji {
emoji = decodeURIComponent(emoji);
diff --git a/src/api/routes/channels/#channel_id/messages/index.ts b/src/api/routes/channels/#channel_id/messages/index.ts
index 6e240864..03d7ca54 100644
--- a/src/api/routes/channels/#channel_id/messages/index.ts
+++ b/src/api/routes/channels/#channel_id/messages/index.ts
@@ -26,8 +26,6 @@ import {
Member,
Message,
MessageCreateEvent,
- MessageCreateSchema,
- Reaction,
ReadState,
Rights,
Snowflake,
@@ -39,14 +37,13 @@ import {
uploadFile,
NewUrlSignatureData,
NewUrlUserSignatureData,
- MessageCreateCloudAttachment,
- MessageCreateAttachment,
} from "@spacebar/util";
import { Request, Response, Router } from "express";
import { HTTPError } from "lambert-server";
import multer from "multer";
import { FindManyOptions, FindOperator, LessThan, MoreThan, MoreThanOrEqual } from "typeorm";
import { URL } from "url";
+import { MessageCreateAttachment, MessageCreateCloudAttachment, MessageCreateSchema, Reaction } from "@spacebar/schemas"
const router: Router = Router({ mergeParams: true });
diff --git a/src/api/routes/channels/#channel_id/permissions.ts b/src/api/routes/channels/#channel_id/permissions.ts
index 3fcde5ec..62b265e3 100644
--- a/src/api/routes/channels/#channel_id/permissions.ts
+++ b/src/api/routes/channels/#channel_id/permissions.ts
@@ -16,11 +16,12 @@
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-import { Channel, ChannelPermissionOverwrite, ChannelPermissionOverwriteSchema, ChannelPermissionOverwriteType, ChannelUpdateEvent, emitEvent, Member, Role } from "@spacebar/util";
+import { Channel, ChannelPermissionOverwrite, ChannelPermissionOverwriteType, ChannelUpdateEvent, emitEvent, Member, Role } from "@spacebar/util";
import { Request, Response, Router } from "express";
import { HTTPError } from "lambert-server";
import { route } from "@spacebar/api";
+import { ChannelPermissionOverwriteSchema } from "@spacebar/schemas"
const router: Router = Router({ mergeParams: true });
// TODO: Only permissions your bot has in the guild or channel can be allowed/denied (unless your bot has a MANAGE_ROLES overwrite in the channel)
diff --git a/src/api/routes/channels/#channel_id/purge.ts b/src/api/routes/channels/#channel_id/purge.ts
index 01f73b4d..c48a46ad 100644
--- a/src/api/routes/channels/#channel_id/purge.ts
+++ b/src/api/routes/channels/#channel_id/purge.ts
@@ -21,7 +21,6 @@ import {
Channel,
Message,
MessageDeleteBulkEvent,
- PurgeSchema,
emitEvent,
getPermission,
getRights,
@@ -30,6 +29,7 @@ import {
import { Request, Response, Router } from "express";
import { HTTPError } from "lambert-server";
import { Between, FindManyOptions, FindOperator, Not } from "typeorm";
+import { PurgeSchema } from "@spacebar/schemas"
const router: Router = Router({ mergeParams: true });
diff --git a/src/api/routes/channels/#channel_id/webhooks.ts b/src/api/routes/channels/#channel_id/webhooks.ts
index a2b43c05..2d0de323 100644
--- a/src/api/routes/channels/#channel_id/webhooks.ts
+++ b/src/api/routes/channels/#channel_id/webhooks.ts
@@ -23,7 +23,6 @@ import {
DiscordApiErrors,
User,
Webhook,
- WebhookCreateSchema,
WebhookType,
handleFile,
isTextChannel,
@@ -33,6 +32,7 @@ import {
import crypto from "crypto";
import { Request, Response, Router } from "express";
import { HTTPError } from "lambert-server";
+import { WebhookCreateSchema } from "@spacebar/schemas"
const router: Router = Router({ mergeParams: true });
diff --git a/src/api/routes/channels/preload-messages.ts b/src/api/routes/channels/preload-messages.ts
index 8ea23adf..47795703 100644
--- a/src/api/routes/channels/preload-messages.ts
+++ b/src/api/routes/channels/preload-messages.ts
@@ -17,8 +17,9 @@
*/
import { route } from "@spacebar/api";
-import { Config, PreloadMessagesRequestSchema, Message, PreloadMessagesResponseSchema } from "@spacebar/util";
+import { Config, Message } from "@spacebar/util";
import { Request, Response, Router } from "express";
+import { PreloadMessagesRequestSchema, PreloadMessagesResponseSchema } from "@spacebar/schemas"
const router = Router({ mergeParams: true });
router.post(
diff --git a/src/api/routes/collectibles-categories.ts b/src/api/routes/collectibles-categories.ts
index d662edbd..d2cac396 100644
--- a/src/api/routes/collectibles-categories.ts
+++ b/src/api/routes/collectibles-categories.ts
@@ -18,7 +18,7 @@
import { route } from "@spacebar/api";
import { Request, Response, Router } from "express";
-import { CollectiblesCategoriesResponse } from "@spacebar/util";
+import { CollectiblesCategoriesResponse } from "@spacebar/schemas";
const router = Router({ mergeParams: true });
diff --git a/src/api/routes/collectibles-shop.ts b/src/api/routes/collectibles-shop.ts
index 066a1e17..b4c82f57 100644
--- a/src/api/routes/collectibles-shop.ts
+++ b/src/api/routes/collectibles-shop.ts
@@ -18,7 +18,7 @@
import { route } from "@spacebar/api";
import { Request, Response, Router } from "express";
-import { CollectiblesShopResponse } from "@spacebar/util";
+import { CollectiblesShopResponse } from "@spacebar/schemas";
const router = Router({ mergeParams: true });
diff --git a/src/api/routes/connections/#connection_name/callback.ts b/src/api/routes/connections/#connection_name/callback.ts
index 40e0d01c..0852acd4 100644
--- a/src/api/routes/connections/#connection_name/callback.ts
+++ b/src/api/routes/connections/#connection_name/callback.ts
@@ -18,12 +18,12 @@
import { route } from "@spacebar/api";
import {
- ConnectionCallbackSchema,
ConnectionStore,
emitEvent,
FieldErrors,
} from "@spacebar/util";
import { Request, Response, Router } from "express";
+import { ConnectionCallbackSchema } from "@spacebar/schemas"
const router = Router({ mergeParams: true });
diff --git a/src/api/routes/emojis/#emoji_id/source.ts b/src/api/routes/emojis/#emoji_id/source.ts
index 28bfd3d3..61133f02 100644
--- a/src/api/routes/emojis/#emoji_id/source.ts
+++ b/src/api/routes/emojis/#emoji_id/source.ts
@@ -19,14 +19,12 @@
import { route } from "@spacebar/api";
import {
Emoji,
- APIErrorResponse,
DiscordApiErrors,
- EmojiSourceResponse,
Guild,
Member,
- EmojiGuild,
} from "@spacebar/util";
import { Request, Response, Router } from "express";
+import { APIErrorResponse, EmojiGuild, EmojiSourceResponse } from "@spacebar/schemas"
const router = Router({ mergeParams: true });
diff --git a/src/api/routes/gifs/search.ts b/src/api/routes/gifs/search.ts
index 6c338ccf..378e3981 100644
--- a/src/api/routes/gifs/search.ts
+++ b/src/api/routes/gifs/search.ts
@@ -18,15 +18,14 @@
import { route } from "@spacebar/api";
import {
- TenorMediaTypes,
getGifApiKey,
parseGifResult,
- TenorGif,
} from "@spacebar/util";
import { Request, Response, Router } from "express";
import fetch from "node-fetch-commonjs";
import { ProxyAgent } from "proxy-agent";
import http from "http";
+import { TenorGif, TenorMediaTypes } from "@spacebar/schemas"
const router = Router({ mergeParams: true });
diff --git a/src/api/routes/gifs/trending-gifs.ts b/src/api/routes/gifs/trending-gifs.ts
index d0fdc7a1..48c2a3bf 100644
--- a/src/api/routes/gifs/trending-gifs.ts
+++ b/src/api/routes/gifs/trending-gifs.ts
@@ -18,15 +18,14 @@
import { route } from "@spacebar/api";
import {
- TenorMediaTypes,
getGifApiKey,
parseGifResult,
- TenorGif,
} from "@spacebar/util";
import { Request, Response, Router } from "express";
import fetch from "node-fetch-commonjs";
import { ProxyAgent } from "proxy-agent";
import http from "http";
+import { TenorGif, TenorMediaTypes } from "@spacebar/schemas"
const router = Router({ mergeParams: true });
diff --git a/src/api/routes/gifs/trending.ts b/src/api/routes/gifs/trending.ts
index d858122a..bcbd450d 100644
--- a/src/api/routes/gifs/trending.ts
+++ b/src/api/routes/gifs/trending.ts
@@ -18,8 +18,6 @@
import { route } from "@spacebar/api";
import {
- TenorCategoriesResults,
- TenorTrendingResults,
getGifApiKey,
parseGifResult,
} from "@spacebar/util";
@@ -27,6 +25,7 @@ import { Request, Response, Router } from "express";
import fetch from "node-fetch-commonjs";
import { ProxyAgent } from "proxy-agent";
import http from "http";
+import { TenorCategoriesResults, TenorTrendingResults } from "@spacebar/schemas"
const router = Router({ mergeParams: true });
diff --git a/src/api/routes/guilds/#guild_id/auto-moderation/rules.ts b/src/api/routes/guilds/#guild_id/auto-moderation/rules.ts
index 15325534..e2a84f66 100644
--- a/src/api/routes/guilds/#guild_id/auto-moderation/rules.ts
+++ b/src/api/routes/guilds/#guild_id/auto-moderation/rules.ts
@@ -17,9 +17,10 @@
*/
import { route } from "@spacebar/api";
-import { User, AutomodRuleSchema, AutomodRule } from "@spacebar/util";
+import { User, AutomodRule } from "@spacebar/util";
import { Request, Response, Router } from "express";
import { HTTPError } from "lambert-server";
+import { AutomodRuleSchema } from "@spacebar/schemas"
const router: Router = Router({ mergeParams: true });
diff --git a/src/api/routes/guilds/#guild_id/bans.ts b/src/api/routes/guilds/#guild_id/bans.ts
index ffae8077..69fa9476 100644
--- a/src/api/routes/guilds/#guild_id/bans.ts
+++ b/src/api/routes/guilds/#guild_id/bans.ts
@@ -18,19 +18,17 @@
import { getIpAdress, route } from "@spacebar/api";
import {
- APIBansArray,
Ban,
- BanRegistrySchema,
DiscordApiErrors,
GuildBanAddEvent,
GuildBanRemoveEvent,
- GuildBansResponse,
Member,
User,
emitEvent,
} from "@spacebar/util";
import { Request, Response, Router } from "express";
import { HTTPError } from "lambert-server";
+import { APIBansArray, BanRegistrySchema, GuildBansResponse } from "@spacebar/schemas"
const router: Router = Router({ mergeParams: true });
diff --git a/src/api/routes/guilds/#guild_id/channels.ts b/src/api/routes/guilds/#guild_id/channels.ts
index fe383ec5..af4e029f 100644
--- a/src/api/routes/guilds/#guild_id/channels.ts
+++ b/src/api/routes/guilds/#guild_id/channels.ts
@@ -19,13 +19,12 @@
import { route } from "@spacebar/api";
import {
Channel,
- ChannelModifySchema,
- ChannelReorderSchema,
ChannelUpdateEvent,
Guild,
emitEvent,
} from "@spacebar/util";
import { Request, Response, Router } from "express";
+import { ChannelModifySchema, ChannelReorderSchema } from "@spacebar/schemas"
const router = Router({ mergeParams: true });
router.get(
diff --git a/src/api/routes/guilds/#guild_id/emojis.ts b/src/api/routes/guilds/#guild_id/emojis.ts
index 19109dc5..b770e5b6 100644
--- a/src/api/routes/guilds/#guild_id/emojis.ts
+++ b/src/api/routes/guilds/#guild_id/emojis.ts
@@ -21,8 +21,6 @@ import {
Config,
DiscordApiErrors,
Emoji,
- EmojiCreateSchema,
- EmojiModifySchema,
GuildEmojisUpdateEvent,
Member,
Snowflake,
@@ -31,6 +29,7 @@ import {
handleFile,
} from "@spacebar/util";
import { Request, Response, Router } from "express";
+import { EmojiCreateSchema, EmojiModifySchema } from "@spacebar/schemas"
const router = Router({ mergeParams: true });
diff --git a/src/api/routes/guilds/#guild_id/index.ts b/src/api/routes/guilds/#guild_id/index.ts
index 2f138d7b..768e9ce6 100644
--- a/src/api/routes/guilds/#guild_id/index.ts
+++ b/src/api/routes/guilds/#guild_id/index.ts
@@ -22,7 +22,6 @@ import {
DiscordApiErrors,
Guild,
GuildUpdateEvent,
- GuildUpdateSchema,
Member,
Permissions,
SpacebarApiErrors,
@@ -33,6 +32,7 @@ import {
} from "@spacebar/util";
import { Request, Response, Router } from "express";
import { HTTPError } from "lambert-server";
+import { GuildUpdateSchema } from "@spacebar/schemas"
const router = Router({ mergeParams: true });
diff --git a/src/api/routes/guilds/#guild_id/members/#member_id/index.ts b/src/api/routes/guilds/#guild_id/members/#member_id/index.ts
index deaacd8c..feb3bade 100644
--- a/src/api/routes/guilds/#guild_id/members/#member_id/index.ts
+++ b/src/api/routes/guilds/#guild_id/members/#member_id/index.ts
@@ -27,13 +27,13 @@ import {
GuildMemberUpdateEvent,
handleFile,
Member,
- MemberChangeSchema,
PublicMemberProjection,
PublicUserProjection,
Role,
Sticker,
} from "@spacebar/util";
import { Request, Response, Router } from "express";
+import { MemberChangeSchema } from "@spacebar/schemas"
const router = Router({ mergeParams: true });
diff --git a/src/api/routes/guilds/#guild_id/profile.ts b/src/api/routes/guilds/#guild_id/profile.ts
index a079b507..1dbb97c4 100644
--- a/src/api/routes/guilds/#guild_id/profile.ts
+++ b/src/api/routes/guilds/#guild_id/profile.ts
@@ -17,8 +17,9 @@
*/
import { route } from "@spacebar/api";
-import { Guild, GuildProfileResponse, GuildVisibilityLevel } from "@spacebar/util";
+import { Guild } from "@spacebar/util";
import { Request, Response, Router } from "express";
+import { GuildProfileResponse, GuildVisibilityLevel } from "@spacebar/schemas"
const router = Router({ mergeParams: true });
diff --git a/src/api/routes/guilds/#guild_id/profile/index.ts b/src/api/routes/guilds/#guild_id/profile/index.ts
index befb1b14..66e223d8 100644
--- a/src/api/routes/guilds/#guild_id/profile/index.ts
+++ b/src/api/routes/guilds/#guild_id/profile/index.ts
@@ -22,10 +22,10 @@ import {
GuildMemberUpdateEvent,
handleFile,
Member,
- MemberChangeProfileSchema,
OrmUtils,
} from "@spacebar/util";
import { Request, Response, Router } from "express";
+import { MemberChangeProfileSchema } from "@spacebar/schemas"
const router = Router({ mergeParams: true });
diff --git a/src/api/routes/guilds/#guild_id/roles/#role_id/index.ts b/src/api/routes/guilds/#guild_id/roles/#role_id/index.ts
index 3e75f677..4ee63225 100644
--- a/src/api/routes/guilds/#guild_id/roles/#role_id/index.ts
+++ b/src/api/routes/guilds/#guild_id/roles/#role_id/index.ts
@@ -24,10 +24,10 @@ import {
handleFile,
Member,
Role,
- RoleModifySchema,
} from "@spacebar/util";
import { Request, Response, Router } from "express";
import { HTTPError } from "lambert-server";
+import { RoleModifySchema } from "@spacebar/schemas"
const router = Router({ mergeParams: true });
diff --git a/src/api/routes/guilds/#guild_id/roles/index.ts b/src/api/routes/guilds/#guild_id/roles/index.ts
index d2267700..8f671b15 100644
--- a/src/api/routes/guilds/#guild_id/roles/index.ts
+++ b/src/api/routes/guilds/#guild_id/roles/index.ts
@@ -25,12 +25,11 @@ import {
GuildRoleUpdateEvent,
Member,
Role,
- RoleModifySchema,
- RolePositionUpdateSchema,
Snowflake,
} from "@spacebar/util";
import { Request, Response, Router } from "express";
import { Not } from "typeorm";
+import { RoleModifySchema, RolePositionUpdateSchema } from "@spacebar/schemas"
const router: Router = Router({ mergeParams: true });
diff --git a/src/api/routes/guilds/#guild_id/stickers.ts b/src/api/routes/guilds/#guild_id/stickers.ts
index 07fbfd58..beccc7e8 100644
--- a/src/api/routes/guilds/#guild_id/stickers.ts
+++ b/src/api/routes/guilds/#guild_id/stickers.ts
@@ -20,7 +20,6 @@ import { route } from "@spacebar/api";
import {
GuildStickersUpdateEvent,
Member,
- ModifyGuildStickerSchema,
Snowflake,
Sticker,
StickerFormatType,
@@ -33,6 +32,7 @@ import {
import { Request, Response, Router } from "express";
import { HTTPError } from "lambert-server";
import multer from "multer";
+import { ModifyGuildStickerSchema } from "@spacebar/schemas"
const router = Router({ mergeParams: true });
router.get(
diff --git a/src/api/routes/guilds/#guild_id/vanity-url.ts b/src/api/routes/guilds/#guild_id/vanity-url.ts
index 2d63e6df..5261f679 100644
--- a/src/api/routes/guilds/#guild_id/vanity-url.ts
+++ b/src/api/routes/guilds/#guild_id/vanity-url.ts
@@ -22,10 +22,10 @@ import {
ChannelType,
Guild,
Invite,
- VanityUrlSchema,
} from "@spacebar/util";
import { Request, Response, Router } from "express";
import { HTTPError } from "lambert-server";
+import { VanityUrlSchema } from "@spacebar/schemas"
const router = Router({ mergeParams: true });
diff --git a/src/api/routes/guilds/#guild_id/voice-states/#user_id/index.ts b/src/api/routes/guilds/#guild_id/voice-states/#user_id/index.ts
index 1944033a..6966f705 100644
--- a/src/api/routes/guilds/#guild_id/voice-states/#user_id/index.ts
+++ b/src/api/routes/guilds/#guild_id/voice-states/#user_id/index.ts
@@ -25,9 +25,9 @@ import {
getPermission,
VoiceState,
VoiceStateUpdateEvent,
- VoiceStateUpdateSchema,
} from "@spacebar/util";
import { Request, Response, Router } from "express";
+import { VoiceStateUpdateSchema } from "@spacebar/schemas"
const router = Router({ mergeParams: true });
//TODO need more testing when community guild and voice stage channel are working
diff --git a/src/api/routes/guilds/#guild_id/welcome-screen.ts b/src/api/routes/guilds/#guild_id/welcome-screen.ts
index fa28bda2..03907f60 100644
--- a/src/api/routes/guilds/#guild_id/welcome-screen.ts
+++ b/src/api/routes/guilds/#guild_id/welcome-screen.ts
@@ -20,10 +20,10 @@ import { route } from "@spacebar/api";
import {
Channel,
Guild,
- GuildUpdateWelcomeScreenSchema,
Member,
} from "@spacebar/util";
import { Request, Response, Router } from "express";
+import { GuildUpdateWelcomeScreenSchema } from "@spacebar/schemas"
const router: Router = Router({ mergeParams: true });
diff --git a/src/api/routes/guilds/#guild_id/widget.ts b/src/api/routes/guilds/#guild_id/widget.ts
index 6773c366..7ea8dce0 100644
--- a/src/api/routes/guilds/#guild_id/widget.ts
+++ b/src/api/routes/guilds/#guild_id/widget.ts
@@ -17,8 +17,9 @@
*/
import { route } from "@spacebar/api";
-import { Guild, WidgetModifySchema } from "@spacebar/util";
+import { Guild } from "@spacebar/util";
import { Request, Response, Router } from "express";
+import { WidgetModifySchema } from "@spacebar/schemas"
const router: Router = Router({ mergeParams: true });
diff --git a/src/api/routes/guilds/automations/email-domain-lookup.ts b/src/api/routes/guilds/automations/email-domain-lookup.ts
index 889f85c2..b6d3338b 100644
--- a/src/api/routes/guilds/automations/email-domain-lookup.ts
+++ b/src/api/routes/guilds/automations/email-domain-lookup.ts
@@ -18,14 +18,12 @@
import { route } from "@spacebar/api";
import {
- EmailDomainLookupResponse,
- EmailDomainLookupSchema,
- EmailDomainLookupVerifyCodeSchema,
FieldErrors,
} from "@spacebar/util";
import emailProviders from "email-providers/all.json";
import { Request, Response, Router } from "express";
import { HTTPError } from "lambert-server";
+import { EmailDomainLookupResponse, EmailDomainLookupSchema, EmailDomainLookupVerifyCodeSchema } from "@spacebar/schemas"
const router = Router({ mergeParams: true });
diff --git a/src/api/routes/guilds/index.ts b/src/api/routes/guilds/index.ts
index c6965c30..0794eaa8 100644
--- a/src/api/routes/guilds/index.ts
+++ b/src/api/routes/guilds/index.ts
@@ -21,11 +21,11 @@ import {
Config,
DiscordApiErrors,
Guild,
- GuildCreateSchema,
Member,
getRights,
} from "@spacebar/util";
import { Request, Response, Router } from "express";
+import { GuildCreateSchema } from "@spacebar/schemas"
const router: Router = Router({ mergeParams: true });
diff --git a/src/api/routes/guilds/templates/index.ts b/src/api/routes/guilds/templates/index.ts
index 002347d3..7937e983 100644
--- a/src/api/routes/guilds/templates/index.ts
+++ b/src/api/routes/guilds/templates/index.ts
@@ -17,10 +17,11 @@
*/
import { route } from "@spacebar/api";
-import { Config, DiscordApiErrors, Guild, GuildTemplateCreateSchema, Member, Template } from "@spacebar/util";
+import { Config, DiscordApiErrors, Guild, Member, Template } from "@spacebar/util";
import { Request, Response, Router } from "express";
import fetch from "node-fetch-commonjs";
import { HTTPError } from "lambert-server";
+import { GuildTemplateCreateSchema } from "@spacebar/schemas"
const router: Router = Router({ mergeParams: true });
diff --git a/src/api/routes/hub-waitlist.ts b/src/api/routes/hub-waitlist.ts
index 8a36e297..2d21ad63 100644
--- a/src/api/routes/hub-waitlist.ts
+++ b/src/api/routes/hub-waitlist.ts
@@ -20,7 +20,7 @@ import { route } from "@spacebar/api";
import {
HubWaitlistSignupResponse,
HubWaitlistSignupSchema,
-} from "@spacebar/util";
+} from "@spacebar/schemas";
import { Request, Response, Router } from "express";
const router = Router({ mergeParams: true });
diff --git a/src/api/routes/oauth2/authorize.ts b/src/api/routes/oauth2/authorize.ts
index 515d77be..54891a51 100644
--- a/src/api/routes/oauth2/authorize.ts
+++ b/src/api/routes/oauth2/authorize.ts
@@ -20,7 +20,6 @@ import { route } from "@spacebar/api";
import {
ApiError,
Application,
- ApplicationAuthorizeSchema,
DiscordApiErrors,
FieldErrors,
Member,
@@ -29,6 +28,7 @@ import {
getPermission,
} from "@spacebar/util";
import { Request, Response, Router } from "express";
+import { ApplicationAuthorizeSchema } from "@spacebar/schemas"
const router = Router({ mergeParams: true });
// TODO: scopes, other oauth types
diff --git a/src/api/routes/read-states/ack-bulk.ts b/src/api/routes/read-states/ack-bulk.ts
index 566cb4e4..475b223a 100644
--- a/src/api/routes/read-states/ack-bulk.ts
+++ b/src/api/routes/read-states/ack-bulk.ts
@@ -17,8 +17,9 @@
*/
import { route } from "@spacebar/api";
-import { AckBulkSchema, ReadState } from "@spacebar/util";
+import { ReadState } from "@spacebar/util";
import { Request, Response, Router } from "express";
+import { AckBulkSchema } from "@spacebar/schemas"
const router = Router({ mergeParams: true });
router.post(
diff --git a/src/api/routes/reporting/menu/message.ts b/src/api/routes/reporting/menu/message.ts
index 69dea24a..c72bc840 100644
--- a/src/api/routes/reporting/menu/message.ts
+++ b/src/api/routes/reporting/menu/message.ts
@@ -18,7 +18,6 @@
import { route } from "@spacebar/api";
import { Request, Response, Router } from "express";
-import { CollectiblesCategoriesResponse } from "@spacebar/util";
const router = Router({ mergeParams: true });
diff --git a/src/api/routes/safety-hub/@me/index.ts b/src/api/routes/safety-hub/@me/index.ts
index 4bd14eb4..ea361eee 100644
--- a/src/api/routes/safety-hub/@me/index.ts
+++ b/src/api/routes/safety-hub/@me/index.ts
@@ -17,8 +17,9 @@
*/
import { route } from "@spacebar/api";
-import { AccountStandingResponse, AccountStandingState, AppealEligibility, User } from "@spacebar/util";
+import { User } from "@spacebar/util";
import { Request, Response, Router } from "express";
+import { AccountStandingResponse, AccountStandingState, AppealEligibility } from "@spacebar/schemas"
const router = Router({ mergeParams: true });
diff --git a/src/api/routes/safety-hub/suspended/@me.ts b/src/api/routes/safety-hub/suspended/@me.ts
index 4bd14eb4..ea361eee 100644
--- a/src/api/routes/safety-hub/suspended/@me.ts
+++ b/src/api/routes/safety-hub/suspended/@me.ts
@@ -17,8 +17,9 @@
*/
import { route } from "@spacebar/api";
-import { AccountStandingResponse, AccountStandingState, AppealEligibility, User } from "@spacebar/util";
+import { User } from "@spacebar/util";
import { Request, Response, Router } from "express";
+import { AccountStandingResponse, AccountStandingState, AppealEligibility } from "@spacebar/schemas"
const router = Router({ mergeParams: true });
diff --git a/src/api/routes/teams.ts b/src/api/routes/teams.ts
index 142248b6..a936fe81 100644
--- a/src/api/routes/teams.ts
+++ b/src/api/routes/teams.ts
@@ -20,13 +20,13 @@ import { Request, Response, Router } from "express";
import { route } from "@spacebar/api";
import {
Team,
- TeamCreateSchema,
TeamMember,
TeamMemberRole,
TeamMemberState,
User,
} from "@spacebar/util";
import { HTTPError } from "lambert-server";
+import { TeamCreateSchema } from "@spacebar/schemas"
const router: Router = Router({ mergeParams: true });
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);
diff --git a/src/api/routes/webhooks/#webhook_id/#token/github.ts b/src/api/routes/webhooks/#webhook_id/#token/github.ts
index f5d098b3..eb9ec425 100644
--- a/src/api/routes/webhooks/#webhook_id/#token/github.ts
+++ b/src/api/routes/webhooks/#webhook_id/#token/github.ts
@@ -1,8 +1,9 @@
import { getProxyUrl, route } from "@spacebar/api";
-import { capitalize, EmbedType, WebhookExecuteSchema } from "@spacebar/util";
+import { capitalize } from "@spacebar/util";
import { NextFunction, Request, Response, Router } from "express";
import { HTTPError } from "lambert-server";
import { executeWebhook } from "../../../../util/handlers/Webhook";
+import { EmbedType, WebhookExecuteSchema } from "@spacebar/schemas"
const router = Router({ mergeParams: true });
diff --git a/src/api/routes/webhooks/#webhook_id/#token/index.ts b/src/api/routes/webhooks/#webhook_id/#token/index.ts
index 18de03f1..fd9b8c36 100644
--- a/src/api/routes/webhooks/#webhook_id/#token/index.ts
+++ b/src/api/routes/webhooks/#webhook_id/#token/index.ts
@@ -7,12 +7,12 @@ import {
ValidateName,
Webhook,
WebhooksUpdateEvent,
- WebhookUpdateSchema,
} from "@spacebar/util";
import { Request, Response, Router } from "express";
import { HTTPError } from "lambert-server";
import multer from "multer";
import { executeWebhook } from "../../../../util/handlers/Webhook";
+import { WebhookUpdateSchema } from "@spacebar/schemas"
const router = Router({ mergeParams: true });
router.get(
diff --git a/src/api/routes/webhooks/#webhook_id/index.ts b/src/api/routes/webhooks/#webhook_id/index.ts
index 213f9288..878985ee 100644
--- a/src/api/routes/webhooks/#webhook_id/index.ts
+++ b/src/api/routes/webhooks/#webhook_id/index.ts
@@ -6,13 +6,13 @@ import {
Webhook,
WebhooksUpdateEvent,
emitEvent,
- WebhookUpdateSchema,
Channel,
handleFile,
ValidateName,
} from "@spacebar/util";
import { Request, Response, Router } from "express";
import { HTTPError } from "lambert-server";
+import { WebhookUpdateSchema } from "@spacebar/schemas"
const router = Router({ mergeParams: true });
router.get(
|
