Skip to content

Commit 1b44a9e

Browse files
committed
Resolve conflicts
2 parents 1f2fb60 + da22c18 commit 1b44a9e

4 files changed

Lines changed: 10 additions & 8 deletions

File tree

dist/handlers/events/messageCreate.d.ts.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/handlers/events/messageCreate.js

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/handlers/events/messageCreate.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/handlers/events/messageCreate.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,12 @@ export default new DiscordEventHandler({
1818
const name = rawArgs[0]?.toLowerCase()
1919

2020
const commands = this.commands.get("messageCreate").filter(
21+
// Allow always execute commands
2122
(cmd) =>
22-
// Allow always execute commands
2323
!cmd.name ||
24-
// Check if it matches the command name or one of aliases
25-
((cmd.name === name || !!cmd.data.aliases?.includes(name!)) &&
24+
(
25+
// Check if it matches the command name or one of aliases
26+
(cmd.name === name || !!cmd.data.aliases?.includes(name!)) &&
2627
// If unprefixed there can be no prefix
2728
(cmd.data.unprefixed ? true : hasPrefix))
2829
)

0 commit comments

Comments
 (0)