diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f771c1a7..162ce935 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,12 +4,21 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
- <list default="true" id="bf10e7c6-8c33-4385-b571-3e96ac86a389" name="Changes" comment="" />
+ <list default="true" id="bf10e7c6-8c33-4385-b571-3e96ac86a389" name="Changes" comment="">
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/extra/admin-api/Spacebar.AdminAPI/Program.cs" beforeDir="false" afterPath="$PROJECT_DIR$/extra/admin-api/Spacebar.AdminAPI/Program.cs" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/extra/admin-api/Spacebar.AdminAPI/Services/AuthenticationService.cs" beforeDir="false" afterPath="$PROJECT_DIR$/extra/admin-api/Spacebar.AdminAPI/Services/AuthenticationService.cs" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/extra/admin-api/Spacebar.AdminApi.Models/UserModel.cs" beforeDir="false" afterPath="$PROJECT_DIR$/extra/admin-api/Spacebar.AdminApi.Models/UserModel.cs" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/extra/admin-api/Utilities/Spacebar.AdminAPI.TestClient/Layout/NavMenu.razor" beforeDir="false" afterPath="$PROJECT_DIR$/extra/admin-api/Utilities/Spacebar.AdminAPI.TestClient/Layout/NavMenu.razor" afterDir="false" />
+ </list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
+ <component name="Git.Settings">
+ <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+ </component>
<component name="HighlightingSettingsPerFile">
<setting file="file://$USER_HOME$/.cache/JetBrains/WebStorm2024.3/javascript/typings/node/20.17.10/node_modules/@types/node/crypto.d.ts" root0="SKIP_INSPECTION" />
<setting file="file://$PROJECT_DIR$/node_modules/@types/amqplib/index.d.ts" root0="SKIP_INSPECTION" />
@@ -30,41 +39,54 @@
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
- <component name="PropertiesComponent"><![CDATA[{
- "keyToString": {
- "NIXITCH_NIXPKGS_CONFIG": "/etc/nix/nixpkgs-config.nix",
- "NIXITCH_NIX_CONF_DIR": "",
- "NIXITCH_NIX_OTHER_STORES": "",
- "NIXITCH_NIX_PATH": "/home/Rory/.nix-defexpr/channels:nixpkgs=/nix/store/wb6agba4kfsxpbnb5hzlq58vkjzvbsk6-source",
- "NIXITCH_NIX_PROFILES": "/run/current-system/sw /nix/var/nix/profiles/default /etc/profiles/per-user/Rory /home/Rory/.local/state/nix/profile /nix/profile /home/Rory/.nix-profile",
- "NIXITCH_NIX_REMOTE": "",
- "NIXITCH_NIX_USER_PROFILE_DIR": "/nix/var/nix/profiles/per-user/Rory",
- "Node.js.Server.ts.executor": "Debug",
- "RunOnceActivity.ShowReadmeOnStart": "true",
- "javascript.nodejs.core.library.configured.version": "20.17.0",
- "javascript.nodejs.core.library.typings.version": "20.17.10",
- "last_opened_file_path": "/home/Rory/git/spacebar/server/src/admin-api/routes/v0",
- "node.js.detected.package.eslint": "true",
- "node.js.selected.package.eslint": "(autodetect)",
- "node.js.selected.package.tslint": "(autodetect)",
- "nodejs_interpreter_path": "/nix/store/dcdc33kdjdhjnzg6rkmd0cx4kpwl8cac-nodejs-20.17.0/bin/node",
- "nodejs_package_manager_path": "npm",
- "npm.Start API.executor": "Run",
- "npm.Start CDN.executor": "Run",
- "npm.Start Gateway.executor": "Run",
- "npm.build.executor": "Run",
- "npm.start.executor": "Debug",
- "prettierjs.PrettierConfiguration.Package": "/home/Rory/git/spacebar/server/node_modules/prettier",
- "settings.editor.selected.configurable": "preferences.pluginManager",
- "ts.external.directory.path": "/home/Rory/git/spacebar/server/node_modules/typescript/lib"
+ <component name="PropertiesComponent">{
+ "keyToString": {
+ "NIXITCH_NIXPKGS_CONFIG": "/etc/nix/nixpkgs-config.nix",
+ "NIXITCH_NIX_CONF_DIR": "",
+ "NIXITCH_NIX_OTHER_STORES": "",
+ "NIXITCH_NIX_PATH": "/home/Rory/.nix-defexpr/channels:nixpkgs=/nix/store/wb6agba4kfsxpbnb5hzlq58vkjzvbsk6-source",
+ "NIXITCH_NIX_PROFILES": "/run/current-system/sw /nix/var/nix/profiles/default /etc/profiles/per-user/Rory /home/Rory/.local/state/nix/profile /nix/profile /home/Rory/.nix-profile",
+ "NIXITCH_NIX_REMOTE": "",
+ "NIXITCH_NIX_USER_PROFILE_DIR": "/nix/var/nix/profiles/per-user/Rory",
+ "Node.js.Server.ts.executor": "Debug",
+ "RunOnceActivity.ShowReadmeOnStart": "true",
+ "RunOnceActivity.git.unshallow": "true",
+ "javascript.nodejs.core.library.configured.version": "24.8.0",
+ "javascript.nodejs.core.library.typings.version": "24.7.0",
+ "last_opened_file_path": "/home/Rory/git/spacebar/server/src/admin-api/routes/v0",
+ "node.js.detected.package.eslint": "true",
+ "node.js.selected.package.eslint": "(autodetect)",
+ "node.js.selected.package.tslint": "(autodetect)",
+ "nodejs_interpreter_path": "node",
+ "nodejs_package_manager_path": "npm",
+ "npm.Start API.executor": "Run",
+ "npm.Start CDN.executor": "Run",
+ "npm.Start Gateway.executor": "Run",
+ "npm.build.executor": "Run",
+ "npm.start.executor": "Debug",
+ "prettierjs.PrettierConfiguration.Package": "/home/Rory/git/spacebar/server/node_modules/prettier",
+ "settings.editor.selected.configurable": "preferences.pluginManager",
+ "ts.external.directory.path": "/home/Rory/git/spacebar/server-master/node_modules/typescript/lib"
+ },
+ "keyToStringList": {
+ "GitStage.ChangesTree.GroupingKeys": [
+ "directory",
+ "module",
+ "repository"
+ ]
}
-}]]></component>
+}</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/src/admin-api/routes/v0" />
<recent name="$PROJECT_DIR$/src" />
<recent name="$PROJECT_DIR$/src/api/routes/channels/#channel_id/messages" />
</key>
+ <key name="MoveFile.RECENT_KEYS">
+ <recent name="$PROJECT_DIR$/src" />
+ <recent name="$PROJECT_DIR$/src/api/routes/store/published-listings/applications/#application_id" />
+ <recent name="$PROJECT_DIR$/src/api/routes/store/published-listings/skus/#sku_id" />
+ </key>
</component>
<component name="RunDashboard">
<option name="configurationTypes">
@@ -85,7 +107,7 @@
<component name="SharedIndexes">
<attachedChunks>
<set>
- <option value="bundled-js-predefined-d6986cc7102b-deb605915726-JavaScript-WS-243.22562.112" />
+ <option value="bundled-js-predefined-d6986cc7102b-9c94529fcfe0-JavaScript-WS-252.26199.162" />
</set>
</attachedChunks>
</component>
@@ -108,6 +130,9 @@
<workItem from="1735256039333" duration="390000" />
<workItem from="1735256441657" duration="58156000" />
<workItem from="1735848116134" duration="80763000" />
+ <workItem from="1759868659577" duration="8847000" />
+ <workItem from="1760044946282" duration="43683000" />
+ <workItem from="1760402350251" duration="18740000" />
</task>
<servers />
</component>
diff --git a/package.json b/package.json
index c847f552..13a41028 100644
--- a/package.json
+++ b/package.json
@@ -120,6 +120,7 @@
"@spacebar/gateway": "dist/gateway",
"@spacebar/util": "dist/util",
"@spacebar/webrtc": "dist/webrtc",
+ "@spacebar/schemas": "dist/schemas",
"lambert-server": "dist/util/util/lambert-server"
},
"optionalDependencies": {
diff --git a/scripts/schema.js b/scripts/schema.js
index 32af357f..77205831 100644
--- a/scripts/schema.js
+++ b/scripts/schema.js
@@ -94,7 +94,7 @@ const Excluded = [
function main() {
const program = TJS.programFromConfig(
path.join(__dirname, "..", "tsconfig.json"),
- walk(path.join(__dirname, "..", "src", "util", "schemas")),
+ walk(path.join(__dirname, "..", "src", "schemas")),
);
const generator = TJS.buildGenerator(program, settings);
if (!generator || !program) return;
diff --git a/src/util/schemas/AckBulkSchema.ts b/src/schemas/AckBulkSchema.ts
index 5604c2fc..5604c2fc 100644
--- a/src/util/schemas/AckBulkSchema.ts
+++ b/src/schemas/AckBulkSchema.ts
diff --git a/src/util/schemas/ActivitySchema.ts b/src/schemas/ActivitySchema.ts
index f168f967..f168f967 100644
--- a/src/util/schemas/ActivitySchema.ts
+++ b/src/schemas/ActivitySchema.ts
diff --git a/src/util/schemas/ApplicationAuthorizeSchema.ts b/src/schemas/ApplicationAuthorizeSchema.ts
index 04b7b1ea..04b7b1ea 100644
--- a/src/util/schemas/ApplicationAuthorizeSchema.ts
+++ b/src/schemas/ApplicationAuthorizeSchema.ts
diff --git a/src/util/schemas/ApplicationCreateSchema.ts b/src/schemas/ApplicationCreateSchema.ts
index 80956ec4..80956ec4 100644
--- a/src/util/schemas/ApplicationCreateSchema.ts
+++ b/src/schemas/ApplicationCreateSchema.ts
diff --git a/src/util/schemas/ApplicationModifySchema.ts b/src/schemas/ApplicationModifySchema.ts
index a8717976..a8717976 100644
--- a/src/util/schemas/ApplicationModifySchema.ts
+++ b/src/schemas/ApplicationModifySchema.ts
diff --git a/src/util/schemas/AutomodRuleSchema.ts b/src/schemas/AutomodRuleSchema.ts
index 55cf2027..55cf2027 100644
--- a/src/util/schemas/AutomodRuleSchema.ts
+++ b/src/schemas/AutomodRuleSchema.ts
diff --git a/src/util/schemas/BackupCodesChallengeSchema.ts b/src/schemas/BackupCodesChallengeSchema.ts
index 25f1b707..25f1b707 100644
--- a/src/util/schemas/BackupCodesChallengeSchema.ts
+++ b/src/schemas/BackupCodesChallengeSchema.ts
diff --git a/src/util/schemas/BanCreateSchema.ts b/src/schemas/BanCreateSchema.ts
index 6d30ca22..6d30ca22 100644
--- a/src/util/schemas/BanCreateSchema.ts
+++ b/src/schemas/BanCreateSchema.ts
diff --git a/src/util/schemas/BanModeratorSchema.ts b/src/schemas/BanModeratorSchema.ts
index cba1a5ed..cba1a5ed 100644
--- a/src/util/schemas/BanModeratorSchema.ts
+++ b/src/schemas/BanModeratorSchema.ts
diff --git a/src/util/schemas/BanRegistrySchema.ts b/src/schemas/BanRegistrySchema.ts
index 4e768700..4e768700 100644
--- a/src/util/schemas/BanRegistrySchema.ts
+++ b/src/schemas/BanRegistrySchema.ts
diff --git a/src/util/schemas/BotModifySchema.ts b/src/schemas/BotModifySchema.ts
index 7d94da23..7d94da23 100644
--- a/src/util/schemas/BotModifySchema.ts
+++ b/src/schemas/BotModifySchema.ts
diff --git a/src/util/schemas/BulkBanSchema.ts b/src/schemas/BulkBanSchema.ts
index 48a7bac8..48a7bac8 100644
--- a/src/util/schemas/BulkBanSchema.ts
+++ b/src/schemas/BulkBanSchema.ts
diff --git a/src/util/schemas/BulkDeleteSchema.ts b/src/schemas/BulkDeleteSchema.ts
index ca22f10d..ca22f10d 100644
--- a/src/util/schemas/BulkDeleteSchema.ts
+++ b/src/schemas/BulkDeleteSchema.ts
diff --git a/src/util/schemas/ChannelModifySchema.ts b/src/schemas/ChannelModifySchema.ts
index 088ac459..088ac459 100644
--- a/src/util/schemas/ChannelModifySchema.ts
+++ b/src/schemas/ChannelModifySchema.ts
diff --git a/src/util/schemas/ChannelPermissionOverwriteSchema.ts b/src/schemas/ChannelPermissionOverwriteSchema.ts
index 6e8b3402..6e8b3402 100644
--- a/src/util/schemas/ChannelPermissionOverwriteSchema.ts
+++ b/src/schemas/ChannelPermissionOverwriteSchema.ts
diff --git a/src/util/schemas/ChannelReorderSchema.ts b/src/schemas/ChannelReorderSchema.ts
index 657ed420..657ed420 100644
--- a/src/util/schemas/ChannelReorderSchema.ts
+++ b/src/schemas/ChannelReorderSchema.ts
diff --git a/src/util/schemas/CodesVerificationSchema.ts b/src/schemas/CodesVerificationSchema.ts
index 3c95e619..3c95e619 100644
--- a/src/util/schemas/CodesVerificationSchema.ts
+++ b/src/schemas/CodesVerificationSchema.ts
diff --git a/src/util/schemas/ConnectedAccountSchema.ts b/src/schemas/ConnectedAccountSchema.ts
index 5fd05b71..3c3e76ec 100644
--- a/src/util/schemas/ConnectedAccountSchema.ts
+++ b/src/schemas/ConnectedAccountSchema.ts
@@ -16,7 +16,7 @@
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-import { ConnectedAccountTokenData } from "../interfaces";
+import { ConnectedAccountTokenData } from "../util/interfaces";
export interface ConnectedAccountSchema {
external_id: string;
diff --git a/src/util/schemas/ConnectionCallbackSchema.ts b/src/schemas/ConnectionCallbackSchema.ts
index b66bfe20..b66bfe20 100644
--- a/src/util/schemas/ConnectionCallbackSchema.ts
+++ b/src/schemas/ConnectionCallbackSchema.ts
diff --git a/src/util/schemas/ConnectionUpdateSchema.ts b/src/schemas/ConnectionUpdateSchema.ts
index f9f17b0d..f9f17b0d 100644
--- a/src/util/schemas/ConnectionUpdateSchema.ts
+++ b/src/schemas/ConnectionUpdateSchema.ts
diff --git a/src/util/schemas/DmChannelCreateSchema.ts b/src/schemas/DmChannelCreateSchema.ts
index 510ff9c3..510ff9c3 100644
--- a/src/util/schemas/DmChannelCreateSchema.ts
+++ b/src/schemas/DmChannelCreateSchema.ts
diff --git a/src/util/schemas/EmailDomainLookupSchema.ts b/src/schemas/EmailDomainLookupSchema.ts
index 43680aa4..43680aa4 100644
--- a/src/util/schemas/EmailDomainLookupSchema.ts
+++ b/src/schemas/EmailDomainLookupSchema.ts
diff --git a/src/util/schemas/EmailDomainLookupVerifyCodeSchema.ts b/src/schemas/EmailDomainLookupVerifyCodeSchema.ts
index 9fe0bd46..9fe0bd46 100644
--- a/src/util/schemas/EmailDomainLookupVerifyCodeSchema.ts
+++ b/src/schemas/EmailDomainLookupVerifyCodeSchema.ts
diff --git a/src/util/schemas/EmojiCreateSchema.ts b/src/schemas/EmojiCreateSchema.ts
index 5eae5a9a..5eae5a9a 100644
--- a/src/util/schemas/EmojiCreateSchema.ts
+++ b/src/schemas/EmojiCreateSchema.ts
diff --git a/src/util/schemas/EmojiModifySchema.ts b/src/schemas/EmojiModifySchema.ts
index 5d33bf61..5d33bf61 100644
--- a/src/util/schemas/EmojiModifySchema.ts
+++ b/src/schemas/EmojiModifySchema.ts
diff --git a/src/util/schemas/ForgotPasswordSchema.ts b/src/schemas/ForgotPasswordSchema.ts
index 0f9fc92d..0f9fc92d 100644
--- a/src/util/schemas/ForgotPasswordSchema.ts
+++ b/src/schemas/ForgotPasswordSchema.ts
diff --git a/src/util/schemas/GatewayBotResponse.ts b/src/schemas/GatewayBotResponse.ts
index c68ec09e..c68ec09e 100644
--- a/src/util/schemas/GatewayBotResponse.ts
+++ b/src/schemas/GatewayBotResponse.ts
diff --git a/src/util/schemas/GatewayPayloadSchema.ts b/src/schemas/GatewayPayloadSchema.ts
index 306f2c03..cb01f161 100644
--- a/src/util/schemas/GatewayPayloadSchema.ts
+++ b/src/schemas/GatewayPayloadSchema.ts
@@ -16,7 +16,7 @@
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-import { Tuple } from "lambert-server";
+import { Tuple } from "lambert-server*";
export const PayloadSchema = {
op: Number,
diff --git a/src/util/schemas/GatewayResponse.ts b/src/schemas/GatewayResponse.ts
index 5b771edc..5b771edc 100644
--- a/src/util/schemas/GatewayResponse.ts
+++ b/src/schemas/GatewayResponse.ts
diff --git a/src/util/schemas/GreetRequestSchema.ts b/src/schemas/GreetRequestSchema.ts
index 545952d0..545952d0 100644
--- a/src/util/schemas/GreetRequestSchema.ts
+++ b/src/schemas/GreetRequestSchema.ts
diff --git a/src/util/schemas/GuildCreateSchema.ts b/src/schemas/GuildCreateSchema.ts
index c293aa8f..278a759c 100644
--- a/src/util/schemas/GuildCreateSchema.ts
+++ b/src/schemas/GuildCreateSchema.ts
@@ -16,7 +16,7 @@
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-import { ChannelModifySchema } from ".";
+import { ChannelModifySchema } from "./index";
export interface GuildCreateSchema {
/**
diff --git a/src/util/schemas/GuildSubscriptionsBulkSchema.ts b/src/schemas/GuildSubscriptionsBulkSchema.ts
index 86f00a3d..86f00a3d 100644
--- a/src/util/schemas/GuildSubscriptionsBulkSchema.ts
+++ b/src/schemas/GuildSubscriptionsBulkSchema.ts
diff --git a/src/util/schemas/GuildTemplateCreateSchema.ts b/src/schemas/GuildTemplateCreateSchema.ts
index 048de6f0..048de6f0 100644
--- a/src/util/schemas/GuildTemplateCreateSchema.ts
+++ b/src/schemas/GuildTemplateCreateSchema.ts
diff --git a/src/util/schemas/GuildUpdateSchema.ts b/src/schemas/GuildUpdateSchema.ts
index 069be6cf..069be6cf 100644
--- a/src/util/schemas/GuildUpdateSchema.ts
+++ b/src/schemas/GuildUpdateSchema.ts
diff --git a/src/util/schemas/GuildUpdateWelcomeScreenSchema.ts b/src/schemas/GuildUpdateWelcomeScreenSchema.ts
index 8046aae6..8046aae6 100644
--- a/src/util/schemas/GuildUpdateWelcomeScreenSchema.ts
+++ b/src/schemas/GuildUpdateWelcomeScreenSchema.ts
diff --git a/src/util/schemas/HubWaitlistSignupSchema.ts b/src/schemas/HubWaitlistSignupSchema.ts
index 8114b3d8..8114b3d8 100644
--- a/src/util/schemas/HubWaitlistSignupSchema.ts
+++ b/src/schemas/HubWaitlistSignupSchema.ts
diff --git a/src/util/schemas/IdentifySchema.ts b/src/schemas/IdentifySchema.ts
index 0619dacc..0619dacc 100644
--- a/src/util/schemas/IdentifySchema.ts
+++ b/src/schemas/IdentifySchema.ts
diff --git a/src/util/schemas/InviteCreateSchema.ts b/src/schemas/InviteCreateSchema.ts
index 92333e77..92333e77 100644
--- a/src/util/schemas/InviteCreateSchema.ts
+++ b/src/schemas/InviteCreateSchema.ts
diff --git a/src/util/schemas/LazyRequestSchema.ts b/src/schemas/LazyRequestSchema.ts
index ca07d37b..ca07d37b 100644
--- a/src/util/schemas/LazyRequestSchema.ts
+++ b/src/schemas/LazyRequestSchema.ts
diff --git a/src/util/schemas/LoginResponse.ts b/src/schemas/LoginResponse.ts
index faf3f769..faf3f769 100644
--- a/src/util/schemas/LoginResponse.ts
+++ b/src/schemas/LoginResponse.ts
diff --git a/src/util/schemas/LoginSchema.ts b/src/schemas/LoginSchema.ts
index 55b6a020..55b6a020 100644
--- a/src/util/schemas/LoginSchema.ts
+++ b/src/schemas/LoginSchema.ts
diff --git a/src/util/schemas/MemberChangeProfileSchema.ts b/src/schemas/MemberChangeProfileSchema.ts
index d2d1481d..d2d1481d 100644
--- a/src/util/schemas/MemberChangeProfileSchema.ts
+++ b/src/schemas/MemberChangeProfileSchema.ts
diff --git a/src/util/schemas/MemberChangeSchema.ts b/src/schemas/MemberChangeSchema.ts
index e1ee0969..e1ee0969 100644
--- a/src/util/schemas/MemberChangeSchema.ts
+++ b/src/schemas/MemberChangeSchema.ts
diff --git a/src/util/schemas/MemberNickChangeSchema.ts b/src/schemas/MemberNickChangeSchema.ts
index 45890560..45890560 100644
--- a/src/util/schemas/MemberNickChangeSchema.ts
+++ b/src/schemas/MemberNickChangeSchema.ts
diff --git a/src/util/schemas/MessageAcknowledgeSchema.ts b/src/schemas/MessageAcknowledgeSchema.ts
index 3ba71649..3ba71649 100644
--- a/src/util/schemas/MessageAcknowledgeSchema.ts
+++ b/src/schemas/MessageAcknowledgeSchema.ts
diff --git a/src/util/schemas/MessageCreateSchema.ts b/src/schemas/MessageCreateSchema.ts
index f5037d66..f5037d66 100644
--- a/src/util/schemas/MessageCreateSchema.ts
+++ b/src/schemas/MessageCreateSchema.ts
diff --git a/src/util/schemas/MessageEditSchema.ts b/src/schemas/MessageEditSchema.ts
index 002e5af9..002e5af9 100644
--- a/src/util/schemas/MessageEditSchema.ts
+++ b/src/schemas/MessageEditSchema.ts
diff --git a/src/util/schemas/MfaCodesSchema.ts b/src/schemas/MfaCodesSchema.ts
index 1f66f08c..1f66f08c 100644
--- a/src/util/schemas/MfaCodesSchema.ts
+++ b/src/schemas/MfaCodesSchema.ts
diff --git a/src/util/schemas/ModifyGuildStickerSchema.ts b/src/schemas/ModifyGuildStickerSchema.ts
index 95eb5415..95eb5415 100644
--- a/src/util/schemas/ModifyGuildStickerSchema.ts
+++ b/src/schemas/ModifyGuildStickerSchema.ts
diff --git a/src/util/schemas/PasswordResetSchema.ts b/src/schemas/PasswordResetSchema.ts
index 15489a91..15489a91 100644
--- a/src/util/schemas/PasswordResetSchema.ts
+++ b/src/schemas/PasswordResetSchema.ts
diff --git a/src/util/schemas/PreloadMessagesRequestSchema.ts b/src/schemas/PreloadMessagesRequestSchema.ts
index 7c5145b7..7c5145b7 100644
--- a/src/util/schemas/PreloadMessagesRequestSchema.ts
+++ b/src/schemas/PreloadMessagesRequestSchema.ts
diff --git a/src/util/schemas/PruneSchema.ts b/src/schemas/PruneSchema.ts
index 88d2f6ec..88d2f6ec 100644
--- a/src/util/schemas/PruneSchema.ts
+++ b/src/schemas/PruneSchema.ts
diff --git a/src/util/schemas/PurgeSchema.ts b/src/schemas/PurgeSchema.ts
index 2e887998..2e887998 100644
--- a/src/util/schemas/PurgeSchema.ts
+++ b/src/schemas/PurgeSchema.ts
diff --git a/src/util/schemas/RefreshUrlsRequestSchema.ts b/src/schemas/RefreshUrlsRequestSchema.ts
index 9c1df548..9c1df548 100644
--- a/src/util/schemas/RefreshUrlsRequestSchema.ts
+++ b/src/schemas/RefreshUrlsRequestSchema.ts
diff --git a/src/util/schemas/RegisterSchema.ts b/src/schemas/RegisterSchema.ts
index cfee0f02..cfee0f02 100644
--- a/src/util/schemas/RegisterSchema.ts
+++ b/src/schemas/RegisterSchema.ts
diff --git a/src/util/schemas/RelationshipPostSchema.ts b/src/schemas/RelationshipPostSchema.ts
index 066ecfd8..066ecfd8 100644
--- a/src/util/schemas/RelationshipPostSchema.ts
+++ b/src/schemas/RelationshipPostSchema.ts
diff --git a/src/util/schemas/RelationshipPutSchema.ts b/src/schemas/RelationshipPutSchema.ts
index 36d9877d..36d9877d 100644
--- a/src/util/schemas/RelationshipPutSchema.ts
+++ b/src/schemas/RelationshipPutSchema.ts
diff --git a/src/util/schemas/RequestGuildMembersSchema.ts b/src/schemas/RequestGuildMembersSchema.ts
index 9e60d26e..9e60d26e 100644
--- a/src/util/schemas/RequestGuildMembersSchema.ts
+++ b/src/schemas/RequestGuildMembersSchema.ts
diff --git a/src/util/schemas/RoleModifySchema.ts b/src/schemas/RoleModifySchema.ts
index a6d18931..a6d18931 100644
--- a/src/util/schemas/RoleModifySchema.ts
+++ b/src/schemas/RoleModifySchema.ts
diff --git a/src/util/schemas/RolePositionUpdateSchema.ts b/src/schemas/RolePositionUpdateSchema.ts
index 6bfd7f32..6bfd7f32 100644
--- a/src/util/schemas/RolePositionUpdateSchema.ts
+++ b/src/schemas/RolePositionUpdateSchema.ts
diff --git a/src/util/schemas/SelectProtocolSchema.ts b/src/schemas/SelectProtocolSchema.ts
index d04adf71..d04adf71 100644
--- a/src/util/schemas/SelectProtocolSchema.ts
+++ b/src/schemas/SelectProtocolSchema.ts
diff --git a/src/util/schemas/SettingsProtoUpdateSchema.ts b/src/schemas/SettingsProtoUpdateSchema.ts
index 2b930bc0..2b930bc0 100644
--- a/src/util/schemas/SettingsProtoUpdateSchema.ts
+++ b/src/schemas/SettingsProtoUpdateSchema.ts
diff --git a/src/util/schemas/StreamCreateSchema.ts b/src/schemas/StreamCreateSchema.ts
index bb650791..bb650791 100644
--- a/src/util/schemas/StreamCreateSchema.ts
+++ b/src/schemas/StreamCreateSchema.ts
diff --git a/src/util/schemas/StreamDeleteSchema.ts b/src/schemas/StreamDeleteSchema.ts
index 0e2aff75..0e2aff75 100644
--- a/src/util/schemas/StreamDeleteSchema.ts
+++ b/src/schemas/StreamDeleteSchema.ts
diff --git a/src/util/schemas/StreamWatchSchema.ts b/src/schemas/StreamWatchSchema.ts
index 263bb11f..263bb11f 100644
--- a/src/util/schemas/StreamWatchSchema.ts
+++ b/src/schemas/StreamWatchSchema.ts
diff --git a/src/util/schemas/TeamCreateSchema.ts b/src/schemas/TeamCreateSchema.ts
index 5903a536..5903a536 100644
--- a/src/util/schemas/TeamCreateSchema.ts
+++ b/src/schemas/TeamCreateSchema.ts
diff --git a/src/util/schemas/TemplateCreateSchema.ts b/src/schemas/TemplateCreateSchema.ts
index 9e562c9b..9e562c9b 100644
--- a/src/util/schemas/TemplateCreateSchema.ts
+++ b/src/schemas/TemplateCreateSchema.ts
diff --git a/src/util/schemas/TemplateModifySchema.ts b/src/schemas/TemplateModifySchema.ts
index 49b02371..49b02371 100644
--- a/src/util/schemas/TemplateModifySchema.ts
+++ b/src/schemas/TemplateModifySchema.ts
diff --git a/src/util/schemas/TotpDisableSchema.ts b/src/schemas/TotpDisableSchema.ts
index 29706f48..29706f48 100644
--- a/src/util/schemas/TotpDisableSchema.ts
+++ b/src/schemas/TotpDisableSchema.ts
diff --git a/src/util/schemas/TotpEnableSchema.ts b/src/schemas/TotpEnableSchema.ts
index a80e06ac..a80e06ac 100644
--- a/src/util/schemas/TotpEnableSchema.ts
+++ b/src/schemas/TotpEnableSchema.ts
diff --git a/src/util/schemas/TotpSchema.ts b/src/schemas/TotpSchema.ts
index 657b7e71..657b7e71 100644
--- a/src/util/schemas/TotpSchema.ts
+++ b/src/schemas/TotpSchema.ts
diff --git a/src/util/schemas/UploadAttachmentRequestSchema.ts b/src/schemas/UploadAttachmentRequestSchema.ts
index 60bf89f6..60bf89f6 100644
--- a/src/util/schemas/UploadAttachmentRequestSchema.ts
+++ b/src/schemas/UploadAttachmentRequestSchema.ts
diff --git a/src/util/schemas/UserDeleteSchema.ts b/src/schemas/UserDeleteSchema.ts
index 40fb778d..40fb778d 100644
--- a/src/util/schemas/UserDeleteSchema.ts
+++ b/src/schemas/UserDeleteSchema.ts
diff --git a/src/util/schemas/UserGuildSettingsSchema.ts b/src/schemas/UserGuildSettingsSchema.ts
index 82edae9c..82edae9c 100644
--- a/src/util/schemas/UserGuildSettingsSchema.ts
+++ b/src/schemas/UserGuildSettingsSchema.ts
diff --git a/src/util/schemas/UserModifySchema.ts b/src/schemas/UserModifySchema.ts
index 6d2998eb..6d2998eb 100644
--- a/src/util/schemas/UserModifySchema.ts
+++ b/src/schemas/UserModifySchema.ts
diff --git a/src/util/schemas/UserNoteUpdateSchema.ts b/src/schemas/UserNoteUpdateSchema.ts
index 0a731279..0a731279 100644
--- a/src/util/schemas/UserNoteUpdateSchema.ts
+++ b/src/schemas/UserNoteUpdateSchema.ts
diff --git a/src/util/schemas/UserProfileModifySchema.ts b/src/schemas/UserProfileModifySchema.ts
index 3dea257a..3dea257a 100644
--- a/src/util/schemas/UserProfileModifySchema.ts
+++ b/src/schemas/UserProfileModifySchema.ts
diff --git a/src/util/schemas/UserSettingsSchema.ts b/src/schemas/UserSettingsSchema.ts
index 0d23e757..0d23e757 100644
--- a/src/util/schemas/UserSettingsSchema.ts
+++ b/src/schemas/UserSettingsSchema.ts
diff --git a/src/util/schemas/Validator.ts b/src/schemas/Validator.ts
index 1d9daf2c..04608603 100644
--- a/src/util/schemas/Validator.ts
+++ b/src/schemas/Validator.ts
@@ -25,7 +25,6 @@ const SchemaPath = path.join(
__dirname,
"..",
"..",
- "..",
"assets",
"schemas.json",
);
diff --git a/src/util/schemas/VanityUrlSchema.ts b/src/schemas/VanityUrlSchema.ts
index 12d5abd6..12d5abd6 100644
--- a/src/util/schemas/VanityUrlSchema.ts
+++ b/src/schemas/VanityUrlSchema.ts
diff --git a/src/util/schemas/VerifyEmailSchema.ts b/src/schemas/VerifyEmailSchema.ts
index ce297c5d..ce297c5d 100644
--- a/src/util/schemas/VerifyEmailSchema.ts
+++ b/src/schemas/VerifyEmailSchema.ts
diff --git a/src/util/schemas/VoiceIdentifySchema.ts b/src/schemas/VoiceIdentifySchema.ts
index 82f846c3..82f846c3 100644
--- a/src/util/schemas/VoiceIdentifySchema.ts
+++ b/src/schemas/VoiceIdentifySchema.ts
diff --git a/src/util/schemas/VoiceStateUpdateSchema.ts b/src/schemas/VoiceStateUpdateSchema.ts
index fda073e9..fda073e9 100644
--- a/src/util/schemas/VoiceStateUpdateSchema.ts
+++ b/src/schemas/VoiceStateUpdateSchema.ts
diff --git a/src/util/schemas/VoiceVideoSchema.ts b/src/schemas/VoiceVideoSchema.ts
index c621431b..c621431b 100644
--- a/src/util/schemas/VoiceVideoSchema.ts
+++ b/src/schemas/VoiceVideoSchema.ts
diff --git a/src/util/schemas/WebAuthnSchema.ts b/src/schemas/WebAuthnSchema.ts
index 3f5e0da7..3f5e0da7 100644
--- a/src/util/schemas/WebAuthnSchema.ts
+++ b/src/schemas/WebAuthnSchema.ts
diff --git a/src/util/schemas/WebhookCreateSchema.ts b/src/schemas/WebhookCreateSchema.ts
index 7bd0afa8..7bd0afa8 100644
--- a/src/util/schemas/WebhookCreateSchema.ts
+++ b/src/schemas/WebhookCreateSchema.ts
diff --git a/src/util/schemas/WebhookExecuteSchema.ts b/src/schemas/WebhookExecuteSchema.ts
index c2617d12..b50a4cf6 100644
--- a/src/util/schemas/WebhookExecuteSchema.ts
+++ b/src/schemas/WebhookExecuteSchema.ts
@@ -16,7 +16,7 @@
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-import { Embed } from "../entities";
+import { Embed } from "../util/entities";
import {
MessageCreateAttachment,
PollCreationSchema,
diff --git a/src/util/schemas/WebhookUpdateSchema.ts b/src/schemas/WebhookUpdateSchema.ts
index bc276e44..bc276e44 100755
--- a/src/util/schemas/WebhookUpdateSchema.ts
+++ b/src/schemas/WebhookUpdateSchema.ts
diff --git a/src/util/schemas/WidgetModifySchema.ts b/src/schemas/WidgetModifySchema.ts
index 50794d6f..50794d6f 100644
--- a/src/util/schemas/WidgetModifySchema.ts
+++ b/src/schemas/WidgetModifySchema.ts
diff --git a/src/util/schemas/index.ts b/src/schemas/index.ts
index 39710425..39710425 100644
--- a/src/util/schemas/index.ts
+++ b/src/schemas/index.ts
diff --git a/src/util/schemas/responses/APIErrorOrCaptchaResponse.ts b/src/schemas/responses/APIErrorOrCaptchaResponse.ts
index fd89a478..fd89a478 100644
--- a/src/util/schemas/responses/APIErrorOrCaptchaResponse.ts
+++ b/src/schemas/responses/APIErrorOrCaptchaResponse.ts
diff --git a/src/util/schemas/responses/APIErrorResponse.ts b/src/schemas/responses/APIErrorResponse.ts
index 547ee58d..547ee58d 100644
--- a/src/util/schemas/responses/APIErrorResponse.ts
+++ b/src/schemas/responses/APIErrorResponse.ts
diff --git a/src/util/schemas/responses/AccountStandingResponse.ts b/src/schemas/responses/AccountStandingResponse.ts
index 9315a32a..b2992c74 100644
--- a/src/util/schemas/responses/AccountStandingResponse.ts
+++ b/src/schemas/responses/AccountStandingResponse.ts
@@ -16,7 +16,7 @@
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-import { Attachment } from "../../entities";
+import { Attachment } from "../../util/entities";
export enum AccountStandingState {
ALL_GOOD = 100,
diff --git a/src/util/schemas/responses/BackupCodesChallengeResponse.ts b/src/schemas/responses/BackupCodesChallengeResponse.ts
index b587845d..b587845d 100644
--- a/src/util/schemas/responses/BackupCodesChallengeResponse.ts
+++ b/src/schemas/responses/BackupCodesChallengeResponse.ts
diff --git a/src/util/schemas/responses/CaptchaRequiredResponse.ts b/src/schemas/responses/CaptchaRequiredResponse.ts
index a58e6054..a58e6054 100644
--- a/src/util/schemas/responses/CaptchaRequiredResponse.ts
+++ b/src/schemas/responses/CaptchaRequiredResponse.ts
diff --git a/src/util/schemas/responses/CollectiblesCategoriesResponse.ts b/src/schemas/responses/CollectiblesCategoriesResponse.ts
index 57dbf47a..8a26d897 100644
--- a/src/util/schemas/responses/CollectiblesCategoriesResponse.ts
+++ b/src/schemas/responses/CollectiblesCategoriesResponse.ts
@@ -16,7 +16,7 @@
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-import { StringStringDictionary } from "../../util";
+import { StringStringDictionary } from "../../util/util";
// TODO: Clean up
export type CollectiblesCategoriesResponse = CollectiblesCategoryItem[];
diff --git a/src/util/schemas/responses/CollectiblesMarketingResponse.ts b/src/schemas/responses/CollectiblesMarketingResponse.ts
index 5fda9760..5fda9760 100644
--- a/src/util/schemas/responses/CollectiblesMarketingResponse.ts
+++ b/src/schemas/responses/CollectiblesMarketingResponse.ts
diff --git a/src/util/schemas/responses/CollectiblesShopResponse.ts b/src/schemas/responses/CollectiblesShopResponse.ts
index f168776a..f168776a 100644
--- a/src/util/schemas/responses/CollectiblesShopResponse.ts
+++ b/src/schemas/responses/CollectiblesShopResponse.ts
diff --git a/src/util/schemas/responses/DiscoverableGuildsResponse.ts b/src/schemas/responses/DiscoverableGuildsResponse.ts
index dc475902..9785c04c 100644
--- a/src/util/schemas/responses/DiscoverableGuildsResponse.ts
+++ b/src/schemas/responses/DiscoverableGuildsResponse.ts
@@ -16,7 +16,7 @@
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-import { Guild } from "../../entities";
+import { Guild } from "../../util/entities";
export interface DiscoverableGuildsResponse {
total: number;
diff --git a/src/util/schemas/responses/DmMessagesResponseSchema.ts b/src/schemas/responses/DmMessagesResponseSchema.ts
index 8bce6e63..8bce6e63 100644
--- a/src/util/schemas/responses/DmMessagesResponseSchema.ts
+++ b/src/schemas/responses/DmMessagesResponseSchema.ts
diff --git a/src/util/schemas/responses/EmailDomainLookupResponse.ts b/src/schemas/responses/EmailDomainLookupResponse.ts
index dc7faa63..dc7faa63 100644
--- a/src/util/schemas/responses/EmailDomainLookupResponse.ts
+++ b/src/schemas/responses/EmailDomainLookupResponse.ts
diff --git a/src/util/schemas/responses/EmailDomainLookupVerifyCodeResponse.ts b/src/schemas/responses/EmailDomainLookupVerifyCodeResponse.ts
index 1fcfba34..3e29c70d 100644
--- a/src/util/schemas/responses/EmailDomainLookupVerifyCodeResponse.ts
+++ b/src/schemas/responses/EmailDomainLookupVerifyCodeResponse.ts
@@ -16,7 +16,7 @@
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-import { Guild } from "../../entities";
+import { Guild } from "../../util/entities";
export interface EmailDomainLookupVerifyCodeResponse {
guild: Guild;
diff --git a/src/util/schemas/responses/EmojiSourceResponse.ts b/src/schemas/responses/EmojiSourceResponse.ts
index 6eeebb32..6eeebb32 100644
--- a/src/util/schemas/responses/EmojiSourceResponse.ts
+++ b/src/schemas/responses/EmojiSourceResponse.ts
diff --git a/src/util/schemas/responses/GatewayBotResponse.ts b/src/schemas/responses/GatewayBotResponse.ts
index c68ec09e..c68ec09e 100644
--- a/src/util/schemas/responses/GatewayBotResponse.ts
+++ b/src/schemas/responses/GatewayBotResponse.ts
diff --git a/src/util/schemas/responses/GatewayResponse.ts b/src/schemas/responses/GatewayResponse.ts
index 5b771edc..5b771edc 100644
--- a/src/util/schemas/responses/GatewayResponse.ts
+++ b/src/schemas/responses/GatewayResponse.ts
diff --git a/src/util/schemas/responses/GenerateRegistrationTokensResponse.ts b/src/schemas/responses/GenerateRegistrationTokensResponse.ts
index 4931eb5a..4931eb5a 100644
--- a/src/util/schemas/responses/GenerateRegistrationTokensResponse.ts
+++ b/src/schemas/responses/GenerateRegistrationTokensResponse.ts
diff --git a/src/util/schemas/responses/GuildBansResponse.ts b/src/schemas/responses/GuildBansResponse.ts
index 91011d5c..91011d5c 100644
--- a/src/util/schemas/responses/GuildBansResponse.ts
+++ b/src/schemas/responses/GuildBansResponse.ts
diff --git a/src/util/schemas/responses/GuildCreateResponse.ts b/src/schemas/responses/GuildCreateResponse.ts
index 50f5f2fc..50f5f2fc 100644
--- a/src/util/schemas/responses/GuildCreateResponse.ts
+++ b/src/schemas/responses/GuildCreateResponse.ts
diff --git a/src/util/schemas/responses/GuildDiscoveryRequirements.ts b/src/schemas/responses/GuildDiscoveryRequirements.ts
index 1c1ea0ad..1c1ea0ad 100644
--- a/src/util/schemas/responses/GuildDiscoveryRequirements.ts
+++ b/src/schemas/responses/GuildDiscoveryRequirements.ts
diff --git a/src/util/schemas/responses/GuildMessagesSearchResponse.ts b/src/schemas/responses/GuildMessagesSearchResponse.ts
index ec41965b..376b684e 100644
--- a/src/util/schemas/responses/GuildMessagesSearchResponse.ts
+++ b/src/schemas/responses/GuildMessagesSearchResponse.ts
@@ -24,7 +24,7 @@ import {
Poll,
PublicUser,
Role,
-} from "../../entities";
+} from "../../util/entities";
export interface GuildMessagesSearchMessage {
id: string;
diff --git a/src/util/schemas/responses/GuildProfileResponse.ts b/src/schemas/responses/GuildProfileResponse.ts
index 58e4b485..58e4b485 100644
--- a/src/util/schemas/responses/GuildProfileResponse.ts
+++ b/src/schemas/responses/GuildProfileResponse.ts
diff --git a/src/util/schemas/responses/GuildPruneResponse.ts b/src/schemas/responses/GuildPruneResponse.ts
index 2a24ef66..2a24ef66 100644
--- a/src/util/schemas/responses/GuildPruneResponse.ts
+++ b/src/schemas/responses/GuildPruneResponse.ts
diff --git a/src/util/schemas/responses/GuildRecommendationsResponse.ts b/src/schemas/responses/GuildRecommendationsResponse.ts
index db67ff67..2f7bb776 100644
--- a/src/util/schemas/responses/GuildRecommendationsResponse.ts
+++ b/src/schemas/responses/GuildRecommendationsResponse.ts
@@ -16,7 +16,7 @@
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-import { Guild } from "../../entities";
+import { Guild } from "../../util/entities";
export interface GuildRecommendationsResponse {
recommended_guilds: Guild[];
diff --git a/src/util/schemas/responses/GuildVanityUrl.ts b/src/schemas/responses/GuildVanityUrl.ts
index c6595a66..c6595a66 100644
--- a/src/util/schemas/responses/GuildVanityUrl.ts
+++ b/src/schemas/responses/GuildVanityUrl.ts
diff --git a/src/util/schemas/responses/GuildVoiceRegionsResponse.ts b/src/schemas/responses/GuildVoiceRegionsResponse.ts
index 63a77f86..63a77f86 100644
--- a/src/util/schemas/responses/GuildVoiceRegionsResponse.ts
+++ b/src/schemas/responses/GuildVoiceRegionsResponse.ts
diff --git a/src/util/schemas/responses/GuildWidgetJsonResponse.ts b/src/schemas/responses/GuildWidgetJsonResponse.ts
index bd692304..bd692304 100644
--- a/src/util/schemas/responses/GuildWidgetJsonResponse.ts
+++ b/src/schemas/responses/GuildWidgetJsonResponse.ts
diff --git a/src/util/schemas/responses/GuildWidgetSettingsResponse.ts b/src/schemas/responses/GuildWidgetSettingsResponse.ts
index 6ffc771a..6ffc771a 100644
--- a/src/util/schemas/responses/GuildWidgetSettingsResponse.ts
+++ b/src/schemas/responses/GuildWidgetSettingsResponse.ts
diff --git a/src/util/schemas/responses/HubDirectoryEntriesResponse.ts b/src/schemas/responses/HubDirectoryEntriesResponse.ts
index 9aaadfed..9efa90c7 100644
--- a/src/util/schemas/responses/HubDirectoryEntriesResponse.ts
+++ b/src/schemas/responses/HubDirectoryEntriesResponse.ts
@@ -16,7 +16,7 @@
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-import { Guild } from "../../entities";
+import { Guild } from "../../util/entities";
export interface HubDirectoryEntry {
author_id: string;
diff --git a/src/util/schemas/responses/HubWaitlistSignupResponse.ts b/src/schemas/responses/HubWaitlistSignupResponse.ts
index bd11df22..bd11df22 100644
--- a/src/util/schemas/responses/HubWaitlistSignupResponse.ts
+++ b/src/schemas/responses/HubWaitlistSignupResponse.ts
diff --git a/src/util/schemas/responses/InstanceDomainsResponse.ts b/src/schemas/responses/InstanceDomainsResponse.ts
index 0be3682b..0be3682b 100644
--- a/src/util/schemas/responses/InstanceDomainsResponse.ts
+++ b/src/schemas/responses/InstanceDomainsResponse.ts
diff --git a/src/util/schemas/responses/InstancePingResponse.ts b/src/schemas/responses/InstancePingResponse.ts
index 4ff3950a..4ff3950a 100644
--- a/src/util/schemas/responses/InstancePingResponse.ts
+++ b/src/schemas/responses/InstancePingResponse.ts
diff --git a/src/util/schemas/responses/InstanceStatsResponse.ts b/src/schemas/responses/InstanceStatsResponse.ts
index 60541f02..60541f02 100644
--- a/src/util/schemas/responses/InstanceStatsResponse.ts
+++ b/src/schemas/responses/InstanceStatsResponse.ts
diff --git a/src/util/schemas/responses/LocationMetadataResponse.ts b/src/schemas/responses/LocationMetadataResponse.ts
index 2a7ca9bf..2a7ca9bf 100644
--- a/src/util/schemas/responses/LocationMetadataResponse.ts
+++ b/src/schemas/responses/LocationMetadataResponse.ts
diff --git a/src/util/schemas/responses/MemberJoinGuildResponse.ts b/src/schemas/responses/MemberJoinGuildResponse.ts
index 67d2de01..40002e11 100644
--- a/src/util/schemas/responses/MemberJoinGuildResponse.ts
+++ b/src/schemas/responses/MemberJoinGuildResponse.ts
@@ -17,7 +17,7 @@
*/
import { GuildCreateResponse } from "@spacebar/util";
-import { Emoji, Role, Sticker } from "../../entities";
+import { Emoji, Role, Sticker } from "../../util/entities";
export interface MemberJoinGuildResponse {
guild: GuildCreateResponse;
diff --git a/src/util/schemas/responses/OAuthAuthorizeResponse.ts b/src/schemas/responses/OAuthAuthorizeResponse.ts
index ba81f94c..ba81f94c 100644
--- a/src/util/schemas/responses/OAuthAuthorizeResponse.ts
+++ b/src/schemas/responses/OAuthAuthorizeResponse.ts
diff --git a/src/util/schemas/responses/PreloadMessagesResponseSchema.ts b/src/schemas/responses/PreloadMessagesResponseSchema.ts
index 9452896e..9452896e 100644
--- a/src/util/schemas/responses/PreloadMessagesResponseSchema.ts
+++ b/src/schemas/responses/PreloadMessagesResponseSchema.ts
diff --git a/src/util/schemas/responses/RefreshUrlsResponse.ts b/src/schemas/responses/RefreshUrlsResponse.ts
index b08efaa4..b08efaa4 100644
--- a/src/util/schemas/responses/RefreshUrlsResponse.ts
+++ b/src/schemas/responses/RefreshUrlsResponse.ts
diff --git a/src/util/schemas/responses/SettingsProtoUpdateResponse.ts b/src/schemas/responses/SettingsProtoUpdateResponse.ts
index 42f8621a..42f8621a 100644
--- a/src/util/schemas/responses/SettingsProtoUpdateResponse.ts
+++ b/src/schemas/responses/SettingsProtoUpdateResponse.ts
diff --git a/src/util/schemas/responses/TeamListResponse.ts b/src/schemas/responses/TeamListResponse.ts
index e4e8284e..e4e8284e 100644
--- a/src/util/schemas/responses/TeamListResponse.ts
+++ b/src/schemas/responses/TeamListResponse.ts
diff --git a/src/util/schemas/responses/Tenor.ts b/src/schemas/responses/Tenor.ts
index 5af229e8..5af229e8 100644
--- a/src/util/schemas/responses/Tenor.ts
+++ b/src/schemas/responses/Tenor.ts
diff --git a/src/util/schemas/responses/TokenResponse.ts b/src/schemas/responses/TokenResponse.ts
index bc136051..c0f1346c 100644
--- a/src/util/schemas/responses/TokenResponse.ts
+++ b/src/schemas/responses/TokenResponse.ts
@@ -16,7 +16,7 @@
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-import { BackupCode, UserSettings } from "../../entities";
+import { BackupCode, UserSettings } from "../../util/entities";
export interface TokenResponse {
token: string;
diff --git a/src/util/schemas/responses/TypedResponses.ts b/src/schemas/responses/TypedResponses.ts
index bc204502..86d0849e 100644
--- a/src/util/schemas/responses/TypedResponses.ts
+++ b/src/schemas/responses/TypedResponses.ts
@@ -17,8 +17,8 @@
*/
import { GuildBansResponse, GuildCreateResponse } from "@spacebar/util";
-import { GeneralConfiguration, LimitsConfiguration } from "../../config";
-import { DmChannelDTO } from "../../dtos";
+import { GeneralConfiguration, LimitsConfiguration } from "../../util/config";
+import { DmChannelDTO } from "../../util/dtos";
import {
Application,
BackupCode,
@@ -37,7 +37,7 @@ import {
StickerPack,
Template,
Webhook,
-} from "../../entities";
+} from "../../util/entities";
import { GuildVoiceRegion } from "./GuildVoiceRegionsResponse";
// removes internal properties from the guild class
diff --git a/src/util/schemas/responses/UpdatesResponse.ts b/src/schemas/responses/UpdatesResponse.ts
index d8770b4e..d8770b4e 100644
--- a/src/util/schemas/responses/UpdatesResponse.ts
+++ b/src/schemas/responses/UpdatesResponse.ts
diff --git a/src/util/schemas/responses/UploadAttachmentResponseSchema.ts b/src/schemas/responses/UploadAttachmentResponseSchema.ts
index eab5f22e..eab5f22e 100644
--- a/src/util/schemas/responses/UploadAttachmentResponseSchema.ts
+++ b/src/schemas/responses/UploadAttachmentResponseSchema.ts
diff --git a/src/util/schemas/responses/UserNoteResponse.ts b/src/schemas/responses/UserNoteResponse.ts
index 0bde99a3..0bde99a3 100644
--- a/src/util/schemas/responses/UserNoteResponse.ts
+++ b/src/schemas/responses/UserNoteResponse.ts
diff --git a/src/util/schemas/responses/UserProfileResponse.ts b/src/schemas/responses/UserProfileResponse.ts
index 7b63542e..7b63542e 100644
--- a/src/util/schemas/responses/UserProfileResponse.ts
+++ b/src/schemas/responses/UserProfileResponse.ts
diff --git a/src/util/schemas/responses/UserRelationsResponse.ts b/src/schemas/responses/UserRelationsResponse.ts
index 808dd3d3..808dd3d3 100644
--- a/src/util/schemas/responses/UserRelationsResponse.ts
+++ b/src/schemas/responses/UserRelationsResponse.ts
diff --git a/src/util/schemas/responses/UserRelationshipsResponse.ts b/src/schemas/responses/UserRelationshipsResponse.ts
index 115c45ae..1a3341f1 100644
--- a/src/util/schemas/responses/UserRelationshipsResponse.ts
+++ b/src/schemas/responses/UserRelationshipsResponse.ts
@@ -15,7 +15,7 @@
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-import { PublicUser, RelationshipType } from "../../entities";
+import { PublicUser, RelationshipType } from "../../util/entities";
export interface UserRelationshipsResponse {
id: string;
diff --git a/src/util/schemas/responses/WebAuthnCreateResponse.ts b/src/schemas/responses/WebAuthnCreateResponse.ts
index 57386e6d..57386e6d 100644
--- a/src/util/schemas/responses/WebAuthnCreateResponse.ts
+++ b/src/schemas/responses/WebAuthnCreateResponse.ts
diff --git a/src/util/schemas/responses/WebhookCreateResponse.ts b/src/schemas/responses/WebhookCreateResponse.ts
index 7226e617..6f1cd241 100644
--- a/src/util/schemas/responses/WebhookCreateResponse.ts
+++ b/src/schemas/responses/WebhookCreateResponse.ts
@@ -16,7 +16,7 @@
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-import { User, Webhook } from "../../entities";
+import { User, Webhook } from "../../util/entities";
export interface WebhookCreateResponse {
user: User;
diff --git a/src/util/schemas/responses/index.ts b/src/schemas/responses/index.ts
index dcf49f3c..dcf49f3c 100644
--- a/src/util/schemas/responses/index.ts
+++ b/src/schemas/responses/index.ts
diff --git a/src/util/connections/Connection.ts b/src/util/connections/Connection.ts
index 638dde2c..32ef6351 100644
--- a/src/util/connections/Connection.ts
+++ b/src/util/connections/Connection.ts
@@ -18,7 +18,7 @@
import crypto from "crypto";
import { ConnectedAccount } from "../entities";
-import { ConnectedAccountSchema, ConnectionCallbackSchema } from "../schemas";
+import { ConnectedAccountSchema, ConnectionCallbackSchema } from "@spacebar/schemas*";
import { Config, DiscordApiErrors } from "../util";
/**
diff --git a/src/util/index.ts b/src/util/index.ts
index 9a84d1af..f2b526e0 100644
--- a/src/util/index.ts
+++ b/src/util/index.ts
@@ -24,7 +24,7 @@ export * from "./util/index";
export * from "./interfaces/index";
export * from "./entities/index";
export * from "./dtos/index";
-export * from "./schemas";
+export * from "@spacebar/schemas*";
export * from "./imports";
export * from "./config";
export * from "./connections";
diff --git a/tsconfig.json b/tsconfig.json
index f3501339..c72ac351 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -39,6 +39,7 @@
"@spacebar/cdn*": ["./src/cdn"],
"@spacebar/util*": ["./src/util"],
"@spacebar/webrtc*": ["./src/webrtc"],
+ "@spacebar/schemas*": ["./src/schemas"],
"lambert-server*": ["./src/util/util/lambert-server"]
} /* Specify a set of entries that re-map imports to additional lookup locations. */,
// "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */
|
