From 2c1be0fa53ca2b8efb5b04de3e2bd41b61917c69 Mon Sep 17 00:00:00 2001 From: Rory& Date: Thu, 11 Jun 2026 18:16:31 +0200 Subject: [PATCH] Use subpath imports for lambert-server, fix openapi.js --- assets/openapi.json | Bin 972008 -> 971939 bytes assets/schemas.json | Bin 439420 -> 439351 bytes scripts/openapi.js | 2 +- src/api/Server.ts | 2 +- src/api/middlewares/Authentication.ts | 2 +- src/api/middlewares/BodyParser.ts | 2 +- src/api/middlewares/ErrorHandler.ts | 2 +- .../applications/#application_id/bot/index.ts | 2 +- .../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 +- .../routes/channels/#channel_id/invites.ts | 2 +- .../#channel_id/messages/#message_id/index.ts | 2 +- .../messages/#message_id/reactions.ts | 2 +- .../#channel_id/messages/bulk-delete.ts | 2 +- .../channels/#channel_id/messages/index.ts | 2 +- .../channels/#channel_id/messages/search.ts | 2 +- .../channels/#channel_id/permissions.ts | 2 +- src/api/routes/channels/#channel_id/purge.ts | 2 +- src/api/routes/channels/#channel_id/tags.ts | 2 +- .../routes/channels/#channel_id/threads.ts | 2 +- .../routes/channels/#channel_id/webhooks.ts | 2 +- .../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 +- .../routes/guilds/#guild_id/members/index.ts | 2 +- .../guilds/#guild_id/messages/search.ts | 2 +- .../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 +- .../guilds/automations/email-domain-lookup.ts | 2 +- src/api/routes/guilds/templates/index.ts | 2 +- .../#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 +- .../@me/mfa/webauthn/credentials/index.ts | 2 +- src/api/routes/users/@me/relationships.ts | 2 +- .../webhooks/#webhook_id/#token/github.ts | 2 +- .../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 +- src/cdn/Server.ts | 2 +- src/cdn/routes/app-assets.ts | 2 +- src/cdn/routes/app-icons.ts | 2 +- src/cdn/routes/attachments.ts | 2 +- src/cdn/routes/avatar-decoration-presets.ts | 2 +- src/cdn/routes/avatars.ts | 2 +- src/cdn/routes/badge-icons.ts | 2 +- src/cdn/routes/banners.ts | 2 +- src/cdn/routes/channel-icons.ts | 2 +- src/cdn/routes/discover-splashes.ts | 2 +- src/cdn/routes/discovery-splashes.ts | 2 +- src/cdn/routes/embed.ts | 2 +- src/cdn/routes/emojis.ts | 2 +- src/cdn/routes/guild-profiles.ts | 2 +- src/cdn/routes/icons.ts | 2 +- src/cdn/routes/role-icons.ts | 2 +- src/cdn/routes/splashes.ts | 2 +- src/cdn/routes/stickers.ts | 2 +- src/cdn/routes/team-icons.ts | 2 +- src/gateway/opcodes/instanceOf.ts | 2 +- src/schemas/api/channels/Channel.ts | 2 +- src/schemas/gateway/GatewayPayloadSchema.ts | 2 +- src/util/entities/Channel.ts | 2 +- src/util/entities/Member.ts | 2 +- src/util/entities/ThreadMember.ts | 2 +- src/util/util/Gifs.ts | 2 +- src/util/util/NameValidation.ts | 2 +- src/util/util/Permissions.ts | 2 +- src/util/util/Rights.ts | 2 +- src/util/util/Token.ts | 2 +- src/util/util/cdn.ts | 2 +- 85 files changed, 83 insertions(+), 83 deletions(-) diff --git a/assets/openapi.json b/assets/openapi.json index b544528791ec285245b89c809366057f388a6b2d..26c330a54ce5b06fb97b67dc18d2a3e42b6c4271 100644 GIT binary patch delta 157 zcmaE{(t7bq>xLG_EljIqr+-+%tULXKB_qdn2RWu%CJ@V`6`6pT z8Hic77b~)!Ji}BRK0RPRyUO&06>O=~1Ik%br+>J?CO3_rnRWW>cdP-NnZ@C$Ng4V1 x+0!SMu}Dr2xXj8v-TDeEXS>gPRv=~rVs;?r0Ai3B7Z7s;G0%3N_q=nS0szDaKBxcy delta 151 zcmZ3y()z_p>xLG_EljIqrw3@W2u*(A&pF*-GNa@43oa~1(?3`;a%{gZ%T&t*mYse; zj)!;phs}(xAZe*-ESyr49rz_C2lTPEuT)?HVrC#_*}hVN_2il90nV)5(=Qxgm!ID7 ojx}`pIweMq_J8kKftU@5*?}0u=LBLdAm#>Qp6&nM@h*J|07a}pZvX%Q diff --git a/assets/schemas.json b/assets/schemas.json index 3d4c30c544e590e441902aa7075f3965425f3665..89841e863d515db22828c0d8fbf9d4abff592457 100644 GIT binary patch delta 118 zcmezKLTdX9sfI0#Ef?96GSf5jN~UjIWl&qc;Jj4U9L>4J@{B9j~38sfI0#Ef=SSvIca(+zgA. */ -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 efa0f5f53..e39026267 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 3a00326f4..4ff55044e 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 370432d06..e3c1c9790 100644 --- a/src/util/entities/Channel.ts +++ b/src/util/entities/Channel.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -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 00178d264..b6b1ca11c 100644 --- a/src/util/entities/Member.ts +++ b/src/util/entities/Member.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -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 2c62ae650..cea61f513 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 b90f44f76..a24ada632 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 5536670ee..02d2a95db 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 11fb76503..66dd1943c 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 41b6d93b9..f0425749f 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 9e4a631c1..a1c4536e1 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 91073a569..46fa0ebde 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";