From d29a81c786a777f791d2e67f17d326de45d8fb18 Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Fri, 1 Dec 2023 18:57:33 +0000
Subject: [PATCH] Clean up some code

---
 src/buttonEvents/Pagination.ts     |  5 +++--
 src/commands/dev/paginationtest.ts | 18 +-----------------
 src/type/paginatedCommand.ts       | 21 +++++++++++++++++----
 3 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/src/buttonEvents/Pagination.ts b/src/buttonEvents/Pagination.ts
index 036dd92..d39371c 100644
--- a/src/buttonEvents/Pagination.ts
+++ b/src/buttonEvents/Pagination.ts
@@ -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":
diff --git a/src/commands/dev/paginationtest.ts b/src/commands/dev/paginationtest.ts
index 76e4790..1a3d6ac 100644
--- a/src/commands/dev/paginationtest.ts
+++ b/src/commands/dev/paginationtest.ts
@@ -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);
diff --git a/src/type/paginatedCommand.ts b/src/type/paginatedCommand.ts
index 6132175..ca5ace6 100644
--- a/src/type/paginatedCommand.ts
+++ b/src/type/paginatedCommand.ts
@@ -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);
     }
 }