From 2c1be0fa53ca2b8efb5b04de3e2bd41b61917c69 Mon Sep 17 00:00:00 2001 From: Rory& Date: Thu, 11 Jun 2026 18:16:31 +0200 Subject: Use subpath imports for lambert-server, fix openapi.js --- src/api/Server.ts | 2 +- src/api/middlewares/Authentication.ts | 2 +- src/api/middlewares/BodyParser.ts | 2 +- src/api/middlewares/ErrorHandler.ts | 2 +- src/api/routes/applications/#application_id/bot/index.ts | 2 +- src/api/routes/applications/#application_id/index.ts | 2 +- src/api/routes/applications/@me.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/verify/resend.ts | 2 +- src/api/routes/channels/#channel_id/invites.ts | 2 +- src/api/routes/channels/#channel_id/messages/#message_id/index.ts | 2 +- src/api/routes/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/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/purge.ts | 2 +- src/api/routes/channels/#channel_id/tags.ts | 2 +- src/api/routes/channels/#channel_id/threads.ts | 2 +- src/api/routes/channels/#channel_id/webhooks.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/delete.ts | 2 +- src/api/routes/guilds/#guild_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/roles/#role_id/index.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 +- src/api/routes/guilds/#guild_id/widget.png.ts | 2 +- src/api/routes/guilds/automations/email-domain-lookup.ts | 2 +- src/api/routes/guilds/templates/index.ts | 2 +- .../routes/interactions/#interaction_id/#interaction_token/callback.ts | 2 +- src/api/routes/invites/index.ts | 2 +- src/api/routes/reporting/index.ts | 2 +- src/api/routes/teams.ts | 2 +- src/api/routes/users/@me/delete.ts | 2 +- src/api/routes/users/@me/guilds.ts | 2 +- src/api/routes/users/@me/mfa/totp/disable.ts | 2 +- src/api/routes/users/@me/mfa/totp/enable.ts | 2 +- src/api/routes/users/@me/mfa/webauthn/credentials/index.ts | 2 +- src/api/routes/users/@me/relationships.ts | 2 +- src/api/routes/webhooks/#webhook_id/#token/github.ts | 2 +- src/api/routes/webhooks/#webhook_id/#token/index.ts | 2 +- src/api/routes/webhooks/#webhook_id/index.ts | 2 +- src/api/util/handlers/Message.ts | 2 +- src/api/util/handlers/Webhook.ts | 2 +- 51 files changed, 51 insertions(+), 51 deletions(-) (limited to 'src/api') diff --git a/src/api/Server.ts b/src/api/Server.ts index 9e4bb937..f48f7220 100644 --- a/src/api/Server.ts +++ b/src/api/Server.ts @@ -19,7 +19,7 @@ import path from "node:path"; import { Request, Response, Router } from "express"; import morgan from "morgan"; -import { Server, ServerOptions } from "lambert-server"; +import { Server, ServerOptions } from "lambert-server/Server"; import { red } from "picocolors"; import { Config, ConnectionConfig, ConnectionLoader, Email, JSONReplacer, WebAuthn, initDatabase, initEvent, registerRoutes, getDatabase, getRevInfoOrFail } from "@spacebar/util"; import { Authentication, CORS, ImageProxy, BodyParser, ErrorHandler, initRateLimits, initTranslation } from "./middlewares"; diff --git a/src/api/middlewares/Authentication.ts b/src/api/middlewares/Authentication.ts index a35c5fbc..f6741342 100644 --- a/src/api/middlewares/Authentication.ts +++ b/src/api/middlewares/Authentication.ts @@ -18,7 +18,7 @@ import { checkToken, Rights, Session, User, UserTokenData } from "@spacebar/util"; import { NextFunction, Request, Response } from "express"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; export const NO_AUTHORIZATION_ROUTES = [ // Authentication routes diff --git a/src/api/middlewares/BodyParser.ts b/src/api/middlewares/BodyParser.ts index a579abb3..7de916b6 100644 --- a/src/api/middlewares/BodyParser.ts +++ b/src/api/middlewares/BodyParser.ts @@ -18,7 +18,7 @@ import bodyParser, { OptionsJson } from "body-parser"; import { NextFunction, Request, Response } from "express"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; const errorMessages: { [key: string]: [string, number] } = { "entity.too.large": ["Request body too large", 413], diff --git a/src/api/middlewares/ErrorHandler.ts b/src/api/middlewares/ErrorHandler.ts index 2d17f1a2..052f2a3a 100644 --- a/src/api/middlewares/ErrorHandler.ts +++ b/src/api/middlewares/ErrorHandler.ts @@ -17,7 +17,7 @@ */ import { NextFunction, Request, Response } from "express"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; import { ApiError, FieldError } from "@spacebar/util"; const EntityNotFoundErrorRegex = /"(\w+)"/; diff --git a/src/api/routes/applications/#application_id/bot/index.ts b/src/api/routes/applications/#application_id/bot/index.ts index a5eb3127..bd871745 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 { route } from "@spacebar/api"; import { Application, DiscordApiErrors, FieldErrors, User, createAppBotUser, generateToken, handleFile } from "@spacebar/util"; import { Request, Response, Router } from "express"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; import { verifyToken } from "node-2fa"; import { BotModifySchema } from "@spacebar/schemas"; diff --git a/src/api/routes/applications/#application_id/index.ts b/src/api/routes/applications/#application_id/index.ts index 64fac23c..5b885332 100644 --- a/src/api/routes/applications/#application_id/index.ts +++ b/src/api/routes/applications/#application_id/index.ts @@ -19,7 +19,7 @@ import { route } from "@spacebar/api"; import { Application, DiscordApiErrors, FieldErrors, Guild, handleFile, User } from "@spacebar/util"; import { Request, Response, Router } from "express"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; import { verifyToken } from "node-2fa"; import { ApplicationModifySchema } from "@spacebar/schemas"; diff --git a/src/api/routes/applications/@me.ts b/src/api/routes/applications/@me.ts index d3d8c70f..887dcb13 100644 --- a/src/api/routes/applications/@me.ts +++ b/src/api/routes/applications/@me.ts @@ -19,7 +19,7 @@ import { route } from "@spacebar/api"; import { Application, Guild, handleFile } from "@spacebar/util"; import { Request, Response, Router } from "express"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; import { ApplicationModifySchema } from "@spacebar/schemas"; const router: Router = Router({ mergeParams: true }); diff --git a/src/api/routes/auth/mfa/totp.ts b/src/api/routes/auth/mfa/totp.ts index d50f2d0e..1696f114 100644 --- a/src/api/routes/auth/mfa/totp.ts +++ b/src/api/routes/auth/mfa/totp.ts @@ -19,7 +19,7 @@ import { route } from "@spacebar/api"; import { BackupCode, User, generateToken } from "@spacebar/util"; import { Request, Response, Router } from "express"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; import { verifyToken } from "node-2fa"; import { TotpSchema } from "@spacebar/schemas"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/auth/mfa/webauthn.ts b/src/api/routes/auth/mfa/webauthn.ts index 8e6c5f03..645c7100 100644 --- a/src/api/routes/auth/mfa/webauthn.ts +++ b/src/api/routes/auth/mfa/webauthn.ts @@ -20,7 +20,7 @@ import { route } from "@spacebar/api"; import { generateToken, SecurityKey, User, verifyWebAuthnToken, WebAuthn } from "@spacebar/util"; import { Request, Response, Router } from "express"; import { ExpectedAssertionResult } from "fido2-lib"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; import { WebAuthnTotpSchema } from "@spacebar/schemas"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/auth/register.ts b/src/api/routes/auth/register.ts index 4f2f4a7d..a937b6a6 100644 --- a/src/api/routes/auth/register.ts +++ b/src/api/routes/auth/register.ts @@ -20,7 +20,7 @@ import { route, verifyCaptcha } from "@spacebar/api"; import { Config, FieldErrors, Invite, User, ValidRegistrationToken, generateToken, IpDataClient, AbuseIpDbClient, TimeSpan, Stopwatch } from "@spacebar/util"; import bcrypt from "bcrypt"; import { Request, Response, Router } from "express"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; import { MoreThan } from "typeorm"; import { RegisterSchema } from "@spacebar/schemas"; import { BcryptWorkerPool } from "../../../util/util/workers/bcrypt/BcryptWorkerPool"; diff --git a/src/api/routes/auth/verify/resend.ts b/src/api/routes/auth/verify/resend.ts index 0d647be9..29175696 100644 --- a/src/api/routes/auth/verify/resend.ts +++ b/src/api/routes/auth/verify/resend.ts @@ -19,7 +19,7 @@ import { route } from "@spacebar/api"; import { Email, User } from "@spacebar/util"; import { Request, Response, Router } from "express"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; const router = Router({ mergeParams: true }); router.post( diff --git a/src/api/routes/channels/#channel_id/invites.ts b/src/api/routes/channels/#channel_id/invites.ts index 55b9ee11..44e431dc 100644 --- a/src/api/routes/channels/#channel_id/invites.ts +++ b/src/api/routes/channels/#channel_id/invites.ts @@ -19,7 +19,7 @@ import { randomString, route } from "@spacebar/api"; import { Channel, Guild, Invite, InviteCreateEvent, PublicInviteRelation, User, emitEvent } from "@spacebar/util"; import { Request, Response, Router } from "express"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; import { InviteCreateSchema, isTextChannel } from "@spacebar/schemas"; const router: Router = Router({ mergeParams: true }); diff --git a/src/api/routes/channels/#channel_id/messages/#message_id/index.ts b/src/api/routes/channels/#channel_id/messages/#message_id/index.ts index eed36691..749121dd 100644 --- a/src/api/routes/channels/#channel_id/messages/#message_id/index.ts +++ b/src/api/routes/channels/#channel_id/messages/#message_id/index.ts @@ -32,7 +32,7 @@ import { NewUrlUserSignatureData, } from "@spacebar/util"; import { Request, Response, Router } from "express"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; import multer from "multer"; import { handleMessage, postHandleMessage, route } from "@spacebar/api"; import { MessageCreateAttachment, MessageCreateCloudAttachment, MessageCreateSchema, MessageEditSchema, ChannelType } from "@spacebar/schemas"; 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 839ae6ee..aa64d8c5 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 @@ -33,7 +33,7 @@ import { ReactionType, } from "@spacebar/util"; import { Request, Response, Router } from "express"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; import { In } from "typeorm"; import { PartialEmoji, PublicMemberProjection, PublicUserProjection } from "@spacebar/schemas"; diff --git a/src/api/routes/channels/#channel_id/messages/bulk-delete.ts b/src/api/routes/channels/#channel_id/messages/bulk-delete.ts index 2fe874f1..d0f2a4f5 100644 --- a/src/api/routes/channels/#channel_id/messages/bulk-delete.ts +++ b/src/api/routes/channels/#channel_id/messages/bulk-delete.ts @@ -19,7 +19,7 @@ import { route } from "@spacebar/api"; import { Channel, Config, emitEvent, getPermission, getRights, Message, MessageDeleteBulkEvent } from "@spacebar/util"; import { Request, Response, Router } from "express"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; const router: Router = Router({ mergeParams: true }); diff --git a/src/api/routes/channels/#channel_id/messages/index.ts b/src/api/routes/channels/#channel_id/messages/index.ts index b117e3ac..d23443cb 100644 --- a/src/api/routes/channels/#channel_id/messages/index.ts +++ b/src/api/routes/channels/#channel_id/messages/index.ts @@ -44,7 +44,7 @@ import { ThreadCreateEvent, } from "@spacebar/util"; import { Request, Response, Router } from "express"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; import multer from "multer"; import { FindManyOptions, FindOperator, LessThan, MoreThan, MoreThanOrEqual } from "typeorm"; import { URL } from "node:url"; diff --git a/src/api/routes/channels/#channel_id/messages/search.ts b/src/api/routes/channels/#channel_id/messages/search.ts index 8363edc6..58a62bd8 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 { route } from "@spacebar/api"; import { Channel, FieldErrors, Message, getPermission } from "@spacebar/util"; import { Request, Response, Router } from "express"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; import { FindManyOptions, Like } from "typeorm"; const router: Router = Router({ mergeParams: true }); diff --git a/src/api/routes/channels/#channel_id/permissions.ts b/src/api/routes/channels/#channel_id/permissions.ts index 1525532a..62386177 100644 --- a/src/api/routes/channels/#channel_id/permissions.ts +++ b/src/api/routes/channels/#channel_id/permissions.ts @@ -18,7 +18,7 @@ import { Channel, ChannelUpdateEvent, emitEvent, Member, Role } from "@spacebar/util"; import { Request, Response, Router } from "express"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; import { route } from "@spacebar/api"; import { ChannelPermissionOverwriteSchema, ChannelPermissionOverwrite, ChannelPermissionOverwriteType } from "@spacebar/schemas"; diff --git a/src/api/routes/channels/#channel_id/purge.ts b/src/api/routes/channels/#channel_id/purge.ts index 38559bcc..ab8ae201 100644 --- a/src/api/routes/channels/#channel_id/purge.ts +++ b/src/api/routes/channels/#channel_id/purge.ts @@ -19,7 +19,7 @@ import { route } from "@spacebar/api"; import { Channel, Message, MessageDeleteBulkEvent, emitEvent, getPermission, getRights } from "@spacebar/util"; import { Request, Response, Router } from "express"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; import { Between, FindManyOptions, FindOperator, Not } from "typeorm"; import { isTextChannel, PurgeSchema } from "@spacebar/schemas"; diff --git a/src/api/routes/channels/#channel_id/tags.ts b/src/api/routes/channels/#channel_id/tags.ts index eafea6c4..3dec8a81 100644 --- a/src/api/routes/channels/#channel_id/tags.ts +++ b/src/api/routes/channels/#channel_id/tags.ts @@ -20,7 +20,7 @@ import { route } from "@spacebar/api"; import { Channel, ChannelUpdateEvent, emitEvent, Tag } from "@spacebar/util"; import { Request, Response, Router } from "express"; import { TagCreateSchema } from "@spacebar/schemas"; -import { HTTPError } from "#util/util/lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; const router: Router = Router({ mergeParams: true }); diff --git a/src/api/routes/channels/#channel_id/threads.ts b/src/api/routes/channels/#channel_id/threads.ts index ce7a9435..1fdc772d 100644 --- a/src/api/routes/channels/#channel_id/threads.ts +++ b/src/api/routes/channels/#channel_id/threads.ts @@ -37,7 +37,7 @@ import { ChannelType, MessageType, ThreadCreationSchema, MessageCreateAttachment import { Request, Response, Router } from "express"; import { messageUpload } from "./messages"; -import { HTTPError } from "#util/util/lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; import { FindManyOptions, FindOptionsOrder, In, Like, ArrayContains, ArrayOverlap } from "typeorm"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/channels/#channel_id/webhooks.ts b/src/api/routes/channels/#channel_id/webhooks.ts index 65597270..137e3139 100644 --- a/src/api/routes/channels/#channel_id/webhooks.ts +++ b/src/api/routes/channels/#channel_id/webhooks.ts @@ -20,7 +20,7 @@ import { route } from "@spacebar/api"; import { Channel, Config, DiscordApiErrors, User, Webhook, handleFile, trimSpecial, ValidateName, Application } from "@spacebar/util"; import crypto from "node:crypto"; import { Request, Response, Router } from "express"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; import { isTextChannel, WebhookCreateSchema, WebhookType } from "@spacebar/schemas"; const router: Router = Router({ mergeParams: true }); diff --git a/src/api/routes/guilds/#guild_id/auto-moderation/rules.ts b/src/api/routes/guilds/#guild_id/auto-moderation/rules.ts index 8b56ded9..7f7717d3 100644 --- a/src/api/routes/guilds/#guild_id/auto-moderation/rules.ts +++ b/src/api/routes/guilds/#guild_id/auto-moderation/rules.ts @@ -19,7 +19,7 @@ import { route } from "@spacebar/api"; import { User, AutomodRule } from "@spacebar/util"; import { Request, Response, Router } from "express"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; import { AutomodRuleSchema } from "@spacebar/schemas"; const router: Router = Router({ mergeParams: true }); diff --git a/src/api/routes/guilds/#guild_id/bans.ts b/src/api/routes/guilds/#guild_id/bans.ts index f2b36ec5..d6541d5f 100644 --- a/src/api/routes/guilds/#guild_id/bans.ts +++ b/src/api/routes/guilds/#guild_id/bans.ts @@ -19,7 +19,7 @@ import { route } from "@spacebar/api"; import { Ban, DiscordApiErrors, GuildBanAddEvent, GuildBanRemoveEvent, Member, User, emitEvent } from "@spacebar/util"; import { Request, Response, Router } from "express"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; import { BanCreateSchema, BanRegistrySchema, GuildBanResponse, GuildBansResponse, PublicUser } from "@spacebar/schemas"; const router: Router = Router({ mergeParams: true }); diff --git a/src/api/routes/guilds/#guild_id/bulk-ban.ts b/src/api/routes/guilds/#guild_id/bulk-ban.ts index 1831deb5..0d97ff75 100644 --- a/src/api/routes/guilds/#guild_id/bulk-ban.ts +++ b/src/api/routes/guilds/#guild_id/bulk-ban.ts @@ -19,7 +19,7 @@ import { route } from "@spacebar/api"; import { Ban, Config, DiscordApiErrors, GuildBanAddEvent, Member, User, emitEvent } from "@spacebar/util"; import { Request, Response, Router } from "express"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; const router: Router = Router({ mergeParams: true }); diff --git a/src/api/routes/guilds/#guild_id/delete.ts b/src/api/routes/guilds/#guild_id/delete.ts index 66f88c93..a855cf00 100644 --- a/src/api/routes/guilds/#guild_id/delete.ts +++ b/src/api/routes/guilds/#guild_id/delete.ts @@ -19,7 +19,7 @@ import { route } from "@spacebar/api"; import { Guild, GuildDeleteEvent, emitEvent } from "@spacebar/util"; import { Request, Response, Router } from "express"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/guilds/#guild_id/index.ts b/src/api/routes/guilds/#guild_id/index.ts index 1bf30e9d..115cd1a9 100644 --- a/src/api/routes/guilds/#guild_id/index.ts +++ b/src/api/routes/guilds/#guild_id/index.ts @@ -32,7 +32,7 @@ import { Config, } from "@spacebar/util"; import { Request, Response, Router } from "express"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; import { GuildCreateResponse, GuildUpdateSchema } from "@spacebar/schemas"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/guilds/#guild_id/members/index.ts b/src/api/routes/guilds/#guild_id/members/index.ts index 78a35d8f..2ca8e32c 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 { route } from "@spacebar/api"; import { Member } from "@spacebar/util"; import { Request, Response, Router } from "express"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; import { MoreThan } from "typeorm"; 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 adc76249..5c50d220 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 { route } from "@spacebar/api"; import { Channel, FieldErrors, Member, Message, Snowflake, getPermission } from "@spacebar/util"; import { Request, Response, Router } from "express"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; import { Between, FindManyOptions, FindOptionsWhere, In, LessThan, Like, MoreThan } from "typeorm"; const router: Router = Router({ mergeParams: true }); diff --git a/src/api/routes/guilds/#guild_id/roles/#role_id/index.ts b/src/api/routes/guilds/#guild_id/roles/#role_id/index.ts index 49c08098..eaacce76 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 @@ -19,7 +19,7 @@ import { route } from "@spacebar/api"; import { emitEvent, GuildRoleDeleteEvent, GuildRoleUpdateEvent, handleFile, Member, Role } from "@spacebar/util"; import { Request, Response, Router } from "express"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; import { RoleModifySchema } from "@spacebar/schemas"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/guilds/#guild_id/stickers.ts b/src/api/routes/guilds/#guild_id/stickers.ts index 09d955a1..7c3e2921 100644 --- a/src/api/routes/guilds/#guild_id/stickers.ts +++ b/src/api/routes/guilds/#guild_id/stickers.ts @@ -19,7 +19,7 @@ import { route } from "@spacebar/api"; import { GuildStickersUpdateEvent, Member, Snowflake, Sticker, emitEvent, uploadFile, Config, DiscordApiErrors } from "@spacebar/util"; import { Request, Response, Router } from "express"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; import multer from "multer"; import { ModifyGuildStickerSchema, StickerFormatType, StickerType } from "@spacebar/schemas"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/guilds/#guild_id/templates.ts b/src/api/routes/guilds/#guild_id/templates.ts index 54b7fce2..2719f88b 100644 --- a/src/api/routes/guilds/#guild_id/templates.ts +++ b/src/api/routes/guilds/#guild_id/templates.ts @@ -19,7 +19,7 @@ import { generateCode, route } from "@spacebar/api"; import { Guild, Template } from "@spacebar/util"; import { Request, Response, Router } from "express"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; const router: Router = Router({ mergeParams: true }); diff --git a/src/api/routes/guilds/#guild_id/vanity-url.ts b/src/api/routes/guilds/#guild_id/vanity-url.ts index ec3f0ab5..f5289072 100644 --- a/src/api/routes/guilds/#guild_id/vanity-url.ts +++ b/src/api/routes/guilds/#guild_id/vanity-url.ts @@ -19,7 +19,7 @@ import { route } from "@spacebar/api"; import { Channel, Guild, Invite } from "@spacebar/util"; import { Request, Response, Router } from "express"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; import { ChannelType, VanityUrlSchema } from "@spacebar/schemas"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/guilds/#guild_id/widget.png.ts b/src/api/routes/guilds/#guild_id/widget.png.ts index 000c1b45..e095548e 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 { route } from "@spacebar/api"; import { DiscordApiErrors, Guild } from "@spacebar/util"; import { Request, Response, Router } from "express"; import fs from "node:fs"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; import path from "node:path"; import { storage } from "@spacebar/cdn"; diff --git a/src/api/routes/guilds/automations/email-domain-lookup.ts b/src/api/routes/guilds/automations/email-domain-lookup.ts index 63ec39d4..b1027cae 100644 --- a/src/api/routes/guilds/automations/email-domain-lookup.ts +++ b/src/api/routes/guilds/automations/email-domain-lookup.ts @@ -20,7 +20,7 @@ import { route } from "@spacebar/api"; import { FieldErrors } from "@spacebar/util"; import emailProviders from "email-providers/all.json"; import { Request, Response, Router } from "express"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; import { EmailDomainLookupResponse, EmailDomainLookupSchema, EmailDomainLookupVerifyCodeSchema } from "@spacebar/schemas"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/guilds/templates/index.ts b/src/api/routes/guilds/templates/index.ts index 6eb6ffbe..a14f73dd 100644 --- a/src/api/routes/guilds/templates/index.ts +++ b/src/api/routes/guilds/templates/index.ts @@ -19,7 +19,7 @@ import { route } from "@spacebar/api"; import { Config, DiscordApiErrors, Guild, Member, Tag, Template } from "@spacebar/util"; import { Request, Response, Router } from "express"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; import { ChannelType, GuildTemplateCreateSchema } from "@spacebar/schemas"; const router: Router = Router({ mergeParams: true }); diff --git a/src/api/routes/interactions/#interaction_id/#interaction_token/callback.ts b/src/api/routes/interactions/#interaction_id/#interaction_token/callback.ts index d8ec9c26..6ba97b6f 100644 --- a/src/api/routes/interactions/#interaction_id/#interaction_token/callback.ts +++ b/src/api/routes/interactions/#interaction_id/#interaction_token/callback.ts @@ -20,7 +20,7 @@ import { BaseMessageComponents, InteractionCallbackSchema, InteractionCallbacksS import { handleComps, route, sendMessage } from "@spacebar/api"; import { Request, Response, Router } from "express"; import { Config, emitEvent, InteractionSuccessEvent, Message, MessageUpdateEvent, pendingInteractions, User, InteractionFailureEvent } from "@spacebar/util"; -import { HTTPError } from "#util/util/lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/invites/index.ts b/src/api/routes/invites/index.ts index 546f42ef..421d5670 100644 --- a/src/api/routes/invites/index.ts +++ b/src/api/routes/invites/index.ts @@ -19,7 +19,7 @@ import { route } from "@spacebar/api"; import { Ban, Config, DiscordApiErrors, emitEvent, getPermission, Guild, Invite, InviteDeleteEvent, PublicInviteRelation } from "@spacebar/util"; import { Request, Response, Router } from "express"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; import { UserFlags } from "@spacebar/schemas"; const router: Router = Router({ mergeParams: true }); diff --git a/src/api/routes/reporting/index.ts b/src/api/routes/reporting/index.ts index 27d284d7..277b4bca 100644 --- a/src/api/routes/reporting/index.ts +++ b/src/api/routes/reporting/index.ts @@ -19,7 +19,7 @@ import fs from "node:fs"; import path from "node:path"; import { Request, Response, Router } from "express"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; import { route } from "@spacebar/api"; import { ReportMenuType, ReportMenuTypeNames, CreateReportSchema } from "@spacebar/schemas"; import { FieldErrors } from "@spacebar/util"; diff --git a/src/api/routes/teams.ts b/src/api/routes/teams.ts index 9e900df1..da0ea784 100644 --- a/src/api/routes/teams.ts +++ b/src/api/routes/teams.ts @@ -19,7 +19,7 @@ import { Request, Response, Router } from "express"; import { route } from "@spacebar/api"; import { Team, TeamMember, User } from "@spacebar/util"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; import { TeamCreateSchema, TeamMemberRole, TeamMemberState } from "@spacebar/schemas"; const router: Router = Router({ mergeParams: true }); diff --git a/src/api/routes/users/@me/delete.ts b/src/api/routes/users/@me/delete.ts index 3d5fa642..fab936a7 100644 --- a/src/api/routes/users/@me/delete.ts +++ b/src/api/routes/users/@me/delete.ts @@ -20,7 +20,7 @@ import { route } from "@spacebar/api"; import { Guild, Member, User, UserSettingsProtos } from "@spacebar/util"; import bcrypt from "bcrypt"; import { Request, Response, Router } from "express"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/users/@me/guilds.ts b/src/api/routes/users/@me/guilds.ts index 8751c3c8..d64054ef 100644 --- a/src/api/routes/users/@me/guilds.ts +++ b/src/api/routes/users/@me/guilds.ts @@ -19,7 +19,7 @@ import { route } from "@spacebar/api"; import { Config, Guild, Member } from "@spacebar/util"; import { Request, Response, Router } from "express"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; const router: Router = Router({ mergeParams: true }); diff --git a/src/api/routes/users/@me/mfa/totp/disable.ts b/src/api/routes/users/@me/mfa/totp/disable.ts index 40251bcb..b26161a3 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 { route } from "@spacebar/api"; import { BackupCode, User, generateToken } from "@spacebar/util"; import { Request, Response, Router } from "express"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; import { verifyToken } from "node-2fa"; 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 aaaa4c12..e626a736 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 { route } from "@spacebar/api"; import { User, generateMfaBackupCodes, generateToken } from "@spacebar/util"; import bcrypt from "bcrypt"; import { Request, Response, Router } from "express"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; import { verifyToken } from "node-2fa"; import { TotpEnableSchema } from "@spacebar/schemas"; 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 778fb9d8..6c877189 100644 --- a/src/api/routes/users/@me/mfa/webauthn/credentials/index.ts +++ b/src/api/routes/users/@me/mfa/webauthn/credentials/index.ts @@ -21,7 +21,7 @@ import { DiscordApiErrors, FieldErrors, generateWebAuthnTicket, SecurityKey, Use import bcrypt from "bcrypt"; import { Request, Response, Router } from "express"; import { ExpectedAttestationResult } from "fido2-lib"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; import { CreateWebAuthnCredentialSchema, GenerateWebAuthnCredentialsSchema, WebAuthnPostSchema } from "@spacebar/schemas"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/users/@me/relationships.ts b/src/api/routes/users/@me/relationships.ts index 5da62ce8..be5629ab 100644 --- a/src/api/routes/users/@me/relationships.ts +++ b/src/api/routes/users/@me/relationships.ts @@ -19,7 +19,7 @@ import { route } from "@spacebar/api"; import { Config, DiscordApiErrors, Relationship, RelationshipAddEvent, RelationshipRemoveEvent, RelationshipUpdateEvent, User, emitEvent } from "@spacebar/util"; import { Request, Response, Router } from "express"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; import { PublicUserProjection, RelationshipType, RelationshipPatchSchema } from "@spacebar/schemas"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/webhooks/#webhook_id/#token/github.ts b/src/api/routes/webhooks/#webhook_id/#token/github.ts index 5b710599..d8a84d8a 100644 --- a/src/api/routes/webhooks/#webhook_id/#token/github.ts +++ b/src/api/routes/webhooks/#webhook_id/#token/github.ts @@ -1,6 +1,6 @@ import { getProxyUrl, route } from "@spacebar/api"; import { NextFunction, Request, Response, Router } from "express"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; import { executeWebhook } from "../../../../util/handlers/Webhook"; import { EmbedType, WebhookExecuteSchema } from "@spacebar/schemas"; diff --git a/src/api/routes/webhooks/#webhook_id/#token/index.ts b/src/api/routes/webhooks/#webhook_id/#token/index.ts index 4d219cc1..cab73d64 100644 --- a/src/api/routes/webhooks/#webhook_id/#token/index.ts +++ b/src/api/routes/webhooks/#webhook_id/#token/index.ts @@ -1,7 +1,7 @@ import { route } from "@spacebar/api"; import { Config, DiscordApiErrors, emitEvent, handleFile, ValidateName, Webhook, WebhooksUpdateEvent } from "@spacebar/util"; import { Request, Response, Router } from "express"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; import multer from "multer"; import { executeWebhook } from "../../../../util/handlers/Webhook"; import { WebhookUpdateSchema } from "@spacebar/schemas"; diff --git a/src/api/routes/webhooks/#webhook_id/index.ts b/src/api/routes/webhooks/#webhook_id/index.ts index f8f50864..5c08ec3d 100644 --- a/src/api/routes/webhooks/#webhook_id/index.ts +++ b/src/api/routes/webhooks/#webhook_id/index.ts @@ -13,7 +13,7 @@ import { MessageDeleteBulkEvent, } from "@spacebar/util"; import { Request, Response, Router } from "express"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; import { WebhookUpdateSchema } from "@spacebar/schemas"; import { In } from "typeorm"; const router = Router({ mergeParams: true }); diff --git a/src/api/util/handlers/Message.ts b/src/api/util/handlers/Message.ts index 74c2d6d0..674b74c6 100644 --- a/src/api/util/handlers/Message.ts +++ b/src/api/util/handlers/Message.ts @@ -53,7 +53,7 @@ import { USER_MENTION, Webhook, } from "@spacebar/util"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; import { Equal, In, Or } from "typeorm"; import { ActionRowComponent, diff --git a/src/api/util/handlers/Webhook.ts b/src/api/util/handlers/Webhook.ts index a3ad944a..48032c8f 100644 --- a/src/api/util/handlers/Webhook.ts +++ b/src/api/util/handlers/Webhook.ts @@ -1,7 +1,7 @@ import { handleMessage, postHandleMessage } from "@spacebar/api"; import { Attachment, Channel, Config, DiscordApiErrors, emitEvent, FieldErrors, Message, MessageCreateEvent, Snowflake, uploadFile, ValidateName, Webhook } from "@spacebar/util"; import { Request, Response } from "express"; -import { HTTPError } from "lambert-server"; +import { HTTPError } from "lambert-server/HTTPError"; import { MoreThan } from "typeorm"; import { WebhookExecuteSchema } from "@spacebar/schemas"; -- cgit 1.5.1