refactor: move zod schemas to a different directory

Author: virtual-designer

src/framework/typescript/commands/Context.ts

@@ -17,7 +17,7 @@
  * along with SudoBot. If not, see <https://www.gnu.org/licenses/>.
  */
 
-import type { GuildConfig } from "@main/types/GuildConfigSchema";
+import type { GuildConfig } from "@main/schemas/GuildConfigSchema";
 import type {
     ChatInputCommandInteraction,
     ContextMenuCommandInteraction,

src/main/typescript/automod/RuleModerationService.ts

@@ -2,19 +2,19 @@ import { Inject } from "@framework/container/Inject";
 import { Name } from "@framework/services/Name";
 import { Service } from "@framework/services/Service";
 import { HasEventListeners } from "@framework/types/HasEventListeners";
-import { LogEventType } from "@main/types/LoggingSchema";
+import { LogEventType } from "@main/schemas/LoggingSchema";
 import { GuildMember, Message, Snowflake, TextChannel } from "discord.js";
 import { MessageAutoModServiceContract } from "../contracts/MessageAutoModServiceContract";
 import {
     MessageRuleScope,
     type default as ModerationRuleHandlerContract
 } from "../contracts/ModerationRuleHandlerContract";
+import { MessageRuleType } from "../schemas/MessageRuleSchema";
 import ModerationRuleHandler from "../security/ModerationRuleHandler";
 import type AuditLoggingService from "../services/AuditLoggingService";
 import type ConfigurationManager from "../services/ConfigurationManager";
 import type ModerationActionService from "../services/ModerationActionService";
 import type PermissionManagerService from "../services/PermissionManagerService";
-import { MessageRuleType } from "../types/MessageRuleSchema";
 import { safeMemberFetch } from "../utils/fetch";
 
 @Name("ruleModerationService")

src/main/typescript/commands/moderation/SaveMessageCommand.ts

@@ -2,8 +2,8 @@ import { Buildable, Command } from "@framework/commands/Command";
 import Context from "@framework/commands/Context";
 import { ContextType } from "@framework/commands/ContextType";
 import { Inject } from "@framework/container/Inject";
+import { LogEventType } from "@main/schemas/LoggingSchema";
 import type AuditLoggingService from "@main/services/AuditLoggingService";
-import { LogEventType } from "@main/types/LoggingSchema";
 import {
     ApplicationCommandType,
     PermissionFlagsBits,

src/main/typescript/contracts/ModerationRuleHandlerContract.ts

@@ -1,5 +1,5 @@
 import type { APIEmbed, Awaitable, GuildMember, Message } from "discord.js";
-import type { MessageRuleType } from "../types/MessageRuleSchema";
+import type { MessageRuleType } from "../schemas/MessageRuleSchema";
 
 type HandlerRecord = {
     [K in MessageRuleType["type"]]: Handler;

src/main/typescript/events/GuildAuditLogEntryCreateEventListener.ts

@@ -2,8 +2,8 @@ import { Inject } from "@framework/container/Inject";
 import EventListener from "@framework/events/EventListener";
 import { Events } from "@framework/types/ClientEvents";
 import { fetchUser } from "@framework/utils/entities";
+import { LogEventType } from "@main/schemas/LoggingSchema";
 import type AuditLoggingService from "@main/services/AuditLoggingService";
-import { LogEventType } from "@main/types/LoggingSchema";
 import { InfractionDeliveryStatus, InfractionType } from "@prisma/client";
 import { AuditLogEvent, Guild, GuildAuditLogsEntry, GuildMember, User } from "discord.js";
 

src/main/typescript/events/member/GuildMemberAddEventListener.ts

@@ -2,9 +2,9 @@ import { Inject } from "@framework/container/Inject";
 import EventListener from "@framework/events/EventListener";
 import { Events } from "@framework/types/ClientEvents";
 import type AntiMemberJoinService from "@main/automod/AntiMemberJoinService";
+import { LogEventType } from "@main/schemas/LoggingSchema";
 import type AuditLoggingService from "@main/services/AuditLoggingService";
 import type InfractionManager from "@main/services/InfractionManager";
-import { LogEventType } from "@main/types/LoggingSchema";
 import type { GuildMember } from "discord.js";
 
 class GuildMemberAddEventListener extends EventListener<Events.GuildMemberAdd> {

src/main/typescript/events/member/GuildMemberRemoveEventListener.ts

@@ -2,9 +2,9 @@ import { Inject } from "@framework/container/Inject";
 import EventListener from "@framework/events/EventListener";
 import { Events } from "@framework/types/ClientEvents";
 import { fetchUser } from "@framework/utils/entities";
+import { LogEventType } from "@main/schemas/LoggingSchema";
 import type AuditLoggingService from "@main/services/AuditLoggingService";
 import type InfractionManager from "@main/services/InfractionManager";
-import { LogEventType } from "@main/types/LoggingSchema";
 import { InfractionDeliveryStatus, InfractionType } from "@prisma/client";
 import { AuditLogEvent, type GuildMember } from "discord.js";
 

src/main/typescript/events/message/MessageBulkDeleteEventListener.ts

@@ -2,8 +2,8 @@ import { Inject } from "@framework/container/Inject";
 import EventListener from "@framework/events/EventListener";
 import { Events } from "@framework/types/ClientEvents";
 import { fetchUser } from "@framework/utils/entities";
+import { LogEventType } from "@main/schemas/LoggingSchema";
 import type AuditLoggingService from "@main/services/AuditLoggingService";
-import { LogEventType } from "@main/types/LoggingSchema";
 import {
     AuditLogEvent,
     type Collection,

src/main/typescript/events/message/MessageDeleteEventListener.ts

@@ -1,8 +1,8 @@
 import { Inject } from "@framework/container/Inject";
 import EventListener from "@framework/events/EventListener";
 import { fetchUser } from "@framework/utils/entities";
+import { LogEventType } from "@main/schemas/LoggingSchema";
 import type AuditLoggingService from "@main/services/AuditLoggingService";
-import { LogEventType } from "@main/types/LoggingSchema";
 import { AuditLogEvent, Events, Message, Snowflake } from "discord.js";
 
 class MessageDeleteEventListener extends EventListener<Events.MessageDelete> {

src/main/typescript/events/message/MessageUpdateEventListener.ts

@@ -1,7 +1,7 @@
 import { Inject } from "@framework/container/Inject";
 import EventListener from "@framework/events/EventListener";
+import { LogEventType } from "@main/schemas/LoggingSchema";
 import type AuditLoggingService from "@main/services/AuditLoggingService";
-import { LogEventType } from "@main/types/LoggingSchema";
 import { Events, Message } from "discord.js";
 
 class MessageUpdateEventListener extends EventListener<Events.MessageUpdate> {

src/main/typescript/queues/MassUnbanQueue.ts

@@ -1,5 +1,5 @@
 import Queue from "@framework/queues/Queue";
-import { LogEventType } from "@main/types/LoggingSchema";
+import { LogEventType } from "@main/schemas/LoggingSchema";
 import { InfractionType, type PrismaClient } from "@prisma/client";
 import type { Snowflake } from "discord.js";
 

src/main/typescript/types/GuildConfigSchema.ts renamed to src/main/typescript/schemas/GuildConfigSchema.ts

@@ -17,8 +17,8 @@
  * along with SudoBot. If not, see <https://www.gnu.org/licenses/>.
  */
 
-import { LoggingSchema } from "@main/types/LoggingSchema";
-import { SurveySystemConfig } from "@main/types/SurveySystemConfig";
+import { LoggingSchema } from "@main/schemas/LoggingSchema";
+import { SurveySystemConfig } from "@main/schemas/SurveySystemConfig";
 import { z } from "zod";
 import { MessageRuleSchema } from "./MessageRuleSchema";
 import { ModerationAction } from "./ModerationAction";

src/main/typescript/types/LoggingSchema.ts renamed to src/main/typescript/schemas/LoggingSchema.ts

@@ -1,7 +1,7 @@
 import type Duration from "@framework/datetime/Duration";
 import type { RuleExecResult } from "@main/contracts/ModerationRuleHandlerContract";
-import type { MessageRuleType } from "@main/types/MessageRuleSchema";
-import { zSnowflake } from "@main/types/SnowflakeSchema";
+import type { MessageRuleType } from "@main/schemas/MessageRuleSchema";
+import { zSnowflake } from "@main/schemas/SnowflakeSchema";
 import type {
     Collection,
     Guild,

src/main/typescript/types/MessageRuleSchema.ts renamed to src/main/typescript/schemas/MessageRuleSchema.ts

@@ -1,4 +1,4 @@
-import { zSnowflake } from "@main/types/SnowflakeSchema";
+import { zSnowflake } from "@main/schemas/SnowflakeSchema";
 import { z } from "zod";
 
 const SurveyQuestion = z.object({

src/main/typescript/types/ModerationAction.ts renamed to src/main/typescript/schemas/ModerationAction.ts

@@ -7,7 +7,6 @@ import { fetchChannel } from "@framework/utils/entities";
 import { isDiscordAPIError } from "@framework/utils/errors";
 import { Colors } from "@main/constants/Colors";
 import { RuleExecResult } from "@main/contracts/ModerationRuleHandlerContract";
-import ConfigurationManager from "@main/services/ConfigurationManager";
 import {
     LogEventArgs,
     LogEventType,
@@ -24,9 +23,10 @@ import {
     LogMemberWarningAddPayload,
     LogMessageBulkDeletePayload,
     LogUserNoteAddPayload
-} from "@main/types/LoggingSchema";
-import { MessageRuleType } from "@main/types/MessageRuleSchema";
-import { ModerationAction } from "@main/types/ModerationAction";
+} from "@main/schemas/LoggingSchema";
+import { MessageRuleType } from "@main/schemas/MessageRuleSchema";
+import { ModerationAction } from "@main/schemas/ModerationAction";
+import ConfigurationManager from "@main/services/ConfigurationManager";
 import { chunkedString } from "@main/utils/utils";
 import { formatDistanceToNowStrict } from "date-fns";
 import {

src/main/typescript/types/SnowflakeSchema.ts renamed to src/main/typescript/schemas/SnowflakeSchema.ts

@@ -26,8 +26,8 @@ import fs, { writeFile } from "fs/promises";
 import path from "path";
 import { AnyZodObject, z } from "zod";
 import { zodToJsonSchema } from "zod-to-json-schema";
-import { GuildConfig, GuildConfigSchema } from "../types/GuildConfigSchema";
-import { SystemConfig, SystemConfigSchema } from "../types/SystemConfigSchema";
+import { GuildConfig, GuildConfigSchema } from "../schemas/GuildConfigSchema";
+import { SystemConfig, SystemConfigSchema } from "../schemas/SystemConfigSchema";
 import { systemPrefix } from "../utils/utils";
 
 export const name = "configManager";

src/main/typescript/types/SurveySystemConfig.ts renamed to src/main/typescript/schemas/SurveySystemConfig.ts

@@ -28,8 +28,8 @@ import { fetchMember, fetchUser } from "@framework/utils/entities";
 import { isDiscordAPIError } from "@framework/utils/errors";
 import { also } from "@framework/utils/utils";
 import MassUnbanQueue from "@main/queues/MassUnbanQueue";
+import { LogEventType } from "@main/schemas/LoggingSchema";
 import type AuditLoggingService from "@main/services/AuditLoggingService";
-import { LogEventType } from "@main/types/LoggingSchema";
 import { Infraction, InfractionDeliveryStatus, InfractionType, PrismaClient } from "@prisma/client";
 import { AsciiTable3 } from "ascii-table3";
 import { formatDistanceStrict, formatDistanceToNowStrict } from "date-fns";
@@ -63,7 +63,7 @@ import InfractionChannelDeleteQueue from "../queues/InfractionChannelDeleteQueue
 import RoleQueue from "../queues/RoleQueue";
 import UnbanQueue from "../queues/UnbanQueue";
 import UnmuteQueue from "../queues/UnmuteQueue";
-import { GuildConfig } from "../types/GuildConfigSchema";
+import { GuildConfig } from "../schemas/GuildConfigSchema";
 import { userInfo } from "../utils/embed";
 import ConfigurationManager from "./ConfigurationManager";
 import QueueService from "./QueueService";

src/main/typescript/types/SystemConfigSchema.ts renamed to src/main/typescript/schemas/SystemConfigSchema.ts

@@ -4,7 +4,7 @@ import { Name } from "@framework/services/Name";
 import { Service } from "@framework/services/Service";
 import { Infraction } from "@prisma/client";
 import { Guild, GuildMember, Message, TextChannel, User } from "discord.js";
-import { ModerationAction } from "../types/ModerationAction";
+import { ModerationAction } from "../schemas/ModerationAction";
 import type InfractionManager from "./InfractionManager";
 
 type MemberOnlyAction = Extract<ModerationAction, { type: "kick" | "mute" | "role" | "warn" }>;

src/main/typescript/types/TriggerSchema.ts renamed to src/main/typescript/schemas/TriggerSchema.ts

@@ -29,10 +29,10 @@ import {
 import { Name } from "@framework/services/Name";
 import { OptionalRecord } from "@framework/types/OptionalRecord";
 import { Guild, GuildMember, Snowflake } from "discord.js";
+import { PermissionMode } from "../schemas/GuildConfigSchema";
 import DiscordPermissionManager from "../security/DiscordPermissionManager";
 import LayeredPermissionManager from "../security/LayeredPermissionManager";
 import LevelBasedPermissionManager from "../security/LevelBasedPermissionManager";
-import { PermissionMode } from "../types/GuildConfigSchema";
 import ConfigurationManager from "./ConfigurationManager";
 
 @Name("permissionManager")

src/main/typescript/services/AuditLoggingService.ts

@@ -32,7 +32,7 @@
             "@root/*": ["./*"],
         }
     },
-    "include": ["src/main/typescript/types/globals.d.ts", "src/**/*.ts", "build.blaze.ts"],
+    "include": ["src/main/typescript/types/global/globals.d.ts", "src/**/*.ts", "build.blaze.ts"],
     "exclude": [
         "./backup",
         "./tmp",