Skip to content

Commit cf8f88c

Browse files
committed
Change configs to using camel case
1 parent 9741033 commit cf8f88c

29 files changed

Lines changed: 155 additions & 164 deletions

File tree

backend/src/common/schema/message.ts

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,19 @@ function message<T extends z.ZodType>(stringType: (markdown: boolean) => T) {
1212
return z
1313
.strictObject({
1414
content: stringType(true),
15-
allowed_mentions: z
15+
allowedMentions: z
1616
.strictObject({
1717
everyone: z.boolean(),
18-
replied_user: z.boolean(),
18+
repliedUser: z.boolean(),
1919
users: z.union([z.boolean(), Snowflake.array().max(100)]),
2020
roles: z.union([z.boolean(), Snowflake.array().max(100)]),
2121
})
22-
.partial()
23-
.transform(({ replied_user, ...input }) => ({
24-
repliedUser: replied_user,
25-
...input,
26-
})),
22+
.partial(),
2723
embeds: embed(stringType).array(),
2824
silent: z.boolean(),
2925
})
3026
.partial()
31-
.transform(({ allowed_mentions, silent, ...input }) => ({
32-
allowedMentions: allowed_mentions,
27+
.transform(({ silent, ...input }) => ({
3328
flags: silent ? MessageFlags.SUPPRESS_NOTIFICATIONS : 0,
3429
...input,
3530
}));
@@ -57,12 +52,8 @@ function embed<T extends z.ZodType>(stringType: (markdown: boolean) => T) {
5752
.strictObject({
5853
name: stringType(false),
5954
url: stringType(false).optional(),
60-
icon_url: stringType(false).optional(),
61-
})
62-
.transform(({ icon_url, ...input }) => ({
63-
iconURL: icon_url,
64-
...input,
65-
})),
55+
iconURL: stringType(false).optional(),
56+
}),
6657
fields: z
6758
.strictObject({
6859
name: stringType(true),

backend/src/common/schema/permissionsFilter.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ import { NumberFilter } from "#common/schema/numberFilter.ts";
33
import { z } from "zod";
44

55
export const PermissionsFilter = z.strictObject({
6-
in_group: z.string().array().optional(),
7-
in_channel: Snowflake.array().optional(),
8-
in_channel_category: Snowflake.array().optional(),
9-
in_thread: Snowflake.array().optional(),
6+
inGroup: z.string().array().optional(),
7+
inChannel: Snowflake.array().optional(),
8+
inChannelCategory: Snowflake.array().optional(),
9+
inThread: Snowflake.array().optional(),
1010
level: NumberFilter.optional(),
1111
});
1212
export type PermissionsFilter = z.output<typeof PermissionsFilter>;

backend/src/plugin/core/command/help/list.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ export function renderCommandListPage(
114114
entries = [];
115115

116116
const prefix =
117-
coreConfigStore.get(ctx.guild.id)?.prefix_commands.prefix ?? "";
117+
coreConfigStore.get(ctx.guild.id)?.prefixCommands.prefix ?? "";
118118

119119
for (const entry of getCommandsByPlugin(plugin.name) ?? []) {
120120
const { command } = entry;

backend/src/plugin/core/command/help/show.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export function renderCommandPage(
2323
container.components.push(Divider());
2424

2525
const prefix =
26-
coreConfigStore.get(guildID)?.prefix_commands.prefix ?? "";
26+
coreConfigStore.get(guildID)?.prefixCommands.prefix ?? "";
2727

2828
let content =
2929
"**Usage:** " +

backend/src/plugin/core/commandEngine/handler/prefixHandler.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ async function handle(
103103
return false;
104104
}
105105

106-
const { prefix } = config.prefix_commands;
106+
const { prefix } = config.prefixCommands;
107107

108108
const reader = new StringReader(message.content);
109109

@@ -286,7 +286,7 @@ class PrefixContext implements CommandContext {
286286
}
287287

288288
const shouldReply =
289-
config.prefix_commands.reply &&
289+
config.prefixCommands.reply &&
290290
this.message.channel
291291
.permissionsOf(this.message.channel.guild.clientMember)
292292
.has(Permissions.READ_MESSAGE_HISTORY);

backend/src/plugin/core/config.ts

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export const CoreConfig = z.strictObject({
2323
"and assign it using a permission override which matches it.",
2424
),
2525

26-
prefix_commands: z
26+
prefixCommands: z
2727
.strictObject({
2828
prefix: z.string().default("?"),
2929
reply: z
@@ -35,24 +35,24 @@ export const CoreConfig = z.strictObject({
3535
})
3636
.prefault({}),
3737

38-
default_permissions: z
38+
defaultPermissions: z
3939
.strictObject({
40-
prefix_commands: z.boolean().default(true),
41-
slash_commands: z.boolean().default(true),
42-
ephemeral_response: z.boolean().default(true),
43-
about_command: z.boolean().default(true),
44-
help_command: z.boolean().default(true),
45-
groups_command: z.boolean().default(false),
40+
prefixCommands: z.boolean().default(true),
41+
slashCommands: z.boolean().default(true),
42+
ephemeralResponse: z.boolean().default(true),
43+
aboutCommand: z.boolean().default(true),
44+
helpCommand: z.boolean().default(true),
45+
groupsCommand: z.boolean().default(false),
4646
})
4747
.prefault({}),
48-
permission_overrides: z
48+
permissionOverrides: z
4949
.strictObject({
50-
prefix_commands: z.boolean().optional(),
51-
slash_commands: z.boolean().optional(),
52-
ephemeral_response: z.boolean().optional(),
53-
about_command: z.boolean().optional(),
54-
help_command: z.boolean().optional(),
55-
groups_command: z.boolean().optional(),
50+
prefixCommands: z.boolean().optional(),
51+
slashCommands: z.boolean().optional(),
52+
ephemeralResponse: z.boolean().optional(),
53+
aboutCommand: z.boolean().optional(),
54+
helpCommand: z.boolean().optional(),
55+
groupsCommand: z.boolean().optional(),
5656
...PermissionsFilter.shape,
5757
})
5858
.array()

backend/src/plugin/core/public/permissionResolution.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ function mockCoreConfig<T>(
2929

3030
const Permissions = z.strictObject({
3131
permissions: z.object({}),
32-
permission_overrides: z.object(PermissionsFilter.shape).array(),
32+
permissionOverrides: z.object(PermissionsFilter.shape).array(),
3333
});
3434

3535
// eslint-disable-next-line @typescript-eslint/no-unused-vars

backend/src/plugin/core/public/permissionResolution.ts

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ function testGroup(group: CoreGroup, member: Member): boolean {
8282
}
8383

8484
export interface ConfigWithPermissions<P extends Record<string, boolean> = {}> {
85-
default_permissions: P;
86-
permission_overrides: (Partial<P> & PermissionsFilter)[];
85+
defaultPermissions: P;
86+
permissionOverrides: (Partial<P> & PermissionsFilter)[];
8787
}
8888

8989
export function resolvePermissions<P extends Record<string, boolean>>(
@@ -93,12 +93,12 @@ export function resolvePermissions<P extends Record<string, boolean>>(
9393
): P {
9494
const groups = resolveGroups(member);
9595

96-
const result = { ...config.default_permissions };
96+
const result = { ...config.defaultPermissions };
9797
Object.setPrototypeOf(result, Object.prototype);
9898

9999
const debugMatchedOverrides: number[] = [];
100100

101-
for (const [i, override] of config.permission_overrides.entries()) {
101+
for (const [i, override] of config.permissionOverrides.entries()) {
102102
if (!testFilter(override, groups, channel)) {
103103
continue;
104104
}
@@ -118,8 +118,8 @@ export function resolvePermissions<P extends Record<string, boolean>>(
118118
`Resolved permissions for ${debugFormatUser(member.user)} ${debugFormatChannel(channel)} ${debugFormatGuild(member.guild)}`,
119119
{
120120
groups,
121-
defaultPermissions: config.default_permissions,
122-
permissionOverrides: config.permission_overrides,
121+
defaultPermissions: config.defaultPermissions,
122+
permissionOverrides: config.permissionOverrides,
123123
matchedOverrides: debugMatchedOverrides,
124124
result,
125125
},
@@ -142,28 +142,28 @@ function testFilter(
142142
const categoryChannel = baseChannel.parent ?? null;
143143

144144
if (
145-
filter.in_group !== undefined &&
146-
filter.in_group.some((group) => groups.groups.has(group))
145+
filter.inGroup !== undefined &&
146+
filter.inGroup.some((group) => groups.groups.has(group))
147147
) {
148148
return true;
149149
}
150150

151-
if (filter.in_channel && filter.in_channel.includes(baseChannel.id)) {
151+
if (filter.inChannel && filter.inChannel.includes(baseChannel.id)) {
152152
return true;
153153
}
154154

155155
if (
156156
categoryChannel !== null &&
157-
filter.in_channel_category &&
158-
filter.in_channel_category.includes(categoryChannel.id)
157+
filter.inChannelCategory &&
158+
filter.inChannelCategory.includes(categoryChannel.id)
159159
) {
160160
return true;
161161
}
162162

163163
if (
164164
channel instanceof ThreadChannel &&
165-
filter.in_thread &&
166-
filter.in_thread.includes(channel.id)
165+
filter.inThread &&
166+
filter.inThread.includes(channel.id)
167167
) {
168168
return true;
169169
}

backend/src/plugin/logging/config/index.ts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,24 +49,24 @@ export const LoggerConfig = z.strictObject({
4949
avatar: z.url().optional(),
5050
events: z
5151
.strictObject({
52-
message_edit: MessageEditEvent,
53-
message_delete: MessageDeleteEvent,
52+
messageEdit: MessageEditEvent,
53+
messageDelete: MessageDeleteEvent,
5454

55-
member_join: MemberJoinEvent,
56-
member_leave: MemberLeaveEvent,
55+
memberJoin: MemberJoinEvent,
56+
memberLeave: MemberLeaveEvent,
5757

58-
role_create: RoleCreateEvent,
59-
role_update: RoleUpdateEvent,
60-
role_delete: RoleDeleteEvent,
58+
roleCreate: RoleCreateEvent,
59+
roleUpdate: RoleUpdateEvent,
60+
roleDelete: RoleDeleteEvent,
6161

62-
user_ban: UserBanEvent,
63-
user_unban: UserUnbanEvent,
64-
user_kick: UserKickEvent,
65-
user_warn: UserWarnEvent,
62+
userBan: UserBanEvent,
63+
userUnban: UserUnbanEvent,
64+
userKick: UserKickEvent,
65+
userWarn: UserWarnEvent,
6666

67-
tag_create: TagCreateEvent,
68-
tag_edit: TagEditEvent,
69-
tag_delete: TagDeleteEvent,
67+
tagCreate: TagCreateEvent,
68+
tagEdit: TagEditEvent,
69+
tagDelete: TagDeleteEvent,
7070
})
7171
.describe(
7272
"Customize what happens when events happen in the server — set them to true to use the default presentation",

backend/src/plugin/logging/config/members.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export const MemberJoinEvent = eventConfig(
99
embeds: [
1010
{
1111
title: "Member Joined",
12-
author: { name: "{{user.tag}}", icon_url: "{{user.avatar}}" },
12+
author: { name: "{{user.tag}}", iconURL: "{{user.avatar}}" },
1313
fields: [
1414
{
1515
name: "Account Created At",
@@ -29,7 +29,7 @@ export const MemberLeaveEvent = eventConfig(
2929
embeds: [
3030
{
3131
title: "Member Left",
32-
author: { name: "{{user.tag}}", icon_url: "{{user.avatar}}" },
32+
author: { name: "{{user.tag}}", iconURL: "{{user.avatar}}" },
3333
fields: [
3434
{
3535
name: "Joined At",

0 commit comments

Comments
 (0)