Skip to content

Commit 4ec1ed8

Browse files
refactor: rename zod schemas to stay consistent
1 parent 636f250 commit 4ec1ed8

File tree

5 files changed

+9
-10
lines changed

5 files changed

+9
-10
lines changed

src/main/typescript/schemas/GuildConfigSchema.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
*/
1919

2020
import { LoggingSchema } from "@main/schemas/LoggingSchema";
21-
import { SurveySystemConfig } from "@main/schemas/SurveySystemConfig";
21+
import { SurveySystemConfigSchema } from "@main/schemas/SurveySystemConfigSchema";
2222
import { z } from "zod";
2323
import { MessageRuleSchema } from "./MessageRuleSchema";
24-
import { ModerationAction } from "./ModerationAction";
24+
import { ModerationActionSchema } from "./ModerationActionSchema";
2525
import { zSnowflake } from "./SnowflakeSchema";
2626

2727
export const PermissionModeSchema = z.union([
@@ -122,7 +122,7 @@ export const GuildConfigSchema = z.object({
122122
mode: z.enum(["exclude", "include"]).default("exclude")
123123
})
124124
.default({}),
125-
actions: z.array(ModerationAction)
125+
actions: z.array(ModerationActionSchema)
126126
})
127127
.optional(),
128128
extensions: z
@@ -168,7 +168,7 @@ export const GuildConfigSchema = z.object({
168168
.optional()
169169
})
170170
.optional(),
171-
survey_system: SurveySystemConfig.optional()
171+
survey_system: SurveySystemConfigSchema.optional()
172172
/*
173173
quickmute: z
174174
.object({

src/main/typescript/schemas/MessageRuleSchema.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
*/
1919

2020
import { z } from "zod";
21-
import { ModerationAction } from "./ModerationAction";
21+
import { ModerationActionSchema } from "./ModerationActionSchema";
2222
import { zSnowflake } from "./SnowflakeSchema";
2323

2424
const hasStringArrayData = {
2525
data: z.array(z.string()).default([])
2626
};
2727

2828
const Common = {
29-
actions: z.array(ModerationAction).default([]),
29+
actions: z.array(ModerationActionSchema).default([]),
3030
mode: z.enum(["normal", "invert"]).default("normal"),
3131
enabled: z.boolean().default(true),
3232
bail: z.boolean().default(true),

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const CommonOptions = {
66
notify: z.boolean().optional()
77
};
88

9-
export const ModerationAction = z.union([
9+
export const ModerationActionSchema = z.union([
1010
z.object({
1111
...CommonOptions,
1212
type: z.literal("ban"),
@@ -56,4 +56,4 @@ export const ModerationAction = z.union([
5656
})
5757
]);
5858

59-
export type ModerationAction = z.infer<typeof ModerationAction>;
59+
export type ModerationActionType = z.infer<typeof ModerationActionSchema>;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const SurveyQuestion = z.object({
1111
default_value: z.string().optional()
1212
});
1313

14-
export const SurveySystemConfig = z.object({
14+
export const SurveySystemConfigSchema = z.object({
1515
enabled: z.boolean().default(false),
1616
default_log_channel: zSnowflake.optional(),
1717
surveys: z

src/main/typescript/services/ModerationActionService.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { Name } from "@framework/services/Name";
44
import { Service } from "@framework/services/Service";
55
import { Infraction } from "@prisma/client";
66
import { Guild, GuildMember, Message, TextChannel, User } from "discord.js";
7-
import { ModerationAction } from "../schemas/ModerationAction";
87
import type InfractionManager from "./InfractionManager";
98

109
type MemberOnlyAction = Extract<ModerationAction, { type: "kick" | "mute" | "role" | "warn" }>;

0 commit comments

Comments
 (0)