Skip to content

Commit 02a9927

Browse files
fix: typescript type errors
1 parent 4ec1ed8 commit 02a9927

File tree

4 files changed

+11
-12
lines changed

4 files changed

+11
-12
lines changed

build.blaze.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ dependencies(() => {
4141
requiredModule("cors", "^2.8.5");
4242
requiredModule("date-fns", "^2.30.0");
4343
requiredModule("deepmerge", "^4.3.1");
44-
requiredModule("discord.js", "^14.15.1");
44+
requiredModule("discord.js", "^14.15.2");
4545
requiredModule("dot-object", "^2.1.4");
4646
requiredModule("dotenv", "^16.3.1");
4747
requiredModule("express", "^4.18.2");
@@ -94,7 +94,6 @@ dependencies(() => {
9494
devModule("@typescript-eslint/parser", "^7.7.0");
9595
devModule("@vitest/coverage-v8", "^1.3.1");
9696
devModule("eslint", "^8.57.0");
97-
devModule("eslint-plugin-osn", "^1.0.3");
9897
devModule("husky", "latest");
9998
devModule("prisma", "^5.11.0");
10099
devModule("typescript", "^5.4.3");

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
"date-fns": "^2.30.0",
8080
"deepmerge": "^4.3.1",
8181
"discord-api-types": "^0.37.83",
82-
"discord.js": "^14.15.1",
82+
"discord.js": "^14.15.2",
8383
"dot-object": "^2.1.4",
8484
"dotenv": "^16.3.1",
8585
"express": "^4.18.2",
@@ -126,7 +126,6 @@
126126
"@typescript-eslint/parser": "^7.7.0",
127127
"@vitest/coverage-v8": "^1.3.1",
128128
"eslint": "^8.57.0",
129-
"eslint-plugin-osn": "^1.0.3",
130129
"husky": "latest",
131130
"prisma": "^5.11.0",
132131
"typescript": "^5.4.3",

src/main/typescript/services/AuditLoggingService.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import {
2525
LogUserNoteAddPayload
2626
} from "@main/schemas/LoggingSchema";
2727
import { MessageRuleType } from "@main/schemas/MessageRuleSchema";
28-
import { ModerationAction } from "@main/schemas/ModerationAction";
28+
import { ModerationActionType } from "@main/schemas/ModerationActionSchema";
2929
import ConfigurationManager from "@main/services/ConfigurationManager";
3030
import { chunkedString } from "@main/utils/utils";
3131
import { formatDistanceToNowStrict } from "date-fns";
@@ -342,7 +342,7 @@ class AuditLoggingService extends Service {
342342
return this.logHandlers[type].call(this, ...args);
343343
}
344344

345-
private commonSummary(action: ModerationAction, name: string) {
345+
private commonSummary(action: ModerationActionType, name: string) {
346346
let summary = bold(name) + "\n";
347347

348348
if ("duration" in action && action.duration) {
@@ -356,7 +356,7 @@ class AuditLoggingService extends Service {
356356
return summary;
357357
}
358358

359-
private summarizeActions(actions: ModerationAction[]) {
359+
private summarizeActions(actions: ModerationActionType[]) {
360360
let summary = "";
361361

362362
for (const action of actions) {

src/main/typescript/services/ModerationActionService.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@ import { Inject } from "@framework/container/Inject";
22
import Duration from "@framework/datetime/Duration";
33
import { Name } from "@framework/services/Name";
44
import { Service } from "@framework/services/Service";
5+
import { ModerationActionType } from "@main/schemas/ModerationActionSchema";
56
import { Infraction } from "@prisma/client";
67
import { Guild, GuildMember, Message, TextChannel, User } from "discord.js";
78
import type InfractionManager from "./InfractionManager";
89

9-
type MemberOnlyAction = Extract<ModerationAction, { type: "kick" | "mute" | "role" | "warn" }>;
10+
type MemberOnlyAction = Extract<ModerationActionType, { type: "kick" | "mute" | "role" | "warn" }>;
1011

1112
type TakeActionResult = {
12-
failedActions: ModerationAction["type"][];
13+
failedActions: ModerationActionType["type"][];
1314
infractions: Infraction[];
1415
};
1516

@@ -26,10 +27,10 @@ class ModerationActionService extends Service {
2627
public async takeActions(
2728
guild: Guild,
2829
target: GuildMember | User,
29-
actions: ModerationAction[],
30+
actions: ModerationActionType[],
3031
payload: TakeActionPayload = {}
3132
): Promise<TakeActionResult> {
32-
const failedActions: ModerationAction["type"][] = [];
33+
const failedActions: ModerationActionType["type"][] = [];
3334
const infractions: Infraction[] = [];
3435
const user = target instanceof GuildMember ? target.user : target;
3536

@@ -119,7 +120,7 @@ class ModerationActionService extends Service {
119120
private async takeActionOnUser(
120121
guild: Guild,
121122
target: User,
122-
action: ModerationAction,
123+
action: ModerationActionType,
123124
{ channel, message }: TakeActionPayload
124125
) {
125126
switch (action.type) {

0 commit comments

Comments
 (0)