Skip to content

Commit fee4b67

Browse files
fix: eslint issues
1 parent 6f5db9b commit fee4b67

39 files changed

+78
-91
lines changed

src/framework/typescript/api/APIServer.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import { ConfigurationManagerServiceInterface } from "@framework/contracts/Confi
2121
import cors from "cors";
2222
import express, {
2323
Application,
24+
NextFunction,
2425
Request as ExpressRequest,
25-
Response as ExpressResponse,
26-
NextFunction
26+
Response as ExpressResponse
2727
} from "express";
2828
import ratelimiter from "express-rate-limit";
2929
import { Router } from "express-serve-static-core";

src/framework/typescript/env/Environment.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { ZodSchema, z } from "zod";
1+
import type { z, ZodSchema } from "zod";
22

33
class Environment {
44
public static isProduction(): boolean {

src/framework/typescript/utils/embeds.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { Client, Snowflake } from "discord.js";
2-
import { MessageType, type GuildBasedChannel, type Message, type User } from "discord.js";
2+
import { type GuildBasedChannel, type Message, MessageType, type User } from "discord.js";
33

44
export function userInfo(user: User) {
55
return `ID: ${user.id}\nUsername: ${user.username}\nMention: <@${user.id}>`;

src/framework/typescript/utils/user.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import { emoji } from "@framework/utils/emoji";
2121
import { client } from "@framework/utils/helpers";
2222
import type { GuildMember, User } from "discord.js";
23-
import { TimestampStyles, UserFlags, time } from "discord.js";
23+
import { time, TimestampStyles, UserFlags } from "discord.js";
2424

2525
const map: Record<string, [string, string]> = {
2626
BugHunterLevel1: ["bughunter", "Bughunter Level 1"],

src/framework/typescript/utils/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919

2020
export function escapeRegex(string: string) {
21-
return string.replace(/[/\-\\^$*+?.()|[\]{}]/g, '\\$&');
21+
return string.replace(/[/\-\\^$*+?.()|[\]{}]/g, "\\$&");
2222
}
2323

2424
export function requireNonNull<T>(value: T | null | undefined, message?: string): T {

src/main/typescript/automod/RuleModerationService.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import { LogEventType } from "@main/schemas/LoggingSchema";
66
import { GuildMember, Message, Snowflake, TextChannel } from "discord.js";
77
import { MessageAutoModServiceContract } from "../contracts/MessageAutoModServiceContract";
88
import {
9-
MessageRuleScope,
10-
type default as ModerationRuleHandlerContract
9+
type default as ModerationRuleHandlerContract,
10+
MessageRuleScope
1111
} from "../contracts/ModerationRuleHandlerContract";
1212
import { MessageRuleType } from "../schemas/MessageRuleSchema";
1313
import ModerationRuleHandler from "../security/ModerationRuleHandler";

src/main/typescript/commands/automation/CreateReactionRoleCommand.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import { isSnowflake } from "@framework/utils/utils";
1313
import ReactionRoleService from "@main/services/ReactionRoleService";
1414
import {
1515
ChatInputCommandInteraction,
16+
parseEmoji,
1617
PermissionFlagsBits,
17-
Snowflake,
18-
parseEmoji
18+
Snowflake
1919
} from "discord.js";
2020

2121
type CreateReactionRoleCommandArgs = {

src/main/typescript/commands/automation/QueueAddCommand.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { PermissionFlags } from "@framework/permissions/PermissionFlag";
1010
import CommandExecutionQueue from "@main/queues/CommandExecutionQueue";
1111
import CommandManager from "@main/services/CommandManager";
1212
import QueueService from "@main/services/QueueService";
13-
import { Message, inlineCode } from "discord.js";
13+
import { inlineCode, Message } from "discord.js";
1414

1515
type QueueAddCommandArgs = {
1616
runAfter: Duration;

src/main/typescript/commands/information/ProfileCommand.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@ import { emoji } from "@framework/utils/emoji";
99
import { getUserBadges } from "@framework/utils/user";
1010
import PermissionManagerService from "@main/services/PermissionManagerService";
1111
import {
12-
APIEmbedField,
1312
ActivityType,
13+
APIEmbedField,
14+
bold,
1415
EmbedBuilder,
1516
Emoji,
1617
GuildMember,
1718
PermissionFlagsBits,
1819
PermissionsBitField,
1920
Role,
20-
User,
21-
bold,
2221
roleMention,
23-
time
22+
time,
23+
User
2424
} from "discord.js";
2525

2626
type ProfileCommandArgs = {

src/main/typescript/commands/information/UserLookupCommand.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import type Context from "@framework/commands/Context";
77
import { Inject } from "@framework/container/Inject";
88
import { userFlagsToString } from "@framework/utils/user";
99
import InfractionManager from "@main/services/InfractionManager";
10-
import { EmbedBuilder, GuildMember, User, time, userMention } from "discord.js";
10+
import { EmbedBuilder, GuildMember, time, User, userMention } from "discord.js";
1111

1212
type UserLookupCommandArgs = {
1313
user: User | GuildMember;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import Context from "@framework/commands/Context";
2626
import { Inject } from "@framework/container/Inject";
2727
import { GatewayEventListener } from "@framework/events/GatewayEventListener";
2828
import { PermissionFlags } from "@framework/permissions/PermissionFlag";
29-
import { Awaitable, Message, TextChannel, User, type Interaction } from "discord.js";
29+
import { Awaitable, type Interaction, Message, TextChannel, User } from "discord.js";
3030
import { Limits } from "../../constants/Limits";
3131
import InfractionManager from "../../services/InfractionManager";
3232
import PermissionManagerService from "../../services/PermissionManagerService";

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* along with SudoBot. If not, see <https://www.gnu.org/licenses/>.
1818
*/
1919

20-
import { Command, type Buildable } from "@framework/commands/Command";
20+
import { type Buildable, Command } from "@framework/commands/Command";
2121
import Context from "@framework/commands/Context";
2222
import { Inject } from "@framework/container/Inject";
2323
import DirectiveParseError from "@framework/directives/DirectiveParseError";
@@ -29,15 +29,15 @@ import DirectiveParsingService from "@main/services/DirectiveParsingService";
2929
import type SystemAuditLoggingService from "@main/services/SystemAuditLoggingService";
3030
import {
3131
ActionRowBuilder,
32+
type APIEmbed,
3233
ApplicationCommandType,
34+
type CacheType,
35+
type Interaction,
3336
MessageContextMenuCommandInteraction,
3437
ModalBuilder,
3538
PermissionsBitField,
3639
TextInputBuilder,
37-
TextInputStyle,
38-
type APIEmbed,
39-
type CacheType,
40-
type Interaction
40+
TextInputStyle
4141
} from "discord.js";
4242

4343
export default class EditMessageCommand extends Command implements HasEventListeners {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { PermissionFlags } from "@framework/permissions/PermissionFlag";
99
import InfractionManager from "@main/services/InfractionManager";
1010
import PermissionManagerService from "@main/services/PermissionManagerService";
1111
import { InfractionType } from "@prisma/client";
12-
import { User, bold } from "discord.js";
12+
import { bold, User } from "discord.js";
1313

1414
type InfractionClearCommandArgs = {
1515
user: User;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { Colors } from "@main/constants/Colors";
99
import InfractionManager from "@main/services/InfractionManager";
1010
import PermissionManagerService from "@main/services/PermissionManagerService";
1111
import { Infraction } from "@prisma/client";
12-
import { User, italic, time } from "discord.js";
12+
import { italic, time, User } from "discord.js";
1313

1414
type InfractionListCommandArgs = {
1515
user: User;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { Colors } from "@main/constants/Colors";
1111
import InfractionManager from "@main/services/InfractionManager";
1212
import PermissionManagerService from "@main/services/PermissionManagerService";
1313
import { Infraction } from "@prisma/client";
14-
import { APIEmbed, User, italic, time } from "discord.js";
14+
import { APIEmbed, italic, time, User } from "discord.js";
1515

1616
type InfractionViewCommandArgs = {
1717
id: number;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ import InfractionManager from "@main/services/InfractionManager";
1111
import {
1212
APIEmbed,
1313
ChatInputCommandInteraction,
14+
heading,
1415
HeadingLevel,
1516
Message,
1617
PermissionFlagsBits,
17-
Snowflake,
18-
heading
18+
Snowflake
1919
} from "discord.js";
2020

2121
class MassBanCommand extends Command {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ import InfractionManager from "@main/services/InfractionManager";
99
import {
1010
APIEmbed,
1111
ChatInputCommandInteraction,
12+
heading,
1213
HeadingLevel,
1314
Message,
1415
PermissionFlagsBits,
15-
Snowflake,
16-
heading
16+
Snowflake
1717
} from "discord.js";
1818
import { setTimeout } from "timers/promises";
1919

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import { PermissionFlags } from "@framework/permissions/PermissionFlag";
2727
import { Colors } from "@main/constants/Colors";
2828
import InfractionManager from "@main/services/InfractionManager";
2929
import { Infraction } from "@prisma/client";
30-
import { ActionRowBuilder, StringSelectMenuBuilder, User, italic, time } from "discord.js";
30+
import { ActionRowBuilder, italic, StringSelectMenuBuilder, time, User } from "discord.js";
3131

3232
type ModStatsCommandArgs = {
3333
user?: User;

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ import DirectiveParsingService from "@main/services/DirectiveParsingService";
1111
import type SystemAuditLoggingService from "@main/services/SystemAuditLoggingService";
1212
import {
1313
ActionRowBuilder,
14-
ApplicationCommandType,
15-
ModalBuilder,
16-
PermissionFlagsBits,
17-
TextInputBuilder,
18-
TextInputStyle,
1914
type APIEmbed,
15+
ApplicationCommandType,
2016
type Interaction,
2117
type MessageContextMenuCommandInteraction,
2218
type MessageCreateOptions,
23-
type MessagePayload
19+
type MessagePayload,
20+
ModalBuilder,
21+
PermissionFlagsBits,
22+
TextInputBuilder,
23+
TextInputStyle
2424
} from "discord.js";
2525

2626
class SendReplyCommand

src/main/typescript/commands/settings/AboutCommand.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* along with SudoBot. If not, see <https://www.gnu.org/licenses/>.
1818
*/
1919

20-
import type { ChatContext} from "@framework/commands/Command";
20+
import type { ChatContext } from "@framework/commands/Command";
2121
import { Command } from "@framework/commands/Command";
2222
import type { MetadataType } from "../../core/DiscordKernel";
2323

src/main/typescript/commands/settings/BlockedTokenCommand.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import RuleModerationService from "@main/automod/RuleModerationService";
99
import { Colors } from "@main/constants/Colors";
1010
import ConfigurationManager from "@main/services/ConfigurationManager";
1111
import {
12-
escapeMarkdown,
1312
type APIEmbed,
1413
type ChatInputCommandInteraction,
14+
escapeMarkdown,
1515
type MessagePayload
1616
} from "discord.js";
1717

src/main/typescript/commands/settings/BlockedWordCommand.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import RuleModerationService from "@main/automod/RuleModerationService";
99
import { Colors } from "@main/constants/Colors";
1010
import ConfigurationManager from "@main/services/ConfigurationManager";
1111
import {
12-
escapeMarkdown,
1312
type APIEmbed,
1413
type ChatInputCommandInteraction,
14+
escapeMarkdown,
1515
type MessagePayload
1616
} from "discord.js";
1717

src/main/typescript/commands/settings/ConfigCommand.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import ConfigurationManager from "@main/services/ConfigurationManager";
1010
import PermissionManagerService from "@main/services/PermissionManagerService";
1111
import {
1212
ChatInputCommandInteraction,
13-
EmbedBuilder,
14-
GuildMember,
1513
codeBlock,
14+
EmbedBuilder,
1615
escapeInlineCode,
16+
GuildMember,
1717
inlineCode,
1818
type Interaction
1919
} from "discord.js";

src/main/typescript/commands/settings/EvalCommand.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import {
1212
ButtonBuilder,
1313
ButtonStyle,
1414
ComponentType,
15+
escapeCodeBlock,
16+
escapeMarkdown,
1517
GuildMember,
1618
InteractionCollector,
17-
InteractionType,
18-
escapeCodeBlock,
19-
escapeMarkdown
19+
InteractionType
2020
} from "discord.js";
2121
import * as uuid from "uuid";
2222

src/main/typescript/commands/settings/RestartCommand.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import {
99
ActionRowBuilder,
1010
ButtonBuilder,
1111
ButtonStyle,
12-
Snowflake,
13-
type Interaction
12+
type Interaction,
13+
Snowflake
1414
} from "discord.js";
1515

1616
class RestartCommand extends Command {

src/main/typescript/commands/settings/SystemStatusCommand.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class SystemStatusCommand extends Command {
3232
message = await context.reply({
3333
embeds: [
3434
{
35-
description: `${context.emoji("loading")??''} Checking system status...`,
35+
description: `${context.emoji("loading") ?? ""} Checking system status...`,
3636
color: Colors.Primary
3737
}
3838
]
@@ -102,10 +102,10 @@ class SystemStatusCommand extends Command {
102102
}
103103

104104
const embed = {
105-
description: `## ${context.emoji("sudobot")??''} System Status\n${
105+
description: `## ${context.emoji("sudobot") ?? ""} System Status\n${
106106
status === "degraded"
107107
? "⚠️"
108-
: context.emoji(status === "operational" ? "check" : "error")??''
108+
: context.emoji(status === "operational" ? "check" : "error") ?? ""
109109
} ${
110110
status === "operational"
111111
? "All systems are operational"

src/main/typescript/commands/tools/EmbedBuildCommand.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@ import { Command } from "@framework/commands/Command";
22
import { PermissionFlags } from "@framework/permissions/PermissionFlag";
33
import type LegacyContext from "@framework/commands/LegacyContext";
44
import type InteractionContext from "@framework/commands/InteractionContext";
5-
import {
6-
type ChatInputCommandInteraction,
7-
EmbedBuilder,
8-
type GuildBasedChannel
9-
} from "discord.js";
5+
import { type ChatInputCommandInteraction, EmbedBuilder, type GuildBasedChannel } from "discord.js";
106
import JSON5 from "json5";
117
import { TakesArgument } from "@framework/arguments/ArgumentTypes";
128
import RestStringArgument from "@framework/arguments/RestStringArgument";

src/main/typescript/commands/tools/EmbedCommand.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import AbstractRootCommand from "@framework/commands/AbstractRootCommand";
22
import { PermissionFlags } from "@framework/permissions/PermissionFlag";
33
import type { Buildable } from "@framework/commands/Command";
4-
import { ChannelType, type SlashCommandSubcommandBuilder } from "discord.js";
4+
import type { ChannelType } from "discord.js";
5+
import { type SlashCommandSubcommandBuilder } from "discord.js";
56
import { TextableChannelTypes } from "@framework/utils/channel";
67

78
class EmbedCommand extends AbstractRootCommand {

src/main/typescript/commands/tools/EmbedSendCommand.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ class EmbedSendCommand extends Command {
3434
return;
3535
}
3636

37-
const channel = context.options.getChannel("channel") as GuildBasedChannel ?? context.channel;
37+
const channel =
38+
(context.options.getChannel("channel") as GuildBasedChannel) ?? context.channel;
3839

3940
if (!channel?.isTextBased()) {
4041
await context.error("Invalid channel given.");

src/main/typescript/commands/tools/TranslateCommand.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { type Buildable, Command } from "@framework/commands/Command";
22
import { TakesArgument } from "@framework/arguments/ArgumentTypes";
3-
import StringArgument from "@framework/arguments/StringArgument";
43
import { ErrorType } from "@framework/arguments/InvalidArgumentError";
54
import type Context from "@framework/commands/Context";
65
import { ContextType } from "@framework/commands/ContextType";

src/main/typescript/core/DiscordKernel.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ import ConfigurationManager from "../services/ConfigurationManager";
3434
import LogStreamingService from "../services/LogStreamingService";
3535
import { systemPrefix } from "../utils/utils";
3636
import Client from "./Client";
37-
import TranslationService from "@main/services/TranslationService";
3837

3938
type Binding = {
4039
key: string;

src/main/typescript/directives/EmbedDirective.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,10 @@ class EmbedDirective extends Directive<APIEmbed> {
7373
}
7474

7575
if (state.currentArgument) {
76-
state.output = state.output.replace(new RegExp(`@embed(\\s*)\\((\\s*)${escapeRegex(state.currentArgument)}(\\s*)\\)`), "");
76+
state.output = state.output.replace(
77+
new RegExp(`@embed(\\s*)\\((\\s*)${escapeRegex(state.currentArgument)}(\\s*)\\)`),
78+
""
79+
);
7780
}
7881

7982
state.data.embeds ??= [];

src/main/typescript/security/ModerationRuleHandler.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import { AcceptsMessageRuleScopes } from "@main/decorators/AcceptsMessageRuleSco
77
import { Invite, Snowflake, spoiler } from "discord.js";
88
import ModerationRuleHandlerContract, {
99
MessageRuleScope,
10-
RuleExecResult,
11-
type ModerationRuleContext
10+
type ModerationRuleContext,
11+
RuleExecResult
1212
} from "../contracts/ModerationRuleHandlerContract";
1313

1414
// FIXME: This class is not complete and is only a placeholder for the actual implementation.

0 commit comments

Comments
 (0)