External/card-drop
5
0
Fork 0
Code Issues 46 Pull requests 1 Projects 1 Releases 30 Packages Wiki Activity Actions

Add ESLint and fix issues (#133)
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse source 
# Description

Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.

- Add ESLint to the project
- Fix issues which ESLint found

#49

## Type of change

Please delete options that are not relevant.

- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
- [ ] This change requires a documentation update

# How Has This Been Tested?

Please describe the tests that you ran to verify the changes. Provide instructions so we can reproduce. Please also list any relevant details to your test configuration.

# Checklist

- [ ] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [ ] My changes generate no new warnings
- [ ] I have added tests that provde my fix is effective or that my feature works
- [ ] New and existing unit tests pass locally with my changes
- [ ] Any dependent changes have been merged and published in downstream modules

Reviewed-on: https://gitea.vylpes.xyz/External/card-drop/pulls/133
Reviewed-by: VylpesTester <tester@vylpes.com>
Co-authored-by: Ethan Lane <ethan@vylpes.com>
Co-committed-by: Ethan Lane <ethan@vylpes.com>
This commit is contained in:
Ethan Lane 2024-01-05 19:26:44 +00:00 • committed by Vylpes
parent 84749c3381
commit 39529cf20c
44 changed files with 1590 additions and 280 deletions
Download patch file Download diff file Expand all files Collapse all files

283
src/client/client.ts
View file

@ -1,24 +1,22 @@
import { Client } from "discord.js";
import { Client, DMChannel, Guild, GuildBan, GuildMember, Message, NonThreadGuildBasedChannel, PartialGuildMember, PartialMessage } from "discord.js";
import * as dotenv from "dotenv";
import { EventType } from "../constants/EventType";
import ICommandItem from "../contracts/ICommandItem";
import IEventItem from "../contracts/IEventItem";
import EventExecutors from "../contracts/EventExecutors";
import { Command } from "../type/command";
import { Events } from "./events";
import { Util } from "./util";
import IButtonEventItem from "../contracts/IButtonEventItem";
import IButtonEventItem from "../contracts/ButtonEventItem";
import { ButtonEvent } from "../type/buttonEvent";
import AppDataSource from "../database/dataSources/appDataSource";
import { Environment } from "../constants/Environment";
import Webhooks from "../webhooks";
import CardMetadataFunction from "../Functions/CardMetadataFunction";
import SeriesMetadata from "../contracts/SeriesMetadata";
import InventoryHelper from "../helpers/InventoryHelper";
import { SeriesMetadata } from "../contracts/SeriesMetadata";
export class CoreClient extends Client {
private static _commandItems: ICommandItem[];
private static _eventItems: IEventItem[];
private static _eventExecutors: EventExecutors;
private static _buttonEvents: IButtonEventItem[];
private _events: Events;
@ -34,8 +32,8 @@ export class CoreClient extends Client {
return this._commandItems;
}
public static get eventItems(): IEventItem[] {
return this._eventItems;
public static get eventExecutors(): EventExecutors {
return this._eventExecutors;
}
public static get buttonEvents(): IButtonEventItem[] {
@ -47,7 +45,6 @@ export class CoreClient extends Client {
dotenv.config();
CoreClient._commandItems = [];
CoreClient._eventItems = [];
CoreClient._buttonEvents = [];
this._events = new Events();
@ -75,15 +72,11 @@ export class CoreClient extends Client {
await CardMetadataFunction.Execute(true);
this._util.loadEvents(this, CoreClient._eventItems);
this._util.loadEvents(this, CoreClient._eventExecutors);
this._util.loadSlashCommands(this);
this._webhooks.start();
console.log(`Registered Commands: ${CoreClient._commandItems.flatMap(x => x.Name).join(", ")}`);
console.log(`Registered Events: ${CoreClient._eventItems.flatMap(x => x.EventType).join(", ")}`);
console.log(`Registered Buttons: ${CoreClient._buttonEvents.flatMap(x => x.ButtonId).join(", ")}`);
await super.login(process.env.BOT_TOKEN);
}
@ -95,20 +88,260 @@ export class CoreClient extends Client {
ServerId: serverId,
};
if (environment &= CoreClient.Environment) {
if ((environment & CoreClient.Environment) == CoreClient.Environment) {
CoreClient._commandItems.push(item);
}
}
public static RegisterEvent(eventType: EventType, func: Function, environment: Environment = Environment.All) {
const item: IEventItem = {
EventType: eventType,
ExecutionFunction: func,
Environment: environment,
};
public static RegisterChannelCreateEvent(fn: (channel: NonThreadGuildBasedChannel) => void) {
if (this._eventExecutors) {
this._eventExecutors.ChannelCreate.push(fn);
} else {
this._eventExecutors = {
ChannelCreate: [ fn ],
ChannelDelete: [],
ChannelUpdate: [],
GuildBanAdd: [],
GuildBanRemove: [],
GuildCreate: [],
GuildMemberAdd: [],
GuildMemberRemove: [],
GuildMemebrUpdate: [],
MessageCreate: [],
MessageDelete: [],
MessageUpdate: [],
};
}
}
if (environment &= CoreClient.Environment) {
CoreClient._eventItems.push(item);
public static RegisterChannelDeleteEvent(fn: (channel: DMChannel | NonThreadGuildBasedChannel) => void) {
if (this._eventExecutors) {
this._eventExecutors.ChannelDelete.push(fn);
} else {
this._eventExecutors = {
ChannelCreate: [],
ChannelDelete: [ fn ],
ChannelUpdate: [],
GuildBanAdd: [],
GuildBanRemove: [],
GuildCreate: [],
GuildMemberAdd: [],
GuildMemberRemove: [],
GuildMemebrUpdate: [],
MessageCreate: [],
MessageDelete: [],
MessageUpdate: [],
};
}
}
public static RegisterChannelUpdateEvent(fn: (channel: DMChannel | NonThreadGuildBasedChannel) => void) {
if (this._eventExecutors) {
this._eventExecutors.ChannelCreate.push(fn);
} else {
this._eventExecutors = {
ChannelCreate: [],
ChannelDelete: [],
ChannelUpdate: [ fn ],
GuildBanAdd: [],
GuildBanRemove: [],
GuildCreate: [],
GuildMemberAdd: [],
GuildMemberRemove: [],
GuildMemebrUpdate: [],
MessageCreate: [],
MessageDelete: [],
MessageUpdate: [],
};
}
}
public static RegisterGuildBanAddEvent(fn: (ban: GuildBan) => void) {
if (this._eventExecutors) {
this._eventExecutors.GuildBanAdd.push(fn);
} else {
this._eventExecutors = {
ChannelCreate: [],
ChannelDelete: [],
ChannelUpdate: [],
GuildBanAdd: [ fn ],
GuildBanRemove: [],
GuildCreate: [],
GuildMemberAdd: [],
GuildMemberRemove: [],
GuildMemebrUpdate: [],
MessageCreate: [],
MessageDelete: [],
MessageUpdate: [],
};
}
}
public static RegisterGuildBanRemoveEvent(fn: (channel: GuildBan) => void) {
if (this._eventExecutors) {
this._eventExecutors.GuildBanRemove.push(fn);
} else {
this._eventExecutors = {
ChannelCreate: [],
ChannelDelete: [],
ChannelUpdate: [],
GuildBanAdd: [],
GuildBanRemove: [ fn ],
GuildCreate: [],
GuildMemberAdd: [],
GuildMemberRemove: [],
GuildMemebrUpdate: [],
MessageCreate: [],
MessageDelete: [],
MessageUpdate: [],
};
}
}
public static RegisterGuildCreateEvent(fn: (guild: Guild) => void) {
if (this._eventExecutors) {
this._eventExecutors.GuildCreate.push(fn);
} else {
this._eventExecutors = {
ChannelCreate: [],
ChannelDelete: [],
ChannelUpdate: [],
GuildBanAdd: [],
GuildBanRemove: [],
GuildCreate: [ fn ],
GuildMemberAdd: [],
GuildMemberRemove: [],
GuildMemebrUpdate: [],
MessageCreate: [],
MessageDelete: [],
MessageUpdate: [],
};
}
}
public static RegisterGuildMemberAddEvent(fn: (member: GuildMember) => void) {
if (this._eventExecutors) {
this._eventExecutors.GuildMemberAdd.push(fn);
} else {
this._eventExecutors = {
ChannelCreate: [],
ChannelDelete: [],
ChannelUpdate: [],
GuildBanAdd: [],
GuildBanRemove: [],
GuildCreate: [],
GuildMemberAdd: [ fn ],
GuildMemberRemove: [],
GuildMemebrUpdate: [],
MessageCreate: [],
MessageDelete: [],
MessageUpdate: [],
};
}
}
public static RegisterGuildMemberRemoveEvent(fn: (member: GuildMember | PartialGuildMember) => void) {
if (this._eventExecutors) {
this._eventExecutors.GuildMemberRemove.push(fn);
} else {
this._eventExecutors = {
ChannelCreate: [],
ChannelDelete: [],
ChannelUpdate: [],
GuildBanAdd: [],
GuildBanRemove: [],
GuildCreate: [],
GuildMemberAdd: [],
GuildMemberRemove: [ fn ],
GuildMemebrUpdate: [],
MessageCreate: [],
MessageDelete: [],
MessageUpdate: [],
};
}
}
public static GuildMemebrUpdate(fn: (oldMember: GuildMember | PartialGuildMember, newMember: GuildMember) => void) {
if (this._eventExecutors) {
this._eventExecutors.GuildMemebrUpdate.push(fn);
} else {
this._eventExecutors = {
ChannelCreate: [],
ChannelDelete: [],
ChannelUpdate: [],
GuildBanAdd: [],
GuildBanRemove: [],
GuildCreate: [],
GuildMemberAdd: [],
GuildMemberRemove: [],
GuildMemebrUpdate: [ fn ],
MessageCreate: [],
MessageDelete: [],
MessageUpdate: [],
};
}
}
public static RegisterMessageCreateEvent(fn: (message: Message<boolean>) => void) {
if (this._eventExecutors) {
this._eventExecutors.MessageCreate.push(fn);
} else {
this._eventExecutors = {
ChannelCreate: [],
ChannelDelete: [],
ChannelUpdate: [],
GuildBanAdd: [],
GuildBanRemove: [],
GuildCreate: [],
GuildMemberAdd: [],
GuildMemberRemove: [],
GuildMemebrUpdate: [],
MessageCreate: [ fn ],
MessageDelete: [],
MessageUpdate: [],
};
}
}
public static RegisterMessageDeleteEvent(fn: (message: Message<boolean> | PartialMessage) => void) {
if (this._eventExecutors) {
this._eventExecutors.MessageDelete.push(fn);
} else {
this._eventExecutors = {
ChannelCreate: [],
ChannelDelete: [],
ChannelUpdate: [],
GuildBanAdd: [],
GuildBanRemove: [],
GuildCreate: [],
GuildMemberAdd: [],
GuildMemberRemove: [],
GuildMemebrUpdate: [],
MessageCreate: [],
MessageDelete: [ fn ],
MessageUpdate: [],
};
}
}
public static RegisterMessageUpdateEvent(fn: (oldMessage: Message<boolean> | PartialMessage, newMessage: Message<boolean> | PartialMessage) => void) {
if (this._eventExecutors) {
this._eventExecutors.MessageUpdate.push(fn);
} else {
this._eventExecutors = {
ChannelCreate: [],
ChannelDelete: [],
ChannelUpdate: [],
GuildBanAdd: [],
GuildBanRemove: [],
GuildCreate: [],
GuildMemberAdd: [],
GuildMemberRemove: [],
GuildMemebrUpdate: [],
MessageCreate: [],
MessageDelete: [],
MessageUpdate: [ fn ],
};
}
}
@ -119,7 +352,7 @@ export class CoreClient extends Client {
Environment: environment,
};
if (environment &= CoreClient.Environment) {
if ((environment & CoreClient.Environment) == CoreClient.Environment) {
CoreClient._buttonEvents.push(item);
}
}

6
src/client/interactionCreate/Button.ts
View file

@ -1,14 +1,14 @@
import { ButtonInteraction, Interaction } from "discord.js";
import { ButtonInteraction } from "discord.js";
import { CoreClient } from "../client";
export default class Button {
public static async onButtonClicked(interaction: ButtonInteraction) {
if (!interaction.isButton) return;
const item = CoreClient.buttonEvents.find(x => x.ButtonId == interaction.customId.split(' ')[0]);
const item = CoreClient.buttonEvents.find(x => x.ButtonId == interaction.customId.split(" ")[0]);
if (!item) {
await interaction.reply('Event not found');
await interaction.reply("Event not found");
return;
}

2
src/client/interactionCreate/ChatInputCommand.ts
View file

@ -13,7 +13,7 @@ export default class ChatInputCommand {
if (!itemForServer) {
if (!item) {
await interaction.reply('Command not found');
await interaction.reply("Command not found");
return;
}

79
src/client/util.ts
View file

@ -1,6 +1,5 @@
import { Client, REST, Routes, SlashCommandBuilder } from "discord.js";
import { EventType } from "../constants/EventType";
import IEventItem from "../contracts/IEventItem";
import EventExecutors from "../contracts/EventExecutors";
import { CoreClient } from "./client";
export class Util {
@ -10,25 +9,25 @@ export class Util {
const globalCommands = registeredCommands.filter(x => !x.ServerId);
const guildCommands = registeredCommands.filter(x => x.ServerId);
const globalCommandData: SlashCommandBuilder[] = [];
const globalCommandData: Omit<SlashCommandBuilder, "addSubcommand" | "addSubcommandGroup">[] = [];
for (let command of globalCommands) {
for (const command of globalCommands) {
if (!command.Command.CommandBuilder) continue;
if (command.Environment &= CoreClient.Environment) {
if ((command.Environment & CoreClient.Environment) == CoreClient.Environment) {
globalCommandData.push(command.Command.CommandBuilder);
}
}
const guildIds: string[] = [];
for (let command of guildCommands) {
for (const command of guildCommands) {
if (!guildIds.find(x => x == command.ServerId)) {
guildIds.push(command.ServerId!);
}
}
const rest = new REST({ version: '10' }).setToken(process.env.BOT_TOKEN!);
const rest = new REST({ version: "10" }).setToken(process.env.BOT_TOKEN!);
rest.put(
Routes.applicationCommands(process.env.BOT_CLIENTID!),
@ -37,13 +36,13 @@ export class Util {
}
);
for (let guild of guildIds) {
const guildCommandData: SlashCommandBuilder[] = [];
for (const guild of guildIds) {
const guildCommandData: Omit<SlashCommandBuilder, "addSubcommand" | "addSubcommandGroup">[] = [];
for (let command of guildCommands.filter(x => x.ServerId == guild)) {
for (const command of guildCommands.filter(x => x.ServerId == guild)) {
if (!command.Command.CommandBuilder) continue;
if (command.Environment &= CoreClient.Environment) {
if ((command.Environment & CoreClient.Environment) == CoreClient.Environment) {
guildCommandData.push(command.Command.CommandBuilder);
}
}
@ -55,53 +54,23 @@ export class Util {
{
body: guildCommandData
}
)
);
}
}
// Load the events
loadEvents(client: Client, events: IEventItem[]) {
events.forEach((e) => {
switch(e.EventType) {
case EventType.ChannelCreate:
client.on('channelCreate', (channel) => e.ExecutionFunction(channel));
break;
case EventType.ChannelDelete:
client.on('channelDelete', (channel) => e.ExecutionFunction(channel));
break;
case EventType.ChannelUpdate:
client.on('channelUpdate', (channel) => e.ExecutionFunction(channel));
break;
case EventType.GuildBanAdd:
client.on('guildBanAdd', (ban) => e.ExecutionFunction(ban));
break;
case EventType.GuildBanRemove:
client.on('guildBanRemove', (ban) => e.ExecutionFunction(ban));
break;
case EventType.GuildCreate:
client.on('guildCreate', (guild) => e.ExecutionFunction(guild));
break;
case EventType.GuildMemberAdd:
client.on('guildMemberAdd', (member) => e.ExecutionFunction(member));
break;
case EventType.GuildMemberRemove:
client.on('guildMemberRemove', (member) => e.ExecutionFunction(member));
break;
case EventType.GuildMemberUpdate:
client.on('guildMemberUpdate', (oldMember, newMember) => e.ExecutionFunction(oldMember, newMember));
break;
case EventType.MessageCreate:
client.on('messageCreate', (message) => e.ExecutionFunction(message));
break;
case EventType.MessageDelete:
client.on('messageDelete', (message) => e.ExecutionFunction(message));
break;
case EventType.MessageUpdate:
client.on('messageUpdate', (oldMessage, newMessage) => e.ExecutionFunction(oldMessage, newMessage));
break;
default:
console.error('Event not implemented.');
}
});
loadEvents(client: Client, events: EventExecutors) {
client.on("channelCreate", (channel) => events.ChannelCreate.forEach((fn) => fn(channel)));
client.on("channelDelete", (channel) => events.ChannelDelete.forEach((fn) => fn(channel)));
client.on("channelUpdate", (channel) => events.ChannelUpdate.forEach((fn) => fn(channel)));
client.on("guildBanAdd", (ban) => events.GuildBanAdd.forEach((fn) => fn(ban)));
client.on("guildBanRemove", (ban) => events.GuildBanRemove.forEach((fn) => fn(ban)));
client.on("guildCreate", (guild) => events.GuildCreate.forEach((fn) => fn(guild)));
client.on("guildMemberAdd", (member) => events.GuildMemberAdd.forEach((fn) => fn(member)));
client.on("guildMemberRemove", (member) => events.GuildMemberRemove.forEach((fn) => fn(member)));
client.on("guildMemberUpdate", (oldMember, newMember) => events.GuildMemebrUpdate.forEach((fn) => fn(oldMember, newMember)));
client.on("messageCreate", (message) => events.MessageCreate.forEach((fn) => fn(message)));
client.on("messageDelete", (message) => events.MessageDelete.forEach((fn) => fn(message)));
client.on("messageUpdate", (oldMessage, newMessage) => events.MessageUpdate.forEach((fn) => fn(oldMessage, newMessage)));
}
}