From 6e0f571b353769e70580b0d78344495f65c8dc25 Mon Sep 17 00:00:00 2001 From: Rory& Date: Tue, 16 Jun 2026 02:47:03 +0200 Subject: [PATCH] Signify some imports more explicitly --- src/api/routes/-/healthz.ts | 2 +- src/api/routes/-/readyz.ts | 2 +- src/api/routes/applications/#application_id/bot/index.ts | 2 +- .../#application_id/commands/#command_id/index.ts | 2 +- .../routes/applications/#application_id/commands/index.ts | 2 +- src/api/routes/applications/#application_id/entitlements.ts | 2 +- .../guilds/#guild_id/commands/#command_id/index.ts | 2 +- .../#application_id/guilds/#guild_id/commands/index.ts | 2 +- src/api/routes/applications/#application_id/index.ts | 2 +- src/api/routes/applications/#application_id/skus.ts | 2 +- src/api/routes/applications/@me.ts | 2 +- src/api/routes/applications/detectable.ts | 2 +- src/api/routes/applications/index.ts | 2 +- src/api/routes/attachments/refresh-urls.ts | 2 +- src/api/routes/auth/fingerprint.ts | 2 +- src/api/routes/auth/generate-registration-tokens.ts | 2 +- src/api/routes/auth/location-metadata.ts | 2 +- src/api/routes/auth/logout.ts | 2 +- src/api/routes/auth/mfa/totp.ts | 2 +- src/api/routes/auth/mfa/webauthn.ts | 2 +- src/api/routes/auth/register.ts | 2 +- src/api/routes/auth/reset.ts | 2 +- src/api/routes/auth/sessions.ts | 2 +- src/api/routes/auth/verify/resend.ts | 2 +- src/api/routes/auth/verify/view-backup-codes-challenge.ts | 2 +- src/api/routes/auth/whoami.ts | 2 +- src/api/routes/beaker.ts | 2 +- src/api/routes/channels/#channel_id/attachments.ts | 2 +- src/api/routes/channels/#channel_id/directory-entries.ts | 2 +- src/api/routes/channels/#channel_id/greet.ts | 2 +- src/api/routes/channels/#channel_id/index.ts | 2 +- src/api/routes/channels/#channel_id/invites.ts | 2 +- .../routes/channels/#channel_id/messages/#message_id/ack.ts | 2 +- .../channels/#channel_id/messages/#message_id/crosspost.ts | 2 +- .../channels/#channel_id/messages/#message_id/reactions.ts | 2 +- src/api/routes/channels/#channel_id/messages/bulk-delete.ts | 2 +- src/api/routes/channels/#channel_id/messages/pins/index.ts | 2 +- src/api/routes/channels/#channel_id/messages/search.ts | 2 +- src/api/routes/channels/#channel_id/permissions.ts | 2 +- src/api/routes/channels/#channel_id/pins.ts | 2 +- src/api/routes/channels/#channel_id/post-data.ts | 2 +- src/api/routes/channels/#channel_id/purge.ts | 2 +- src/api/routes/channels/#channel_id/recipients.ts | 2 +- src/api/routes/channels/#channel_id/tags.ts | 2 +- src/api/routes/channels/#channel_id/thread-members.ts | 2 +- src/api/routes/channels/#channel_id/typing.ts | 2 +- src/api/routes/channels/#channel_id/webhooks.ts | 2 +- src/api/routes/channels/preload-messages.ts | 2 +- src/api/routes/collectibles-categories.ts | 2 +- src/api/routes/collectibles-shop.ts | 2 +- .../connections/#connection_name/#connection_id/refresh.ts | 2 +- src/api/routes/connections/#connection_name/authorize.ts | 2 +- src/api/routes/connections/#connection_name/callback.ts | 2 +- src/api/routes/connections/index.ts | 2 +- src/api/routes/discoverable-guilds.ts | 2 +- src/api/routes/discovery.ts | 2 +- src/api/routes/download.ts | 2 +- src/api/routes/emojis/#emoji_id/source.ts | 2 +- src/api/routes/experiments.ts | 2 +- src/api/routes/games/detectable.ts | 2 +- src/api/routes/gateway/bot.ts | 2 +- src/api/routes/gateway/index.ts | 2 +- src/api/routes/gifs/search.ts | 2 +- src/api/routes/gifs/trending-gifs.ts | 2 +- src/api/routes/gifs/trending.ts | 2 +- src/api/routes/guild-recommendations.ts | 2 +- .../routes/guilds/#guild_id/application-command-index.ts | 2 +- src/api/routes/guilds/#guild_id/audit-logs.ts | 2 +- src/api/routes/guilds/#guild_id/auto-moderation/rules.ts | 2 +- src/api/routes/guilds/#guild_id/bans.ts | 2 +- src/api/routes/guilds/#guild_id/bulk-ban.ts | 2 +- src/api/routes/guilds/#guild_id/channels.ts | 2 +- src/api/routes/guilds/#guild_id/delete.ts | 2 +- src/api/routes/guilds/#guild_id/discovery-requirements.ts | 2 +- src/api/routes/guilds/#guild_id/emojis.ts | 2 +- src/api/routes/guilds/#guild_id/index.ts | 2 +- src/api/routes/guilds/#guild_id/integrations.ts | 2 +- src/api/routes/guilds/#guild_id/invites.ts | 2 +- src/api/routes/guilds/#guild_id/member-verification.ts | 2 +- src/api/routes/guilds/#guild_id/members/#member_id/index.ts | 2 +- src/api/routes/guilds/#guild_id/members/#member_id/nick.ts | 2 +- .../#guild_id/members/#member_id/roles/#role_id/index.ts | 2 +- src/api/routes/guilds/#guild_id/members/index.ts | 2 +- src/api/routes/guilds/#guild_id/messages/search.ts | 2 +- src/api/routes/guilds/#guild_id/premium.ts | 2 +- src/api/routes/guilds/#guild_id/profile.ts | 2 +- src/api/routes/guilds/#guild_id/profile/index.ts | 2 +- src/api/routes/guilds/#guild_id/prune.ts | 2 +- src/api/routes/guilds/#guild_id/roles/#role_id/index.ts | 2 +- .../routes/guilds/#guild_id/roles/#role_id/member-ids.ts | 2 +- src/api/routes/guilds/#guild_id/roles/#role_id/members.ts | 2 +- src/api/routes/guilds/#guild_id/roles/index.ts | 2 +- src/api/routes/guilds/#guild_id/roles/member-counts.ts | 2 +- src/api/routes/guilds/#guild_id/shield.svg.ts | 2 +- src/api/routes/guilds/#guild_id/stickers.ts | 2 +- src/api/routes/guilds/#guild_id/templates.ts | 2 +- src/api/routes/guilds/#guild_id/vanity-url.ts | 2 +- .../routes/guilds/#guild_id/voice-states/#user_id/index.ts | 2 +- src/api/routes/guilds/#guild_id/webhooks.ts | 2 +- src/api/routes/guilds/#guild_id/welcome-screen.ts | 2 +- src/api/routes/guilds/#guild_id/widget.json.ts | 2 +- src/api/routes/guilds/#guild_id/widget.png.ts | 2 +- src/api/routes/guilds/#guild_id/widget.ts | 2 +- src/api/routes/guilds/automations/email-domain-lookup.ts | 2 +- src/api/routes/guilds/index.ts | 2 +- src/api/routes/guilds/templates/index.ts | 2 +- src/api/routes/hub-waitlist.ts | 2 +- src/api/routes/interactions/index.ts | 2 +- src/api/routes/invites/index.ts | 2 +- src/api/routes/oauth2/applications/@me.ts | 2 +- src/api/routes/oauth2/authorize.ts | 2 +- src/api/routes/oauth2/tokens.ts | 2 +- src/api/routes/outbound-promotions.ts | 2 +- src/api/routes/partners/#guild_id/requirements.ts | 2 +- src/api/routes/ping.ts | 2 +- src/api/routes/policies/instance/config.ts | 2 +- src/api/routes/policies/instance/domains.ts | 2 +- src/api/routes/policies/instance/index.ts | 2 +- src/api/routes/policies/instance/limits.ts | 2 +- src/api/routes/policies/stats.ts | 2 +- src/api/routes/read-states/ack-bulk.ts | 2 +- src/api/routes/reporting/index.ts | 2 +- src/api/routes/safety-hub/@me/index.ts | 2 +- src/api/routes/safety-hub/suspended/@me.ts | 2 +- src/api/routes/scheduled-maintenances/upcoming.json.ts | 2 +- src/api/routes/science.ts | 2 +- src/api/routes/stage-instances.ts | 2 +- src/api/routes/sticker-packs/index.ts | 2 +- src/api/routes/stickers/#sticker_id/index.ts | 2 +- src/api/routes/stop.ts | 2 +- .../applications/#application_id/index.ts | 2 +- .../applications/#application_id/subscription-plans.ts | 2 +- src/api/routes/store/published-listings/skus.ts | 2 +- .../published-listings/skus/#sku_id/subscription-plans.ts | 2 +- src/api/routes/teams.ts | 2 +- src/api/routes/track.ts | 2 +- src/api/routes/updates.ts | 2 +- src/api/routes/users/#user_id/delete.ts | 2 +- src/api/routes/users/#user_id/index.ts | 2 +- src/api/routes/users/#user_id/messages.ts | 2 +- src/api/routes/users/#user_id/profile.ts | 2 +- src/api/routes/users/#user_id/relationships.ts | 2 +- .../routes/users/@me/activities/statistics/applications.ts | 2 +- src/api/routes/users/@me/affinities/guilds.ts | 2 +- src/api/routes/users/@me/affinities/users.ts | 2 +- .../users/@me/applications/#application_id/entitlements.ts | 2 +- src/api/routes/users/@me/billing/country-code.ts | 2 +- src/api/routes/users/@me/billing/location-info.ts | 2 +- src/api/routes/users/@me/billing/payment-sources.ts | 2 +- src/api/routes/users/@me/billing/subscriptions.ts | 2 +- src/api/routes/users/@me/channels.ts | 2 +- src/api/routes/users/@me/collectibles-marketing.ts | 2 +- src/api/routes/users/@me/collectibles-purchases.ts | 2 +- .../#connection_name/#connection_id/access-token.ts | 2 +- .../connections/#connection_name/#connection_id/index.ts | 2 +- src/api/routes/users/@me/connections/index.ts | 2 +- src/api/routes/users/@me/delete.ts | 2 +- src/api/routes/users/@me/devices.ts | 2 +- src/api/routes/users/@me/disable.ts | 2 +- src/api/routes/users/@me/email-settings.ts | 2 +- src/api/routes/users/@me/entitlements.ts | 2 +- src/api/routes/users/@me/guilds.ts | 2 +- src/api/routes/users/@me/guilds/#guild_id/settings.ts | 2 +- .../routes/users/@me/guilds/premium/subscription-slots.ts | 2 +- src/api/routes/users/@me/index.ts | 2 +- src/api/routes/users/@me/library.ts | 2 +- src/api/routes/users/@me/mentions.ts | 2 +- src/api/routes/users/@me/mfa/codes-verification.ts | 2 +- src/api/routes/users/@me/mfa/codes.ts | 2 +- src/api/routes/users/@me/mfa/totp/disable.ts | 2 +- src/api/routes/users/@me/mfa/totp/enable.ts | 2 +- .../users/@me/mfa/webauthn/credentials/#key_id/index.ts | 2 +- src/api/routes/users/@me/mfa/webauthn/credentials/index.ts | 2 +- src/api/routes/users/@me/notes.ts | 2 +- src/api/routes/users/@me/relationships.ts | 2 +- src/api/routes/users/@me/settings-proto/1.ts | 2 +- src/api/routes/users/@me/settings-proto/2.ts | 2 +- src/api/routes/users/@me/settings.ts | 2 +- src/api/routes/warp/license.ts | 2 +- src/api/routes/webhooks/#webhook_id/#token/index.ts | 2 +- src/api/routes/webhooks/#webhook_id/index.ts | 2 +- src/database/entities/Attachment.ts | 6 +++--- src/database/entities/BackupCodes.ts | 2 +- src/database/entities/BaseClass.ts | 4 ++-- src/database/entities/Channel.ts | 2 +- src/database/entities/Member.ts | 2 +- src/database/entities/Message.ts | 2 +- src/database/entities/ReportMenu.ts | 2 +- src/database/entities/ThreadMember.ts | 2 +- src/database/entities/User.ts | 2 +- src/gateway/events/Close.ts | 2 +- src/gateway/events/Connection.ts | 2 +- 192 files changed, 195 insertions(+), 195 deletions(-) diff --git a/src/api/routes/-/healthz.ts b/src/api/routes/-/healthz.ts index b98eb9456..17bf29965 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 b98eb9456..17bf29965 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 443b5d02e..f494c2e3f 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 5aec66cdf..8672e1c9a 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 c01a99f4a..accd649b7 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"; +import { route } from "@spacebar/api/util/handlers/route"; import { Application, ApplicationCommand } from "@spacebar/database"; import { FieldErrors, Snowflake } from "@spacebar/util"; diff --git a/src/api/routes/applications/#application_id/entitlements.ts b/src/api/routes/applications/#application_id/entitlements.ts index 4cd13b938..07c893679 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 847d18245..968432557 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 3664aa0cb..de160c3fb 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 2a520def5..0ada6042a 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 cd0eb0f75..6f0714690 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 308bb4eec..65034ebd6 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 688a7d125..6c7cc21a6 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 894f9331f..6eac62431 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 8f43c8cae..b9e90ea21 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 2a77d3c7f..8e18654c8 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"; +import { route } from "@spacebar/api/util/handlers/route"; import { createHash } from "node:crypto"; import { Snowflake } from "@spacebar/util"; import { Request, Response, Router } from "express"; diff --git a/src/api/routes/auth/generate-registration-tokens.ts b/src/api/routes/auth/generate-registration-tokens.ts index 7b54d9efe..d787e22a2 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 6f2f26af1..51f126a32 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"; +import { route } from "@spacebar/api/util/handlers/route"; import { IpDataClient } from "@spacebar/util"; import { Request, Response, Router } from "express"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/auth/logout.ts b/src/api/routes/auth/logout.ts index 9ad9a873a..cea155324 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 2d0d8fa0f..72a79db9e 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 d948ccace..5d7af959c 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 379d2775e..767d53cc5 100644 --- a/src/api/routes/auth/register.ts +++ b/src/api/routes/auth/register.ts @@ -24,7 +24,7 @@ import { route, verifyCaptcha } from "@spacebar/api"; import { Invite, User, ValidRegistrationToken } from "@spacebar/database"; import { Config, FieldErrors, generateToken, IpDataClient, AbuseIpDbClient } from "@spacebar/util"; import { RegisterSchema } from "@spacebar/schemas"; -import { BcryptWorkerPool } from "../../../util/util/workers/bcrypt/BcryptWorkerPool"; +import { BcryptWorkerPool } from "@spacebar/util/util/workers/bcrypt/BcryptWorkerPool"; import { Stopwatch, TimeSpan } from "@spacebar/extensions"; const router: Router = Router({ mergeParams: true }); diff --git a/src/api/routes/auth/reset.ts b/src/api/routes/auth/reset.ts index 5460b17d1..cbb13a1db 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"; +import { route } from "@spacebar/api/util/handlers/route"; import { 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 c83c654cd..0ea25a34d 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"; +import { route } from "@spacebar/api/util/handlers/route"; import { emitEvent } from "@spacebar/util"; import { SessionsLogoutSchema } from "@spacebar/schemas"; import { Session } from "@spacebar/database"; diff --git a/src/api/routes/auth/verify/resend.ts b/src/api/routes/auth/verify/resend.ts index 98d5d69ce..5aa0b6f82 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 4cfd476ba..85b57bac7 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 0aaad2bbb..6dd4c084d 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 22c1904f4..7bd1adbe8 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 8a14a135a..7cdad8c66 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 98958d561..dc2ad1ba6 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 c1c08781b..c9c3c9b0b 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 1c8572612..e6069b9f1 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 6375a239d..a6896cb7c 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 ec187d8cb..d0e0adbc2 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 2aad157df..0db480a67 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"; +import { route } from "@spacebar/api/util/handlers/route"; import { Request, Response, Router } from "express"; const router = Router({ mergeParams: true }); 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 709b7c73a..6348737ad 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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/bulk-delete.ts b/src/api/routes/channels/#channel_id/messages/bulk-delete.ts index 70cbb3e41..ba5b54de6 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"; +import { route } from "@spacebar/api/util/handlers/route"; import { Channel, Message } from "@spacebar/database"; import { Config, emitEvent, getPermission, getRights, MessageDeleteBulkEvent } from "@spacebar/util"; 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 766af429d..443112b9e 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 ab55f8ca9..4cb7b897d 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 b1129d215..2f0a0de38 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 27aeaac4a..136ac34ef 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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/post-data.ts b/src/api/routes/channels/#channel_id/post-data.ts index f8359f99f..8e593d65f 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 69bdd4e76..d1bef5043 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 7e7c5d348..4acc1cb66 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 73ca8a9d1..8e9f20438 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 036bc3dc9..837fb6c2a 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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/typing.ts b/src/api/routes/channels/#channel_id/typing.ts index b8ef6433d..930672b09 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 0dac75747..4c8e470d7 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"; +import { route } from "@spacebar/api/util/handlers/route"; import { Application, Channel, User, Webhook } from "@spacebar/database"; import { Config, DiscordApiErrors, handleFile, ValidateName } from "@spacebar/util"; import { isTextChannel, WebhookCreateSchema, WebhookType } from "@spacebar/schemas"; diff --git a/src/api/routes/channels/preload-messages.ts b/src/api/routes/channels/preload-messages.ts index 39fbd9842..80e0ddf78 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"; +import { route } from "@spacebar/api/util/handlers/route"; import { Message } from "@spacebar/database"; import { Config } from "@spacebar/util"; import { PreloadMessagesRequestSchema, PreloadMessagesResponseSchema } from "@spacebar/schemas"; diff --git a/src/api/routes/collectibles-categories.ts b/src/api/routes/collectibles-categories.ts index ffeff099b..c71fde1c3 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 756c80c56..3d69a9745 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 f575f0a09..4488cc861 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 7d3d03eb4..fadc2a616 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 7fc725309..a162b6894 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 f63d13235..cf6fcbd37 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 bc850bc33..dc22126a5 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 1afe7b235..487284033 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 9af0f47c4..3420bc1c7 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 d7556fd2c..e9775e01c 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"; +import { route } from "@spacebar/api/util/handlers/route"; import { 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 9dd54cc0f..eb9d08494 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"; +import { route } from "@spacebar/api/util/handlers/route"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/games/detectable.ts b/src/api/routes/games/detectable.ts index e1415ea33..997bbb95f 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 34a648cda..e77c19148 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 b85fcd9f6..d0bb8a3fc 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 cd20b8d44..13c246590 100644 --- a/src/api/routes/gifs/search.ts +++ b/src/api/routes/gifs/search.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api"; +import { route } from "@spacebar/api/util/handlers/route"; import { getGifApiKey, parseGifResult } from "@spacebar/util"; import { Request, Response, Router } from "express"; import { TenorGif, TenorMediaTypes } from "@spacebar/schemas"; diff --git a/src/api/routes/gifs/trending-gifs.ts b/src/api/routes/gifs/trending-gifs.ts index 99aa528b6..14d3d4dc1 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"; +import { route } from "@spacebar/api/util/handlers/route"; import { getGifApiKey, parseGifResult } from "@spacebar/util"; import { Request, Response, Router } from "express"; import { TenorGif, TenorMediaTypes } from "@spacebar/schemas"; diff --git a/src/api/routes/gifs/trending.ts b/src/api/routes/gifs/trending.ts index 4a7a3f3ce..1393d6b5b 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"; +import { route } from "@spacebar/api/util/handlers/route"; import { getGifApiKey, parseGifResult } from "@spacebar/util"; import { Request, Response, Router } from "express"; import { TenorCategoriesResults, TenorTrendingResults } from "@spacebar/schemas"; diff --git a/src/api/routes/guild-recommendations.ts b/src/api/routes/guild-recommendations.ts index 0245af831..9587e8587 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 f2e5cddca..e9342e90e 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 b3bfab3c4..ccbe4dc6e 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 6ad578999..dc4328d11 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 6afac611e..c844d55b7 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 29d7e3a1c..ab1affec7 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 267adc161..09bcaa549 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 88d222c0f..c306dd1b0 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 d11d9d917..4f6c320d5 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 1d88de5d7..6aadc2b14 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 72e59f875..a3767d4c4 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 7eb088e12..2b3676322 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 aadd040a8..697df8db2 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 aaf95a851..88d6c0359 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 ef5b3bf50..bfe8bb2e9 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 4932bec9f..b8b6d3648 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 6874abbb3..f27cf86b2 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 942da645d..3c97a289f 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 c3c4b3405..ca6d40ed4 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 f73de1190..a5b577786 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 3156629be..07d2a64b5 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 8352a3794..08ea7ee53 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 7b19737e3..6b8a1f561 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"; +import { route } from "@spacebar/api/util/handlers/route"; import { Guild, Member } from "@spacebar/database"; import { Snowflake } from "@spacebar/util"; 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 b3c276df9..823d14bd9 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 20ec5dacd..7e05902ee 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 349db75db..8bf1fbd08 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 5f792222d..403d886b4 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 2aa8aaece..a823a37f3 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 5ccf082c7..18803a9dd 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 127d30f31..ee45f01b0 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 b6d513735..613ee5166 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 6a182fb3a..8db0ac681 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 75824e9d3..5d0e60ad2 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 4b46af012..506ea5186 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"; +import { route } from "@spacebar/api/util/handlers/route"; import { Webhook } from "@spacebar/database"; import { Config } from "@spacebar/util"; diff --git a/src/api/routes/guilds/#guild_id/welcome-screen.ts b/src/api/routes/guilds/#guild_id/welcome-screen.ts index c60cf4f6d..878d5c98f 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 9cb4d928b..4f875c058 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 aad2da1bd..58465d452 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 2e2b31181..397c6099b 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 b1027cae6..abf4f89fd 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 f9370f270..f4561691e 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 d934d2998..b203e15dc 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 bd9a8253f..d95a7f9da 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"; +import { route } from "@spacebar/api/util/handlers/route"; import { HubWaitlistSignupResponse, HubWaitlistSignupSchema } from "@spacebar/schemas"; import { Request, Response, Router } from "express"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/interactions/index.ts b/src/api/routes/interactions/index.ts index 47b189fd9..a556c380b 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 323511ceb..0728d77ed 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 4fd687802..1fd4aa847 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 55ae6a1db..f4c27f995 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 27aa1e7c3..96ba21e7a 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 6641df6ad..18b7fbd9e 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 7592d2362..e0c0a4ae0 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"; +import { route } from "@spacebar/api/util/handlers/route"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/ping.ts b/src/api/routes/ping.ts index 2a5ec6aa5..c81182495 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 686ecd1e2..f1fc0d0f4 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 3d3303708..b263bb231 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 31e80bdf0..da3696c98 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 380d9e1a5..3005a6cde 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 043dbb269..89a238780 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 c9c903d46..73364efab 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 277b4bca9..b8c1057d3 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 ee55370b6..5e83d1292 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 043f73643..0c7684e93 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 bf8fa5587..a0d9e5e97 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"; +import { route } from "@spacebar/api/util/handlers/route"; const router = Router({ mergeParams: true }); router.get( diff --git a/src/api/routes/science.ts b/src/api/routes/science.ts index 4a6ddeab3..3d6091378 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 6641df6ad..18b7fbd9e 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 86a18ef6b..6b1f9f12a 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 ac265c64e..0deec2f0c 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 e04b46ba6..836c72ccf 100644 --- a/src/api/routes/stop.ts +++ b/src/api/routes/stop.ts @@ -18,7 +18,7 @@ import { route, SpacebarServer } from "@spacebar/api"; import { Request, Response, Router } from "express"; -import { ProcessLifecycle } from "../../util/util/ProcessLifecycle"; +import { ProcessLifecycle } from "@spacebar/util/util/ProcessLifecycle"; const router: Router = Router({ mergeParams: true }); 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 bffb572bd..f3f2bc195 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 a59eaae5e..73b6b43c7 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 01bbc8b27..2c354b8bc 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 13db49d69..1660c4aaf 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"; +import { route } from "@spacebar/api/util/handlers/route"; const router: Router = Router({ mergeParams: true }); diff --git a/src/api/routes/teams.ts b/src/api/routes/teams.ts index fa3a24134..4a668f528 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 fe33b5028..4306068cf 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"; +import { route } from "@spacebar/api/util/handlers/route"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/updates.ts b/src/api/routes/updates.ts index ca14507f4..79b609dfe 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 cf3fb2541..ceedb3aa4 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 82a19420c..a0d7ba6e0 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 1e32ca453..c15801c09 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 bbe8faed7..e2f962d18 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 255d12c3e..999542f64 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 b01191611..5d4c2537b 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 8de9aa58b..098c78a54 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 2f6662526..ffbdd4fec 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 6641df6ad..18b7fbd9e 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 b60818d24..c62d545c1 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 c5aa8603c..6942aff6c 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 1380ed52b..b1a55106c 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 6641df6ad..18b7fbd9e 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 081aa862a..9032103da 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 f7d246231..1260eb823 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 26f23ed68..29c2edcb1 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 595f33b50..a826c3f83 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 f633b35e7..857cc0039 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 9dffbef36..012a3d6c0 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 aa112dca5..4007c4363 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 d32061388..c9f249767 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"; +import { route } from "@spacebar/api/util/handlers/route"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/users/@me/disable.ts b/src/api/routes/users/@me/disable.ts index 7ae17b498..83f460c19 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 ede735326..6bab5f905 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"; +import { route } from "@spacebar/api/util/handlers/route"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/users/@me/entitlements.ts b/src/api/routes/users/@me/entitlements.ts index ac73a12c7..1f4205349 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"; +import { route } from "@spacebar/api/util/handlers/route"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/users/@me/guilds.ts b/src/api/routes/users/@me/guilds.ts index 50f5a59ca..592bb7223 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 157ad985b..04f966eaa 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 b01191611..5d4c2537b 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"; +import { route } from "@spacebar/api/util/handlers/route"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/users/@me/index.ts b/src/api/routes/users/@me/index.ts index ecb0b35cb..29a05ccb7 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 8d09b38d3..9c28cb98f 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"; +import { route } from "@spacebar/api/util/handlers/route"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/users/@me/mentions.ts b/src/api/routes/users/@me/mentions.ts index 88d7ebb0b..c372abe80 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 ca6447f3b..2fd1dd329 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 26f555bde..969ff78fa 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 c75365ace..6fa9f6933 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 fd098c2de..472360c20 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 c15a01441..32e60af5a 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 774c41388..a7f1c20a6 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 b988b2cdd..667bf163e 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 6a6db5e4e..319514182 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 531dcdcbd..e4879baa3 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 e4e9ff1d3..d242ec357 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"; +import { route } from "@spacebar/api/util/handlers/route"; 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 3bf8b887a..6bbc8ea00 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"; +import { route } from "@spacebar/api/util/handlers/route"; import { Session, User, UserSettings } from "@spacebar/database"; import { emitEvent, PresenceUpdateEvent } from "@spacebar/util"; import { UserSettingsUpdateSchema } from "@spacebar/schemas"; diff --git a/src/api/routes/warp/license.ts b/src/api/routes/warp/license.ts index 7ac8eb5c8..0d92ed168 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"; +import { route } from "@spacebar/api/util/handlers/route"; import { Request, Response, Router } from "express"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/webhooks/#webhook_id/#token/index.ts b/src/api/routes/webhooks/#webhook_id/#token/index.ts index a3984a852..e5f52c3db 100644 --- a/src/api/routes/webhooks/#webhook_id/#token/index.ts +++ b/src/api/routes/webhooks/#webhook_id/#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"; +import { route } from "@spacebar/api/util/handlers/route"; import { Webhook } 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/index.ts b/src/api/routes/webhooks/#webhook_id/index.ts index 71a02b228..78eb27e65 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"; +import { route } from "@spacebar/api/util/handlers/route"; import { Webhook, Channel, Message } from "@spacebar/database"; import { Config, DiscordApiErrors, getPermission, WebhooksUpdateEvent, emitEvent, handleFile, ValidateName, MessageDeleteBulkEvent } from "@spacebar/util"; import { WebhookUpdateSchema } from "@spacebar/schemas"; diff --git a/src/database/entities/Attachment.ts b/src/database/entities/Attachment.ts index b9756bf71..9631e74b2 100644 --- a/src/database/entities/Attachment.ts +++ b/src/database/entities/Attachment.ts @@ -17,10 +17,10 @@ */ import { BeforeRemove, Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm"; -import { Config, deleteFile } from "../../util/util"; +import { Config, deleteFile } from "@spacebar/util/util"; +import { getUrlSignature, NewUrlUserSignatureData, NewUrlSignatureData } from "@spacebar/util/Signing"; +import { PublicAttachment } from "@spacebar/schemas/api/messages/Attachments"; import { BaseClass } from "./BaseClass"; -import { getUrlSignature, NewUrlUserSignatureData, NewUrlSignatureData } from "../../util/Signing"; -import { PublicAttachment } from "../../schemas/api/messages/Attachments"; @Entity({ name: "attachments", diff --git a/src/database/entities/BackupCodes.ts b/src/database/entities/BackupCodes.ts index 88fe932e4..47dfc454b 100644 --- a/src/database/entities/BackupCodes.ts +++ b/src/database/entities/BackupCodes.ts @@ -20,7 +20,7 @@ import { Column, Entity, JoinColumn, ManyToOne } from "typeorm"; import { BaseClass } from "./BaseClass"; import { User } from "./User"; import crypto from "node:crypto"; -import { Config } from "../../util/util"; +import { Config } from "@spacebar/util/util"; @Entity({ name: "backup_codes", diff --git a/src/database/entities/BaseClass.ts b/src/database/entities/BaseClass.ts index 770c96e8d..730a769f4 100644 --- a/src/database/entities/BaseClass.ts +++ b/src/database/entities/BaseClass.ts @@ -18,9 +18,9 @@ import { BaseEntity, BeforeInsert, BeforeUpdate, FindOptionsWhere, PrimaryColumn } from "typeorm"; import { getDatabase } from "../Database"; -import { Snowflake } from "../../util/util/Snowflake"; +import { Snowflake } from "@spacebar/util/util/Snowflake"; import { OrmUtils } from "../../util/imports/OrmUtils"; -import { annotationsKey } from "../../util/util/Decorators"; +import { annotationsKey } from "@spacebar/util/util/Decorators"; export class BaseClassWithoutId extends BaseEntity { private get construct() { diff --git a/src/database/entities/Channel.ts b/src/database/entities/Channel.ts index 1543d20b0..85ffcd8a0 100644 --- a/src/database/entities/Channel.ts +++ b/src/database/entities/Channel.ts @@ -20,7 +20,7 @@ import { HTTPError } from "lambert-server/HTTPError"; import { Column, Entity, JoinColumn, ManyToOne, OneToMany, RelationId } from "typeorm"; import { DmChannelDTO } from "../../util/dtos"; import { ChannelCreateEvent, ChannelRecipientRemoveEvent, ThreadCreateEvent, ThreadMembersUpdateEvent } from "../../util/interfaces"; -import { InvisibleCharacters, Snowflake, emitEvent, getPermission, Permissions, Config, DiscordApiErrors } from "../../util/util"; +import { InvisibleCharacters, Snowflake, emitEvent, getPermission, Permissions, Config, DiscordApiErrors } from "@spacebar/util/util"; import { BaseClass } from "./BaseClass"; import { Guild } from "./Guild"; import { Invite } from "./Invite"; diff --git a/src/database/entities/Member.ts b/src/database/entities/Member.ts index e8e186602..75f38f883 100644 --- a/src/database/entities/Member.ts +++ b/src/database/entities/Member.ts @@ -21,7 +21,7 @@ import { BeforeInsert, BeforeUpdate, Column, Entity, Index, JoinColumn, JoinTabl import { Ban, Channel, PublicGuildRelations } from "./index"; import { ReadyGuildDTO } from "../../util/dtos"; import { GuildCreateEvent, GuildDeleteEvent, GuildMemberAddEvent, GuildMemberRemoveEvent, GuildMemberUpdateEvent, MessageCreateEvent } from "../../util/interfaces"; -import { Config, emitEvent, DiscordApiErrors } from "../../util/util"; +import { Config, emitEvent, DiscordApiErrors } from "@spacebar/util/util"; import { BaseClassWithoutId } from "./BaseClass"; import { Guild } from "./Guild"; import { Message } from "./Message"; diff --git a/src/database/entities/Message.ts b/src/database/entities/Message.ts index 31e6a0e42..edcce4948 100644 --- a/src/database/entities/Message.ts +++ b/src/database/entities/Message.ts @@ -44,7 +44,7 @@ import { InteractionType, } from "@spacebar/schemas"; import { MessageFlags } from "@spacebar/util"; -import { JsonRemoveEmpty } from "../../util/util/Decorators"; +import { JsonRemoveEmpty } from "@spacebar/util/util/Decorators"; @Entity({ name: "messages", diff --git a/src/database/entities/ReportMenu.ts b/src/database/entities/ReportMenu.ts index a37ae159d..8a4909d75 100644 --- a/src/database/entities/ReportMenu.ts +++ b/src/database/entities/ReportMenu.ts @@ -18,7 +18,7 @@ import { BaseClass } from "./BaseClass"; import { Entity, Column } from "typeorm"; -import { ReportMenuType } from "../../schemas/api/reports/ReportMenu"; +import { ReportMenuType } from "@spacebar/schemas/api/reports/ReportMenu"; @Entity({ name: "report_menus", diff --git a/src/database/entities/ThreadMember.ts b/src/database/entities/ThreadMember.ts index fdda4eeaf..52729dd95 100644 --- a/src/database/entities/ThreadMember.ts +++ b/src/database/entities/ThreadMember.ts @@ -18,7 +18,7 @@ import { Column, Entity, Index, JoinColumn, ManyToOne, PrimaryGeneratedColumn, RelationId } from "typeorm"; import { ThreadMembersUpdateEvent } from "../../util/interfaces"; -import { emitEvent } from "../../util/util"; +import { emitEvent } from "@spacebar/util/util"; import { BaseClassWithoutId } from "./BaseClass"; import { Channel } from "./Channel"; import { HTTPError } from "lambert-server/HTTPError"; diff --git a/src/database/entities/User.ts b/src/database/entities/User.ts index 434f16303..59128a35e 100644 --- a/src/database/entities/User.ts +++ b/src/database/entities/User.ts @@ -39,7 +39,7 @@ import { PublicUserProjection, UserPrivate, } from "@spacebar/schemas"; -import { JsonNumber } from "../../util/util/Decorators"; +import { JsonNumber } from "@spacebar/util/util/Decorators"; @Entity({ name: "users", diff --git a/src/gateway/events/Close.ts b/src/gateway/events/Close.ts index 366e3b7c3..d532894c8 100644 --- a/src/gateway/events/Close.ts +++ b/src/gateway/events/Close.ts @@ -20,7 +20,7 @@ import { Member, Session, User, VoiceState } from "@spacebar/database"; import { Random } from "@spacebar/extensions"; import { WebSocket } from "@spacebar/gateway"; import { emitEvent, PresenceUpdateEvent, SessionsReplace, VoiceStateUpdateEvent, distributePresenceUpdate } from "@spacebar/util"; -import { ProcessLifecycle } from "../../util/util/ProcessLifecycle"; +import { ProcessLifecycle } from "@spacebar/util/util/ProcessLifecycle"; export async function Close(this: WebSocket, code: number, reason: Buffer) { console.log("[WebSocket] closed", code, reason.toString()); diff --git a/src/gateway/events/Connection.ts b/src/gateway/events/Connection.ts index 8daa5998f..d6a1e33c3 100644 --- a/src/gateway/events/Connection.ts +++ b/src/gateway/events/Connection.ts @@ -29,7 +29,7 @@ import { Deflate, Inflate } from "fast-zlib"; import { URL } from "node:url"; import { Config } from "@spacebar/util"; import { Decoder, Encoder } from "@toondepauw/node-zstd"; -import { ProcessLifecycle } from "../../util/util/ProcessLifecycle"; +import { ProcessLifecycle } from "@spacebar/util/util/ProcessLifecycle"; import { Monitoring } from "../../util/monitoring/Monitoring"; import { Gauge } from "prom-client";