diff --git a/assets/openapi.json b/assets/openapi.json
index b5445287..26c330a5 100644
--- a/assets/openapi.json
+++ b/assets/openapi.json
@@ -3767,9 +3767,7 @@
"additionalProperties": false
},
"intents": {
- "type": "number",
- "properties": {},
- "additionalProperties": false
+ "type": "number"
},
"presence": {
"$ref": "#/components/schemas/ActivitySchema"
@@ -3788,9 +3786,7 @@
"maxItems": 2,
"type": "array",
"items": {
- "type": "number",
- "properties": {},
- "additionalProperties": false
+ "type": "number"
}
},
"guild_subscriptions": {
@@ -10872,6 +10868,9 @@
"$ref": "#/components/schemas/MessageSnapshot"
}
},
+ "isWebhook": {
+ "type": "boolean"
+ },
"id": {
"type": "string"
}
@@ -10881,6 +10880,7 @@
"embeds",
"flags",
"id",
+ "isWebhook",
"mention_channels",
"mention_roles",
"mentions",
diff --git a/assets/schemas.json b/assets/schemas.json
index 3d4c30c5..89841e86 100644
--- a/assets/schemas.json
+++ b/assets/schemas.json
@@ -3993,9 +3993,7 @@
"additionalProperties": false
},
"intents": {
- "type": "number",
- "properties": {},
- "additionalProperties": false
+ "type": "bigint"
},
"presence": {
"$ref": "#/definitions/ActivitySchema"
@@ -4014,9 +4012,7 @@
"maxItems": 2,
"type": "array",
"items": {
- "type": "number",
- "properties": {},
- "additionalProperties": false
+ "type": "bigint"
}
},
"guild_subscriptions": {
@@ -11552,6 +11548,9 @@
"$ref": "#/definitions/MessageSnapshot"
}
},
+ "isWebhook": {
+ "type": "boolean"
+ },
"id": {
"type": "string"
}
@@ -11562,6 +11561,7 @@
"embeds",
"flags",
"id",
+ "isWebhook",
"mention_channels",
"mention_roles",
"mentions",
diff --git a/scripts/openapi.js b/scripts/openapi.js
index 3f428fce..a6033cd6 100644
--- a/scripts/openapi.js
+++ b/scripts/openapi.js
@@ -26,7 +26,7 @@ const getRouteDescriptions = require("./util/getRouteDescriptions");
const path = require("path");
const fs = require("fs");
const { NO_AUTHORIZATION_ROUTES } = require("../dist/api/middlewares/Authentication");
-require("../dist/util/util/extensions");
+require("../dist/extensions");
const { bgRedBright, bgYellow, black, bgYellowBright, blue, white } = require("picocolors");
const openapiPath = path.join(__dirname, "..", "assets", "openapi.json");
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";
diff --git a/src/cdn/Server.ts b/src/cdn/Server.ts
index 8964161d..0bd6a8f4 100644
--- a/src/cdn/Server.ts
+++ b/src/cdn/Server.ts
@@ -18,7 +18,7 @@
import path from "node:path";
import morgan from "morgan";
-import { Server, ServerOptions } from "lambert-server";
+import { Server, ServerOptions } from "lambert-server/Server";
import { Attachment, Config, initDatabase, registerRoutes } from "@spacebar/util";
import { CORS, BodyParser } from "@spacebar/api";
import guildProfilesRoute from "./routes/guild-profiles";
diff --git a/src/cdn/routes/app-assets.ts b/src/cdn/routes/app-assets.ts
index e3df7fd9..fc20cb17 100644
--- a/src/cdn/routes/app-assets.ts
+++ b/src/cdn/routes/app-assets.ts
@@ -20,7 +20,7 @@ import { Router, Response, Request } from "express";
import { Config } from "@spacebar/util";
import { storage } from "@spacebar/cdn";
import { fileTypeFromBuffer } from "file-type";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "lambert-server/HTTPError";
import crypto from "node:crypto";
import { multer } from "../util/multer";
import { cache, cacheNotFound } from "../util/cache";
diff --git a/src/cdn/routes/app-icons.ts b/src/cdn/routes/app-icons.ts
index 378d2092..4cff5754 100644
--- a/src/cdn/routes/app-icons.ts
+++ b/src/cdn/routes/app-icons.ts
@@ -20,7 +20,7 @@ import { Router, Response, Request } from "express";
import { Config } from "@spacebar/util";
import { storage } from "@spacebar/cdn";
import { fileTypeFromBuffer } from "file-type";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "lambert-server/HTTPError";
import crypto from "node:crypto";
import { multer } from "../util/multer";
import { cache, cacheNotFound } from "../util/cache";
diff --git a/src/cdn/routes/attachments.ts b/src/cdn/routes/attachments.ts
index 39980db3..d1defe85 100644
--- a/src/cdn/routes/attachments.ts
+++ b/src/cdn/routes/attachments.ts
@@ -19,7 +19,7 @@
import { Config, CloudAttachment, hasValidSignature, NewUrlUserSignatureData, Snowflake, UrlSignResult } from "@spacebar/util";
import { Request, Response, Router } from "express";
import imageSize from "image-size";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "lambert-server/HTTPError";
import { multer } from "../util/multer";
import { storage } from "@spacebar/cdn";
import { fileTypeFromBuffer } from "file-type";
diff --git a/src/cdn/routes/avatar-decoration-presets.ts b/src/cdn/routes/avatar-decoration-presets.ts
index 591e0ab1..a2df4de4 100644
--- a/src/cdn/routes/avatar-decoration-presets.ts
+++ b/src/cdn/routes/avatar-decoration-presets.ts
@@ -18,7 +18,7 @@
import { Router, Response, Request } from "express";
import { storage } from "@spacebar/cdn";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "lambert-server/HTTPError";
import { fileTypeFromBuffer } from "file-type";
import { cache } from "../util/cache";
diff --git a/src/cdn/routes/avatars.ts b/src/cdn/routes/avatars.ts
index 6685ef7f..3a6991e0 100644
--- a/src/cdn/routes/avatars.ts
+++ b/src/cdn/routes/avatars.ts
@@ -21,7 +21,7 @@ import { Router, Response, Request } from "express";
import { fileTypeFromBuffer } from "file-type";
import { Config } from "@spacebar/util";
import { storage } from "@spacebar/cdn";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "lambert-server/HTTPError";
import { multer } from "../util/multer";
import { cache } from "../util/cache";
diff --git a/src/cdn/routes/badge-icons.ts b/src/cdn/routes/badge-icons.ts
index 33134e1a..4eaed599 100644
--- a/src/cdn/routes/badge-icons.ts
+++ b/src/cdn/routes/badge-icons.ts
@@ -18,7 +18,7 @@
import { Router, Response, Request } from "express";
import { storage } from "@spacebar/cdn";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "lambert-server/HTTPError";
import { fileTypeFromBuffer } from "file-type";
import { cache } from "../util/cache";
diff --git a/src/cdn/routes/banners.ts b/src/cdn/routes/banners.ts
index 6867a58e..af0d194d 100644
--- a/src/cdn/routes/banners.ts
+++ b/src/cdn/routes/banners.ts
@@ -20,7 +20,7 @@ import { Router, Response, Request } from "express";
import { Config } from "@spacebar/util";
import { storage } from "@spacebar/cdn";
import { fileTypeFromBuffer } from "file-type";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "lambert-server/HTTPError";
import crypto from "node:crypto";
import { multer } from "../util/multer";
import { cache, cacheNotFound } from "../util/cache";
diff --git a/src/cdn/routes/channel-icons.ts b/src/cdn/routes/channel-icons.ts
index daea1633..3f345bbc 100644
--- a/src/cdn/routes/channel-icons.ts
+++ b/src/cdn/routes/channel-icons.ts
@@ -20,7 +20,7 @@ import { Router, Response, Request } from "express";
import { Config } from "@spacebar/util";
import { storage } from "@spacebar/cdn";
import { fileTypeFromBuffer } from "file-type";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "lambert-server/HTTPError";
import crypto from "node:crypto";
import { multer } from "../util/multer";
import { cache, cacheNotFound } from "../util/cache";
diff --git a/src/cdn/routes/discover-splashes.ts b/src/cdn/routes/discover-splashes.ts
index d8da7373..c3aa8444 100644
--- a/src/cdn/routes/discover-splashes.ts
+++ b/src/cdn/routes/discover-splashes.ts
@@ -20,7 +20,7 @@ import { Router, Response, Request } from "express";
import { Config } from "@spacebar/util";
import { storage } from "@spacebar/cdn";
import { fileTypeFromBuffer } from "file-type";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "lambert-server/HTTPError";
import crypto from "node:crypto";
import { multer } from "../util/multer";
import { cache, cacheNotFound } from "../util/cache";
diff --git a/src/cdn/routes/discovery-splashes.ts b/src/cdn/routes/discovery-splashes.ts
index 7d0f5058..c5ab5b37 100644
--- a/src/cdn/routes/discovery-splashes.ts
+++ b/src/cdn/routes/discovery-splashes.ts
@@ -20,7 +20,7 @@ import { Router, Response, Request } from "express";
import { Config } from "@spacebar/util";
import { storage } from "@spacebar/cdn";
import { fileTypeFromBuffer } from "file-type";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "lambert-server/HTTPError";
import crypto from "node:crypto";
import { multer } from "../util/multer";
import { cache, cacheNotFound } from "../util/cache";
diff --git a/src/cdn/routes/embed.ts b/src/cdn/routes/embed.ts
index e63936d0..0ca4908f 100644
--- a/src/cdn/routes/embed.ts
+++ b/src/cdn/routes/embed.ts
@@ -18,7 +18,7 @@
import { Request, Response, Router } from "express";
import fs from "node:fs/promises";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "lambert-server/HTTPError";
import { join } from "node:path";
import { fileTypeFromBuffer } from "file-type";
import { cache } from "../util/cache";
diff --git a/src/cdn/routes/emojis.ts b/src/cdn/routes/emojis.ts
index ad3238a1..a0a14ac3 100644
--- a/src/cdn/routes/emojis.ts
+++ b/src/cdn/routes/emojis.ts
@@ -20,7 +20,7 @@ import { Router, Response, Request } from "express";
import { Config } from "@spacebar/util";
import { storage } from "@spacebar/cdn";
import { fileTypeFromBuffer } from "file-type";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "lambert-server/HTTPError";
import crypto from "node:crypto";
import { multer } from "../util/multer";
import { cache, cacheNotFound } from "../util/cache";
diff --git a/src/cdn/routes/guild-profiles.ts b/src/cdn/routes/guild-profiles.ts
index 20ff2e23..a38ef4c9 100644
--- a/src/cdn/routes/guild-profiles.ts
+++ b/src/cdn/routes/guild-profiles.ts
@@ -19,7 +19,7 @@
import { Config } 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 { multer } from "../util/multer";
import { storage } from "@spacebar/cdn";
import { fileTypeFromBuffer } from "file-type";
diff --git a/src/cdn/routes/icons.ts b/src/cdn/routes/icons.ts
index 5a6a10e9..e2d4341f 100644
--- a/src/cdn/routes/icons.ts
+++ b/src/cdn/routes/icons.ts
@@ -20,7 +20,7 @@ import { Router, Response, Request } from "express";
import { Config } from "@spacebar/util";
import { storage } from "@spacebar/cdn";
import { fileTypeFromBuffer } from "file-type";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "lambert-server/HTTPError";
import crypto from "node:crypto";
import { multer } from "../util/multer";
import { cache, cacheNotFound } from "../util/cache";
diff --git a/src/cdn/routes/role-icons.ts b/src/cdn/routes/role-icons.ts
index 26c41cad..55da7f02 100644
--- a/src/cdn/routes/role-icons.ts
+++ b/src/cdn/routes/role-icons.ts
@@ -20,7 +20,7 @@ import { Router, Response, Request } from "express";
import { Config } from "@spacebar/util";
import { storage } from "@spacebar/cdn";
import { fileTypeFromBuffer } from "file-type";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "lambert-server/HTTPError";
import crypto from "node:crypto";
import { multer } from "../util/multer";
import { cache } from "../util/cache";
diff --git a/src/cdn/routes/splashes.ts b/src/cdn/routes/splashes.ts
index 8199441d..68f4cede 100644
--- a/src/cdn/routes/splashes.ts
+++ b/src/cdn/routes/splashes.ts
@@ -20,7 +20,7 @@ import { Router, Response, Request } from "express";
import { Config } from "@spacebar/util";
import { storage } from "@spacebar/cdn";
import { fileTypeFromBuffer } from "file-type";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "lambert-server/HTTPError";
import crypto from "node:crypto";
import { multer } from "../util/multer";
import { cache, cacheNotFound } from "../util/cache";
diff --git a/src/cdn/routes/stickers.ts b/src/cdn/routes/stickers.ts
index 241ecdab..536c617b 100644
--- a/src/cdn/routes/stickers.ts
+++ b/src/cdn/routes/stickers.ts
@@ -20,7 +20,7 @@ import { Router, Response, Request } from "express";
import { Config } from "@spacebar/util";
import { storage } from "@spacebar/cdn";
import { fileTypeFromBuffer } from "file-type";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "lambert-server/HTTPError";
import crypto from "node:crypto";
import { multer } from "../util/multer";
import { cache, cacheNotFound } from "../util/cache";
diff --git a/src/cdn/routes/team-icons.ts b/src/cdn/routes/team-icons.ts
index 03db4142..99de19c6 100644
--- a/src/cdn/routes/team-icons.ts
+++ b/src/cdn/routes/team-icons.ts
@@ -20,7 +20,7 @@ import { Router, Response, Request } from "express";
import { Config } from "@spacebar/util";
import { storage } from "@spacebar/cdn";
import { fileTypeFromBuffer } from "file-type";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "lambert-server/HTTPError";
import crypto from "node:crypto";
import { multer } from "../util/multer";
import { cache, cacheNotFound } from "../util/cache";
diff --git a/src/gateway/opcodes/instanceOf.ts b/src/gateway/opcodes/instanceOf.ts
index 3c851803..7bebf49e 100644
--- a/src/gateway/opcodes/instanceOf.ts
+++ b/src/gateway/opcodes/instanceOf.ts
@@ -16,7 +16,7 @@
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-import { instanceOf } from "lambert-server";
+import { instanceOf } from "lambert-server/check";
import { WebSocket } from "@spacebar/gateway";
import { CLOSECODES } from "../util/Constants";
diff --git a/src/schemas/api/channels/Channel.ts b/src/schemas/api/channels/Channel.ts
index efa0f5f5..e3902626 100644
--- a/src/schemas/api/channels/Channel.ts
+++ b/src/schemas/api/channels/Channel.ts
@@ -18,7 +18,7 @@
// TODO: remove entity imports
import { Channel, Recipient, Tag, ThreadMember } from "@spacebar/util";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "lambert-server/HTTPError";
import { Snowflake } from "../../Identifiers";
import { PartialUser, PublicMember } from "../users";
diff --git a/src/schemas/gateway/GatewayPayloadSchema.ts b/src/schemas/gateway/GatewayPayloadSchema.ts
index 3a00326f..4ff55044 100644
--- a/src/schemas/gateway/GatewayPayloadSchema.ts
+++ b/src/schemas/gateway/GatewayPayloadSchema.ts
@@ -17,7 +17,7 @@
*/
// TODO: should this even be in schemas?
-import { Tuple } from "lambert-server";
+import { Tuple } from "lambert-server/check";
export const PayloadSchema = {
op: Number,
diff --git a/src/util/entities/Channel.ts b/src/util/entities/Channel.ts
index 370432d0..e3c1c979 100644
--- a/src/util/entities/Channel.ts
+++ b/src/util/entities/Channel.ts
@@ -16,7 +16,7 @@
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "lambert-server/HTTPError";
import { Column, Entity, JoinColumn, ManyToOne, OneToMany, RelationId } from "typeorm";
import { DmChannelDTO } from "../dtos";
import { ChannelCreateEvent, ChannelRecipientRemoveEvent, ThreadCreateEvent, ThreadMembersUpdateEvent } from "../interfaces";
diff --git a/src/util/entities/Member.ts b/src/util/entities/Member.ts
index 00178d26..b6b1ca11 100644
--- a/src/util/entities/Member.ts
+++ b/src/util/entities/Member.ts
@@ -16,7 +16,7 @@
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "lambert-server/HTTPError";
import { BeforeInsert, BeforeUpdate, Column, Entity, Index, JoinColumn, JoinTable, ManyToMany, ManyToOne, Not, PrimaryGeneratedColumn, RelationId } from "typeorm";
import { Ban, Channel, PublicGuildRelations } from ".";
import { ReadyGuildDTO } from "../dtos";
diff --git a/src/util/entities/ThreadMember.ts b/src/util/entities/ThreadMember.ts
index 2c62ae65..cea61f51 100644
--- a/src/util/entities/ThreadMember.ts
+++ b/src/util/entities/ThreadMember.ts
@@ -21,7 +21,7 @@ import { ThreadMembersUpdateEvent } from "../interfaces";
import { emitEvent } from "../util";
import { BaseClassWithoutId } from "./BaseClass";
import { Channel } from "./Channel";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "lambert-server/HTTPError";
import { Member } from "./Member";
// TODO: move
diff --git a/src/util/util/Gifs.ts b/src/util/util/Gifs.ts
index b90f44f7..a24ada63 100644
--- a/src/util/util/Gifs.ts
+++ b/src/util/util/Gifs.ts
@@ -1,4 +1,4 @@
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "lambert-server/HTTPError";
import { Config } from "./Config";
import { TenorGif } from "@spacebar/schemas";
diff --git a/src/util/util/NameValidation.ts b/src/util/util/NameValidation.ts
index 5536670e..02d2a95d 100755
--- a/src/util/util/NameValidation.ts
+++ b/src/util/util/NameValidation.ts
@@ -18,7 +18,7 @@
import { Config } from "./Config";
import { FieldErrors } from "./FieldError";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "lambert-server/HTTPError";
export function ValidateName(name: string) {
const check_username = name.replace(/\s/g, "");
diff --git a/src/util/util/Permissions.ts b/src/util/util/Permissions.ts
index 11fb7650..66dd1943 100644
--- a/src/util/util/Permissions.ts
+++ b/src/util/util/Permissions.ts
@@ -4,7 +4,7 @@
import { Channel, Guild, Member, Role, User } from "../entities";
import { BitField, BitFieldResolvable, BitFlag } from "./BitField";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "lambert-server/HTTPError";
import { ChannelPermissionOverwrite, ChannelPermissionOverwriteType, ChannelType, UserFlags } from "@spacebar/schemas";
import { FindOneOptions } from "typeorm";
diff --git a/src/util/util/Rights.ts b/src/util/util/Rights.ts
index 41b6d93b..f0425749 100644
--- a/src/util/util/Rights.ts
+++ b/src/util/util/Rights.ts
@@ -18,7 +18,7 @@
import { BitField, BitFieldResolvable, BitFlag } from "./BitField";
import { User } from "../entities";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "lambert-server/HTTPError";
export type RightResolvable = bigint | number | Rights | RightResolvable[] | RightString;
diff --git a/src/util/util/Token.ts b/src/util/util/Token.ts
index 9e4a631c..a1c4536e 100644
--- a/src/util/util/Token.ts
+++ b/src/util/util/Token.ts
@@ -26,7 +26,7 @@ import { existsSync } from "node:fs";
import { FindOptionsRelationByString, FindOptionsSelectByString } from "typeorm";
import { randomUpperString } from "@spacebar/api";
import { TimeSpan } from "./Timespan";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "lambert-server/HTTPError";
import path from "node:path";
/// Change history:
diff --git a/src/util/util/cdn.ts b/src/util/util/cdn.ts
index 91073a56..46fa0ebd 100644
--- a/src/util/util/cdn.ts
+++ b/src/util/util/cdn.ts
@@ -17,7 +17,7 @@
*/
import FormData from "form-data";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "lambert-server/HTTPError";
import { Attachment } from "../entities";
import { Config } from "./Config";
|
