Compare commits
No commits in common. "a71b33d8792dcf64dda0fb16d57afb488b946705" and "c5fc99d658c73bc258cc70064218e19ee275c4c7" have entirely different histories.
a71b33d879
...
c5fc99d658
8 changed files with 0 additions and 89 deletions
|
@ -38,7 +38,6 @@ const client = new CoreClient([
|
||||||
|
|
||||||
Registry.RegisterCommands();
|
Registry.RegisterCommands();
|
||||||
Registry.RegisterButtonEvents();
|
Registry.RegisterButtonEvents();
|
||||||
Registry.RegisterStringDropdownEvents();
|
|
||||||
|
|
||||||
if (!existsSync(`${process.env.DATA_DIR}/cards`) && process.env.GDRIVESYNC_AUTO && process.env.GDRIVESYNC_AUTO == "true") {
|
if (!existsSync(`${process.env.DATA_DIR}/cards`) && process.env.GDRIVESYNC_AUTO && process.env.GDRIVESYNC_AUTO == "true") {
|
||||||
console.log("Card directory not found, syncing...");
|
console.log("Card directory not found, syncing...");
|
||||||
|
|
|
@ -17,14 +17,11 @@ import AppLogger from "./appLogger";
|
||||||
import TimerHelper from "../helpers/TimerHelper";
|
import TimerHelper from "../helpers/TimerHelper";
|
||||||
import GiveCurrency from "../timers/GiveCurrency";
|
import GiveCurrency from "../timers/GiveCurrency";
|
||||||
import PurgeClaims from "../timers/PurgeClaims";
|
import PurgeClaims from "../timers/PurgeClaims";
|
||||||
import StringDropdownEventItem from "../contracts/StringDropdownEventItem";
|
|
||||||
import {StringDropdownEvent} from "../type/stringDropdownEvent";
|
|
||||||
|
|
||||||
export class CoreClient extends Client {
|
export class CoreClient extends Client {
|
||||||
private static _commandItems: ICommandItem[];
|
private static _commandItems: ICommandItem[];
|
||||||
private static _eventExecutors: EventExecutors;
|
private static _eventExecutors: EventExecutors;
|
||||||
private static _buttonEvents: IButtonEventItem[];
|
private static _buttonEvents: IButtonEventItem[];
|
||||||
private static _stringDropdowns: StringDropdownEventItem[];
|
|
||||||
|
|
||||||
private _events: Events;
|
private _events: Events;
|
||||||
private _util: Util;
|
private _util: Util;
|
||||||
|
@ -48,10 +45,6 @@ export class CoreClient extends Client {
|
||||||
return this._buttonEvents;
|
return this._buttonEvents;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static get stringDropdowns(): StringDropdownEventItem[] {
|
|
||||||
return this._stringDropdowns;
|
|
||||||
}
|
|
||||||
|
|
||||||
constructor(intents: number[]) {
|
constructor(intents: number[]) {
|
||||||
super({ intents: intents });
|
super({ intents: intents });
|
||||||
dotenv.config();
|
dotenv.config();
|
||||||
|
@ -66,7 +59,6 @@ export class CoreClient extends Client {
|
||||||
|
|
||||||
CoreClient._commandItems = [];
|
CoreClient._commandItems = [];
|
||||||
CoreClient._buttonEvents = [];
|
CoreClient._buttonEvents = [];
|
||||||
CoreClient._stringDropdowns = [];
|
|
||||||
|
|
||||||
this._events = new Events();
|
this._events = new Events();
|
||||||
this._util = new Util();
|
this._util = new Util();
|
||||||
|
@ -416,19 +408,4 @@ export class CoreClient extends Client {
|
||||||
AppLogger.LogVerbose("Client", `Registered Button Event: ${buttonId}`);
|
AppLogger.LogVerbose("Client", `Registered Button Event: ${buttonId}`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static RegisterStringDropdownEvent(dropdownId: string, event: StringDropdownEvent, environment: Environment = Environment.All) {
|
|
||||||
const item: StringDropdownEventItem = {
|
|
||||||
DropdownId: dropdownId,
|
|
||||||
Event: event,
|
|
||||||
Environment: environment,
|
|
||||||
};
|
|
||||||
|
|
||||||
if ((environment & CoreClient.Environment) == CoreClient.Environment) {
|
|
||||||
CoreClient._stringDropdowns.push(item);
|
|
||||||
|
|
||||||
AppLogger.LogVerbose("Client", `Registered String Dropdown Event: ${dropdownId}`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,6 @@ import ChatInputCommand from "./interactionCreate/ChatInputCommand";
|
||||||
import Button from "./interactionCreate/Button";
|
import Button from "./interactionCreate/Button";
|
||||||
import AppLogger from "./appLogger";
|
import AppLogger from "./appLogger";
|
||||||
import NewUserDiscovery from "./interactionCreate/middleware/NewUserDiscovery";
|
import NewUserDiscovery from "./interactionCreate/middleware/NewUserDiscovery";
|
||||||
import StringDropdown from "./interactionCreate/StringDropdown";
|
|
||||||
|
|
||||||
export class Events {
|
export class Events {
|
||||||
public async onInteractionCreate(interaction: Interaction) {
|
public async onInteractionCreate(interaction: Interaction) {
|
||||||
|
@ -20,11 +19,6 @@ export class Events {
|
||||||
AppLogger.LogVerbose("Client", `Button: ${interaction.customId}`);
|
AppLogger.LogVerbose("Client", `Button: ${interaction.customId}`);
|
||||||
Button.onButtonClicked(interaction);
|
Button.onButtonClicked(interaction);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (interaction.isStringSelectMenu()) {
|
|
||||||
AppLogger.LogVerbose("Client", `StringDropdown: ${interaction.customId}`);
|
|
||||||
StringDropdown.onStringDropdownSelected(interaction);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Emit when bot is logged in and ready to use
|
// Emit when bot is logged in and ready to use
|
||||||
|
|
|
@ -1,29 +0,0 @@
|
||||||
import {StringSelectMenuInteraction} from "discord.js";
|
|
||||||
import {CoreClient} from "../client";
|
|
||||||
import AppLogger from "../appLogger";
|
|
||||||
|
|
||||||
export default class StringDropdown {
|
|
||||||
public static async onStringDropdownSelected(interaction: StringSelectMenuInteraction) {
|
|
||||||
if (!interaction.isStringSelectMenu()) return;
|
|
||||||
|
|
||||||
const item = CoreClient.stringDropdowns.find(x => x.DropdownId == interaction.customId.split(" ")[0]);
|
|
||||||
|
|
||||||
if (!item) {
|
|
||||||
AppLogger.LogVerbose("StringDropdown", `Event not found: ${interaction.customId}`);
|
|
||||||
|
|
||||||
await interaction.reply("Event not found");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
AppLogger.LogDebug("StringDropdown", `Executing ${interaction.customId}`);
|
|
||||||
|
|
||||||
item.Event.execute(interaction);
|
|
||||||
} catch (e) {
|
|
||||||
AppLogger.LogError("StringDropdown", `Error occurred while executing event: ${interaction.customId}`);
|
|
||||||
AppLogger.LogError("StringDropdown", e as string);
|
|
||||||
|
|
||||||
await interaction.reply("An error occurred while executing the event");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,10 +0,0 @@
|
||||||
import {Environment} from "../constants/Environment";
|
|
||||||
import {StringDropdownEvent} from "../type/stringDropdownEvent";
|
|
||||||
|
|
||||||
interface StringDropdownEventItem {
|
|
||||||
DropdownId: string,
|
|
||||||
Event: StringDropdownEvent,
|
|
||||||
Environment: Environment,
|
|
||||||
}
|
|
||||||
|
|
||||||
export default StringDropdownEventItem;
|
|
|
@ -31,9 +31,6 @@ import SeriesEvent from "./buttonEvents/Series";
|
||||||
import TradeButtonEvent from "./buttonEvents/Trade";
|
import TradeButtonEvent from "./buttonEvents/Trade";
|
||||||
import ViewButtonEvent from "./buttonEvents/View";
|
import ViewButtonEvent from "./buttonEvents/View";
|
||||||
|
|
||||||
// String Dropdown Event Imports
|
|
||||||
import InventoryStringDropdown from "./stringDropdowns/Inventory";
|
|
||||||
|
|
||||||
export default class Registry {
|
export default class Registry {
|
||||||
public static RegisterCommands() {
|
public static RegisterCommands() {
|
||||||
// Global Commands
|
// Global Commands
|
||||||
|
@ -67,8 +64,4 @@ export default class Registry {
|
||||||
CoreClient.RegisterButtonEvent("trade", new TradeButtonEvent());
|
CoreClient.RegisterButtonEvent("trade", new TradeButtonEvent());
|
||||||
CoreClient.RegisterButtonEvent("view", new ViewButtonEvent());
|
CoreClient.RegisterButtonEvent("view", new ViewButtonEvent());
|
||||||
}
|
}
|
||||||
|
|
||||||
public static RegisterStringDropdownEvents() {
|
|
||||||
CoreClient.RegisterStringDropdownEvent("inventory", new InventoryStringDropdown());
|
|
||||||
}
|
|
||||||
}
|
}
|
|
@ -1,8 +0,0 @@
|
||||||
import {StringSelectMenuInteraction} from "discord.js";
|
|
||||||
import {StringDropdownEvent} from "../type/stringDropdownEvent";
|
|
||||||
|
|
||||||
export default class Inventory extends StringDropdownEvent {
|
|
||||||
public override async execute(interaction: StringSelectMenuInteraction) {
|
|
||||||
await interaction.reply(`Test: ${interaction.customId}, ${interaction.values.join(",")}`);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,5 +0,0 @@
|
||||||
import {StringSelectMenuInteraction} from "discord.js";
|
|
||||||
|
|
||||||
export abstract class StringDropdownEvent {
|
|
||||||
abstract execute(interaction: StringSelectMenuInteraction): Promise<void>;
|
|
||||||
}
|
|
Loading…
Reference in a new issue