diff --git a/src/api/Server.ts b/src/api/Server.ts index 84503d6eb..b8ec2f492 100644 --- a/src/api/Server.ts +++ b/src/api/Server.ts @@ -40,7 +40,8 @@ import { Monitoring } from "../util/monitoring/Monitoring"; import { BcryptWorkerPool } from "../util/util/workers/bcrypt/BcryptWorkerPool"; import { Authentication, CORS, ImageProxy, BodyParser, ErrorHandler, initRateLimits, initTranslation } from "./middlewares"; import { initInstance } from "./util/handlers/Instance"; -import { route, addPendingPoll } from "./util"; +import { addPendingPoll } from "./util"; +import { route } from "@spacebar/api/middlewares"; import { GifProviderManager } from "@spacebar/integrations/gifs"; const ASSETS_FOLDER = path.join(__dirname, "..", "..", "assets"); diff --git a/src/api/routes/-/healthz.ts b/src/api/routes/-/healthz.ts index 17bf29965..9c91de187 100644 --- a/src/api/routes/-/healthz.ts +++ b/src/api/routes/-/healthz.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { getDatabase } from "@spacebar/database"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/-/readyz.ts b/src/api/routes/-/readyz.ts index 17bf29965..9c91de187 100644 --- a/src/api/routes/-/readyz.ts +++ b/src/api/routes/-/readyz.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { getDatabase } from "@spacebar/database"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/applications/#application_id/bot/index.ts b/src/api/routes/applications/#application_id/bot/index.ts index d4ef60964..07a6732e4 100644 --- a/src/api/routes/applications/#application_id/bot/index.ts +++ b/src/api/routes/applications/#application_id/bot/index.ts @@ -19,7 +19,7 @@ import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server/HTTPError"; import { verifyToken } from "node-2fa"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Application, User } from "@spacebar/database"; import { DiscordApiErrors, FieldErrors, createAppBotUser, generateToken, handleFile } from "@spacebar/util"; import { BotModifySchema } from "@spacebar/schemas"; diff --git a/src/api/routes/applications/#application_id/commands/#command_id/index.ts b/src/api/routes/applications/#application_id/commands/#command_id/index.ts index 8672e1c9a..6fc4e28ed 100644 --- a/src/api/routes/applications/#application_id/commands/#command_id/index.ts +++ b/src/api/routes/applications/#application_id/commands/#command_id/index.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Application, ApplicationCommand } from "@spacebar/database"; import { FieldErrors, Snowflake } from "@spacebar/util"; import { ApplicationCommandCreateSchema, ApplicationCommandSchema } from "@spacebar/schemas"; diff --git a/src/api/routes/applications/#application_id/commands/index.ts b/src/api/routes/applications/#application_id/commands/index.ts index accd649b7..4891a180f 100644 --- a/src/api/routes/applications/#application_id/commands/index.ts +++ b/src/api/routes/applications/#application_id/commands/index.ts @@ -19,7 +19,7 @@ import { Request, Response, Router } from "express"; import { IsNull } from "typeorm"; import { ApplicationCommandCreateSchema, ApplicationCommandSchema } from "@spacebar/schemas"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Application, ApplicationCommand } from "@spacebar/database"; import { FieldErrors, Snowflake } from "@spacebar/util"; diff --git a/src/api/routes/applications/#application_id/emojis.ts b/src/api/routes/applications/#application_id/emojis.ts index ac27d6811..8803727a2 100644 --- a/src/api/routes/applications/#application_id/emojis.ts +++ b/src/api/routes/applications/#application_id/emojis.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Emoji, Application } from "@spacebar/database"; import { Config, DiscordApiErrors, Snowflake, handleFile } from "@spacebar/util"; import { ApplicationEmojiModifySchema, EmojiCreateSchema } from "@spacebar/schemas"; diff --git a/src/api/routes/applications/#application_id/entitlements.ts b/src/api/routes/applications/#application_id/entitlements.ts index 07c893679..3f3a6eb0e 100644 --- a/src/api/routes/applications/#application_id/entitlements.ts +++ b/src/api/routes/applications/#application_id/entitlements.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Request, Response, Router } from "express"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/applications/#application_id/guilds/#guild_id/commands/#command_id/index.ts b/src/api/routes/applications/#application_id/guilds/#guild_id/commands/#command_id/index.ts index 968432557..6cbd4ae06 100644 --- a/src/api/routes/applications/#application_id/guilds/#guild_id/commands/#command_id/index.ts +++ b/src/api/routes/applications/#application_id/guilds/#guild_id/commands/#command_id/index.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Application, ApplicationCommand, Guild, Member } from "@spacebar/database"; import { FieldErrors, Snowflake } from "@spacebar/util"; import { ApplicationCommandCreateSchema, ApplicationCommandSchema } from "@spacebar/schemas"; diff --git a/src/api/routes/applications/#application_id/guilds/#guild_id/commands/index.ts b/src/api/routes/applications/#application_id/guilds/#guild_id/commands/index.ts index de160c3fb..19444d3a8 100644 --- a/src/api/routes/applications/#application_id/guilds/#guild_id/commands/index.ts +++ b/src/api/routes/applications/#application_id/guilds/#guild_id/commands/index.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Application, ApplicationCommand, Guild, Member } from "@spacebar/database"; import { FieldErrors, Snowflake } from "@spacebar/util"; import { ApplicationCommandCreateSchema, ApplicationCommandSchema } from "@spacebar/schemas"; diff --git a/src/api/routes/applications/#application_id/index.ts b/src/api/routes/applications/#application_id/index.ts index 0ada6042a..cbd1e92a3 100644 --- a/src/api/routes/applications/#application_id/index.ts +++ b/src/api/routes/applications/#application_id/index.ts @@ -19,7 +19,7 @@ import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server/HTTPError"; import { verifyToken } from "node-2fa"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Application, Guild, User } from "@spacebar/database"; import { DiscordApiErrors, FieldErrors, handleFile } from "@spacebar/util"; import { ApplicationModifySchema } from "@spacebar/schemas"; diff --git a/src/api/routes/applications/#application_id/skus.ts b/src/api/routes/applications/#application_id/skus.ts index 6f0714690..64ea8a279 100644 --- a/src/api/routes/applications/#application_id/skus.ts +++ b/src/api/routes/applications/#application_id/skus.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Request, Response, Router } from "express"; const router: Router = Router({ mergeParams: true }); diff --git a/src/api/routes/applications/@me.ts b/src/api/routes/applications/@me.ts index 65034ebd6..2e75cd993 100644 --- a/src/api/routes/applications/@me.ts +++ b/src/api/routes/applications/@me.ts @@ -18,7 +18,7 @@ import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server/HTTPError"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Application, Guild } from "@spacebar/database"; import { handleFile } from "@spacebar/util"; import { ApplicationModifySchema } from "@spacebar/schemas"; diff --git a/src/api/routes/applications/detectable.ts b/src/api/routes/applications/detectable.ts index 6c7cc21a6..86495d6da 100644 --- a/src/api/routes/applications/detectable.ts +++ b/src/api/routes/applications/detectable.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Request, Response, Router } from "express"; import { ApplicationDetectableResponse } from "@spacebar/schemas"; diff --git a/src/api/routes/applications/index.ts b/src/api/routes/applications/index.ts index 6eac62431..b20bdf795 100644 --- a/src/api/routes/applications/index.ts +++ b/src/api/routes/applications/index.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Application } from "@spacebar/database"; import { Config, createAppBotUser } from "@spacebar/util"; import { ApplicationCreateSchema } from "@spacebar/schemas"; diff --git a/src/api/routes/attachments/refresh-urls.ts b/src/api/routes/attachments/refresh-urls.ts index b9e90ea21..d5aac180d 100644 --- a/src/api/routes/attachments/refresh-urls.ts +++ b/src/api/routes/attachments/refresh-urls.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { getUrlSignature, NewUrlSignatureData } from "@spacebar/util"; import { Request, Response, Router } from "express"; import { RefreshUrlsRequestSchema } from "@spacebar/schemas"; diff --git a/src/api/routes/auth/fingerprint.ts b/src/api/routes/auth/fingerprint.ts index 8e18654c8..d3e3321e8 100644 --- a/src/api/routes/auth/fingerprint.ts +++ b/src/api/routes/auth/fingerprint.ts @@ -15,7 +15,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . */ -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { createHash } from "node:crypto"; import { Snowflake } from "@spacebar/util"; import { Request, Response, Router } from "express"; diff --git a/src/api/routes/auth/forgot.ts b/src/api/routes/auth/forgot.ts index a21db720d..4ee46ccb7 100644 --- a/src/api/routes/auth/forgot.ts +++ b/src/api/routes/auth/forgot.ts @@ -17,7 +17,8 @@ */ import { Request, Response, Router } from "express"; -import { route, verifyCaptcha } from "@spacebar/api/util"; +import { verifyCaptcha } from "@spacebar/api/util"; +import { route } from "@spacebar/api/middlewares"; import { User } from "@spacebar/database"; import { Config, Email } from "@spacebar/util"; import { ForgotPasswordSchema } from "@spacebar/schemas"; diff --git a/src/api/routes/auth/generate-registration-tokens.ts b/src/api/routes/auth/generate-registration-tokens.ts index d787e22a2..2a94aeb28 100644 --- a/src/api/routes/auth/generate-registration-tokens.ts +++ b/src/api/routes/auth/generate-registration-tokens.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { ValidRegistrationToken } from "@spacebar/database"; import { Random } from "@spacebar/extensions"; import { Config } from "@spacebar/util"; diff --git a/src/api/routes/auth/location-metadata.ts b/src/api/routes/auth/location-metadata.ts index 51f126a32..b00298bba 100644 --- a/src/api/routes/auth/location-metadata.ts +++ b/src/api/routes/auth/location-metadata.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { IpDataClient } from "@spacebar/util"; import { Request, Response, Router } from "express"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/auth/login.ts b/src/api/routes/auth/login.ts index b74414b5e..0c1976f08 100644 --- a/src/api/routes/auth/login.ts +++ b/src/api/routes/auth/login.ts @@ -19,7 +19,8 @@ import crypto from "node:crypto"; import bcrypt from "bcrypt"; import { Request, Response, Router } from "express"; -import { route, verifyCaptcha } from "@spacebar/api/util"; +import { verifyCaptcha } from "@spacebar/api/util"; +import { route } from "@spacebar/api/middlewares"; import { User } from "@spacebar/database"; import { Config, FieldErrors, WebAuthn, generateToken, generateWebAuthnTicket } from "@spacebar/util"; import { LoginSchema } from "@spacebar/schemas"; diff --git a/src/api/routes/auth/logout.ts b/src/api/routes/auth/logout.ts index cea155324..1d14d3eed 100644 --- a/src/api/routes/auth/logout.ts +++ b/src/api/routes/auth/logout.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Session } from "@spacebar/database"; import { emitEvent } from "@spacebar/util"; diff --git a/src/api/routes/auth/mfa/totp.ts b/src/api/routes/auth/mfa/totp.ts index 72a79db9e..37cff655f 100644 --- a/src/api/routes/auth/mfa/totp.ts +++ b/src/api/routes/auth/mfa/totp.ts @@ -19,7 +19,7 @@ import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server/HTTPError"; import { verifyToken } from "node-2fa"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { BackupCode, User } from "@spacebar/database"; import { generateToken } from "@spacebar/util"; import { TotpSchema } from "@spacebar/schemas"; diff --git a/src/api/routes/auth/mfa/webauthn.ts b/src/api/routes/auth/mfa/webauthn.ts index 5d7af959c..8c107a15f 100644 --- a/src/api/routes/auth/mfa/webauthn.ts +++ b/src/api/routes/auth/mfa/webauthn.ts @@ -19,7 +19,7 @@ import { Request, Response, Router } from "express"; import { ExpectedAssertionResult } from "fido2-lib"; import { HTTPError } from "lambert-server/HTTPError"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { SecurityKey, User } from "@spacebar/database"; import { generateToken, verifyWebAuthnToken, WebAuthn } from "@spacebar/util"; import { WebAuthnTotpSchema } from "@spacebar/schemas"; diff --git a/src/api/routes/auth/register.ts b/src/api/routes/auth/register.ts index 6d2133f01..ba2f6607b 100644 --- a/src/api/routes/auth/register.ts +++ b/src/api/routes/auth/register.ts @@ -20,7 +20,8 @@ import bcrypt from "bcrypt"; import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server/HTTPError"; import { MoreThan } from "typeorm"; -import { route, verifyCaptcha } from "@spacebar/api/util"; +import { verifyCaptcha } from "@spacebar/api/util"; +import { route } from "@spacebar/api/middlewares"; import { Invite, User, ValidRegistrationToken } from "@spacebar/database"; import { Config, FieldErrors, generateToken, IpDataClient, AbuseIpDbClient } from "@spacebar/util"; import { RegisterSchema } from "@spacebar/schemas"; diff --git a/src/api/routes/auth/reset.ts b/src/api/routes/auth/reset.ts index 9b0874430..0270de90d 100644 --- a/src/api/routes/auth/reset.ts +++ b/src/api/routes/auth/reset.ts @@ -18,7 +18,7 @@ import bcrypt from "bcrypt"; import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Session, User } from "@spacebar/database"; import { checkToken, Email, FieldErrors, generateToken } from "@spacebar/util"; import { PasswordResetSchema } from "@spacebar/schemas"; diff --git a/src/api/routes/auth/sessions.ts b/src/api/routes/auth/sessions.ts index 0ea25a34d..a566f7760 100644 --- a/src/api/routes/auth/sessions.ts +++ b/src/api/routes/auth/sessions.ts @@ -19,7 +19,7 @@ import { createHash } from "node:crypto"; import { Request, Response, Router } from "express"; import { In } from "typeorm"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { emitEvent } from "@spacebar/util"; import { SessionsLogoutSchema } from "@spacebar/schemas"; import { Session } from "@spacebar/database"; diff --git a/src/api/routes/auth/verify/index.ts b/src/api/routes/auth/verify/index.ts index 59020b612..7630a77fa 100644 --- a/src/api/routes/auth/verify/index.ts +++ b/src/api/routes/auth/verify/index.ts @@ -17,7 +17,8 @@ */ import { Request, Response, Router } from "express"; -import { route, verifyCaptcha } from "@spacebar/api/util"; +import { verifyCaptcha } from "@spacebar/api/util"; +import { route } from "@spacebar/api/middlewares"; import { User } from "@spacebar/database"; import { checkToken, Config, FieldErrors, generateToken } from "@spacebar/util"; diff --git a/src/api/routes/auth/verify/resend.ts b/src/api/routes/auth/verify/resend.ts index 5aa0b6f82..574254d2a 100644 --- a/src/api/routes/auth/verify/resend.ts +++ b/src/api/routes/auth/verify/resend.ts @@ -18,7 +18,7 @@ import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server/HTTPError"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { User } from "@spacebar/database"; import { Email } from "@spacebar/util"; 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 85b57bac7..724ab6e8d 100644 --- a/src/api/routes/auth/verify/view-backup-codes-challenge.ts +++ b/src/api/routes/auth/verify/view-backup-codes-challenge.ts @@ -18,7 +18,7 @@ import bcrypt from "bcrypt"; import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { User } from "@spacebar/database"; import { FieldErrors } from "@spacebar/util"; import { BackupCodesChallengeSchema } from "@spacebar/schemas"; diff --git a/src/api/routes/auth/whoami.ts b/src/api/routes/auth/whoami.ts index 6dd4c084d..fc4a66336 100644 --- a/src/api/routes/auth/whoami.ts +++ b/src/api/routes/auth/whoami.ts @@ -15,7 +15,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . */ -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Request, Response, Router } from "express"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/beaker.ts b/src/api/routes/beaker.ts index 7bd1adbe8..88cc72c09 100644 --- a/src/api/routes/beaker.ts +++ b/src/api/routes/beaker.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Request, Response, Router } from "express"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/channels/#channel_id/attachments.ts b/src/api/routes/channels/#channel_id/attachments.ts index 7cdad8c66..c7a56b3b7 100644 --- a/src/api/routes/channels/#channel_id/attachments.ts +++ b/src/api/routes/channels/#channel_id/attachments.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Channel, CloudAttachment } from "@spacebar/database"; import { Random } from "@spacebar/extensions"; import { Config, Permissions } from "@spacebar/util"; diff --git a/src/api/routes/channels/#channel_id/directory-entries.ts b/src/api/routes/channels/#channel_id/directory-entries.ts index dc2ad1ba6..fb073df56 100644 --- a/src/api/routes/channels/#channel_id/directory-entries.ts +++ b/src/api/routes/channels/#channel_id/directory-entries.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; 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 51ff35837..836cf7ef5 100644 --- a/src/api/routes/channels/#channel_id/greet.ts +++ b/src/api/routes/channels/#channel_id/greet.ts @@ -18,7 +18,7 @@ import { Request, Response, Router } from "express"; import { In } from "typeorm"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Channel, Message, Sticker } from "@spacebar/database"; import { emitEvent, MessageCreateEvent, Permissions } from "@spacebar/util"; import { GreetRequestSchema, MessageType } from "@spacebar/schemas"; diff --git a/src/api/routes/channels/#channel_id/index.ts b/src/api/routes/channels/#channel_id/index.ts index e6069b9f1..486e8b390 100644 --- a/src/api/routes/channels/#channel_id/index.ts +++ b/src/api/routes/channels/#channel_id/index.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Channel, Recipient } from "@spacebar/database"; import { ChannelDeleteEvent, ChannelUpdateEvent, emitEvent, handleFile, Config, FieldError, ErrorList, makeObjectErrorContent } from "@spacebar/util"; import { ChannelModifySchema, ChannelType } from "@spacebar/schemas"; diff --git a/src/api/routes/channels/#channel_id/invites.ts b/src/api/routes/channels/#channel_id/invites.ts index a6896cb7c..984a3c812 100644 --- a/src/api/routes/channels/#channel_id/invites.ts +++ b/src/api/routes/channels/#channel_id/invites.ts @@ -18,7 +18,7 @@ import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server/HTTPError"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Channel, Guild, Invite, PublicInviteRelation, User } from "@spacebar/database"; import { InviteCreateEvent, emitEvent } from "@spacebar/util"; import { InviteCreateSchema, isTextChannel } from "@spacebar/schemas"; diff --git a/src/api/routes/channels/#channel_id/messages/#message_id/ack.ts b/src/api/routes/channels/#channel_id/messages/#message_id/ack.ts index d0e0adbc2..bb1e12f05 100644 --- a/src/api/routes/channels/#channel_id/messages/#message_id/ack.ts +++ b/src/api/routes/channels/#channel_id/messages/#message_id/ack.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { ReadState } from "@spacebar/database"; import { emitEvent, getPermission, MessageAckEvent } from "@spacebar/util"; diff --git a/src/api/routes/channels/#channel_id/messages/#message_id/crosspost.ts b/src/api/routes/channels/#channel_id/messages/#message_id/crosspost.ts index 7ee337ffb..b4acb20e5 100644 --- a/src/api/routes/channels/#channel_id/messages/#message_id/crosspost.ts +++ b/src/api/routes/channels/#channel_id/messages/#message_id/crosspost.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Request, Response, Router } from "express"; const 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 a4d5a8522..1dcd36783 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 @@ -19,7 +19,8 @@ import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server/HTTPError"; import multer from "multer"; -import { handleMessage, postHandleMessage, route } from "@spacebar/api/util"; +import { handleMessage, postHandleMessage } from "@spacebar/api/util"; +import { route } from "@spacebar/api/middlewares"; import { Attachment, Channel, Message } from "@spacebar/database"; import { MessageCreateEvent, 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 6348737ad..d1b4c048b 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 @@ -19,7 +19,7 @@ import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server/HTTPError"; import { In } from "typeorm"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Channel, Emoji, Member, Message, User } from "@spacebar/database"; import { arrayRemove } from "@spacebar/extensions"; import { diff --git a/src/api/routes/channels/#channel_id/messages/#message_id/threads.ts b/src/api/routes/channels/#channel_id/messages/#message_id/threads.ts index edd6f555a..fb70b8f57 100644 --- a/src/api/routes/channels/#channel_id/messages/#message_id/threads.ts +++ b/src/api/routes/channels/#channel_id/messages/#message_id/threads.ts @@ -17,7 +17,8 @@ */ import { Request, Response, Router } from "express"; -import { route, sendMessage } from "@spacebar/api/util"; +import { sendMessage } from "@spacebar/api/util"; +import { route } from "@spacebar/api/middlewares"; import { Channel, Message, User } from "@spacebar/database"; import { emitEvent, MessageUpdateEvent } from "@spacebar/util"; import { MessageThreadCreationSchema, ChannelType, MessageType } from "@spacebar/schemas"; diff --git a/src/api/routes/channels/#channel_id/messages/bulk-delete.ts b/src/api/routes/channels/#channel_id/messages/bulk-delete.ts index 96cad171e..f976a4d7e 100644 --- a/src/api/routes/channels/#channel_id/messages/bulk-delete.ts +++ b/src/api/routes/channels/#channel_id/messages/bulk-delete.ts @@ -18,7 +18,7 @@ import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server/HTTPError"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Channel, Message } from "@spacebar/database"; import { Config, emitEvent, getPermission, getRights, MessageDeleteBulkEvent } from "@spacebar/util"; import { In } from "typeorm"; diff --git a/src/api/routes/channels/#channel_id/messages/index.ts b/src/api/routes/channels/#channel_id/messages/index.ts index 63c763793..69ebef0b9 100644 --- a/src/api/routes/channels/#channel_id/messages/index.ts +++ b/src/api/routes/channels/#channel_id/messages/index.ts @@ -16,7 +16,8 @@ along with this program. If not, see . */ -import { handleMessage, postHandleMessage, route } from "@spacebar/api/util"; +import { handleMessage, postHandleMessage } from "@spacebar/api/util"; +import { route } from "@spacebar/api/middlewares"; import { Attachment, Channel, Member, Message, ReadState, Relationship, User, ThreadMember, ThreadMemberFlags } from "@spacebar/database"; import { Config, diff --git a/src/api/routes/channels/#channel_id/messages/pins/index.ts b/src/api/routes/channels/#channel_id/messages/pins/index.ts index 50d533c35..062084e58 100644 --- a/src/api/routes/channels/#channel_id/messages/pins/index.ts +++ b/src/api/routes/channels/#channel_id/messages/pins/index.ts @@ -18,7 +18,7 @@ import { Request, Response, Router } from "express"; import { IsNull, Not } from "typeorm"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Message, User } from "@spacebar/database"; import { ChannelPinsUpdateEvent, Config, DiscordApiErrors, emitEvent, MessageCreateEvent, MessageUpdateEvent } from "@spacebar/util"; diff --git a/src/api/routes/channels/#channel_id/messages/search.ts b/src/api/routes/channels/#channel_id/messages/search.ts index 4cb7b897d..afba25067 100644 --- a/src/api/routes/channels/#channel_id/messages/search.ts +++ b/src/api/routes/channels/#channel_id/messages/search.ts @@ -21,7 +21,7 @@ import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server/HTTPError"; import { FindManyOptions, Like } from "typeorm"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Channel, Message } from "@spacebar/database"; import { FieldErrors, getPermission } from "@spacebar/util"; diff --git a/src/api/routes/channels/#channel_id/permissions.ts b/src/api/routes/channels/#channel_id/permissions.ts index 2f0a0de38..6776697d3 100644 --- a/src/api/routes/channels/#channel_id/permissions.ts +++ b/src/api/routes/channels/#channel_id/permissions.ts @@ -18,7 +18,7 @@ import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server/HTTPError"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Channel, Member, Role } from "@spacebar/database"; import { ChannelUpdateEvent, emitEvent } from "@spacebar/util"; import { ChannelPermissionOverwriteSchema, ChannelPermissionOverwrite, ChannelPermissionOverwriteType } from "@spacebar/schemas"; diff --git a/src/api/routes/channels/#channel_id/pins.ts b/src/api/routes/channels/#channel_id/pins.ts index c7aa99847..499e3a980 100644 --- a/src/api/routes/channels/#channel_id/pins.ts +++ b/src/api/routes/channels/#channel_id/pins.ts @@ -18,7 +18,7 @@ import { Request, Response, Router } from "express"; import { IsNull, Not } from "typeorm"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { ChannelPinsUpdateEvent, Config, DiscordApiErrors, emitEvent, MessageCreateEvent, MessageUpdateEvent } from "@spacebar/util"; import { Message, User } from "@spacebar/database"; diff --git a/src/api/routes/channels/#channel_id/polls/#poll_id/answers/#answer_id.ts b/src/api/routes/channels/#channel_id/polls/#poll_id/answers/#answer_id.ts index 849e8350d..417dcd9fc 100644 --- a/src/api/routes/channels/#channel_id/polls/#poll_id/answers/#answer_id.ts +++ b/src/api/routes/channels/#channel_id/polls/#poll_id/answers/#answer_id.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Message, User } from "@spacebar/database"; import { DiscordApiErrors } from "@spacebar/util"; import { PollAnswerCount } from "@spacebar/schemas"; diff --git a/src/api/routes/channels/#channel_id/polls/#poll_id/answers/@me.ts b/src/api/routes/channels/#channel_id/polls/#poll_id/answers/@me.ts index 32f93a9ad..e812a8fcf 100644 --- a/src/api/routes/channels/#channel_id/polls/#poll_id/answers/@me.ts +++ b/src/api/routes/channels/#channel_id/polls/#poll_id/answers/@me.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { PollAnswerCount, PollUserAnswersSchema } from "@spacebar/schemas"; import { Message } from "@spacebar/database"; import { DiscordApiErrors, emitEvent, ErrorList, FieldError, makeObjectErrorContent, MessagePollVoteAddEvent, MessagePollVoteRemoveEvent } from "@spacebar/util"; diff --git a/src/api/routes/channels/#channel_id/polls/#poll_id/expire.ts b/src/api/routes/channels/#channel_id/polls/#poll_id/expire.ts index e4544db53..8e03a527b 100644 --- a/src/api/routes/channels/#channel_id/polls/#poll_id/expire.ts +++ b/src/api/routes/channels/#channel_id/polls/#poll_id/expire.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Message } from "@spacebar/database"; import { DiscordApiErrors, emitEvent, MessageUpdateEvent, pendingPolls } from "@spacebar/util"; import { generatePollResultsMessage, sendMessage } from "@spacebar/api/util"; diff --git a/src/api/routes/channels/#channel_id/post-data.ts b/src/api/routes/channels/#channel_id/post-data.ts index 8e593d65f..202cce99b 100644 --- a/src/api/routes/channels/#channel_id/post-data.ts +++ b/src/api/routes/channels/#channel_id/post-data.ts @@ -19,7 +19,7 @@ import { Request, Response, Router } from "express"; import { messageUpload } from "./messages"; import { In } from "typeorm"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Channel, Member, Message } from "@spacebar/database"; import { PostDataSchema, PublicMessage } from "@spacebar/schemas"; diff --git a/src/api/routes/channels/#channel_id/purge.ts b/src/api/routes/channels/#channel_id/purge.ts index d1bef5043..8b85de9a1 100644 --- a/src/api/routes/channels/#channel_id/purge.ts +++ b/src/api/routes/channels/#channel_id/purge.ts @@ -19,7 +19,7 @@ import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server/HTTPError"; import { Between, FindManyOptions, FindOperator, Not } from "typeorm"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Channel, Message } from "@spacebar/database"; import { MessageDeleteBulkEvent, emitEvent, getPermission, getRights } from "@spacebar/util"; import { isTextChannel, PurgeSchema } from "@spacebar/schemas"; diff --git a/src/api/routes/channels/#channel_id/recipients.ts b/src/api/routes/channels/#channel_id/recipients.ts index 4acc1cb66..72ac12f7f 100644 --- a/src/api/routes/channels/#channel_id/recipients.ts +++ b/src/api/routes/channels/#channel_id/recipients.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Channel, Recipient, User } from "@spacebar/database"; import { ChannelRecipientAddEvent, DiscordApiErrors, DmChannelDTO, emitEvent } from "@spacebar/util"; import { ChannelType, PublicUserProjection } from "@spacebar/schemas"; diff --git a/src/api/routes/channels/#channel_id/tags.ts b/src/api/routes/channels/#channel_id/tags.ts index 8e9f20438..66e2cc238 100644 --- a/src/api/routes/channels/#channel_id/tags.ts +++ b/src/api/routes/channels/#channel_id/tags.ts @@ -18,7 +18,7 @@ import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server/HTTPError"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Channel, Tag } from "@spacebar/database"; import { ChannelUpdateEvent, emitEvent } from "@spacebar/util"; import { TagCreateSchema } from "@spacebar/schemas"; diff --git a/src/api/routes/channels/#channel_id/thread-members.ts b/src/api/routes/channels/#channel_id/thread-members.ts index 837fb6c2a..f1d2a6cf1 100644 --- a/src/api/routes/channels/#channel_id/thread-members.ts +++ b/src/api/routes/channels/#channel_id/thread-members.ts @@ -18,7 +18,7 @@ import { Request, Response, Router } from "express"; import { MoreThan } from "typeorm"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Channel, Member, ThreadMember, ThreadMemberFlags } from "@spacebar/database"; import { emitEvent, Permissions, ThreadCreateEvent, ThreadDeleteEvent, ThreadMembersUpdateEvent } from "@spacebar/util"; import { ChannelType, Snowflake } from "@spacebar/schemas"; diff --git a/src/api/routes/channels/#channel_id/threads.ts b/src/api/routes/channels/#channel_id/threads.ts index 6fe4ff119..b992d7004 100644 --- a/src/api/routes/channels/#channel_id/threads.ts +++ b/src/api/routes/channels/#channel_id/threads.ts @@ -19,7 +19,8 @@ import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server/HTTPError"; import { FindManyOptions, FindOptionsOrder, In, Like, ArrayContains, ArrayOverlap } from "typeorm"; -import { handleMessage, postHandleMessage, route, sendMessage } from "@spacebar/api/util"; +import { handleMessage, postHandleMessage, sendMessage } from "@spacebar/api/util"; +import { route } from "@spacebar/api/middlewares"; import { Attachment, Channel, Member, Message, ReadState, ThreadMember, User } from "@spacebar/database"; import { emitEvent, uploadFile, MessageCreateEvent, FieldErrors, getPermission, ChannelFlags } from "@spacebar/util"; import { ChannelType, MessageType, ThreadCreationSchema, MessageCreateAttachment, MessageCreateCloudAttachment } from "@spacebar/schemas"; diff --git a/src/api/routes/channels/#channel_id/typing.ts b/src/api/routes/channels/#channel_id/typing.ts index 930672b09..224fc3695 100644 --- a/src/api/routes/channels/#channel_id/typing.ts +++ b/src/api/routes/channels/#channel_id/typing.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Channel, Member } from "@spacebar/database"; import { emitEvent, TypingStartEvent } from "@spacebar/util"; diff --git a/src/api/routes/channels/#channel_id/webhooks.ts b/src/api/routes/channels/#channel_id/webhooks.ts index 5ad5d6e44..d38e18d7c 100644 --- a/src/api/routes/channels/#channel_id/webhooks.ts +++ b/src/api/routes/channels/#channel_id/webhooks.ts @@ -19,7 +19,7 @@ import crypto from "node:crypto"; import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server/HTTPError"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Application, Channel, User, Webhook } from "@spacebar/database"; import { Config, DiscordApiErrors, handleFile, ValidateName } from "@spacebar/util"; import { isTextChannel, WebhookCreateSchema, WebhookResponse, WebhookType } from "@spacebar/schemas"; diff --git a/src/api/routes/channels/preload-messages.ts b/src/api/routes/channels/preload-messages.ts index 1a7548e71..8b860bc98 100644 --- a/src/api/routes/channels/preload-messages.ts +++ b/src/api/routes/channels/preload-messages.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Message } from "@spacebar/database"; import { Config } from "@spacebar/util"; import { PreloadMessagesRequestSchema, PublicMessageArray } from "@spacebar/schemas"; diff --git a/src/api/routes/collectibles-categories.ts b/src/api/routes/collectibles-categories.ts index c71fde1c3..dcbadd2d4 100644 --- a/src/api/routes/collectibles-categories.ts +++ b/src/api/routes/collectibles-categories.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Request, Response, Router } from "express"; import { CollectiblesCategoriesResponse } from "@spacebar/schemas"; diff --git a/src/api/routes/collectibles-shop.ts b/src/api/routes/collectibles-shop.ts index 3d69a9745..b35ddf171 100644 --- a/src/api/routes/collectibles-shop.ts +++ b/src/api/routes/collectibles-shop.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Request, Response, Router } from "express"; import { CollectiblesShopResponse } from "@spacebar/schemas"; diff --git a/src/api/routes/connections/#connection_name/#connection_id/refresh.ts b/src/api/routes/connections/#connection_name/#connection_id/refresh.ts index 4488cc861..16a5a5266 100644 --- a/src/api/routes/connections/#connection_name/#connection_id/refresh.ts +++ b/src/api/routes/connections/#connection_name/#connection_id/refresh.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Request, Response, Router } from "express"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/connections/#connection_name/authorize.ts b/src/api/routes/connections/#connection_name/authorize.ts index fadc2a616..dbc1c3864 100644 --- a/src/api/routes/connections/#connection_name/authorize.ts +++ b/src/api/routes/connections/#connection_name/authorize.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Request, Response, Router } from "express"; import { ConnectionStore, FieldErrors } from "@spacebar/util"; diff --git a/src/api/routes/connections/#connection_name/callback.ts b/src/api/routes/connections/#connection_name/callback.ts index a162b6894..134b0d582 100644 --- a/src/api/routes/connections/#connection_name/callback.ts +++ b/src/api/routes/connections/#connection_name/callback.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { ConnectionStore, emitEvent, FieldErrors } from "@spacebar/util"; import { Request, Response, Router } from "express"; import { ConnectionCallbackSchema } from "@spacebar/schemas"; diff --git a/src/api/routes/connections/index.ts b/src/api/routes/connections/index.ts index cf6fcbd37..9735eccd1 100644 --- a/src/api/routes/connections/index.ts +++ b/src/api/routes/connections/index.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { ConnectionConfig } from "@spacebar/util"; import { Request, Response, Router } from "express"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/discoverable-guilds.ts b/src/api/routes/discoverable-guilds.ts index dc22126a5..e79db8f15 100644 --- a/src/api/routes/discoverable-guilds.ts +++ b/src/api/routes/discoverable-guilds.ts @@ -18,7 +18,7 @@ import { Request, Response, Router } from "express"; import { ArrayContains, In, Not } from "typeorm"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Guild, Member } from "@spacebar/database"; import { Config } from "@spacebar/util"; diff --git a/src/api/routes/discovery.ts b/src/api/routes/discovery.ts index 487284033..461681780 100644 --- a/src/api/routes/discovery.ts +++ b/src/api/routes/discovery.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Categories } from "@spacebar/database"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/download.ts b/src/api/routes/download.ts index 3420bc1c7..b6dd35787 100644 --- a/src/api/routes/download.ts +++ b/src/api/routes/download.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { ClientRelease } from "@spacebar/database"; import { FieldErrors } from "@spacebar/util"; diff --git a/src/api/routes/emojis/#emoji_id/source.ts b/src/api/routes/emojis/#emoji_id/source.ts index d3c20f91b..6948cb6fa 100644 --- a/src/api/routes/emojis/#emoji_id/source.ts +++ b/src/api/routes/emojis/#emoji_id/source.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Application, Emoji, Guild, Member } from "@spacebar/database"; import { DiscordApiErrors } from "@spacebar/util"; import { APIErrorResponse, EmojiGuild, EmojiSourceResponse } from "@spacebar/schemas"; diff --git a/src/api/routes/experiments.ts b/src/api/routes/experiments.ts index eb9d08494..22e0d832b 100644 --- a/src/api/routes/experiments.ts +++ b/src/api/routes/experiments.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/games/detectable.ts b/src/api/routes/games/detectable.ts index 997bbb95f..8e2db77c0 100644 --- a/src/api/routes/games/detectable.ts +++ b/src/api/routes/games/detectable.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Request, Response, Router } from "express"; import { ApplicationDetectableResponse } from "@spacebar/schemas"; diff --git a/src/api/routes/gateway/bot.ts b/src/api/routes/gateway/bot.ts index e77c19148..23bb402e8 100644 --- a/src/api/routes/gateway/bot.ts +++ b/src/api/routes/gateway/bot.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Config } from "@spacebar/util"; import { Request, Response, Router } from "express"; diff --git a/src/api/routes/gateway/index.ts b/src/api/routes/gateway/index.ts index d0bb8a3fc..24efef911 100644 --- a/src/api/routes/gateway/index.ts +++ b/src/api/routes/gateway/index.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Config } from "@spacebar/util"; import { Request, Response, Router } from "express"; diff --git a/src/api/routes/gifs/search.ts b/src/api/routes/gifs/search.ts index 8e512979d..ebab71e6f 100644 --- a/src/api/routes/gifs/search.ts +++ b/src/api/routes/gifs/search.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { GifMediaTypes } from "@spacebar/schemas"; import { GifProviderManager } from "@spacebar/integrations/gifs"; diff --git a/src/api/routes/gifs/trending-gifs.ts b/src/api/routes/gifs/trending-gifs.ts index f40116d31..a759a0416 100644 --- a/src/api/routes/gifs/trending-gifs.ts +++ b/src/api/routes/gifs/trending-gifs.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Request, Response, Router } from "express"; import { GifMediaTypes } from "@spacebar/schemas"; import { GifProviderManager } from "@spacebar/integrations/gifs"; diff --git a/src/api/routes/gifs/trending.ts b/src/api/routes/gifs/trending.ts index 64c9cd471..2e24c77c5 100644 --- a/src/api/routes/gifs/trending.ts +++ b/src/api/routes/gifs/trending.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Request, Response, Router } from "express"; import { TrendingGifsResponse } from "@spacebar/schemas"; import { GifProviderManager } from "@spacebar/integrations/gifs"; diff --git a/src/api/routes/guild-recommendations.ts b/src/api/routes/guild-recommendations.ts index 9587e8587..43efa6693 100644 --- a/src/api/routes/guild-recommendations.ts +++ b/src/api/routes/guild-recommendations.ts @@ -18,7 +18,7 @@ import { Request, Response, Router } from "express"; import { ArrayContains } from "typeorm"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Guild } from "@spacebar/database"; import { Config } from "@spacebar/util"; diff --git a/src/api/routes/guilds/#guild_id/application-command-index.ts b/src/api/routes/guilds/#guild_id/application-command-index.ts index e9342e90e..758392fe8 100644 --- a/src/api/routes/guilds/#guild_id/application-command-index.ts +++ b/src/api/routes/guilds/#guild_id/application-command-index.ts @@ -18,7 +18,7 @@ import { Request, Response, Router } from "express"; import { IsNull } from "typeorm"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Application, ApplicationCommand, Member } from "@spacebar/database"; import { Snowflake } from "@spacebar/util"; import { ApplicationCommandSchema, ApplicationCommandType } from "@spacebar/schemas"; diff --git a/src/api/routes/guilds/#guild_id/audit-logs.ts b/src/api/routes/guilds/#guild_id/audit-logs.ts index ccbe4dc6e..e8765a99b 100644 --- a/src/api/routes/guilds/#guild_id/audit-logs.ts +++ b/src/api/routes/guilds/#guild_id/audit-logs.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; const router = Router({ mergeParams: true }); //TODO: implement audit logs 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 dc4328d11..0ece7adee 100644 --- a/src/api/routes/guilds/#guild_id/auto-moderation/rules.ts +++ b/src/api/routes/guilds/#guild_id/auto-moderation/rules.ts @@ -18,7 +18,7 @@ import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server/HTTPError"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { User, AutomodRule } from "@spacebar/database"; import { AutomodRuleSchema } from "@spacebar/schemas"; diff --git a/src/api/routes/guilds/#guild_id/bans.ts b/src/api/routes/guilds/#guild_id/bans.ts index c844d55b7..821746654 100644 --- a/src/api/routes/guilds/#guild_id/bans.ts +++ b/src/api/routes/guilds/#guild_id/bans.ts @@ -18,7 +18,7 @@ import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server/HTTPError"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Ban, Member, User } from "@spacebar/database"; import { DiscordApiErrors, GuildBanAddEvent, GuildBanRemoveEvent, emitEvent } from "@spacebar/util"; import { BanCreateSchema, BanRegistrySchema, GuildBanResponse, GuildBansResponse, PublicUser } from "@spacebar/schemas"; diff --git a/src/api/routes/guilds/#guild_id/bulk-ban.ts b/src/api/routes/guilds/#guild_id/bulk-ban.ts index ab1affec7..d0b754435 100644 --- a/src/api/routes/guilds/#guild_id/bulk-ban.ts +++ b/src/api/routes/guilds/#guild_id/bulk-ban.ts @@ -18,7 +18,7 @@ import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server/HTTPError"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Ban, Member, User } from "@spacebar/database"; import { Config, DiscordApiErrors, GuildBanAddEvent, emitEvent } from "@spacebar/util"; diff --git a/src/api/routes/guilds/#guild_id/channels.ts b/src/api/routes/guilds/#guild_id/channels.ts index 09bcaa549..2d8871eb9 100644 --- a/src/api/routes/guilds/#guild_id/channels.ts +++ b/src/api/routes/guilds/#guild_id/channels.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Channel, Guild } from "@spacebar/database"; import { ChannelUpdateEvent, emitEvent } from "@spacebar/util"; import { ChannelCreateSchema, ChannelReorderSchema } from "@spacebar/schemas"; diff --git a/src/api/routes/guilds/#guild_id/delete.ts b/src/api/routes/guilds/#guild_id/delete.ts index c306dd1b0..d1966ebaf 100644 --- a/src/api/routes/guilds/#guild_id/delete.ts +++ b/src/api/routes/guilds/#guild_id/delete.ts @@ -18,7 +18,7 @@ import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server/HTTPError"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Guild } from "@spacebar/database"; import { GuildDeleteEvent, emitEvent } from "@spacebar/util"; diff --git a/src/api/routes/guilds/#guild_id/discovery-requirements.ts b/src/api/routes/guilds/#guild_id/discovery-requirements.ts index 4f6c320d5..0601741b1 100644 --- a/src/api/routes/guilds/#guild_id/discovery-requirements.ts +++ b/src/api/routes/guilds/#guild_id/discovery-requirements.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Request, Response, Router } from "express"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/guilds/#guild_id/emojis.ts b/src/api/routes/guilds/#guild_id/emojis.ts index bae895668..0f1b21046 100644 --- a/src/api/routes/guilds/#guild_id/emojis.ts +++ b/src/api/routes/guilds/#guild_id/emojis.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Emoji, Member } from "@spacebar/database"; import { Config, DiscordApiErrors, GuildEmojisUpdateEvent, Snowflake, emitEvent, handleFile } from "@spacebar/util"; import { EmojiCreateSchema, EmojiModifySchema } from "@spacebar/schemas"; diff --git a/src/api/routes/guilds/#guild_id/index.ts b/src/api/routes/guilds/#guild_id/index.ts index a3767d4c4..a05bf4669 100644 --- a/src/api/routes/guilds/#guild_id/index.ts +++ b/src/api/routes/guilds/#guild_id/index.ts @@ -18,7 +18,7 @@ import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server/HTTPError"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Channel, Guild, Member } from "@spacebar/database"; import { DiscordApiErrors, GuildUpdateEvent, Permissions, SpacebarApiErrors, emitEvent, getPermission, getRights, handleFile } from "@spacebar/util"; import { GuildCreateResponse, GuildUpdateSchema } from "@spacebar/schemas"; diff --git a/src/api/routes/guilds/#guild_id/integrations.ts b/src/api/routes/guilds/#guild_id/integrations.ts index 2b3676322..c49a729eb 100644 --- a/src/api/routes/guilds/#guild_id/integrations.ts +++ b/src/api/routes/guilds/#guild_id/integrations.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; const router = Router({ mergeParams: true }); //TODO: implement integrations list diff --git a/src/api/routes/guilds/#guild_id/invites.ts b/src/api/routes/guilds/#guild_id/invites.ts index 697df8db2..89ac00c88 100644 --- a/src/api/routes/guilds/#guild_id/invites.ts +++ b/src/api/routes/guilds/#guild_id/invites.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Invite, PublicInviteRelation } from "@spacebar/database"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/guilds/#guild_id/member-verification.ts b/src/api/routes/guilds/#guild_id/member-verification.ts index 88d6c0359..9a69a4769 100644 --- a/src/api/routes/guilds/#guild_id/member-verification.ts +++ b/src/api/routes/guilds/#guild_id/member-verification.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Request, Response, Router } from "express"; 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 929ae7529..d6879818e 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 @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Emoji, Guild, Member, Role, Sticker } from "@spacebar/database"; import { Config, DiscordApiErrors, emitEvent, getPermission, getRights, GuildMemberUpdateEvent, handleFile } from "@spacebar/util"; import { MemberChangeSchema, PublicMemberProjection, PublicUserProjection } from "@spacebar/schemas"; diff --git a/src/api/routes/guilds/#guild_id/members/#member_id/nick.ts b/src/api/routes/guilds/#guild_id/members/#member_id/nick.ts index 4d48aa2d3..b3b8fd058 100644 --- a/src/api/routes/guilds/#guild_id/members/#member_id/nick.ts +++ b/src/api/routes/guilds/#guild_id/members/#member_id/nick.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Member } from "@spacebar/database"; import { getPermission, PermissionResolvable } from "@spacebar/util"; diff --git a/src/api/routes/guilds/#guild_id/members/#member_id/roles/#role_id/index.ts b/src/api/routes/guilds/#guild_id/members/#member_id/roles/#role_id/index.ts index f27cf86b2..a2bf998fc 100644 --- a/src/api/routes/guilds/#guild_id/members/#member_id/roles/#role_id/index.ts +++ b/src/api/routes/guilds/#guild_id/members/#member_id/roles/#role_id/index.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Member } from "@spacebar/database"; import { Request, Response, Router } from "express"; diff --git a/src/api/routes/guilds/#guild_id/members/index.ts b/src/api/routes/guilds/#guild_id/members/index.ts index 8373265ef..ba8f4b3b9 100644 --- a/src/api/routes/guilds/#guild_id/members/index.ts +++ b/src/api/routes/guilds/#guild_id/members/index.ts @@ -19,7 +19,7 @@ import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server/HTTPError"; import { MoreThan } from "typeorm"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Member } from "@spacebar/database"; import { PublicMemberProjection } from "@spacebar/schemas"; diff --git a/src/api/routes/guilds/#guild_id/messages/search.ts b/src/api/routes/guilds/#guild_id/messages/search.ts index ca6d40ed4..8c6d29c83 100644 --- a/src/api/routes/guilds/#guild_id/messages/search.ts +++ b/src/api/routes/guilds/#guild_id/messages/search.ts @@ -19,7 +19,7 @@ import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server/HTTPError"; import { Between, FindManyOptions, FindOptionsWhere, In, LessThan, Like, MoreThan } from "typeorm"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Channel, Member, Message } from "@spacebar/database"; import { FieldErrors, Snowflake, getPermission } from "@spacebar/util"; diff --git a/src/api/routes/guilds/#guild_id/premium.ts b/src/api/routes/guilds/#guild_id/premium.ts index a5b577786..df4e41191 100644 --- a/src/api/routes/guilds/#guild_id/premium.ts +++ b/src/api/routes/guilds/#guild_id/premium.ts @@ -17,7 +17,7 @@ */ import { Router, Request, Response } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; const router = Router({ mergeParams: true }); router.get("/subscriptions", route({}), (req: Request, res: Response) => { diff --git a/src/api/routes/guilds/#guild_id/profile.ts b/src/api/routes/guilds/#guild_id/profile.ts index 07d2a64b5..7279c25ad 100644 --- a/src/api/routes/guilds/#guild_id/profile.ts +++ b/src/api/routes/guilds/#guild_id/profile.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Guild } from "@spacebar/database"; import { Request, Response, Router } from "express"; import { GuildProfileResponse, GuildVisibilityLevel } from "@spacebar/schemas"; diff --git a/src/api/routes/guilds/#guild_id/profile/index.ts b/src/api/routes/guilds/#guild_id/profile/index.ts index 08ea7ee53..4df0ad97e 100644 --- a/src/api/routes/guilds/#guild_id/profile/index.ts +++ b/src/api/routes/guilds/#guild_id/profile/index.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Member } from "@spacebar/database"; import { emitEvent, getPermission, getRights, GuildMemberUpdateEvent, handleFile, OrmUtils, Permissions } from "@spacebar/util"; import { MemberChangeProfileSchema } from "@spacebar/schemas"; diff --git a/src/api/routes/guilds/#guild_id/prune.ts b/src/api/routes/guilds/#guild_id/prune.ts index 6b8a1f561..bffb24d5c 100644 --- a/src/api/routes/guilds/#guild_id/prune.ts +++ b/src/api/routes/guilds/#guild_id/prune.ts @@ -18,7 +18,7 @@ import { Request, Response, Router } from "express"; import { IsNull, LessThan } from "typeorm"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Guild, Member } from "@spacebar/database"; import { Snowflake } from "@spacebar/util"; diff --git a/src/api/routes/guilds/#guild_id/regions.ts b/src/api/routes/guilds/#guild_id/regions.ts index a924441cb..025ea7c44 100644 --- a/src/api/routes/guilds/#guild_id/regions.ts +++ b/src/api/routes/guilds/#guild_id/regions.ts @@ -16,7 +16,8 @@ along with this program. If not, see . */ -import { getVoiceRegions, route } from "@spacebar/api/util"; +import { getVoiceRegions } from "@spacebar/api/util"; +import { route } from "@spacebar/api/middlewares"; import { Guild } from "@spacebar/database"; import { Request, Response, Router } from "express"; 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 823d14bd9..42463c831 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 @@ -18,7 +18,7 @@ import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server/HTTPError"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Member, Role } from "@spacebar/database"; import { emitEvent, GuildRoleDeleteEvent, GuildRoleUpdateEvent, handleFile } from "@spacebar/util"; import { RoleModifySchema } from "@spacebar/schemas"; diff --git a/src/api/routes/guilds/#guild_id/roles/#role_id/member-ids.ts b/src/api/routes/guilds/#guild_id/roles/#role_id/member-ids.ts index 7e05902ee..418e93650 100644 --- a/src/api/routes/guilds/#guild_id/roles/#role_id/member-ids.ts +++ b/src/api/routes/guilds/#guild_id/roles/#role_id/member-ids.ts @@ -18,7 +18,7 @@ import { Router, Request, Response } from "express"; import { Member } from "@spacebar/database"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/guilds/#guild_id/roles/#role_id/members.ts b/src/api/routes/guilds/#guild_id/roles/#role_id/members.ts index 8bf1fbd08..7628c6825 100644 --- a/src/api/routes/guilds/#guild_id/roles/#role_id/members.ts +++ b/src/api/routes/guilds/#guild_id/roles/#role_id/members.ts @@ -17,7 +17,7 @@ */ import { Router, Request, Response } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Member } from "@spacebar/database"; import { arrayPartition } from "@spacebar/extensions"; import { DiscordApiErrors } from "@spacebar/util"; diff --git a/src/api/routes/guilds/#guild_id/roles/index.ts b/src/api/routes/guilds/#guild_id/roles/index.ts index 403d886b4..721c7586c 100644 --- a/src/api/routes/guilds/#guild_id/roles/index.ts +++ b/src/api/routes/guilds/#guild_id/roles/index.ts @@ -18,7 +18,7 @@ import { Request, Response, Router } from "express"; import { Not } from "typeorm"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Member, Role } from "@spacebar/database"; import { Config, DiscordApiErrors, emitEvent, GuildRoleCreateEvent, GuildRoleUpdateEvent, Snowflake } from "@spacebar/util"; import { RoleModifySchema, RolePositionUpdateSchema } from "@spacebar/schemas"; diff --git a/src/api/routes/guilds/#guild_id/roles/member-counts.ts b/src/api/routes/guilds/#guild_id/roles/member-counts.ts index a823a37f3..8aeba60b2 100644 --- a/src/api/routes/guilds/#guild_id/roles/member-counts.ts +++ b/src/api/routes/guilds/#guild_id/roles/member-counts.ts @@ -18,7 +18,7 @@ import { Request, Response, Router } from "express"; import { Role, Member } from "@spacebar/database"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; const router: Router = Router({ mergeParams: true }); diff --git a/src/api/routes/guilds/#guild_id/shield.svg.ts b/src/api/routes/guilds/#guild_id/shield.svg.ts index 18803a9dd..3f01ada1d 100644 --- a/src/api/routes/guilds/#guild_id/shield.svg.ts +++ b/src/api/routes/guilds/#guild_id/shield.svg.ts @@ -20,7 +20,7 @@ import fs from "node:fs"; import path from "node:path"; import { makeBadge } from "badge-maker"; import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Guild, Member } from "@spacebar/database"; import { DiscordApiErrors } from "@spacebar/util"; diff --git a/src/api/routes/guilds/#guild_id/stickers.ts b/src/api/routes/guilds/#guild_id/stickers.ts index ee45f01b0..7b56d14fd 100644 --- a/src/api/routes/guilds/#guild_id/stickers.ts +++ b/src/api/routes/guilds/#guild_id/stickers.ts @@ -19,7 +19,7 @@ import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server/HTTPError"; import multer from "multer"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Member, Sticker } from "@spacebar/database"; import { GuildStickersUpdateEvent, Snowflake, emitEvent, uploadFile, Config, DiscordApiErrors } from "@spacebar/util"; import { ModifyGuildStickerSchema, StickerFormatType, StickerType } from "@spacebar/schemas"; diff --git a/src/api/routes/guilds/#guild_id/templates.ts b/src/api/routes/guilds/#guild_id/templates.ts index 613ee5166..eef49d6af 100644 --- a/src/api/routes/guilds/#guild_id/templates.ts +++ b/src/api/routes/guilds/#guild_id/templates.ts @@ -18,7 +18,7 @@ import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server/HTTPError"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Guild, Template } from "@spacebar/database"; import { generateCode } from "@spacebar/extensions"; diff --git a/src/api/routes/guilds/#guild_id/vanity-url.ts b/src/api/routes/guilds/#guild_id/vanity-url.ts index 8db0ac681..8881b182e 100644 --- a/src/api/routes/guilds/#guild_id/vanity-url.ts +++ b/src/api/routes/guilds/#guild_id/vanity-url.ts @@ -18,7 +18,7 @@ import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server/HTTPError"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Channel, Guild, Invite } from "@spacebar/database"; import { ChannelType, VanityUrlSchema } from "@spacebar/schemas"; 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 5d0e60ad2..a8df4a2e4 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 @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Channel, Member, VoiceState } from "@spacebar/database"; import { DiscordApiErrors, emitEvent, getPermission, VoiceStateUpdateEvent } from "@spacebar/util"; import { ChannelType, VoiceStateUpdateSchema } from "@spacebar/schemas"; diff --git a/src/api/routes/guilds/#guild_id/webhooks.ts b/src/api/routes/guilds/#guild_id/webhooks.ts index 3b29b24a9..3ae2ad7ee 100644 --- a/src/api/routes/guilds/#guild_id/webhooks.ts +++ b/src/api/routes/guilds/#guild_id/webhooks.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Webhook } from "@spacebar/database"; import { Config } from "@spacebar/util"; import { WebhookResponse } from "@spacebar/schemas"; diff --git a/src/api/routes/guilds/#guild_id/welcome-screen.ts b/src/api/routes/guilds/#guild_id/welcome-screen.ts index 878d5c98f..eac2d6cd2 100644 --- a/src/api/routes/guilds/#guild_id/welcome-screen.ts +++ b/src/api/routes/guilds/#guild_id/welcome-screen.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Channel, Guild, Member } from "@spacebar/database"; import { GuildUpdateWelcomeScreenSchema } from "@spacebar/schemas"; diff --git a/src/api/routes/guilds/#guild_id/widget.json.ts b/src/api/routes/guilds/#guild_id/widget.json.ts index 4f875c058..04f103dc7 100644 --- a/src/api/routes/guilds/#guild_id/widget.json.ts +++ b/src/api/routes/guilds/#guild_id/widget.json.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Channel, Guild, Member, Invite } from "@spacebar/database"; import { Random } from "@spacebar/extensions"; import { Config, DiscordApiErrors, Permissions } from "@spacebar/util"; diff --git a/src/api/routes/guilds/#guild_id/widget.png.ts b/src/api/routes/guilds/#guild_id/widget.png.ts index 58465d452..f808aa993 100644 --- a/src/api/routes/guilds/#guild_id/widget.png.ts +++ b/src/api/routes/guilds/#guild_id/widget.png.ts @@ -22,7 +22,7 @@ import fs from "node:fs"; import path from "node:path"; import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server/HTTPError"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { storage } from "@spacebar/cdn/util/Storage"; import { Guild } from "@spacebar/database"; import { DiscordApiErrors } from "@spacebar/util"; diff --git a/src/api/routes/guilds/#guild_id/widget.ts b/src/api/routes/guilds/#guild_id/widget.ts index 397c6099b..3349f6a89 100644 --- a/src/api/routes/guilds/#guild_id/widget.ts +++ b/src/api/routes/guilds/#guild_id/widget.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Guild } from "@spacebar/database"; import { Request, Response, Router } from "express"; import { WidgetModifySchema } from "@spacebar/schemas"; diff --git a/src/api/routes/guilds/automations/email-domain-lookup.ts b/src/api/routes/guilds/automations/email-domain-lookup.ts index abf4f89fd..1078ac532 100644 --- a/src/api/routes/guilds/automations/email-domain-lookup.ts +++ b/src/api/routes/guilds/automations/email-domain-lookup.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { FieldErrors } from "@spacebar/util"; import emailProviders from "email-providers/all.json"; import { Request, Response, Router } from "express"; diff --git a/src/api/routes/guilds/index.ts b/src/api/routes/guilds/index.ts index f4561691e..231ba9041 100644 --- a/src/api/routes/guilds/index.ts +++ b/src/api/routes/guilds/index.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Guild, Member } from "@spacebar/database"; import { Config, DiscordApiErrors, getRights } from "@spacebar/util"; import { GuildCreateSchema } from "@spacebar/schemas"; diff --git a/src/api/routes/guilds/templates/index.ts b/src/api/routes/guilds/templates/index.ts index b203e15dc..1f9b7042b 100644 --- a/src/api/routes/guilds/templates/index.ts +++ b/src/api/routes/guilds/templates/index.ts @@ -18,7 +18,7 @@ import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server/HTTPError"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Guild, Member, Tag, Template } from "@spacebar/database"; import { Config, DiscordApiErrors } from "@spacebar/util"; import { ChannelType, GuildTemplateCreateSchema } from "@spacebar/schemas"; diff --git a/src/api/routes/hub-waitlist.ts b/src/api/routes/hub-waitlist.ts index d95a7f9da..bae7c991c 100644 --- a/src/api/routes/hub-waitlist.ts +++ b/src/api/routes/hub-waitlist.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { HubWaitlistSignupResponse, HubWaitlistSignupSchema } from "@spacebar/schemas"; import { Request, Response, Router } from "express"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/interactions/#interaction_id/#interaction_token/callback.ts b/src/api/routes/interactions/#interaction_id/#interaction_token/callback.ts index d071bcb4b..2de4d3dae 100644 --- a/src/api/routes/interactions/#interaction_id/#interaction_token/callback.ts +++ b/src/api/routes/interactions/#interaction_id/#interaction_token/callback.ts @@ -18,7 +18,8 @@ import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server/HTTPError"; -import { handleComps, route, sendMessage } from "@spacebar/api/util"; +import { handleComps, sendMessage } from "@spacebar/api/util"; +import { route } from "@spacebar/api/middlewares"; import { Message, User } from "@spacebar/database"; import { InteractionCallbacksSchema, InteractionCallbackType, InteractionFailureReason, MessageType } from "@spacebar/schemas"; import { Config, emitEvent, InteractionSuccessEvent, MessageUpdateEvent, pendingInteractions, InteractionFailureEvent } from "@spacebar/util"; diff --git a/src/api/routes/interactions/index.ts b/src/api/routes/interactions/index.ts index 4875d2119..a44b38ee2 100644 --- a/src/api/routes/interactions/index.ts +++ b/src/api/routes/interactions/index.ts @@ -19,7 +19,7 @@ import { randomBytes } from "node:crypto"; import { Request, Response, Router } from "express"; import { InteractionFailureReason, InteractionSchema, InteractionType } from "@spacebar/schemas"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Guild, Member, Message } from "@spacebar/database"; import { Config, emitEvent, getPermission, InteractionCreateEvent, InteractionFailureEvent, Snowflake } from "@spacebar/util"; import { pendingInteractions } from "@spacebar/util/imports/Interactions"; diff --git a/src/api/routes/invites/index.ts b/src/api/routes/invites/index.ts index 0728d77ed..609ffc14e 100644 --- a/src/api/routes/invites/index.ts +++ b/src/api/routes/invites/index.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Ban, Guild, Invite, PublicInviteRelation } from "@spacebar/database"; import { Config, DiscordApiErrors, emitEvent, getPermission, InviteDeleteEvent } from "@spacebar/util"; import { Request, Response, Router } from "express"; diff --git a/src/api/routes/oauth2/applications/@me.ts b/src/api/routes/oauth2/applications/@me.ts index 1fd4aa847..872cb5b27 100644 --- a/src/api/routes/oauth2/applications/@me.ts +++ b/src/api/routes/oauth2/applications/@me.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Application } from "@spacebar/database"; import { DiscordApiErrors } from "@spacebar/util"; import { PublicUserProjection } from "@spacebar/schemas"; diff --git a/src/api/routes/oauth2/authorize.ts b/src/api/routes/oauth2/authorize.ts index 38a699b88..5e9a0cab1 100644 --- a/src/api/routes/oauth2/authorize.ts +++ b/src/api/routes/oauth2/authorize.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Application, Member, Role, User } from "@spacebar/database"; import { ApiError, DiscordApiErrors, FieldErrors, Permissions, getPermission } from "@spacebar/util"; import { ApplicationAuthorizeSchema } from "@spacebar/schemas"; diff --git a/src/api/routes/oauth2/tokens.ts b/src/api/routes/oauth2/tokens.ts index 96ba21e7a..0bb98478d 100644 --- a/src/api/routes/oauth2/tokens.ts +++ b/src/api/routes/oauth2/tokens.ts @@ -17,7 +17,7 @@ */ import { Router, Request, Response } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; const router = Router({ mergeParams: true }); router.get("/", route({}), (req: Request, res: Response) => { diff --git a/src/api/routes/outbound-promotions.ts b/src/api/routes/outbound-promotions.ts index 18b7fbd9e..a7b19b876 100644 --- a/src/api/routes/outbound-promotions.ts +++ b/src/api/routes/outbound-promotions.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; const router: Router = Router({ mergeParams: true }); diff --git a/src/api/routes/partners/#guild_id/requirements.ts b/src/api/routes/partners/#guild_id/requirements.ts index e0c0a4ae0..a5f3d673d 100644 --- a/src/api/routes/partners/#guild_id/requirements.ts +++ b/src/api/routes/partners/#guild_id/requirements.ts @@ -17,7 +17,7 @@ */ import { Router, Request, Response } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/ping.ts b/src/api/routes/ping.ts index c81182495..eea5d9fc4 100644 --- a/src/api/routes/ping.ts +++ b/src/api/routes/ping.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Config } from "@spacebar/util"; import { Request, Response, Router } from "express"; diff --git a/src/api/routes/policies/instance/config.ts b/src/api/routes/policies/instance/config.ts index f1fc0d0f4..2b0f1a645 100755 --- a/src/api/routes/policies/instance/config.ts +++ b/src/api/routes/policies/instance/config.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Config, getRights } from "@spacebar/util"; import { Request, Response, Router } from "express"; diff --git a/src/api/routes/policies/instance/domains.ts b/src/api/routes/policies/instance/domains.ts index b263bb231..c05f1d18b 100644 --- a/src/api/routes/policies/instance/domains.ts +++ b/src/api/routes/policies/instance/domains.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Config } from "@spacebar/util"; import { Request, Response, Router } from "express"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/policies/instance/index.ts b/src/api/routes/policies/instance/index.ts index da3696c98..116e35126 100644 --- a/src/api/routes/policies/instance/index.ts +++ b/src/api/routes/policies/instance/index.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Config } from "@spacebar/util"; import { Request, Response, Router } from "express"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/policies/instance/limits.ts b/src/api/routes/policies/instance/limits.ts index 3005a6cde..018be0386 100644 --- a/src/api/routes/policies/instance/limits.ts +++ b/src/api/routes/policies/instance/limits.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Config } from "@spacebar/util"; import { Request, Response, Router } from "express"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/policies/stats.ts b/src/api/routes/policies/stats.ts index 89a238780..5f9f91bb9 100644 --- a/src/api/routes/policies/stats.ts +++ b/src/api/routes/policies/stats.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Guild, Member, Message, User } from "@spacebar/database"; import { Config, getRights } from "@spacebar/util"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/read-states/ack-bulk.ts b/src/api/routes/read-states/ack-bulk.ts index 73364efab..5a1cef184 100644 --- a/src/api/routes/read-states/ack-bulk.ts +++ b/src/api/routes/read-states/ack-bulk.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { ReadState } from "@spacebar/database"; import { AckBulkSchema } from "@spacebar/schemas"; diff --git a/src/api/routes/reporting/index.ts b/src/api/routes/reporting/index.ts index b8c1057d3..0b23cafd1 100644 --- a/src/api/routes/reporting/index.ts +++ b/src/api/routes/reporting/index.ts @@ -20,7 +20,7 @@ import fs from "node:fs"; import path from "node:path"; import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server/HTTPError"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { ReportMenuType, ReportMenuTypeNames, CreateReportSchema } from "@spacebar/schemas"; import { FieldErrors } from "@spacebar/util"; diff --git a/src/api/routes/safety-hub/@me/index.ts b/src/api/routes/safety-hub/@me/index.ts index 5e83d1292..234b6ccd9 100644 --- a/src/api/routes/safety-hub/@me/index.ts +++ b/src/api/routes/safety-hub/@me/index.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { User } from "@spacebar/database"; import { Request, Response, Router } from "express"; import { AccountStandingResponse, AccountStandingState, AppealEligibility } from "@spacebar/schemas"; diff --git a/src/api/routes/safety-hub/suspended/@me.ts b/src/api/routes/safety-hub/suspended/@me.ts index 0c7684e93..8b179f73e 100644 --- a/src/api/routes/safety-hub/suspended/@me.ts +++ b/src/api/routes/safety-hub/suspended/@me.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { User } from "@spacebar/database"; import { AccountStandingResponse, AccountStandingState, AppealEligibility } from "@spacebar/schemas"; diff --git a/src/api/routes/scheduled-maintenances/upcoming.json.ts b/src/api/routes/scheduled-maintenances/upcoming.json.ts index a0d9e5e97..50581c402 100644 --- a/src/api/routes/scheduled-maintenances/upcoming.json.ts +++ b/src/api/routes/scheduled-maintenances/upcoming.json.ts @@ -17,7 +17,7 @@ */ import { Router, Request, Response } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; const router = Router({ mergeParams: true }); router.get( diff --git a/src/api/routes/science.ts b/src/api/routes/science.ts index 3d6091378..2a71d747e 100644 --- a/src/api/routes/science.ts +++ b/src/api/routes/science.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Request, Response, Router } from "express"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/stage-instances.ts b/src/api/routes/stage-instances.ts index 18b7fbd9e..a7b19b876 100644 --- a/src/api/routes/stage-instances.ts +++ b/src/api/routes/stage-instances.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; const router: Router = Router({ mergeParams: true }); diff --git a/src/api/routes/sticker-packs/index.ts b/src/api/routes/sticker-packs/index.ts index 6b1f9f12a..0c756077c 100644 --- a/src/api/routes/sticker-packs/index.ts +++ b/src/api/routes/sticker-packs/index.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { StickerPack } from "@spacebar/database"; import { Request, Response, Router } from "express"; diff --git a/src/api/routes/stickers/#sticker_id/index.ts b/src/api/routes/stickers/#sticker_id/index.ts index 0deec2f0c..20426086f 100644 --- a/src/api/routes/stickers/#sticker_id/index.ts +++ b/src/api/routes/stickers/#sticker_id/index.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Sticker } from "@spacebar/database"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/stop.ts b/src/api/routes/stop.ts index 574bf918d..1177496a2 100644 --- a/src/api/routes/stop.ts +++ b/src/api/routes/stop.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Request, Response, Router } from "express"; import { ProcessLifecycle } from "@spacebar/util/util/ProcessLifecycle"; diff --git a/src/api/routes/store/published-listings/applications/#application_id/index.ts b/src/api/routes/store/published-listings/applications/#application_id/index.ts index f3f2bc195..b006d49e6 100644 --- a/src/api/routes/store/published-listings/applications/#application_id/index.ts +++ b/src/api/routes/store/published-listings/applications/#application_id/index.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; const router: Router = Router({ mergeParams: true }); diff --git a/src/api/routes/store/published-listings/applications/#application_id/subscription-plans.ts b/src/api/routes/store/published-listings/applications/#application_id/subscription-plans.ts index 73b6b43c7..cc6db7631 100644 --- a/src/api/routes/store/published-listings/applications/#application_id/subscription-plans.ts +++ b/src/api/routes/store/published-listings/applications/#application_id/subscription-plans.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; const router: Router = Router({ mergeParams: true }); diff --git a/src/api/routes/store/published-listings/skus.ts b/src/api/routes/store/published-listings/skus.ts index 2c354b8bc..879866f54 100644 --- a/src/api/routes/store/published-listings/skus.ts +++ b/src/api/routes/store/published-listings/skus.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; const router: Router = Router({ mergeParams: true }); diff --git a/src/api/routes/store/published-listings/skus/#sku_id/subscription-plans.ts b/src/api/routes/store/published-listings/skus/#sku_id/subscription-plans.ts index 1660c4aaf..988129e71 100644 --- a/src/api/routes/store/published-listings/skus/#sku_id/subscription-plans.ts +++ b/src/api/routes/store/published-listings/skus/#sku_id/subscription-plans.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; const router: Router = Router({ mergeParams: true }); diff --git a/src/api/routes/teams.ts b/src/api/routes/teams.ts index 4a668f528..f9ddb78a7 100644 --- a/src/api/routes/teams.ts +++ b/src/api/routes/teams.ts @@ -18,7 +18,7 @@ import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server/HTTPError"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Team, TeamMember, User } from "@spacebar/database"; import { TeamCreateSchema, TeamMemberRole, TeamMemberState } from "@spacebar/schemas"; diff --git a/src/api/routes/track.ts b/src/api/routes/track.ts index 4306068cf..d6cd8b196 100644 --- a/src/api/routes/track.ts +++ b/src/api/routes/track.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/updates.ts b/src/api/routes/updates.ts index 79b609dfe..47e1434a2 100644 --- a/src/api/routes/updates.ts +++ b/src/api/routes/updates.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { ClientRelease } from "@spacebar/database"; import { FieldErrors } from "@spacebar/util"; diff --git a/src/api/routes/users/#user_id/delete.ts b/src/api/routes/users/#user_id/delete.ts index ceedb3aa4..8265141b7 100644 --- a/src/api/routes/users/#user_id/delete.ts +++ b/src/api/routes/users/#user_id/delete.ts @@ -18,7 +18,7 @@ import { Request, Response, Router } from "express"; import { Not } from "typeorm"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Channel, Emoji, Guild, InstanceBan, Member, Recipient, Sticker, User, UserSettingsProtos } from "@spacebar/database"; import { ChannelDeleteEvent, ChannelRecipientRemoveEvent, emitEvent, UserDeleteEvent } from "@spacebar/util"; import { ChannelType, InstanceUserDeleteSchema, PrivateUserProjection } from "@spacebar/schemas"; diff --git a/src/api/routes/users/#user_id/index.ts b/src/api/routes/users/#user_id/index.ts index a0d7ba6e0..228c87bb2 100644 --- a/src/api/routes/users/#user_id/index.ts +++ b/src/api/routes/users/#user_id/index.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { User } from "@spacebar/database"; import { Request, Response, Router } from "express"; diff --git a/src/api/routes/users/#user_id/messages.ts b/src/api/routes/users/#user_id/messages.ts index c15801c09..17512d9fc 100644 --- a/src/api/routes/users/#user_id/messages.ts +++ b/src/api/routes/users/#user_id/messages.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Message, User } from "@spacebar/database"; import { Config } from "@spacebar/util"; import { DmMessagesResponseSchema } from "@spacebar/schemas"; diff --git a/src/api/routes/users/#user_id/profile.ts b/src/api/routes/users/#user_id/profile.ts index e2f962d18..1db2a63da 100644 --- a/src/api/routes/users/#user_id/profile.ts +++ b/src/api/routes/users/#user_id/profile.ts @@ -18,7 +18,7 @@ import { Request, Response, Router } from "express"; import { In } from "typeorm"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Badge, Member, Relationship, User } from "@spacebar/database"; import { Config, emitEvent, FieldErrors, handleFile, UserUpdateEvent } from "@spacebar/util"; import { PartialConnectedAccountResponse, PrivateUserProjection, PublicUser, PublicUserProjection, RelationshipType, UserProfileModifySchema } from "@spacebar/schemas"; diff --git a/src/api/routes/users/#user_id/relationships.ts b/src/api/routes/users/#user_id/relationships.ts index 999542f64..b5fabe1cd 100644 --- a/src/api/routes/users/#user_id/relationships.ts +++ b/src/api/routes/users/#user_id/relationships.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { User } from "@spacebar/database"; import { Request, Response, Router } from "express"; import { UserRelationsResponse } from "@spacebar/schemas"; diff --git a/src/api/routes/users/@me/activities/statistics/applications.ts b/src/api/routes/users/@me/activities/statistics/applications.ts index 5d4c2537b..478146a81 100644 --- a/src/api/routes/users/@me/activities/statistics/applications.ts +++ b/src/api/routes/users/@me/activities/statistics/applications.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/users/@me/affinities/guilds.ts b/src/api/routes/users/@me/affinities/guilds.ts index 098c78a54..bf78e8db9 100644 --- a/src/api/routes/users/@me/affinities/guilds.ts +++ b/src/api/routes/users/@me/affinities/guilds.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/users/@me/affinities/users.ts b/src/api/routes/users/@me/affinities/users.ts index ffbdd4fec..fb04ffa63 100644 --- a/src/api/routes/users/@me/affinities/users.ts +++ b/src/api/routes/users/@me/affinities/users.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/users/@me/applications/#application_id/entitlements.ts b/src/api/routes/users/@me/applications/#application_id/entitlements.ts index 18b7fbd9e..a7b19b876 100644 --- a/src/api/routes/users/@me/applications/#application_id/entitlements.ts +++ b/src/api/routes/users/@me/applications/#application_id/entitlements.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; const router: Router = Router({ mergeParams: true }); diff --git a/src/api/routes/users/@me/billing/country-code.ts b/src/api/routes/users/@me/billing/country-code.ts index c62d545c1..76782e183 100644 --- a/src/api/routes/users/@me/billing/country-code.ts +++ b/src/api/routes/users/@me/billing/country-code.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { IpDataClient } from "@spacebar/util"; const router: Router = Router({ mergeParams: true }); diff --git a/src/api/routes/users/@me/billing/location-info.ts b/src/api/routes/users/@me/billing/location-info.ts index 6942aff6c..c3fe8b557 100644 --- a/src/api/routes/users/@me/billing/location-info.ts +++ b/src/api/routes/users/@me/billing/location-info.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { IpDataClient } from "@spacebar/util"; const router: Router = Router({ mergeParams: true }); diff --git a/src/api/routes/users/@me/billing/payment-sources.ts b/src/api/routes/users/@me/billing/payment-sources.ts index b1a55106c..3c6008cf7 100644 --- a/src/api/routes/users/@me/billing/payment-sources.ts +++ b/src/api/routes/users/@me/billing/payment-sources.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/users/@me/billing/subscriptions.ts b/src/api/routes/users/@me/billing/subscriptions.ts index 18b7fbd9e..a7b19b876 100644 --- a/src/api/routes/users/@me/billing/subscriptions.ts +++ b/src/api/routes/users/@me/billing/subscriptions.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; 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 9032103da..11cdb1d3e 100644 --- a/src/api/routes/users/@me/channels.ts +++ b/src/api/routes/users/@me/channels.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Channel, Recipient } from "@spacebar/database"; import { DmChannelDTO } from "@spacebar/util"; import { DmChannelCreateSchema } from "@spacebar/schemas"; diff --git a/src/api/routes/users/@me/collectibles-marketing.ts b/src/api/routes/users/@me/collectibles-marketing.ts index 1260eb823..1dd2c7ca3 100644 --- a/src/api/routes/users/@me/collectibles-marketing.ts +++ b/src/api/routes/users/@me/collectibles-marketing.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Request, Response, Router } from "express"; import { CollectiblesMarketingResponse } from "@spacebar/schemas"; diff --git a/src/api/routes/users/@me/collectibles-purchases.ts b/src/api/routes/users/@me/collectibles-purchases.ts index 29c2edcb1..bfbb969ba 100644 --- a/src/api/routes/users/@me/collectibles-purchases.ts +++ b/src/api/routes/users/@me/collectibles-purchases.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Request, Response, Router } from "express"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/users/@me/connections/#connection_name/#connection_id/access-token.ts b/src/api/routes/users/@me/connections/#connection_name/#connection_id/access-token.ts index a826c3f83..923e4e069 100644 --- a/src/api/routes/users/@me/connections/#connection_name/#connection_id/access-token.ts +++ b/src/api/routes/users/@me/connections/#connection_name/#connection_id/access-token.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { ConnectedAccount } from "@spacebar/database"; import { ApiError, ConnectionStore, DiscordApiErrors, FieldErrors, RefreshableConnection } from "@spacebar/util"; 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 857cc0039..12094d3f0 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,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { ConnectedAccount } from "@spacebar/database"; import { DiscordApiErrors, emitEvent } from "@spacebar/util"; import { ConnectionUpdateSchema } from "@spacebar/schemas"; diff --git a/src/api/routes/users/@me/connections/index.ts b/src/api/routes/users/@me/connections/index.ts index 012a3d6c0..24b1eb55a 100644 --- a/src/api/routes/users/@me/connections/index.ts +++ b/src/api/routes/users/@me/connections/index.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { ConnectedAccount } from "@spacebar/database"; import { ConnectedAccountDTO } from "@spacebar/util"; diff --git a/src/api/routes/users/@me/delete.ts b/src/api/routes/users/@me/delete.ts index 4007c4363..e0887900a 100644 --- a/src/api/routes/users/@me/delete.ts +++ b/src/api/routes/users/@me/delete.ts @@ -19,7 +19,7 @@ import bcrypt from "bcrypt"; import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server/HTTPError"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Guild, Member, User, UserSettingsProtos } from "@spacebar/database"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/users/@me/devices.ts b/src/api/routes/users/@me/devices.ts index c9f249767..a41088359 100644 --- a/src/api/routes/users/@me/devices.ts +++ b/src/api/routes/users/@me/devices.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/users/@me/disable.ts b/src/api/routes/users/@me/disable.ts index 83f460c19..2eca7db12 100644 --- a/src/api/routes/users/@me/disable.ts +++ b/src/api/routes/users/@me/disable.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { User } from "@spacebar/database"; import bcrypt from "bcrypt"; import { Request, Response, Router } from "express"; diff --git a/src/api/routes/users/@me/email-settings.ts b/src/api/routes/users/@me/email-settings.ts index 6bab5f905..71223df6d 100644 --- a/src/api/routes/users/@me/email-settings.ts +++ b/src/api/routes/users/@me/email-settings.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/users/@me/entitlements.ts b/src/api/routes/users/@me/entitlements.ts index 1f4205349..fc11e9a0c 100644 --- a/src/api/routes/users/@me/entitlements.ts +++ b/src/api/routes/users/@me/entitlements.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/users/@me/guilds.ts b/src/api/routes/users/@me/guilds.ts index 592bb7223..fa9eb048e 100644 --- a/src/api/routes/users/@me/guilds.ts +++ b/src/api/routes/users/@me/guilds.ts @@ -18,7 +18,7 @@ import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server/HTTPError"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Guild, Member } from "@spacebar/database"; import { Config } from "@spacebar/util"; 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 b3abd726d..eb3694b59 100644 --- a/src/api/routes/users/@me/guilds/#guild_id/settings.ts +++ b/src/api/routes/users/@me/guilds/#guild_id/settings.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Channel, Member } from "@spacebar/database"; import { OrmUtils } from "@spacebar/util"; import { UserGuildSettingsSchema } from "@spacebar/schemas"; diff --git a/src/api/routes/users/@me/guilds/premium/subscription-slots.ts b/src/api/routes/users/@me/guilds/premium/subscription-slots.ts index 5d4c2537b..478146a81 100644 --- a/src/api/routes/users/@me/guilds/premium/subscription-slots.ts +++ b/src/api/routes/users/@me/guilds/premium/subscription-slots.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/users/@me/index.ts b/src/api/routes/users/@me/index.ts index 29a05ccb7..2ed525e82 100644 --- a/src/api/routes/users/@me/index.ts +++ b/src/api/routes/users/@me/index.ts @@ -18,7 +18,7 @@ import bcrypt from "bcrypt"; import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { User } from "@spacebar/database"; import { Config, emitEvent, FieldErrors, generateToken, handleFile, UserUpdateEvent } from "@spacebar/util"; import { DisplayNameStyle, PrivateUserProjection, UserModifySchema } from "@spacebar/schemas"; diff --git a/src/api/routes/users/@me/library.ts b/src/api/routes/users/@me/library.ts index 9c28cb98f..4c7eb66ab 100644 --- a/src/api/routes/users/@me/library.ts +++ b/src/api/routes/users/@me/library.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/users/@me/mentions.ts b/src/api/routes/users/@me/mentions.ts index c372abe80..30aceaa7e 100644 --- a/src/api/routes/users/@me/mentions.ts +++ b/src/api/routes/users/@me/mentions.ts @@ -18,7 +18,7 @@ import { Request, Response, Router } from "express"; import { In, LessThan, FindOptionsWhere } from "typeorm"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Message, Member, Channel, Attachment } from "@spacebar/database"; import { Snowflake, Permissions, NewUrlUserSignatureData } from "@spacebar/util"; import { Stopwatch } from "@spacebar/extensions"; diff --git a/src/api/routes/users/@me/mfa/codes-verification.ts b/src/api/routes/users/@me/mfa/codes-verification.ts index d84aa26a3..b5fe6ca67 100644 --- a/src/api/routes/users/@me/mfa/codes-verification.ts +++ b/src/api/routes/users/@me/mfa/codes-verification.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { BackupCode, generateMfaBackupCodes, User } from "@spacebar/database"; import { DiscordApiErrors } from "@spacebar/util"; import { CodesVerificationSchema } from "@spacebar/schemas"; diff --git a/src/api/routes/users/@me/mfa/codes.ts b/src/api/routes/users/@me/mfa/codes.ts index 73cde9d4a..0b92d4996 100644 --- a/src/api/routes/users/@me/mfa/codes.ts +++ b/src/api/routes/users/@me/mfa/codes.ts @@ -18,7 +18,7 @@ import bcrypt from "bcrypt"; import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { BackupCode, generateMfaBackupCodes, User } from "@spacebar/database"; import { FieldErrors } from "@spacebar/util"; import { MfaCodesSchema } from "@spacebar/schemas"; diff --git a/src/api/routes/users/@me/mfa/totp/disable.ts b/src/api/routes/users/@me/mfa/totp/disable.ts index 6fa9f6933..e3c911c0a 100644 --- a/src/api/routes/users/@me/mfa/totp/disable.ts +++ b/src/api/routes/users/@me/mfa/totp/disable.ts @@ -19,7 +19,7 @@ import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server/HTTPError"; import { verifyToken } from "node-2fa"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { BackupCode, User } from "@spacebar/database"; import { generateToken } from "@spacebar/util"; import { TotpDisableSchema } from "@spacebar/schemas"; diff --git a/src/api/routes/users/@me/mfa/totp/enable.ts b/src/api/routes/users/@me/mfa/totp/enable.ts index 472360c20..a55a9ff65 100644 --- a/src/api/routes/users/@me/mfa/totp/enable.ts +++ b/src/api/routes/users/@me/mfa/totp/enable.ts @@ -20,7 +20,7 @@ import bcrypt from "bcrypt"; import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server/HTTPError"; import { verifyToken } from "node-2fa"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { User, generateMfaBackupCodes } from "@spacebar/database"; import { generateToken } from "@spacebar/util"; import { TotpEnableSchema } from "@spacebar/schemas"; diff --git a/src/api/routes/users/@me/mfa/webauthn/credentials/#key_id/index.ts b/src/api/routes/users/@me/mfa/webauthn/credentials/#key_id/index.ts index 32e60af5a..5f7ec7088 100644 --- a/src/api/routes/users/@me/mfa/webauthn/credentials/#key_id/index.ts +++ b/src/api/routes/users/@me/mfa/webauthn/credentials/#key_id/index.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { SecurityKey, User } from "@spacebar/database"; import { Request, Response, Router } from "express"; 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 a7f1c20a6..fb3f06522 100644 --- a/src/api/routes/users/@me/mfa/webauthn/credentials/index.ts +++ b/src/api/routes/users/@me/mfa/webauthn/credentials/index.ts @@ -20,7 +20,7 @@ import bcrypt from "bcrypt"; import { Request, Response, Router } from "express"; import { ExpectedAttestationResult } from "fido2-lib"; import { HTTPError } from "lambert-server/HTTPError"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { SecurityKey, User } from "@spacebar/database"; import { DiscordApiErrors, FieldErrors, generateWebAuthnTicket, verifyWebAuthnToken, WebAuthn } from "@spacebar/util"; import { CreateWebAuthnCredentialSchema, GenerateWebAuthnCredentialsSchema, WebAuthnPostSchema } from "@spacebar/schemas"; diff --git a/src/api/routes/users/@me/notes.ts b/src/api/routes/users/@me/notes.ts index 667bf163e..8ab8bc5bf 100644 --- a/src/api/routes/users/@me/notes.ts +++ b/src/api/routes/users/@me/notes.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Note, User } from "@spacebar/database"; import { Snowflake, emitEvent } from "@spacebar/util"; diff --git a/src/api/routes/users/@me/relationships.ts b/src/api/routes/users/@me/relationships.ts index 319514182..07aa59f4d 100644 --- a/src/api/routes/users/@me/relationships.ts +++ b/src/api/routes/users/@me/relationships.ts @@ -18,7 +18,7 @@ import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server/HTTPError"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Relationship, User } from "@spacebar/database"; import { Config, DiscordApiErrors, RelationshipAddEvent, RelationshipRemoveEvent, RelationshipUpdateEvent, emitEvent } from "@spacebar/util"; import { PublicUserProjection, RelationshipType, RelationshipPatchSchema } from "@spacebar/schemas"; diff --git a/src/api/routes/users/@me/settings-proto/1.ts b/src/api/routes/users/@me/settings-proto/1.ts index e4879baa3..b0164bc42 100644 --- a/src/api/routes/users/@me/settings-proto/1.ts +++ b/src/api/routes/users/@me/settings-proto/1.ts @@ -19,7 +19,7 @@ import { Request, Response, Router } from "express"; import { PreloadedUserSettings } from "discord-protos"; import { JsonValue } from "@protobuf-ts/runtime"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { UserSettingsProtos } from "@spacebar/database"; import { emitEvent, OrmUtils } from "@spacebar/util"; import { SettingsProtoJsonResponse, SettingsProtoResponse, SettingsProtoUpdateJsonSchema, SettingsProtoUpdateSchema } from "@spacebar/schemas"; diff --git a/src/api/routes/users/@me/settings-proto/2.ts b/src/api/routes/users/@me/settings-proto/2.ts index d242ec357..aa9a09468 100644 --- a/src/api/routes/users/@me/settings-proto/2.ts +++ b/src/api/routes/users/@me/settings-proto/2.ts @@ -19,7 +19,7 @@ import { Request, Response, Router } from "express"; import { FrecencyUserSettings } from "discord-protos"; import { JsonValue } from "@protobuf-ts/runtime"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { UserSettingsProtos } from "@spacebar/database"; import { emitEvent, OrmUtils } from "@spacebar/util"; import { SettingsProtoJsonResponse, SettingsProtoResponse, SettingsProtoUpdateJsonSchema, SettingsProtoUpdateSchema } from "@spacebar/schemas"; diff --git a/src/api/routes/users/@me/settings.ts b/src/api/routes/users/@me/settings.ts index 6bbc8ea00..c4dfb5daa 100644 --- a/src/api/routes/users/@me/settings.ts +++ b/src/api/routes/users/@me/settings.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Session, User, UserSettings } from "@spacebar/database"; import { emitEvent, PresenceUpdateEvent } from "@spacebar/util"; import { UserSettingsUpdateSchema } from "@spacebar/schemas"; diff --git a/src/api/routes/voice/regions.ts b/src/api/routes/voice/regions.ts index 4ef6d60f5..dfde30828 100644 --- a/src/api/routes/voice/regions.ts +++ b/src/api/routes/voice/regions.ts @@ -16,7 +16,8 @@ along with this program. If not, see . */ -import { getVoiceRegions, route } from "@spacebar/api/util"; +import { getVoiceRegions } from "@spacebar/api/util"; +import { route } from "@spacebar/api/middlewares"; import { Request, Response, Router } from "express"; const router: Router = Router({ mergeParams: true }); diff --git a/src/api/routes/warp/license.ts b/src/api/routes/warp/license.ts index 0d92ed168..4b757f8ab 100644 --- a/src/api/routes/warp/license.ts +++ b/src/api/routes/warp/license.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Request, Response, Router } from "express"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/webhooks/#webhook_id/#webhook_token/github.ts b/src/api/routes/webhooks/#webhook_id/#webhook_token/github.ts index 140d3618d..ac0b7c359 100644 --- a/src/api/routes/webhooks/#webhook_id/#webhook_token/github.ts +++ b/src/api/routes/webhooks/#webhook_id/#webhook_token/github.ts @@ -1,6 +1,7 @@ import { NextFunction, Request, Response, Router } from "express"; import { HTTPError } from "lambert-server/HTTPError"; -import { getProxyUrl, route } from "@spacebar/api/util"; +import { getProxyUrl } from "@spacebar/api/util"; +import { route } from "@spacebar/api/middlewares"; import { EmbedType, WebhookExecuteSchema } from "@spacebar/schemas"; import { executeWebhook } from "../../../../util/handlers/Webhook"; diff --git a/src/api/routes/webhooks/#webhook_id/#webhook_token/index.ts b/src/api/routes/webhooks/#webhook_id/#webhook_token/index.ts index 73763f0b4..f5f315514 100644 --- a/src/api/routes/webhooks/#webhook_id/#webhook_token/index.ts +++ b/src/api/routes/webhooks/#webhook_id/#webhook_token/index.ts @@ -19,7 +19,7 @@ import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server/HTTPError"; import multer from "multer"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Webhook, Message } from "@spacebar/database"; import { Config, DiscordApiErrors, emitEvent, handleFile, ValidateName, WebhooksUpdateEvent } from "@spacebar/util"; import { executeWebhook } from "@spacebar/api/util/handlers/Webhook"; diff --git a/src/api/routes/webhooks/#webhook_id/#webhook_token/messages/#message_id.ts b/src/api/routes/webhooks/#webhook_id/#webhook_token/messages/#message_id.ts index 929719e59..5ada4aa08 100644 --- a/src/api/routes/webhooks/#webhook_id/#webhook_token/messages/#message_id.ts +++ b/src/api/routes/webhooks/#webhook_id/#webhook_token/messages/#message_id.ts @@ -19,7 +19,8 @@ import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server/HTTPError"; import multer from "multer"; -import { handleMessage, postHandleMessage, route } from "@spacebar/api/util"; +import { handleMessage, postHandleMessage } from "@spacebar/api/util"; +import { route } from "@spacebar/api/middlewares"; import { Channel, Message, Webhook } from "@spacebar/database"; import { MessageDeleteEvent, MessageUpdateEvent, emitEvent, DiscordApiErrors } from "@spacebar/util"; import { ChannelType, PublicMessage, WebhookExecuteSchema } from "@spacebar/schemas"; diff --git a/src/api/routes/webhooks/#webhook_id/index.ts b/src/api/routes/webhooks/#webhook_id/index.ts index 674fba81e..5d402be34 100644 --- a/src/api/routes/webhooks/#webhook_id/index.ts +++ b/src/api/routes/webhooks/#webhook_id/index.ts @@ -19,7 +19,7 @@ import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server/HTTPError"; import { In } from "typeorm"; -import { route } from "@spacebar/api/util/handlers/route"; +import { route } from "@spacebar/api/middlewares"; import { Webhook, Channel, Message } from "@spacebar/database"; import { Config, DiscordApiErrors, getPermission, WebhooksUpdateEvent, emitEvent, handleFile, ValidateName, MessageDeleteBulkEvent } from "@spacebar/util"; import { WebhookResponse, WebhookUpdateSchema } from "@spacebar/schemas";