diff --git a/src/api/routes/channels/#channel_id/attachments.ts b/src/api/routes/channels/#channel_id/attachments.ts index 76e88bc2..5789b06c 100644 --- a/src/api/routes/channels/#channel_id/attachments.ts +++ b/src/api/routes/channels/#channel_id/attachments.ts @@ -16,24 +16,16 @@ along with this program. If not, see . */ -import { generateCode, randomString, route } from "@spacebar/api"; +import { randomString, route } from "@spacebar/api"; import { - Attachment, Channel, Config, - emitEvent, - GreetRequestSchema, - Message, - MessageCreateEvent, - MessageType, Permissions, - Sticker, UploadAttachmentRequestSchema, UploadAttachmentResponseSchema, User, } from "@spacebar/util"; import { Request, Response, Router } from "express"; -import { In } from "typeorm"; import { CloudAttachment } from "../../../../util/entities/CloudAttachment"; import fetch from "node-fetch-commonjs"; 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 3d1103e2..351088e1 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 @@ -39,7 +39,6 @@ import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server"; import multer from "multer"; import { handleMessage, postHandleMessage, route } from "../../../../../util"; -import { URL } from "url"; const router = Router(); // TODO: message content/embed string length limit diff --git a/src/api/routes/channels/#channel_id/messages/index.ts b/src/api/routes/channels/#channel_id/messages/index.ts index 0f41a61c..a5b77dff 100644 --- a/src/api/routes/channels/#channel_id/messages/index.ts +++ b/src/api/routes/channels/#channel_id/messages/index.ts @@ -47,8 +47,6 @@ import { HTTPError } from "lambert-server"; import multer from "multer"; import { FindManyOptions, FindOperator, LessThan, MoreThan, MoreThanOrEqual } from "typeorm"; import { URL } from "url"; -import fetch from "node-fetch-commonjs"; -import { CloudAttachment } from "../../../../../util/entities/CloudAttachment"; const router: Router = Router(); diff --git a/src/api/routes/channels/#channel_id/webhooks.ts b/src/api/routes/channels/#channel_id/webhooks.ts index 0df53a86..4e0908b7 100644 --- a/src/api/routes/channels/#channel_id/webhooks.ts +++ b/src/api/routes/channels/#channel_id/webhooks.ts @@ -28,7 +28,6 @@ import { handleFile, isTextChannel, trimSpecial, - FieldErrors, ValidateName, } from "@spacebar/util"; import crypto from "crypto"; diff --git a/src/api/routes/guilds/#guild_id/roles/member-counts.ts b/src/api/routes/guilds/#guild_id/roles/member-counts.ts index 88243b42..6502069a 100644 --- a/src/api/routes/guilds/#guild_id/roles/member-counts.ts +++ b/src/api/routes/guilds/#guild_id/roles/member-counts.ts @@ -19,7 +19,6 @@ import { Request, Response, Router } from "express"; import { Role, Member } from "@spacebar/util"; import { route } from "@spacebar/api"; -import {} from "typeorm"; const router: Router = Router(); diff --git a/src/api/routes/guilds/templates/index.ts b/src/api/routes/guilds/templates/index.ts index cff8f778..9023a4a7 100644 --- a/src/api/routes/guilds/templates/index.ts +++ b/src/api/routes/guilds/templates/index.ts @@ -23,8 +23,6 @@ import { Guild, GuildTemplateCreateSchema, Member, - Role, - Snowflake, Template, } from "@spacebar/util"; import { Request, Response, Router } from "express"; diff --git a/src/api/routes/users/#id/messages.ts b/src/api/routes/users/#id/messages.ts index aefa8329..12c9d439 100644 --- a/src/api/routes/users/#id/messages.ts +++ b/src/api/routes/users/#id/messages.ts @@ -17,7 +17,7 @@ */ import { route } from "@spacebar/api"; -import { Channel, Config, DmMessagesResponseSchema, Message, User } from "@spacebar/util"; +import { Config, DmMessagesResponseSchema, Message, User } from "@spacebar/util"; import { Request, Response, Router } from "express"; const router = Router(); diff --git a/src/api/routes/users/@me/settings-proto/2.ts b/src/api/routes/users/@me/settings-proto/2.ts index 6cb1654b..44d4eeed 100644 --- a/src/api/routes/users/@me/settings-proto/2.ts +++ b/src/api/routes/users/@me/settings-proto/2.ts @@ -27,7 +27,7 @@ import { SettingsProtoUpdateSchema, UserSettingsProtos, } from "@spacebar/util"; -import { FrecencyUserSettings, PreloadedUserSettings } from "discord-protos"; +import { FrecencyUserSettings } from "discord-protos"; import { JsonValue } from "@protobuf-ts/runtime"; const router: Router = Router(); diff --git a/src/api/routes/webhooks/#webhook_id/index.ts b/src/api/routes/webhooks/#webhook_id/index.ts index baedc7f0..8f7a93b7 100644 --- a/src/api/routes/webhooks/#webhook_id/index.ts +++ b/src/api/routes/webhooks/#webhook_id/index.ts @@ -9,7 +9,6 @@ import { WebhookUpdateSchema, Channel, handleFile, - FieldErrors, ValidateName, } from "@spacebar/util"; import { Request, Response, Router } from "express"; diff --git a/src/cdn/Server.ts b/src/cdn/Server.ts index 062ae19e..321eba7c 100644 --- a/src/cdn/Server.ts +++ b/src/cdn/Server.ts @@ -29,7 +29,7 @@ import avatarsRoute from "./routes/avatars"; import guildProfilesRoute from "./routes/guild-profiles"; import iconsRoute from "./routes/role-icons"; import morgan from "morgan"; -import { Like, Or } from "typeorm"; +import { Like } from "typeorm"; export type CDNServerOptions = ServerOptions; diff --git a/src/cdn/routes/attachments.ts b/src/cdn/routes/attachments.ts index 1f3bc9f9..03c6fdd7 100644 --- a/src/cdn/routes/attachments.ts +++ b/src/cdn/routes/attachments.ts @@ -18,12 +18,12 @@ import { Config, hasValidSignature, NewUrlUserSignatureData, Snowflake, UrlSignResult } from "@spacebar/util"; import { Request, Response, Router } from "express"; -import { fileTypeFromBuffer } from "file-type"; import imageSize from "image-size"; import { HTTPError } from "lambert-server"; import { multer } from "../util/multer"; import { storage } from "../util/Storage"; import { CloudAttachment } from "../../util/entities/CloudAttachment"; +import { fileTypeFromBuffer } from "file-type"; const router = Router(); diff --git a/src/cdn/routes/badge-icons.ts b/src/cdn/routes/badge-icons.ts index 44dd4c8f..e86ae89f 100644 --- a/src/cdn/routes/badge-icons.ts +++ b/src/cdn/routes/badge-icons.ts @@ -18,8 +18,8 @@ import { Router, Response, Request } from "express"; import { storage } from "../util/Storage"; -import { fileTypeFromBuffer } from "file-type"; import { HTTPError } from "lambert-server"; +import { fileTypeFromBuffer } from "file-type"; const router = Router(); diff --git a/src/cdn/routes/embed.ts b/src/cdn/routes/embed.ts index d0bb620f..16635b12 100644 --- a/src/cdn/routes/embed.ts +++ b/src/cdn/routes/embed.ts @@ -17,10 +17,10 @@ */ import { Request, Response, Router } from "express"; -import { fileTypeFromBuffer } from "file-type"; import fs from "fs/promises"; import { HTTPError } from "lambert-server"; import { join } from "path"; +import { fileTypeFromBuffer } from "file-type"; const defaultAvatarHashMap = new Map([ ["0", "4a8562cf00887030c416d3ec2d46385a"], diff --git a/src/cdn/routes/guild-profiles.ts b/src/cdn/routes/guild-profiles.ts index 4fcf1f39..86ec1245 100644 --- a/src/cdn/routes/guild-profiles.ts +++ b/src/cdn/routes/guild-profiles.ts @@ -19,10 +19,10 @@ import { Config, Snowflake } from "@spacebar/util"; import crypto from "crypto"; import { Request, Response, Router } from "express"; -import { fileTypeFromBuffer } from "file-type"; import { HTTPError } from "lambert-server"; import { multer } from "../util/multer"; import { storage } from "../util/Storage"; +import { fileTypeFromBuffer } from "file-type"; // TODO: check premium and animated pfp are allowed in the config // TODO: generate different sizes of icon diff --git a/src/gateway/opcodes/Identify.ts b/src/gateway/opcodes/Identify.ts index 62413420..9f334358 100644 --- a/src/gateway/opcodes/Identify.ts +++ b/src/gateway/opcodes/Identify.ts @@ -24,14 +24,12 @@ import { DefaultUserGuildSettings, EVENTEnum, Guild, - GuildCreateEvent, GuildOrUnavailable, IdentifySchema, Intents, Member, MemberPrivateProjection, OPCodes, - Permissions, PresenceUpdateEvent, PrivateSessionProjection, PrivateUserProjection, @@ -61,7 +59,6 @@ import { } from "@spacebar/util"; import { check } from "./instanceOf"; import { In } from "typeorm"; -import guild_id from "../../api/routes/guilds/#guild_id"; // TODO: user sharding // TODO: check privileged intents, if defined in the config diff --git a/src/gateway/opcodes/StreamCreate.ts b/src/gateway/opcodes/StreamCreate.ts index 69bcb32c..3aa8e81a 100644 --- a/src/gateway/opcodes/StreamCreate.ts +++ b/src/gateway/opcodes/StreamCreate.ts @@ -9,7 +9,6 @@ import { Config, emitEvent, Member, - Region, Snowflake, Stream, StreamCreateEvent, diff --git a/src/util/entities/CloudAttachment.ts b/src/util/entities/CloudAttachment.ts index 887bce2c..415dcf81 100644 --- a/src/util/entities/CloudAttachment.ts +++ b/src/util/entities/CloudAttachment.ts @@ -16,9 +16,7 @@ along with this program. If not, see . */ -import { BeforeRemove, Column, Entity, JoinColumn, ManyToOne, OneToOne, RelationId } from "typeorm"; -import { URL } from "url"; -import { deleteFile } from "../util/cdn"; +import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm"; import { BaseClass } from "./BaseClass"; import { dbEngine } from "../util/Database"; import { User } from "./User"; diff --git a/src/util/entities/Invite.ts b/src/util/entities/Invite.ts index 9dbdd04f..29e2ac1f 100644 --- a/src/util/entities/Invite.ts +++ b/src/util/entities/Invite.ts @@ -16,16 +16,13 @@ along with this program. If not, see . */ -import { AfterLoad, Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm"; +import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm"; import { BaseClassWithoutId, PrimaryIdColumn } from "./BaseClass"; import { Channel } from "./Channel"; import { Guild } from "./Guild"; import { Member } from "./Member"; import { User } from "./User"; import { dbEngine } from "../util/Database"; -import { emitEvent } from "../util"; -import { GuildCreateEvent } from "../interfaces"; -import { ReadyGuildDTO } from "../dtos"; export const PublicInviteRelation = ["inviter", "guild", "channel"]; diff --git a/src/util/entities/Stream.ts b/src/util/entities/Stream.ts index 2787e3ce..01d621fa 100644 --- a/src/util/entities/Stream.ts +++ b/src/util/entities/Stream.ts @@ -3,14 +3,12 @@ import { Entity, JoinColumn, ManyToOne, - OneToMany, RelationId, } from "typeorm"; import { BaseClass } from "./BaseClass"; import { dbEngine } from "../util/Database"; import { User } from "./User"; import { Channel } from "./Channel"; -import { StreamSession } from "./StreamSession"; @Entity({ name: "streams", diff --git a/src/util/entities/StreamSession.ts b/src/util/entities/StreamSession.ts index 6d7ccf9d..472b22b6 100644 --- a/src/util/entities/StreamSession.ts +++ b/src/util/entities/StreamSession.ts @@ -3,7 +3,6 @@ import { Entity, JoinColumn, ManyToOne, - OneToMany, RelationId, } from "typeorm"; import { BaseClass } from "./BaseClass"; diff --git a/src/util/entities/User.ts b/src/util/entities/User.ts index 42b46146..03b6b365 100644 --- a/src/util/entities/User.ts +++ b/src/util/entities/User.ts @@ -18,7 +18,7 @@ import { Request } from "express"; import { Column, Entity, FindOneOptions, JoinColumn, OneToMany, OneToOne } from "typeorm"; -import { Channel, ChannelType, Config, Email, FieldErrors, Recipient, Snowflake, trimSpecial } from ".."; +import { Channel, ChannelType, Config, Email, FieldErrors, Snowflake, trimSpecial } from ".."; import { BitField } from "../util/BitField"; import { BaseClass } from "./BaseClass"; import { ConnectedAccount } from "./ConnectedAccount"; diff --git a/src/util/entities/UserSettingsProtos.ts b/src/util/entities/UserSettingsProtos.ts index 9d749445..d7a23199 100644 --- a/src/util/entities/UserSettingsProtos.ts +++ b/src/util/entities/UserSettingsProtos.ts @@ -16,18 +16,18 @@ along with this program. If not, see . */ -import { Column, Entity, JoinColumn, OneToOne, RelationId } from "typeorm"; +import { Column, Entity, JoinColumn, OneToOne } from "typeorm"; import { BaseClassWithoutId, PrimaryIdColumn } from "./BaseClass"; import { dbEngine } from "@spacebar/util"; import { User } from "./User"; import { FrecencyUserSettings, PreloadedUserSettings, - PreloadedUserSettings_LaunchPadMode, - PreloadedUserSettings_SwipeRightToLeftMode, - PreloadedUserSettings_Theme, - PreloadedUserSettings_TimestampHourCycle, - PreloadedUserSettings_UIDensity, + + + + + } from "discord-protos"; @Entity({ diff --git a/src/util/schemas/GreetRequestSchema.ts b/src/util/schemas/GreetRequestSchema.ts index 62294ece..c0bd6a79 100644 --- a/src/util/schemas/GreetRequestSchema.ts +++ b/src/util/schemas/GreetRequestSchema.ts @@ -16,7 +16,6 @@ along with this program. If not, see . */ -import { ConnectedAccountTokenData } from "../interfaces"; import { AllowedMentions } from "@spacebar/util*"; export interface GreetRequestSchema { diff --git a/src/util/schemas/MessageCreateSchema.ts b/src/util/schemas/MessageCreateSchema.ts index 98c55cf8..7e590467 100644 --- a/src/util/schemas/MessageCreateSchema.ts +++ b/src/util/schemas/MessageCreateSchema.ts @@ -16,8 +16,7 @@ along with this program. If not, see . */ -import { ActionRowComponent, Embed, PollAnswer, PollMedia, UploadAttachmentResponse } from "@spacebar/util"; -import { CloudAttachment } from "../entities/CloudAttachment"; +import { ActionRowComponent, Embed, PollAnswer, PollMedia } from "@spacebar/util"; export type MessageCreateAttachment = { id: string; diff --git a/src/util/schemas/responses/CollectiblesShopResponse.ts b/src/util/schemas/responses/CollectiblesShopResponse.ts index ece12d40..f168776a 100644 --- a/src/util/schemas/responses/CollectiblesShopResponse.ts +++ b/src/util/schemas/responses/CollectiblesShopResponse.ts @@ -16,7 +16,6 @@ along with this program. If not, see . */ -import { StringStringDictionary } from "../../util"; import { CollectiblesCategoryItem, StaticAnimatedAsset } from "./CollectiblesCategoriesResponse"; export interface CollectiblesShopResponse { diff --git a/src/util/util/email/index.ts b/src/util/util/email/index.ts index 3ba18fbe..8966e8f5 100644 --- a/src/util/util/email/index.ts +++ b/src/util/util/email/index.ts @@ -21,7 +21,7 @@ import path from "node:path"; import { User } from "../../entities"; import { Config } from "../Config"; import { generateToken } from "../Token"; -import { BaseEmailClient, IEmail, IEmailClient } from "./clients/IEmailClient"; +import { IEmail, IEmailClient } from "./clients/IEmailClient"; import { SendGridEmailClient } from "./clients/SendGridEmailClient"; import { SMTPEmailClient } from "./clients/SMTPEmailClient"; import { MailGunEmailClient } from "./clients/MailGunEmailClient";