Add optional user tagging for information commands

Delemangi · Feb 10, 2025 · a9b6995 · a9b6995
1 parent adc69be
commit a9b6995
Show file tree

Hide file tree

Showing 9 changed files with 89 additions and 14 deletions.
diff --git a/src/commands/course.ts b/src/commands/course.ts
@@ -3,6 +3,7 @@ import {
   type GuildMember,
   roleMention,
   SlashCommandBuilder,
+  userMention,
 } from 'discord.js';
 
 import {
@@ -43,6 +44,9 @@ export const data = new SlashCommandBuilder()
           .setDescription('Предмет')
           .setRequired(true)
           .setAutocomplete(true),
+      )
+      .addUserOption((option) =>
+        option.setName('user').setDescription('Корисник').setRequired(false),
       ),
   )
   .addSubcommand((command) =>
@@ -55,6 +59,9 @@ export const data = new SlashCommandBuilder()
           .setDescription('Предмет')
           .setRequired(true)
           .setAutocomplete(true),
+      )
+      .addUserOption((option) =>
+        option.setName('user').setDescription('Корисник').setRequired(false),
       ),
   )
   .addSubcommand((command) =>
@@ -79,6 +86,9 @@ export const data = new SlashCommandBuilder()
           .setDescription('Предмет')
           .setRequired(true)
           .setAutocomplete(true),
+      )
+      .addUserOption((option) =>
+        option.setName('user').setDescription('Корисник').setRequired(false),
       ),
   )
   .addSubcommand((command) =>
@@ -91,6 +101,9 @@ export const data = new SlashCommandBuilder()
           .setDescription('Предмет')
           .setRequired(true)
           .setAutocomplete(true),
+      )
+      .addUserOption((option) =>
+        option.setName('user').setDescription('Корисник').setRequired(false),
       ),
   )
   .addSubcommand((command) =>
@@ -103,6 +116,9 @@ export const data = new SlashCommandBuilder()
           .setDescription('Предмет')
           .setRequired(true)
           .setAutocomplete(true),
+      )
+      .addUserOption((option) =>
+        option.setName('user').setDescription('Корисник').setRequired(false),
       ),
   )
   .addSubcommand((command) =>
@@ -122,6 +138,8 @@ const handleCourseParticipants = async (
   interaction: ChatInputCommandInteraction,
   course: null | string,
 ) => {
+  const user = interaction.options.getUser('user');
+
   const information = getParticipants().find(
     (participants) =>
       participants.course.toLowerCase() === course?.toLowerCase(),
@@ -135,6 +153,7 @@ const handleCourseParticipants = async (
 
   const embed = getCourseParticipantsEmbed(information);
   await interaction.editReply({
+    content: user ? userMention(user.id) : null,
     embeds: [embed],
   });
 };
@@ -143,6 +162,8 @@ const handleCourseProfessors = async (
   interaction: ChatInputCommandInteraction,
   course: null | string,
 ) => {
+  const user = interaction.options.getUser('user');
+
   const information = getProfessors().find(
     (staff) => staff.course.toLowerCase() === course?.toLowerCase(),
   );
@@ -155,6 +176,7 @@ const handleCourseProfessors = async (
 
   const embed = getCourseProfessorsEmbed(information);
   await interaction.editReply({
+    content: user ? userMention(user.id) : null,
     embeds: [embed],
   });
 };
@@ -205,6 +227,8 @@ const handleCoursePrerequisite = async (
   interaction: ChatInputCommandInteraction,
   course: null | string,
 ) => {
+  const user = interaction.options.getUser('user');
+
   const information = getPrerequisites().find(
     (prerequisites) =>
       prerequisites.course.toLowerCase() === course?.toLowerCase(),
@@ -218,6 +242,7 @@ const handleCoursePrerequisite = async (
 
   const embed = getCoursePrerequisiteEmbed(information);
   await interaction.editReply({
+    content: user ? userMention(user.id) : null,
     embeds: [embed],
   });
 };
@@ -226,6 +251,8 @@ const handleCourseInfo = async (
   interaction: ChatInputCommandInteraction,
   course: null | string,
 ) => {
+  const user = interaction.options.getUser('user');
+
   const information = getInformation().find(
     (info) => info.course.toLowerCase() === course?.toLowerCase(),
   );
@@ -238,6 +265,7 @@ const handleCourseInfo = async (
 
   const embed = getCourseInfoEmbed(information);
   await interaction.editReply({
+    content: user ? userMention(user.id) : null,
     embeds: [embed],
   });
 };
@@ -246,6 +274,8 @@ const handleCourseSummary = async (
   interaction: ChatInputCommandInteraction,
   course: null | string,
 ) => {
+  const user = interaction.options.getUser('user');
+
   if (course === null || !getCourses().includes(course)) {
     await interaction.editReply(commandErrors.courseNotFound);
 
@@ -254,6 +284,7 @@ const handleCourseSummary = async (
 
   const embeds = getCourseSummaryEmbed(course);
   await interaction.editReply({
+    content: user ? userMention(user.id) : null,
     embeds,
   });
 };

diff --git a/src/commands/courses.ts b/src/commands/courses.ts
@@ -2,6 +2,7 @@ import {
   type ChatInputCommandInteraction,
   type GuildMember,
   SlashCommandBuilder,
+  userMention,
 } from 'discord.js';
 
 import { getCoursesPrerequisiteEmbed } from '../components/commands.js';
@@ -29,6 +30,9 @@ export const data = new SlashCommandBuilder()
           .setDescription('Курс')
           .setRequired(true)
           .setAutocomplete(true),
+      )
+      .addUserOption((option) =>
+        option.setName('user').setDescription('Корисник').setRequired(false),
       ),
   )
   .addSubcommand((command) =>
@@ -62,9 +66,11 @@ const handleCoursesPrerequisite = async (
   interaction: ChatInputCommandInteraction,
 ) => {
   const course = interaction.options.getString('course', true);
+  const user = interaction.options.getUser('user');
 
   const embed = getCoursesPrerequisiteEmbed(course);
   await interaction.editReply({
+    content: user ? userMention(user.id) : null,
     embeds: [embed],
   });
 };

diff --git a/src/commands/link.ts b/src/commands/link.ts
@@ -1,6 +1,7 @@
 import {
   type ChatInputCommandInteraction,
   SlashCommandBuilder,
+  userMention,
 } from 'discord.js';
 
 import { getLinkComponents, getLinkEmbed } from '../components/commands.js';
@@ -21,10 +22,15 @@ export const data = new SlashCommandBuilder()
       .setDescription('Линк')
       .setRequired(true)
       .setAutocomplete(true),
+  )
+  .addUserOption((option) =>
+    option.setName('user').setDescription('Корисник').setRequired(false),
   );
 
 export const execute = async (interaction: ChatInputCommandInteraction) => {
   const keyword = interaction.options.getString('link', true);
+  const user = interaction.options.getUser('user');
+
   const link = Number.isNaN(Number(keyword))
     ? await getLink(keyword)
     : await getNthLink(Number(keyword));
@@ -39,6 +45,7 @@ export const execute = async (interaction: ChatInputCommandInteraction) => {
   const components = getLinkComponents(link);
   await interaction.editReply({
     components,
+    content: user ? userMention(user.id) : null,
     embeds: [embed],
   });
 };
diff --git a/src/commands/list.ts b/src/commands/list.ts
@@ -1,6 +1,7 @@
 import {
   type ChatInputCommandInteraction,
   SlashCommandBuilder,
+  userMention,
 } from 'discord.js';
 
 import {
@@ -22,15 +23,25 @@ export const data = new SlashCommandBuilder()
   .addSubcommand((command) =>
     command
       .setName('questions')
-      .setDescription(commandDescriptions['list questions']),
+      .setDescription(commandDescriptions['list questions'])
+      .addUserOption((option) =>
+        option.setName('user').setDescription('Корисник').setRequired(false),
+      ),
   )
   .addSubcommand((command) =>
-    command.setName('links').setDescription(commandDescriptions['list links']),
+    command
+      .setName('links')
+      .setDescription(commandDescriptions['list links'])
+      .addUserOption((option) =>
+        option.setName('user').setDescription('Корисник').setRequired(false),
+      ),
   );
 
 const handleListQuestions = async (
   interaction: ChatInputCommandInteraction,
 ) => {
+  const user = interaction.options.getUser('user');
+
   const questions = await getQuestions();
 
   if (questions === null) {
@@ -43,11 +54,14 @@ const handleListQuestions = async (
 
   const embed = getListQuestionsEmbed(questions);
   await interaction.editReply({
+    content: user ? userMention(user.id) : null,
     embeds: [embed],
   });
 };
 
 const handleListLinks = async (interaction: ChatInputCommandInteraction) => {
+  const user = interaction.options.getUser('user');
+
   const links = await getLinks();
 
   if (links === null) {
@@ -60,6 +74,7 @@ const handleListLinks = async (interaction: ChatInputCommandInteraction) => {
 
   const embed = getListLinksEmbed(links);
   await interaction.editReply({
+    content: user ? userMention(user.id) : null,
     embeds: [embed],
   });
 };

diff --git a/src/commands/session.ts b/src/commands/session.ts
@@ -1,6 +1,7 @@
 import {
   type ChatInputCommandInteraction,
   SlashCommandBuilder,
+  userMention,
 } from 'discord.js';
 import { access } from 'node:fs/promises';
 
@@ -21,10 +22,15 @@ export const data = new SlashCommandBuilder()
       .setDescription('Сесија')
       .setRequired(true)
       .setAutocomplete(true),
+  )
+  .addUserOption((option) =>
+    option.setName('user').setDescription('Корисник').setRequired(false),
   );
 
 export const execute = async (interaction: ChatInputCommandInteraction) => {
   const session = interaction.options.getString('session', true);
+  const user = interaction.options.getUser('user');
+
   const information = Object.entries(getSessions()).find(
     ([key]) => key.toLowerCase() === session.toLowerCase(),
   );
@@ -46,7 +52,7 @@ export const execute = async (interaction: ChatInputCommandInteraction) => {
   }
 
   await interaction.editReply({
-    content: information[0],
+    content: user ? userMention(user.id) : null,
     files: [path],
   });
 };
diff --git a/src/commands/staff.ts b/src/commands/staff.ts
@@ -1,6 +1,7 @@
 import {
   type ChatInputCommandInteraction,
   SlashCommandBuilder,
+  userMention,
 } from 'discord.js';
 
 import { getStaffEmbed } from '../components/commands.js';
@@ -21,10 +22,15 @@ export const data = new SlashCommandBuilder()
       .setDescription('Професор')
       .setRequired(true)
       .setAutocomplete(true),
+  )
+  .addUserOption((option) =>
+    option.setName('user').setDescription('Корисник').setRequired(false),
   );
 
 export const execute = async (interaction: ChatInputCommandInteraction) => {
   const professor = interaction.options.getString('professor', true);
+  const user = interaction.options.getUser('user');
+
   const information = getStaff().find(
     (staff) => staff.name.toLowerCase() === professor.toLowerCase(),
   );
@@ -37,6 +43,7 @@ export const execute = async (interaction: ChatInputCommandInteraction) => {
 
   const embed = getStaffEmbed(information);
   await interaction.editReply({
+    content: user ? userMention(user.id) : null,
     embeds: [embed],
   });
 };
diff --git a/src/shared/commands/classroom.ts b/src/shared/commands/classroom.ts
@@ -1,6 +1,7 @@
 import {
   type ChatInputCommandInteraction,
   SlashCommandBuilder,
+  userMention,
 } from 'discord.js';
 
 import { getClassroomEmbed } from '../../components/commands.js';
@@ -9,7 +10,6 @@ import { type Command } from '../../lib/types/Command.js';
 import {
   commandDescriptions,
   commandErrors,
-  commandResponseFunctions,
 } from '../../translations/commands.js';
 
 export const getCommonCommand = (
@@ -24,10 +24,15 @@ export const getCommonCommand = (
         .setDescription('Просторија')
         .setRequired(true)
         .setAutocomplete(true),
+    )
+    .addUserOption((option) =>
+      option.setName('user').setDescription('Корисник').setRequired(false),
     ),
 
   execute: async (interaction: ChatInputCommandInteraction) => {
     const classroom = interaction.options.getString('classroom', true);
+    const user = interaction.options.getUser('user');
+
     const charPos = classroom.indexOf('(');
     const classroomName =
       charPos === -1 ? classroom : classroom.slice(0, charPos).trim();
@@ -46,12 +51,8 @@ export const getCommonCommand = (
 
     const embeds = classrooms.map((cl) => getClassroomEmbed(cl));
     await interaction.editReply({
+      content: user ? userMention(user.id) : null,
       embeds,
-      ...(embeds.length > 1
-        ? {
-            content: commandResponseFunctions.multipleClassrooms(classroomName),
-          }
-        : {}),
     });
   },
 });