Skip to content

/tainfo ui improvments and linter fixes #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TheLuckyman30 merged 5 commits into from
May 4, 2025
Merged

/tainfo ui improvments and linter fixes #154

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d78c462
removing download option
IrvinFavors Apr 28, 2025
38023ea
putting email on separate line from name
IrvinFavors Apr 30, 2025
8e0b0b5
merging main into branch
IrvinFavors Apr 30, 2025
a788ab6
updating with main
IrvinFavors May 4, 2025
29e5d0c
linter fixes and ui improvements
IrvinFavors May 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 21 additions & 37 deletions src/commands/general/tainfo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ import {
ButtonStyle,
ComponentType,
EmbedBuilder,
DMChannel,
AttachmentBuilder
DMChannel
} from 'discord.js';
import { Command } from '@lib/types/Command';
import 'dotenv/config';
Expand All @@ -21,7 +20,6 @@ const CALENDAR_ID
const EXPIRATION_TIME = 5 * 60 * 1000; // 5 minutes
const NUM_ENTRIES_PER_PAGE = 5;


// Function to chunk an array into smaller ones; used for pagination
function chunk<T>(arr: T[], size: number): T[][] {
const pages: T[][] = [];
Expand Down Expand Up @@ -79,7 +77,9 @@ export default class extends Command {
!ev.summary
?.toLowerCase()
.includes(className.toLowerCase())
) { continue; }
) {
continue;
}
const name = ev.summary.split('-')[1]?.trim();
if (!name) continue;
const email
Expand All @@ -95,37 +95,40 @@ export default class extends Command {
});
}

// Build dual arrays: markdown for embeds, plain for downloadable text file
const taData = Array.from(taSet).map((line) => {
const [rawName, rawEmail] = line
.replace(/\*\*/g, '') // remove all asterisks for plain text
.split(' ');
const name = rawName.replace(/^Name:\s*/, '').trim();
const email = rawEmail.replace(/^Email:\s*/, '').trim();
return {
markdown: `**Name:** ${name} **Email:** ${email}`,
plain: `Name: ${name} Email: ${email}`
name: rawName.replace(/^Name:\s*/, '').trim(),
email: rawEmail.replace(/^Email:\s*/, '').trim()
};
});

// Set for embed
const taSetMdEntries = taData.map((x) => x.markdown);
// Set for downloadable text file
const taSetPlainEntries = taData.map((x) => x.plain);

const pages = chunk(taSetMdEntries, NUM_ENTRIES_PER_PAGE);
const pages = chunk(taData, NUM_ENTRIES_PER_PAGE);
let pageIndex = 0;

const makeEmbed = (page: number) =>
new EmbedBuilder()
const makeEmbed = (page: number) => {
const embed = new EmbedBuilder()
.setTitle(
`TAs for **${className}** (page ${page + 1}/${
pages.length
})`
)
.setDescription(pages[page].join('\n\n'))
.setColor('#0099ff');

pages[page].forEach((ta) =>
embed.addFields(
{ name: 'Name', value: ta.name, inline: true },
{ name: 'Email', value: ta.email, inline: true },
// Spacer for new line
{ name: '\u200b', value: '\u200b', inline: true }
)
);

return embed;
};

const makeRow = () =>
new ActionRowBuilder<ButtonBuilder>().addComponents(
new ButtonBuilder()
Expand All @@ -138,10 +141,6 @@ export default class extends Command {
.setLabel('Next ➡')
.setStyle(ButtonStyle.Secondary)
.setDisabled(pageIndex === pages.length - 1),
new ButtonBuilder()
.setCustomId('download')
.setLabel('Download .txt')
.setStyle(ButtonStyle.Primary),
new ButtonBuilder()
.setCustomId('close')
.setLabel('Close ✖️')
Expand Down Expand Up @@ -184,18 +183,8 @@ export default class extends Command {
embeds: [makeEmbed(pageIndex)],
components: [makeRow()]
});
} else if (btn.customId === 'download') {
const content = taSetPlainEntries.join('\n');
const file = new AttachmentBuilder(
Buffer.from(content, 'utf-8'),
{
name: `${className}_TAs.txt`
}
);
return btn.reply({ files: [file], ephemeral: true });
} else if (btn.customId === 'close') {
await btn.update({
content: 'Paginator closed.',
components: []
});
return dmCollector.stop();
Expand All @@ -217,11 +206,6 @@ export default class extends Command {
.setLabel('Next ➡')
.setStyle(ButtonStyle.Primary)
.setDisabled(true),
new ButtonBuilder()
.setCustomId('download')
.setLabel('Download .txt')
.setStyle(ButtonStyle.Secondary)
.setDisabled(true),
new ButtonBuilder()
.setCustomId('close')
.setLabel('Close ✖️')
Expand Down