RabbitLabs/vylbot-app
RabbitLabs/vylbot-app
5
0
Fork 0
Code Issues 90 Pull requests 4 Projects 1 Releases 22 Packages Wiki Activity Actions

Add list moons command #449

Merged
Vylpes merged 15 commits from feature/195-list-moons into develop 2024-08-17 16:47:14 +01:00
Conversation 0 Commits 15 Files changed 10 +6 -6
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 084b8aea79 - Show all commits

4
src/commands/304276391837302787/moons/list.ts
View file

@ -1,7 +1,7 @@
import {ActionRowBuilder, ButtonBuilder, ButtonStyle, CommandInteraction, EmbedBuilder} from "discord.js"; import {ActionRowBuilder, ButtonBuilder, ButtonStyle, CommandInteraction, EmbedBuilder} from "discord.js";
import Moon from "../../../database/entities/Moon"; import Moon from "../../../database/entities/Moon";
import EmbedColours from "../../../constants/EmbedColours"; import EmbedColours from "../../../constants/EmbedColours";
import MoonValues from "../../../constants/MoonValues"; import MoonConstants from "../../../constants/MoonConstants";
export default async function ListMoons(interaction: CommandInteraction) { export default async function ListMoons(interaction: CommandInteraction) {
const user = interaction.options.get("user")?.user ?? interaction.user; const user = interaction.options.get("user")?.user ?? interaction.user;
@ -14,7 +14,7 @@ export default async function ListMoons(interaction: CommandInteraction) {
return; return;
} }
const totalPages = Math.ceil(moons[1] / MoonValues.ListPageLength); const totalPages = Math.ceil(moons[1] / MoonConstants.ListPageLength);
const description = moons[0].flatMap(x => `${x.MoonNumber}. ${x.Description.slice(0, 15)}`); const description = moons[0].flatMap(x => `${x.MoonNumber}. ${x.Description.slice(0, 15)}`);

2
src/constants/MoonValues.ts → src/constants/MoonConstants.ts
View file

@ -1,3 +1,3 @@
export default class MoonValues { export default class MoonConstants {
public static readonly ListPageLength = 10; public static readonly ListPageLength = 10;
} }

6
src/database/entities/Moon.ts
View file

@ -1,7 +1,7 @@
import { Column, Entity } from "typeorm"; import { Column, Entity } from "typeorm";
import BaseEntity from "../../contracts/BaseEntity"; import BaseEntity from "../../contracts/BaseEntity";
import AppDataSource from "../dataSources/appDataSource"; import AppDataSource from "../dataSources/appDataSource";
import MoonValues from "../../constants/MoonValues"; import MoonConstants from "../../constants/MoonConstants";
@Entity() @Entity()
export default class Moon extends BaseEntity { export default class Moon extends BaseEntity {
@ -31,7 +31,7 @@ export default class Moon extends BaseEntity {
} }
public static async FetchPaginatedMoonsByUserId(userId: string, page: number): Promise<[ Moon[], number ]> { public static async FetchPaginatedMoonsByUserId(userId: string, page: number): Promise<[ Moon[], number ]> {
const rangeStart = page * MoonValues.ListPageLength; const rangeStart = page * MoonConstants.ListPageLength;
Vylpes marked this conversation as resolved Outdated
VylpesTester commented 2024-07-06 19:08:13 +01:00
Outdated
Review
Copy link

ListPageLength could just be a parameter tbh

`ListPageLength` could just be a parameter tbh
Vylpes commented 2024-08-06 18:37:00 +01:00
Outdated
Review
Copy link

Or we make it a global page length, affecting all future pages?

Or we make it a global page length, affecting all future pages?
VylpesTester commented 2024-08-12 16:10:48 +01:00
Outdated
Review
Copy link

I think just make it a parameter, the issue with that would be adjusting it for 1 and having unintended changes on other pages

I think just make it a parameter, the issue with that would be adjusting it for 1 and having unintended changes on other pages
const repository = AppDataSource.getRepository(Moon); const repository = AppDataSource.getRepository(Moon);
@ -39,7 +39,7 @@ export default class Moon extends BaseEntity {
where: { UserId: userId }, where: { UserId: userId },
order: { MoonNumber: "ASC" }, order: { MoonNumber: "ASC" },
skip: rangeStart, skip: rangeStart,
take: MoonValues.ListPageLength, take: MoonConstants.ListPageLength,
}); });
return moons; return moons;