Compare commits

..

No commits in common. "e7527abdf9d9f021f11883243782c024b00e9f17" and "dc3cb936537326b868d76235e2917d05b4828954" have entirely different histories.

5 changed files with 8 additions and 11 deletions

View file

@ -5,6 +5,5 @@ CREATE TABLE `moon` (
`MoonNumber` int NOT NULL,
`UserId` varchar(255) NOT NULL,
`Description` varchar(255) NOT NULL
`WhenArchived` datetime NULL,
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;

View file

@ -4,7 +4,7 @@ import List from "./moons/list";
export default class Moons extends ButtonEvent {
public override async execute(interaction: ButtonInteraction): Promise<void> {
const action = interaction.customId.split(" ")[1];
const action = interaction.customId.split(" ")[0];
switch (action) {
case "list":

View file

@ -5,10 +5,11 @@ import EmbedColours from "../../constants/EmbedColours";
export default async function List(interaction: ButtonInteraction) {
if (!interaction.guild) return;
const userId = interaction.customId.split(" ")[2];
const page = interaction.customId.split(" ")[3];
const userId = interaction.customId.split(" ")[1];
const page = interaction.customId.split(" ")[2];
if (!userId || !page) return;
if (!Number(page)) return;
const pageNumber = Number(page);
@ -31,7 +32,7 @@ export default async function List(interaction: ButtonInteraction) {
.setTitle(`${member?.user.username}'s Moons`)
.setColor(EmbedColours.Ok)
.setDescription(description.join("\n"))
.setFooter({ text: `Page ${page + 1} of ${totalPages} · ${moons[1]} moons` });
.setFooter({ text: `${moons.length} moons` });
const row = new ActionRowBuilder<ButtonBuilder>()
.addComponents(

View file

@ -23,7 +23,7 @@ export default async function ListMoons(interaction: CommandInteraction) {
.setTitle(`${user.username}'s Moons`)
.setColor(EmbedColours.Ok)
.setDescription(description.join("\n"))
.setFooter({ text: `Page ${page + 1} of ${totalPages} · ${moons[1]} moons` });
.setFooter({ text: `${moons.length} moons` });
const row = new ActionRowBuilder<ButtonBuilder>()
.addComponents(

View file

@ -1,4 +1,4 @@
import { Column, Entity, IsNull } from "typeorm";
import { Column, Entity } from "typeorm";
import BaseEntity from "../../contracts/BaseEntity";
import AppDataSource from "../dataSources/appDataSource";
@ -18,9 +18,6 @@ export default class Moon extends BaseEntity {
@Column()
Description: string;
@Column({ nullable: true })
WhenArchived?: Date;
@Column()
UserId: string;
@ -38,7 +35,7 @@ export default class Moon extends BaseEntity {
const repository = AppDataSource.getRepository(Moon);
const moons = await repository.findAndCount({
where: { UserId: userId, WhenArchived: IsNull() },
where: { UserId: userId },
order: { MoonNumber: "ASC" },
skip: rangeStart,
take: pageLength,