External/card-drop
4
0
Fork 0
Code Issues 27 Pull requests 2 Actions Packages Projects 1 Releases 27 Wiki Activity

Clean up some code
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse source
This commit is contained in:
Ethan Lane 2023-12-01 18:57:33 +00:00
parent 3fc8ea3e28
commit d29a81c786
3 changed files with 21 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/buttonEvents/Pagination.ts
View file

@ -2,14 +2,15 @@ import { ButtonInteraction, CacheType } from "discord.js";
import { ButtonEvent } from "../type/buttonEvent";
import { CoreClient } from "../client/client";
import { PaginatedCommand } from "../type/paginatedCommand";
import EmbedPage from "../type/embedPage";
export default class Pagination extends ButtonEvent {
export default class Pagination<TPage extends EmbedPage> extends ButtonEvent {
public override async execute(interaction: ButtonInteraction<CacheType>) {
const embedId = interaction.customId.split(' ')[1];
const action = interaction.customId.split(' ')[2];
const commandItem = CoreClient.commandItems.find(x => x.Name == embedId);
const command = commandItem?.Command as PaginatedCommand;
const command = commandItem?.Command as PaginatedCommand<TPage>;
switch (action) {
case "next":

18
src/commands/dev/paginationtest.ts
View file

@ -3,9 +3,7 @@ import PaginatedEmbed from "../../helpers/PaginatedEmbed";
import TestPage from "../../helpers/Pagination/TestPage";
import { PaginatedCommand } from "../../type/paginatedCommand";
export default class Paginationtest extends PaginatedCommand {
public paginatedEmbed: PaginatedEmbed<TestPage>;
export default class Paginationtest extends PaginatedCommand<TestPage> {
constructor() {
super();
@ -13,8 +11,6 @@ export default class Paginationtest extends PaginatedCommand {
.setName('paginationtest')
.setDescription('Test the pagination functionality');
this.paginatedEmbed = new PaginatedEmbed<TestPage>("paginationtest");
this.InitialisePages();
}
@ -24,18 +20,6 @@ export default class Paginationtest extends PaginatedCommand {
await page!.sendCommandEmbed(interaction);
}
public override async nextPage(interaction: ButtonInteraction<CacheType>) {
const page = this.paginatedEmbed.NextPage();
await page!.sendButtonEmbed(interaction);
}
public override async previousPage(interaction: ButtonInteraction<CacheType>) {
const page = this.paginatedEmbed.PreviousPage();
await page!.sendButtonEmbed(interaction);
}
private InitialisePages() {
const page0 = new TestPage("paginationtest", 0, 2);
const page1 = new TestPage("paginationtest", 1, 2);

21
src/type/paginatedCommand.ts
View file

@ -1,14 +1,27 @@
import { ButtonInteraction, CommandInteraction } from "discord.js";
import { ButtonInteraction, CacheType } from "discord.js";
import { Command } from "./command";
import PaginatedEmbed from "../helpers/PaginatedEmbed";
import EmbedPage from "./embedPage";
export class PaginatedCommand extends Command {
export class PaginatedCommand<TPage extends EmbedPage> extends Command {
public CommandBuilder: any;
public paginatedEmbed: PaginatedEmbed<TPage>;
public async nextPage(interaction: ButtonInteraction) {
constructor() {
super();
this.paginatedEmbed = new PaginatedEmbed<TPage>("paginationtest");
}
public async previousPage(interaction: ButtonInteraction) {
public async nextPage(interaction: ButtonInteraction<CacheType>) {
const page = this.paginatedEmbed.NextPage();
await page!.sendButtonEmbed(interaction);
}
public async previousPage(interaction: ButtonInteraction<CacheType>) {
const page = this.paginatedEmbed.PreviousPage();
await page!.sendButtonEmbed(interaction);
}
}