Skip to content

Nitpick refactor for courses command #126

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.

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
merged 5 commits into from
May 25, 2024
Merged
Changes from all commits
Commits
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
41 changes: 24 additions & 17 deletions commands/course.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
const { SlashCommandBuilder } = require("@discordjs/builders");
const { ChannelType } = require("discord.js");

const COMMAND_JOIN = "join";
const COMMAND_LEAVE = "leave";
Expand Down Expand Up @@ -35,20 +36,26 @@ const get_real_course_name = (course) => {
};

const is_valid_course = (course) => {
const reg_comp_course = /^comp\d{4}$/;
const reg_math_course = /^math\d{4}$/;
const reg_binf_course = /^binf\d{4}$/;
const reg_engg_course = /^engg\d{4}$/;
const reg_seng_course = /^seng\d{4}$/;
const reg_desn_course = /^desn\d{4}$/;
const reg_valid_course = /^[a-zA-Z]{4}\d{4}$/;

return reg_valid_course.test(course);
};

const is_supported_course = (course) => {
const reg_comp_course = /^comp\d{4}$/i;
const reg_math_course = /^math\d{4}$/i;
const reg_binf_course = /^binf\d{4}$/i;
const reg_engg_course = /^engg\d{4}$/i;
const reg_seng_course = /^seng\d{4}$/i;
const reg_desn_course = /^desn\d{4}$/i;

return (
reg_comp_course.test(course.toLowerCase()) ||
reg_math_course.test(course.toLowerCase()) ||
reg_binf_course.test(course.toLowerCase()) ||
reg_engg_course.test(course.toLowerCase()) ||
reg_seng_course.test(course.toLowerCase()) ||
reg_desn_course.test(course.toLowerCase())
reg_comp_course.test(course) ||
reg_math_course.test(course) ||
reg_binf_course.test(course) ||
reg_engg_course.test(course) ||
reg_seng_course.test(course) ||
reg_desn_course.test(course)
);
};

Expand Down Expand Up @@ -87,20 +94,20 @@ module.exports = {
const input_course = await interaction.options.getString("course").toLowerCase();
const course = get_real_course_name(input_course);

const other_courses = /^[a-zA-Z]{4}\d{4}$/;
const is_valid = is_valid_course(course);
const is_supported = is_supported_course(course);

const course_with_alias =
course != input_course
? `${course} (same course chat as ${input_course})`
: `${course}`;

if (!is_valid && other_courses.test(course.toLowerCase())) {
if (!is_supported && is_valid) {
return await interaction.reply({
content: `❌ | Course chats for other faculties are not supported.`,
ephemeral: true,
});
} else if (!is_valid) {
} else if (!is_supported) {
return await interaction.reply({
content: `❌ | You are not allowed to join this channel using this command.`,
ephemeral: true,
Expand Down Expand Up @@ -138,7 +145,7 @@ module.exports = {
const input_course = await interaction.options.getString("course");
const course = get_real_course_name(input_course);

if (!is_valid_course(course)) {
if (!is_supported_course(course)) {
return await interaction.reply({
content: `❌ | Not a valid course.`,
ephemeral: true,
Expand All @@ -155,7 +162,7 @@ module.exports = {
content: `❌ | The course chat for \`${course}\` does not exist.`,
ephemeral: true,
});
} else if (channel.type !== "GUILD_TEXT") {
} else if (channel.type !== ChannelType.GuildText) {
return await interaction.reply({
content: `❌ | The course chat for \`${course}\` is not a text channel.`,
ephemeral: true,
Expand Down
Loading