Skip to content

Commit 82d84a4

Browse files
xhyromxhyrom
committed
fix: eslint
1 parent 3138149 commit 82d84a4

File tree

11 files changed

+135
-127
lines changed

11 files changed

+135
-127
lines changed

Diff for: ‎src/handlers/MessageCommandHandler.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const checkValidation = async(arg: MessageArgumentTypes, content: string, client
2323
if (!validate) return checkValidation(arg, null, client, guild, argument, channel, user);
2424

2525
return arg.resolve(argument, client, guild);
26-
}
26+
};
2727

2828
export async function MessageCommandHandler(
2929
message: Message,

Diff for: ‎src/lib/structures/arguments/Boolean.ts

+17-17
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@ const truthy = new Set(['true', 't', 'yes', 'y', 'on', 'enable', 'enabled', '1',
55
const falsy = new Set(['false', 'f', 'no', 'n', 'off', 'disable', 'disabled', '0', '-']);
66

77
export class BooleanType extends MessageArgumentTypeBase {
8-
value;
8+
value;
99

10-
validate(content: string): boolean {
11-
const yes = truthy.has(content.toLowerCase());
12-
const no = falsy.has(content.toLowerCase());
10+
validate(content: string): boolean {
11+
const yes = truthy.has(content.toLowerCase());
12+
const no = falsy.has(content.toLowerCase());
1313

14-
if (!yes && !no) return false;
15-
else {
16-
this.value = yes ? true : false;
17-
return true;
18-
};
19-
}
14+
if (!yes && !no) return false;
15+
else {
16+
this.value = yes ? true : false;
17+
return true;
18+
}
19+
}
2020

21-
resolve(argument: Argument) {
22-
return {
23-
...argument.toJSON(),
24-
type: ArgumentType[argument.type],
25-
value: this.value
26-
}
27-
}
21+
resolve(argument: Argument) {
22+
return {
23+
...argument.toJSON(),
24+
type: ArgumentType[argument.type],
25+
value: this.value
26+
};
27+
}
2828
}

Diff for: ‎src/lib/structures/arguments/Channel.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { MessageArgumentTypeBase } from './base';
22

33
export class ChannelType extends MessageArgumentTypeBase {
4-
validate() {
5-
return true;
6-
}
4+
validate() {
5+
return true;
6+
}
77
}

Diff for: ‎src/lib/structures/arguments/Integer.ts

+15-15
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@ import { Argument, ArgumentType } from '../Argument';
22
import { MessageArgumentTypeBase } from './base';
33

44
export class IntegerType extends MessageArgumentTypeBase {
5-
value;
5+
value;
66

7-
validate(content: string): boolean {
8-
if (Number.isInteger(Number(content))) {
9-
this.value = content;
10-
return true
11-
}
12-
else return false;
13-
}
7+
validate(content: string): boolean {
8+
if (Number.isInteger(Number(content))) {
9+
this.value = content;
10+
return true;
11+
}
12+
else return false;
13+
}
1414

15-
resolve(argument: Argument) {
16-
return {
17-
...argument.toJSON(),
18-
type: ArgumentType[argument.type],
19-
value: this.value
20-
}
21-
}
15+
resolve(argument: Argument) {
16+
return {
17+
...argument.toJSON(),
18+
type: ArgumentType[argument.type],
19+
value: this.value
20+
};
21+
}
2222
}

Diff for: ‎src/lib/structures/arguments/Mentionable.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { MessageArgumentTypeBase } from './base';
22

33
export class MentionableType extends MessageArgumentTypeBase {
4-
validate() {
5-
return true;
6-
}
4+
validate() {
5+
return true;
6+
}
77
}

Diff for: ‎src/lib/structures/arguments/Number.ts

+15-15
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@ import { Argument, ArgumentType } from '../Argument';
22
import { MessageArgumentTypeBase } from './base';
33

44
export class NumberType extends MessageArgumentTypeBase {
5-
value;
5+
value;
66

7-
validate(content: string): boolean {
8-
if (!isNaN(Number(content))) {
9-
this.value = content;
10-
return true
11-
}
12-
else return false;
13-
}
7+
validate(content: string): boolean {
8+
if (!isNaN(Number(content))) {
9+
this.value = content;
10+
return true;
11+
}
12+
else return false;
13+
}
1414

15-
resolve(argument: Argument) {
16-
return {
17-
...argument.toJSON(),
18-
type: ArgumentType[argument.type],
19-
value: this.value
20-
}
21-
}
15+
resolve(argument: Argument) {
16+
return {
17+
...argument.toJSON(),
18+
type: ArgumentType[argument.type],
19+
value: this.value
20+
};
21+
}
2222
}

Diff for: ‎src/lib/structures/arguments/Role.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { MessageArgumentTypeBase } from './base';
22

33
export class RoleType extends MessageArgumentTypeBase {
4-
validate() {
5-
return true;
6-
}
4+
validate() {
5+
return true;
6+
}
77
}

Diff for: ‎src/lib/structures/arguments/String.ts

+15-15
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@ import { Argument, ArgumentType } from '../Argument';
22
import { MessageArgumentTypeBase } from './base';
33

44
export class StringType extends MessageArgumentTypeBase {
5-
value;
5+
value;
66

7-
validate(content: string): boolean {
8-
if (typeof content === 'string') {
9-
this.value = content;
10-
return true
11-
}
12-
else return false;
13-
}
7+
validate(content: string): boolean {
8+
if (typeof content === 'string') {
9+
this.value = content;
10+
return true;
11+
}
12+
else return false;
13+
}
1414

15-
resolve(argument: Argument) {
16-
return {
17-
...argument.toJSON(),
18-
type: ArgumentType[argument.type],
19-
value: this.value
20-
}
21-
}
15+
resolve(argument: Argument) {
16+
return {
17+
...argument.toJSON(),
18+
type: ArgumentType[argument.type],
19+
value: this.value
20+
};
21+
}
2222
}

Diff for: ‎src/lib/structures/arguments/User.ts

+15-15
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@ import { Argument, ArgumentType } from '../Argument';
33
import { MessageArgumentTypeBase } from './base';
44

55
export class UserType extends MessageArgumentTypeBase {
6-
matches;
6+
matches;
77

8-
validate(content: string): boolean {
9-
const matches = content.match(/([0-9]+)/);
8+
validate(content: string): boolean {
9+
const matches = content.match(/([0-9]+)/);
1010

11-
if (!matches) return false;
11+
if (!matches) return false;
1212

13-
this.matches = matches;
13+
this.matches = matches;
1414

15-
return true;
16-
}
15+
return true;
16+
}
1717

18-
resolve(argument: Argument, client: Client, guild: Guild) {
19-
return {
20-
...argument.toJSON(),
21-
type: ArgumentType[argument.type],
22-
user: client.users.cache.get(this.matches[1]),
23-
member: guild.members?.cache?.get(this.matches[1])
24-
}
25-
}
18+
resolve(argument: Argument, client: Client, guild: Guild) {
19+
return {
20+
...argument.toJSON(),
21+
type: ArgumentType[argument.type],
22+
user: client.users.cache.get(this.matches[1]),
23+
member: guild.members?.cache?.get(this.matches[1])
24+
};
25+
}
2626
}

Diff for: ‎src/lib/structures/arguments/base.ts

+45-37
Original file line numberDiff line numberDiff line change
@@ -12,43 +12,51 @@ import type { UserType } from './User';
1212
export type MessageArgumentTypes = BooleanType | ChannelType | IntegerType | MentionableType | NumberType | RoleType | StringType | UserType;
1313

1414
export class MessageArgumentTypeBase {
15-
// eslint-disable-next-line @typescript-eslint/no-unused-vars
16-
validate(content: string): boolean {
17-
Util.throwError('Validate method is not implemented!', this.constructor.name);
18-
return true;
19-
}
15+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
16+
validate(content: string): boolean {
17+
Util.throwError('Validate method is not implemented!', this.constructor.name);
18+
return true;
19+
}
2020

21-
// eslint-disable-next-line @typescript-eslint/no-unused-vars
22-
resolve(argument: Argument, ...args) {
23-
Util.throwError('Resolve method is not implemented!', this.constructor.name);
24-
}
21+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
22+
resolve(argument: Argument, ...args) {
23+
Util.throwError('Resolve method is not implemented!', this.constructor.name);
24+
}
2525

26-
static async createArgument(type: ArgumentType | keyof typeof ArgumentType) {
27-
switch(type) {
28-
case ArgumentType.BOOLEAN:
29-
const { BooleanType } = await import('./Boolean');
30-
return new BooleanType();
31-
case ArgumentType.CHANNEL:
32-
const { ChannelType } = await import('./Channel');
33-
return new ChannelType();
34-
case ArgumentType.INTEGER:
35-
const { IntegerType } = await import('./Integer');
36-
return new IntegerType();
37-
case ArgumentType.MENTIONABLE:
38-
const { MentionableType } = await import('./Mentionable');
39-
return new MentionableType();
40-
case ArgumentType.NUMBER:
41-
const { NumberType } = await import('./Number');
42-
return new NumberType();
43-
case ArgumentType.ROLE:
44-
const { RoleType } = await import('./Role');
45-
return new RoleType();
46-
case ArgumentType.STRING:
47-
const { StringType } = await import('./String');
48-
return new StringType();
49-
case ArgumentType.USER:
50-
const { UserType } = await import('./User');
51-
return new UserType();
52-
}
53-
}
26+
static async createArgument(type: ArgumentType | keyof typeof ArgumentType) {
27+
switch(type) {
28+
case ArgumentType.BOOLEAN: {
29+
const { BooleanType } = await import('./Boolean');
30+
return new BooleanType();
31+
}
32+
case ArgumentType.CHANNEL: {
33+
const { ChannelType } = await import('./Channel');
34+
return new ChannelType();
35+
}
36+
case ArgumentType.INTEGER: {
37+
const { IntegerType } = await import('./Integer');
38+
return new IntegerType();
39+
}
40+
case ArgumentType.MENTIONABLE: {
41+
const { MentionableType } = await import('./Mentionable');
42+
return new MentionableType();
43+
}
44+
case ArgumentType.NUMBER: {
45+
const { NumberType } = await import('./Number');
46+
return new NumberType();
47+
}
48+
case ArgumentType.ROLE: {
49+
const { RoleType } = await import('./Role');
50+
return new RoleType();
51+
}
52+
case ArgumentType.STRING: {
53+
const { StringType } = await import('./String');
54+
return new StringType();
55+
}
56+
case ArgumentType.USER: {
57+
const { UserType } = await import('./User');
58+
return new UserType();
59+
}
60+
}
61+
}
5462
}

Diff for: ‎src/lib/util/Util.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import Logger from "js-logger";
1+
import Logger from 'js-logger';
22

33
export class Util {
44
/**
@@ -105,8 +105,8 @@ export class Util {
105105
.replace(new RegExp(/[-_]+/, 'g'), ' ')
106106
.replace(new RegExp(/[^\w\s]/, 'g'), '')
107107
.replace(
108-
new RegExp(/\s+(.)(\w*)/, 'g'),
109-
($1, $2, $3) => `${$2.toUpperCase() + $3.toLowerCase()}`
108+
new RegExp(/\s+(.)(\w*)/, 'g'),
109+
($1, $2, $3) => `${$2.toUpperCase() + $3.toLowerCase()}`
110110
)
111111
.replace(new RegExp(/\w/), s => s.toUpperCase());
112112
}

0 commit comments

Comments
 (0)