fix: Extract logic for getting author value for embeds

src/classes/interactions.ts

@@ -1,4 +1,5 @@
 import config from 'config';
+import { GuildQueue } from 'discord-player';
 import {
     ApplicationCommandOptionChoiceData,
     AutocompleteInteraction,
@@ -64,7 +65,7 @@ abstract class BaseInteractionWithEmbedResponse extends BaseInteraction {
         this.botOptions = config.get('botOptions');
     }
 
-    protected async getEmbedAuthor(
+    protected async getEmbedUserAuthor(
         interaction: MessageComponentInteraction | ChatInputCommandInteraction
     ): Promise<EmbedAuthorOptions> {
         let authorName: string = '';
@@ -79,6 +80,16 @@ abstract class BaseInteractionWithEmbedResponse extends BaseInteraction {
             iconURL: interaction.user.avatarURL() || this.embedOptions.info.fallbackIconUrl
         };
     }
+
+    protected async getEmbedQueueAuthor(
+        interaction: MessageComponentInteraction | ChatInputCommandInteraction,
+        queue: GuildQueue
+    ): Promise<EmbedAuthorOptions> {
+        return {
+            name: `Channel: ${queue.channel!.name} (${queue.channel!.bitrate / 1000}kbps)`,
+            iconURL: interaction.guild!.iconURL() || this.embedOptions.info.fallbackIconUrl
+        };
+    }
 }
 
 export abstract class BaseSlashCommandInteraction extends BaseInteractionWithEmbedResponse {

src/events/client/debug.ts

@@ -1,8 +1,7 @@
 import { Events } from 'discord.js';
 import { randomUUID as uuidv4 } from 'node:crypto';
-
-import loggerModule from '../../services/logger';
 import { Logger } from 'pino';
+import loggerModule from '../../services/logger';
 
 module.exports = {
     name: Events.Debug,

src/events/client/disconnect.ts

@@ -1,11 +1,10 @@
 import config from 'config';
 import { BaseGuildTextChannel, EmbedBuilder } from 'discord.js';
 import { randomUUID as uuidv4 } from 'node:crypto';
-
+import { Logger } from 'pino';
 import loggerModule from '../../services/logger';
 import { ExtendedClient } from '../../types/clientTypes';
 import { EmbedOptions, SystemOptions } from '../../types/configTypes';
-import { Logger } from 'pino';
 
 const embedOptions: EmbedOptions = config.get('embedOptions');
 const systemOptions: SystemOptions = config.get('systemOptions');

src/events/client/error.ts

@@ -1,8 +1,7 @@
 import { Events } from 'discord.js';
 import { randomUUID as uuidv4 } from 'node:crypto';
-
-import loggerModule from '../../services/logger';
 import { Logger } from 'pino';
+import loggerModule from '../../services/logger';
 
 module.exports = {
     name: Events.Error,

src/events/client/guildCreate.ts

@@ -1,8 +1,7 @@
 import { Events, Guild } from 'discord.js';
 import { randomUUID as uuidv4 } from 'node:crypto';
-
-import loggerModule from '../../services/logger';
 import { Logger } from 'pino';
+import loggerModule from '../../services/logger';
 
 module.exports = {
     name: Events.GuildCreate,

src/events/client/guildDelete.ts

@@ -1,8 +1,7 @@
 import { Events, Guild } from 'discord.js';
 import { randomUUID as uuidv4 } from 'node:crypto';
-
-import loggerModule from '../../services/logger';
 import { Logger } from 'pino';
+import loggerModule from '../../services/logger';
 
 module.exports = {
     name: Events.GuildDelete,

src/events/client/ready.ts

@@ -1,7 +1,6 @@
 import config from 'config';
 import { BaseGuildTextChannel, EmbedBuilder, Events, PresenceData } from 'discord.js';
 import { randomUUID as uuidv4 } from 'node:crypto';
-
 import { Logger } from 'pino';
 import loggerModule from '../../services/logger';
 import { ExtendedClient } from '../../types/clientTypes';

src/events/client/reconnecting.ts

@@ -1,7 +1,6 @@
 import config from 'config';
 import { BaseGuildTextChannel, EmbedBuilder } from 'discord.js';
 import { randomUUID as uuidv4 } from 'node:crypto';
-
 import { Logger } from 'pino';
 import loggerModule from '../../services/logger';
 import { ExtendedClient } from '../../types/clientTypes';

src/events/client/warn.ts

@@ -1,6 +1,6 @@
 import { Events } from 'discord.js';
-import { Logger } from 'pino';
 import { randomUUID as uuidv4 } from 'node:crypto';
+import { Logger } from 'pino';
 import loggerModule from '../../services/logger';
 
 module.exports = {

src/events/interactions/interactionCreate.ts

@@ -6,15 +6,15 @@ import {
     InteractionType,
     MessageComponentInteraction
 } from 'discord.js';
-import { Logger } from 'pino';
 import { randomUUID as uuidv4 } from 'node:crypto';
+import { Logger } from 'pino';
+import { CustomError } from '../../classes/interactions';
 import { handleAutocomplete } from '../../handlers/interactionAutocompleteHandler';
 import { handleCommand } from '../../handlers/interactionCommandHandler';
 import { handleComponent } from '../../handlers/interactionComponentHandler';
 import { handleError } from '../../handlers/interactionErrorHandler';
 import loggerModule from '../../services/logger';
 import { ExtendedClient } from '../../types/clientTypes';
-import { CustomError } from '../../classes/interactions';
 
 module.exports = {
     name: Events.InteractionCreate,

src/events/player/generalDebug.ts

@@ -1,5 +1,5 @@
-import { Logger } from 'pino';
 import { randomUUID as uuidv4 } from 'node:crypto';
+import { Logger } from 'pino';
 import loggerModule from '../../services/logger';
 
 module.exports = {

src/events/player/generalError.ts

@@ -1,7 +1,7 @@
 import config from 'config';
 import { BaseGuildTextChannel, EmbedBuilder } from 'discord.js';
-import { Logger } from 'pino';
 import { randomUUID as uuidv4 } from 'node:crypto';
+import { Logger } from 'pino';
 import loggerModule from '../../services/logger';
 import { BotOptions, EmbedOptions, SystemOptions } from '../../types/configTypes';
 import { ExtendedGuildQueuePlayerNode } from '../../types/eventTypes';

src/events/player/playerDebug.ts

@@ -1,5 +1,5 @@
-import { Logger } from 'pino';
 import { randomUUID as uuidv4 } from 'node:crypto';
+import { Logger } from 'pino';
 import loggerModule from '../../services/logger';
 
 module.exports = {

src/events/player/playerError.ts

@@ -1,7 +1,7 @@
 import config from 'config';
 import { BaseGuildTextChannel, EmbedBuilder } from 'discord.js';
-import { Logger } from 'pino';
 import { randomUUID as uuidv4 } from 'node:crypto';
+import { Logger } from 'pino';
 import loggerModule from '../../services/logger';
 import { BotOptions, EmbedOptions, SystemOptions } from '../../types/configTypes';
 import { ExtendedGuildQueuePlayerNode } from '../../types/eventTypes';

src/events/player/playerSkip.ts

@@ -1,8 +1,8 @@
 import config from 'config';
 import { Track } from 'discord-player';
 import { BaseGuildTextChannel, EmbedBuilder } from 'discord.js';
-import { Logger } from 'pino';
 import { randomUUID as uuidv4 } from 'node:crypto';
+import { Logger } from 'pino';
 import loggerModule from '../../services/logger';
 import { BotOptions, EmbedOptions, SystemOptions } from '../../types/configTypes';
 import { ExtendedGuildQueuePlayerNode } from '../../types/eventTypes';

src/events/player/playerStart.ts

@@ -1,6 +1,6 @@
 import { Track } from 'discord-player';
-import { Logger } from 'pino';
 import { randomUUID as uuidv4 } from 'node:crypto';
+import { Logger } from 'pino';
 import loggerModule from '../../services/logger';
 import { ExtendedGuildQueuePlayerNode } from '../../types/eventTypes';
 

src/events/process/uncaughtException.ts

@@ -1,5 +1,5 @@
-import { Logger } from 'pino';
 import { randomUUID as uuidv4 } from 'node:crypto';
+import { Logger } from 'pino';
 import loggerModule from '../../services/logger';
 
 module.exports = {

src/events/process/unhandledRejection.ts

@@ -1,5 +1,5 @@
-import { Logger } from 'pino';
 import { randomUUID as uuidv4 } from 'node:crypto';
+import { Logger } from 'pino';
 import loggerModule from '../../services/logger';
 
 module.exports = {

src/handlers/interactionAutocompleteHandler.ts

@@ -1,8 +1,8 @@
 import { AutocompleteInteraction } from 'discord.js';
 import { Logger } from 'pino';
+import { BaseAutocompleteInteraction } from '../classes/interactions';
 import loggerModule from '../services/logger';
 import { ExtendedClient } from '../types/clientTypes';
-import { BaseAutocompleteInteraction } from '../classes/interactions';
 
 export const handleAutocomplete = async (
     interaction: AutocompleteInteraction,

src/handlers/interactionCommandHandler.ts

@@ -1,8 +1,8 @@
 import { ChatInputCommandInteraction } from 'discord.js';
 import { Logger } from 'pino';
+import { BaseSlashCommandInteraction } from '../classes/interactions';
 import loggerModule from '../services/logger';
 import { ExtendedClient } from '../types/clientTypes';
-import { BaseSlashCommandInteraction } from '../classes/interactions';
 import { checkChannelPermissionViewable } from '../utils/validation/permissionValidator';
 
 export const handleCommand = async (

src/handlers/interactionComponentHandler.ts

@@ -1,8 +1,8 @@
 import { MessageComponentInteraction } from 'discord.js';
 import { Logger } from 'pino';
+import { BaseComponentInteraction } from '../classes/interactions';
 import loggerModule from '../services/logger';
 import { ExtendedClient } from '../types/clientTypes';
-import { BaseComponentInteraction } from '../classes/interactions';
 import { checkChannelPermissionViewable } from '../utils/validation/permissionValidator';
 
 export const handleComponent = async (

src/handlers/interactionErrorHandler.ts

@@ -8,9 +8,9 @@ import {
     MessageComponentInteraction
 } from 'discord.js';
 import { Logger } from 'pino';
+import { CustomError, InteractionValidationError } from '../classes/interactions';
 import loggerModule from '../services/logger';
 import { BotOptions, EmbedOptions } from '../types/configTypes';
-import { CustomError, InteractionValidationError } from '../classes/interactions';
 
 const embedOptions: EmbedOptions = config.get('embedOptions');
 const botOptions: BotOptions = config.get('botOptions');

src/index.ts

@@ -1,9 +1,7 @@
-import 'dotenv/config';
-
 import config from 'config';
 import { Client, Shard, ShardEvents, ShardingManager, ShardingManagerOptions } from 'discord.js';
+import 'dotenv/config';
 import { randomUUID as uuidv4 } from 'node:crypto';
-
 import { Logger } from 'pino';
 import loggerModule from './services/logger';
 

src/interactions/autocomplete/lyrics.ts

@@ -1,8 +1,8 @@
 import { LyricsData, lyricsExtractor } from '@discord-player/extractor';
 import { Player, SearchResult, useMainPlayer } from 'discord-player';
 import { ApplicationCommandOptionChoiceData } from 'discord.js';
-import { BaseAutocompleteParams, BaseAutocompleteReturnType } from '../../types/interactionTypes';
 import { BaseAutocompleteInteraction } from '../../classes/interactions';
+import { BaseAutocompleteParams, BaseAutocompleteReturnType } from '../../types/interactionTypes';
 
 // TODO: create type for recent query object
 const recentQueries = new Map();

src/interactions/autocomplete/play.ts

@@ -1,7 +1,7 @@
 import { Player, SearchResult, useMainPlayer } from 'discord-player';
 import { ApplicationCommandOptionChoiceData } from 'discord.js';
-import { BaseAutocompleteParams, BaseAutocompleteReturnType } from '../../types/interactionTypes';
 import { BaseAutocompleteInteraction } from '../../classes/interactions';
+import { BaseAutocompleteParams, BaseAutocompleteReturnType } from '../../types/interactionTypes';
 
 // TODO: create type for recent query object
 const recentQueries = new Map();

src/interactions/commands/info/help.ts

@@ -1,6 +1,6 @@
 import { EmbedBuilder, SlashCommandBuilder, SlashCommandNumberOption, SlashCommandStringOption } from 'discord.js';
-import { BaseSlashCommandParams, BaseSlashCommandReturnType } from '../../../types/interactionTypes';
 import { BaseSlashCommandInteraction } from '../../../classes/interactions';
+import { BaseSlashCommandParams, BaseSlashCommandReturnType } from '../../../types/interactionTypes';
 
 class HelpCommand extends BaseSlashCommandInteraction {
     constructor() {

src/interactions/commands/info/status.ts

@@ -2,8 +2,8 @@ import { EmbedBuilder, Guild, SlashCommandBuilder } from 'discord.js';
 import osu from 'node-os-utils';
 // @ts-ignore
 import { version } from '../../../../package.json';
-import { BaseSlashCommandParams, BaseSlashCommandReturnType } from '../../../types/interactionTypes';
 import { BaseSlashCommandInteraction } from '../../../classes/interactions';
+import { BaseSlashCommandParams, BaseSlashCommandReturnType } from '../../../types/interactionTypes';
 import { getUptimeFormatted } from '../../../utils/system/getUptimeFormatted';
 
 class StatusCommand extends BaseSlashCommandInteraction {

src/interactions/commands/player/filters.ts

@@ -18,8 +18,8 @@ import { Logger } from 'pino';
 import { BaseSlashCommandInteraction } from '../../../classes/interactions';
 import { FFmpegFilterOption, FFmpegFilterOptions } from '../../../types/configTypes';
 import { BaseSlashCommandParams, BaseSlashCommandReturnType } from '../../../types/interactionTypes';
-import { checkQueueExists, checkQueueCurrentTrack } from '../../../utils/validation/queueValidator';
-import { checkSameVoiceChannel, checkInVoiceChannel } from '../../../utils/validation/voiceChannelValidator';
+import { checkQueueCurrentTrack, checkQueueExists } from '../../../utils/validation/queueValidator';
+import { checkInVoiceChannel, checkSameVoiceChannel } from '../../../utils/validation/voiceChannelValidator';
 
 const ffmpegFilterOptions: FFmpegFilterOptions = config.get('ffmpegFilterOptions');
 

src/interactions/commands/player/leave.ts

@@ -3,7 +3,7 @@ import { EmbedBuilder, SlashCommandBuilder } from 'discord.js';
 import { BaseSlashCommandInteraction } from '../../../classes/interactions';
 import { BaseSlashCommandParams, BaseSlashCommandReturnType } from '../../../types/interactionTypes';
 import { checkQueueExists } from '../../../utils/validation/queueValidator';
-import { checkSameVoiceChannel, checkInVoiceChannel } from '../../../utils/validation/voiceChannelValidator';
+import { checkInVoiceChannel, checkSameVoiceChannel } from '../../../utils/validation/voiceChannelValidator';
 
 class LeaveCommand extends BaseSlashCommandInteraction {
     constructor() {
@@ -36,7 +36,7 @@ class LeaveCommand extends BaseSlashCommandInteraction {
         return await interaction.editReply({
             embeds: [
                 new EmbedBuilder()
-                    .setAuthor(await this.getEmbedAuthor(interaction))
+                    .setAuthor(await this.getEmbedUserAuthor(interaction))
                     .setDescription(
                         `**${this.embedOptions.icons.success} Leaving channel**\nCleared the track queue and left voice channel.\n\nTo play more music, use the **\`/play\`** command!`
                     )

src/interactions/commands/player/loop.ts

@@ -1,9 +1,9 @@
 import { GuildQueue, QueueRepeatMode, useQueue } from 'discord-player';
-import { EmbedBuilder, GuildMember, SlashCommandBuilder, SlashCommandStringOption } from 'discord.js';
-import { BaseSlashCommandParams, BaseSlashCommandReturnType } from '../../../types/interactionTypes';
+import { EmbedBuilder, SlashCommandBuilder, SlashCommandStringOption } from 'discord.js';
 import { BaseSlashCommandInteraction } from '../../../classes/interactions';
+import { BaseSlashCommandParams, BaseSlashCommandReturnType } from '../../../types/interactionTypes';
 import { checkQueueExists } from '../../../utils/validation/queueValidator';
-import { checkSameVoiceChannel, checkInVoiceChannel } from '../../../utils/validation/voiceChannelValidator';
+import { checkInVoiceChannel, checkSameVoiceChannel } from '../../../utils/validation/voiceChannelValidator';
 
 class LoopCommand extends BaseSlashCommandInteraction {
     constructor() {
@@ -106,14 +106,6 @@ class LoopCommand extends BaseSlashCommandInteraction {
             });
         }
 
-        let authorName: string;
-
-        if (interaction.member instanceof GuildMember) {
-            authorName = interaction.member.nickname || interaction.user.username;
-        } else {
-            authorName = interaction.user.username;
-        }
-
         if (queue.repeatMode === 0) {
             logger.debug('Disabled loop mode.');
 
@@ -122,10 +114,7 @@ class LoopCommand extends BaseSlashCommandInteraction {
             return await interaction.editReply({
                 embeds: [
                     new EmbedBuilder()
-                        .setAuthor({
-                            name: authorName,
-                            iconURL: interaction.user.avatarURL() || this.embedOptions.info.fallbackIconUrl
-                        })
+                        .setAuthor(await this.getEmbedUserAuthor(interaction))
                         .setDescription(
                             `**${this.embedOptions.icons.success} Loop mode disabled**\nChanging loop mode from **\`${currentModeUserString}\`** to **\`${modeUserString}\`**.\n\nThe ${currentModeUserString} will no longer play on repeat!`
                         )
@@ -141,10 +130,7 @@ class LoopCommand extends BaseSlashCommandInteraction {
             return await interaction.editReply({
                 embeds: [
                     new EmbedBuilder()
-                        .setAuthor({
-                            name: authorName,
-                            iconURL: interaction.user.avatarURL() || this.embedOptions.info.fallbackIconUrl
-                        })
+                        .setAuthor(await this.getEmbedUserAuthor(interaction))
                         .setDescription(
                             `**${this.embedOptions.icons.autoplaying} Loop mode changed**\nChanging loop mode from **\`${currentModeUserString}\`** to **\`${modeUserString}\`**.\n\nWhen the queue is empty, similar tracks will start playing!`
                         )
@@ -159,10 +145,7 @@ class LoopCommand extends BaseSlashCommandInteraction {
         return await interaction.editReply({
             embeds: [
                 new EmbedBuilder()
-                    .setAuthor({
-                        name: authorName,
-                        iconURL: interaction.user.avatarURL() || this.embedOptions.info.fallbackIconUrl
-                    })
+                    .setAuthor(await this.getEmbedUserAuthor(interaction))
                     .setDescription(
                         `**${this.embedOptions.icons.looping} Loop mode changed**\nChanging loop mode from **\`${currentModeUserString}\`** to **\`${modeUserString}\`**.\n\nThe ${modeUserString} will now play on repeat!`
                     )

src/interactions/commands/player/lyrics.ts

@@ -1,10 +1,10 @@
 import { LyricsData, lyricsExtractor } from '@discord-player/extractor';
 import { GuildQueue, Player, QueryType, useMainPlayer, useQueue } from 'discord-player';
 import { EmbedBuilder, SlashCommandBuilder } from 'discord.js';
-import { BaseSlashCommandParams, BaseSlashCommandReturnType } from '../../../types/interactionTypes';
 import { BaseSlashCommandInteraction } from '../../../classes/interactions';
-import { checkQueueExists, checkQueueCurrentTrack } from '../../../utils/validation/queueValidator';
-import { checkSameVoiceChannel, checkInVoiceChannel } from '../../../utils/validation/voiceChannelValidator';
+import { BaseSlashCommandParams, BaseSlashCommandReturnType } from '../../../types/interactionTypes';
+import { checkQueueCurrentTrack, checkQueueExists } from '../../../utils/validation/queueValidator';
+import { checkInVoiceChannel, checkSameVoiceChannel } from '../../../utils/validation/voiceChannelValidator';
 
 class LyricsCommand extends BaseSlashCommandInteraction {
     constructor() {