diff --git a/packages/bot/src/functions/music/commands/album.ts b/packages/bot/src/functions/music/commands/album.ts index 04bfb6ae8..a5b0fdadd 100644 --- a/packages/bot/src/functions/music/commands/album.ts +++ b/packages/bot/src/functions/music/commands/album.ts @@ -8,7 +8,7 @@ import { requireDJRole, } from '../../../utils/command/commandValidations' import { resolveGuildQueue } from '../../../utils/music/queueResolver' -import { moveUserTrackToPriority } from '../../../utils/music/queueManipulation' +import { moveUserTrackToPriority } from '../../../services/musicManagement/queueManipulation' import { createErrorEmbed, createSuccessEmbed, @@ -70,9 +70,12 @@ export default new Command({ return } - const isEnabled = await featureToggleService.isEnabled('ALBUM_COMMAND', { - guildId: interaction.guildId, - }) + const isEnabled = await featureToggleService.isEnabled( + 'ALBUM_COMMAND', + { + guildId: interaction.guildId, + }, + ) if (!isEnabled) { await interactionReply({ interaction, @@ -93,7 +96,10 @@ export default new Command({ if (!(await requireVoiceChannel(interaction))) return if (!(await requireDJRole(interaction, interaction.guildId))) return - const voiceChannel = assertDefined(member.voice.channel, 'voice channel present after requireVoiceChannel guard') + const voiceChannel = assertDefined( + member.voice.channel, + 'voice channel present after requireVoiceChannel guard', + ) const query = interaction.options.getString('query', true) const artistFilter = interaction.options.getString('artist') diff --git a/packages/bot/src/functions/music/commands/artist.ts b/packages/bot/src/functions/music/commands/artist.ts index 6233c40c2..3213bffa3 100644 --- a/packages/bot/src/functions/music/commands/artist.ts +++ b/packages/bot/src/functions/music/commands/artist.ts @@ -8,7 +8,7 @@ import { requireDJRole, } from '../../../utils/command/commandValidations' import { resolveGuildQueue } from '../../../utils/music/queueResolver' -import { moveUserTrackToPriority } from '../../../utils/music/queueManipulation' +import { moveUserTrackToPriority } from '../../../services/musicManagement/queueManipulation' import { createErrorEmbed, createSuccessEmbed, @@ -66,9 +66,12 @@ export default new Command({ return } - const isEnabled = await featureToggleService.isEnabled('ARTIST_COMMAND', { - guildId: interaction.guildId, - }) + const isEnabled = await featureToggleService.isEnabled( + 'ARTIST_COMMAND', + { + guildId: interaction.guildId, + }, + ) if (!isEnabled) { await interactionReply({ interaction, @@ -89,7 +92,10 @@ export default new Command({ if (!(await requireVoiceChannel(interaction))) return if (!(await requireDJRole(interaction, interaction.guildId))) return - const voiceChannel = assertDefined(member.voice.channel, 'voice channel present after requireVoiceChannel guard') + const voiceChannel = assertDefined( + member.voice.channel, + 'voice channel present after requireVoiceChannel guard', + ) const artistName = interaction.options.getString('name', true) const limit = interaction.options.getInteger('limit') ?? DEFAULT_LIMIT diff --git a/packages/bot/src/functions/music/commands/autoplay.spec.ts b/packages/bot/src/functions/music/commands/autoplay.spec.ts index f290bec7d..938d8823e 100644 --- a/packages/bot/src/functions/music/commands/autoplay.spec.ts +++ b/packages/bot/src/functions/music/commands/autoplay.spec.ts @@ -34,7 +34,7 @@ jest.mock('../../../utils/general/embeds', () => ({ }, })) -jest.mock('../../../utils/music/queueOperations', () => ({ +jest.mock('../../../services/musicManagement/queueOperations', () => ({ replenishQueue: (...args: unknown[]) => replenishQueueMock(...args), })) @@ -154,8 +154,6 @@ describe('autoplay command', () => { }) }) - - describe('status subcommand', () => { it('should show autoplay status', async () => { const interaction = createInteraction('status') @@ -172,7 +170,6 @@ describe('autoplay command', () => { expect(interactionReplyMock).toHaveBeenCalled() }) - it('should not show blend when only one member has last.fm', async () => { getLastFmLinkMock .mockResolvedValueOnce({ lastFmUsername: 'user1' }) @@ -195,7 +192,6 @@ describe('autoplay command', () => { }) }) - describe('analytics subcommand', () => { it('should show autoplay analytics with data', async () => { const interaction = createInteraction('analytics') @@ -242,11 +238,5 @@ describe('autoplay command', () => { expect(embed.description).toContain('No play history yet') expect(interactionReplyMock).toHaveBeenCalled() }) - }) - - - - - }) diff --git a/packages/bot/src/functions/music/commands/autoplay/queueHandlers.spec.ts b/packages/bot/src/functions/music/commands/autoplay/queueHandlers.spec.ts index 71b640939..f3ff628f6 100644 --- a/packages/bot/src/functions/music/commands/autoplay/queueHandlers.spec.ts +++ b/packages/bot/src/functions/music/commands/autoplay/queueHandlers.spec.ts @@ -13,7 +13,7 @@ jest.mock('../../../../utils/general/interactionReply', () => ({ interactionReply: (...args: unknown[]) => mockInteractionReply(...args), })) -jest.mock('../../../../utils/music/queueOperations', () => ({ +jest.mock('../../../../services/musicManagement/queueOperations', () => ({ replenishQueue: (...args: unknown[]) => mockReplenishQueue(...args), })) @@ -104,8 +104,14 @@ describe('handleAutoplayStatus', () => { expect.objectContaining({ title: '📻 Autoplay Status', fields: expect.arrayContaining([ - expect.objectContaining({ name: '📊 Queue', value: '2 / 3 tracks' }), - expect.objectContaining({ name: '🎵 Status', value: expect.stringContaining('Enabled') }), + expect.objectContaining({ + name: '📊 Queue', + value: '2 / 3 tracks', + }), + expect.objectContaining({ + name: '🎵 Status', + value: expect.stringContaining('Enabled'), + }), ]), }), ) @@ -119,7 +125,10 @@ describe('handleAutoplayStatus', () => { expect(mockCreateEmbed).toHaveBeenCalledWith( expect.objectContaining({ fields: expect.arrayContaining([ - expect.objectContaining({ name: '🎵 Status', value: 'Disabled' }), + expect.objectContaining({ + name: '🎵 Status', + value: 'Disabled', + }), ]), }), ) @@ -133,7 +142,10 @@ describe('handleAutoplayStatus', () => { expect(mockCreateEmbed).toHaveBeenCalledWith( expect.objectContaining({ fields: expect.arrayContaining([ - expect.objectContaining({ name: '📊 Queue', value: '0 / 0 tracks' }), + expect.objectContaining({ + name: '📊 Queue', + value: '0 / 0 tracks', + }), ]), }), ) @@ -148,7 +160,9 @@ describe('handleAutoplayStatus', () => { await handleAutoplayStatus(interaction, queue) - const call = mockCreateEmbed.mock.calls[0][0] as { fields: Array<{ name: string }> } + const call = mockCreateEmbed.mock.calls[0][0] as { + fields: Array<{ name: string }> + } const blendField = call.fields.find((f) => f.name === '🎭 Blend') expect(blendField).toBeUndefined() }) @@ -189,7 +203,9 @@ describe('handleAutoplayStatus', () => { await handleAutoplayStatus(interaction, queue) - const call = mockCreateEmbed.mock.calls[0][0] as { fields: Array<{ name: string }> } + const call = mockCreateEmbed.mock.calls[0][0] as { + fields: Array<{ name: string }> + } const blendField = call.fields.find((f) => f.name === '🎭 Blend') expect(blendField).toBeUndefined() }) @@ -197,7 +213,9 @@ describe('handleAutoplayStatus', () => { it('handles null metadata without throwing', async () => { const queue = makeQueue([makeTrack(true)], null, 2) - await expect(handleAutoplayStatus(interaction, queue)).resolves.not.toThrow() + await expect( + handleAutoplayStatus(interaction, queue), + ).resolves.not.toThrow() }) }) @@ -210,7 +228,10 @@ describe('handleSkipAutoplayTrack', () => { await handleSkipAutoplayTrack(interaction, queue) - expect(mockCreateErrorEmbed).toHaveBeenCalledWith('Queue Empty', expect.any(String)) + expect(mockCreateErrorEmbed).toHaveBeenCalledWith( + 'Queue Empty', + expect.any(String), + ) expect(mockReplenishQueue).not.toHaveBeenCalled() }) @@ -220,7 +241,10 @@ describe('handleSkipAutoplayTrack', () => { await handleSkipAutoplayTrack(interaction, queue) - expect(mockCreateErrorEmbed).toHaveBeenCalledWith('No Autoplay Tracks', expect.any(String)) + expect(mockCreateErrorEmbed).toHaveBeenCalledWith( + 'No Autoplay Tracks', + expect.any(String), + ) expect(mockReplenishQueue).not.toHaveBeenCalled() }) @@ -245,7 +269,10 @@ describe('handleClearAutoplayTracks', () => { await handleClearAutoplayTracks(interaction, queue) - expect(mockCreateErrorEmbed).toHaveBeenCalledWith('No Autoplay Tracks', expect.any(String)) + expect(mockCreateErrorEmbed).toHaveBeenCalledWith( + 'No Autoplay Tracks', + expect.any(String), + ) expect(mockReplenishQueue).not.toHaveBeenCalled() }) @@ -261,7 +288,9 @@ describe('handleClearAutoplayTracks', () => { expect((queue as any).removeTrack).toHaveBeenNthCalledWith(2, 0) expect(mockReplenishQueue).toHaveBeenCalledWith(queue) expect(mockCreateEmbed).toHaveBeenCalledWith( - expect.objectContaining({ description: expect.stringContaining('2 autoplay tracks') }), + expect.objectContaining({ + description: expect.stringContaining('2 autoplay tracks'), + }), ) }) }) diff --git a/packages/bot/src/functions/music/commands/autoplay/queueHandlers.ts b/packages/bot/src/functions/music/commands/autoplay/queueHandlers.ts index 3f3448e75..a47ba13df 100644 --- a/packages/bot/src/functions/music/commands/autoplay/queueHandlers.ts +++ b/packages/bot/src/functions/music/commands/autoplay/queueHandlers.ts @@ -1,5 +1,5 @@ import { interactionReply } from '../../../../utils/general/interactionReply' -import { replenishQueue } from '../../../../utils/music/queueOperations' +import { replenishQueue } from '../../../../services/musicManagement/queueOperations' import { createEmbed, createErrorEmbed, diff --git a/packages/bot/src/functions/music/commands/play/handlers/playHandler.ts b/packages/bot/src/functions/music/commands/play/handlers/playHandler.ts index ef1e417bb..f9b060ed9 100644 --- a/packages/bot/src/functions/music/commands/play/handlers/playHandler.ts +++ b/packages/bot/src/functions/music/commands/play/handlers/playHandler.ts @@ -8,7 +8,7 @@ import { createErrorEmbed } from '../../../../../utils/general/embeds' import { interactionReply } from '../../../../../utils/general/interactionReply' import { createUserFriendlyError } from '@lucky/shared/utils/general/errorSanitizer' import { collaborativePlaylistService } from '../../../../../services/musicRecommendation/collaborativePlaylist' -import { moveUserTrackToPriority } from '../../../../../utils/music/queueManipulation' +import { moveUserTrackToPriority } from '../../../../../services/musicManagement/queueManipulation' import { buildPlayResponseEmbed } from '../../../../../utils/music/nowPlayingEmbed' import { registerNowPlayingMessage } from '../../../../../handlers/player/trackNowPlaying' import { resolveGuildQueue } from '../../../../../utils/music/queueResolver' diff --git a/packages/bot/src/functions/music/commands/play/handlers/postPlayBackgroundOps.spec.ts b/packages/bot/src/functions/music/commands/play/handlers/postPlayBackgroundOps.spec.ts index 64316f536..1e7d7c123 100644 --- a/packages/bot/src/functions/music/commands/play/handlers/postPlayBackgroundOps.spec.ts +++ b/packages/bot/src/functions/music/commands/play/handlers/postPlayBackgroundOps.spec.ts @@ -21,7 +21,7 @@ jest.mock('./autoplayPreference', () => ({ applyStoredAutoplayPreference: (q: unknown, id: string) => applyStoredAutoplayPreference(q, id), })) -jest.mock('../../../../../utils/music/queueManipulation', () => ({ +jest.mock('../../../../../services/musicManagement/queueManipulation', () => ({ blendAutoplayTracks: (q: unknown, t: unknown) => blendAutoplayTracks(q, t), })) jest.mock( diff --git a/packages/bot/src/functions/music/commands/play/handlers/postPlayBackgroundOps.ts b/packages/bot/src/functions/music/commands/play/handlers/postPlayBackgroundOps.ts index bb06e7840..af1af2af0 100644 --- a/packages/bot/src/functions/music/commands/play/handlers/postPlayBackgroundOps.ts +++ b/packages/bot/src/functions/music/commands/play/handlers/postPlayBackgroundOps.ts @@ -2,7 +2,7 @@ import type { GuildQueue, Track } from 'discord-player' import { QueueRepeatMode } from 'discord-player' import { errorLog } from '@lucky/shared/utils' import { addBreadcrumb } from '@lucky/shared/utils/monitoring' -import { blendAutoplayTracks } from '../../../../../utils/music/queueManipulation' +import { blendAutoplayTracks } from '../../../../../services/musicManagement/queueManipulation' import { applyStoredAutoplayPreference } from './autoplayPreference' import { clearAutoplayPause } from '../../../../../services/musicRecommendation/autoplay/skipCircuitBreaker' import { clearSessionMoodCache } from '../../../../../services/musicRecommendation/autoplay/replenisher' diff --git a/packages/bot/src/functions/music/commands/play/index.spec.ts b/packages/bot/src/functions/music/commands/play/index.spec.ts index 88be2be79..0bfcf6a85 100644 --- a/packages/bot/src/functions/music/commands/play/index.spec.ts +++ b/packages/bot/src/functions/music/commands/play/index.spec.ts @@ -80,7 +80,7 @@ jest.mock('discord-player', () => ({ }, })) -jest.mock('../../../../utils/music/queueManipulation', () => ({ +jest.mock('../../../../services/musicManagement/queueManipulation', () => ({ moveUserTrackToPriority: (queue: unknown, track: unknown) => moveUserTrackToPriorityMock(queue, track), blendAutoplayTracks: (queue: unknown, track: unknown) => diff --git a/packages/bot/src/functions/music/commands/queue/index.ts b/packages/bot/src/functions/music/commands/queue/index.ts index 94a87da42..6d6dbcb2f 100644 --- a/packages/bot/src/functions/music/commands/queue/index.ts +++ b/packages/bot/src/functions/music/commands/queue/index.ts @@ -16,7 +16,7 @@ import { interactionReply } from '../../../../utils/general/interactionReply' import { smartShuffleQueue, rescueQueue, -} from '../../../../utils/music/queueManipulation' +} from '../../../../services/musicManagement/queueManipulation' import { resolveGuildQueue } from '../../../../utils/music/queueResolver' import { createUserFriendlyError } from '@lucky/shared/utils/general/errorSanitizer' @@ -63,7 +63,9 @@ export default new Command({ if (!queue) { await interactionReply({ interaction, - content: { embeds: [createErrorEmbed('Error', 'No queue found')] }, + content: { + embeds: [createErrorEmbed('Error', 'No queue found')], + }, }) return } diff --git a/packages/bot/src/handlers/musicButtonHandler.spec.ts b/packages/bot/src/handlers/musicButtonHandler.spec.ts index 54ac64ea7..b20724d0b 100644 --- a/packages/bot/src/handlers/musicButtonHandler.spec.ts +++ b/packages/bot/src/handlers/musicButtonHandler.spec.ts @@ -25,7 +25,7 @@ jest.mock('../functions/music/commands/queue/queueEmbed', () => ({ createQueueEmbed: jest.fn(), })) -jest.mock('../utils/music/queueManipulation', () => ({ +jest.mock('../services/musicManagement/queueManipulation', () => ({ shuffleQueue: jest.fn(), })) diff --git a/packages/bot/src/handlers/musicButtonHandler.ts b/packages/bot/src/handlers/musicButtonHandler.ts index f5185c236..9ed538162 100644 --- a/packages/bot/src/handlers/musicButtonHandler.ts +++ b/packages/bot/src/handlers/musicButtonHandler.ts @@ -13,7 +13,7 @@ import { createLeaderboardPaginationButtons, } from '../utils/music/buttonComponents' import { createQueueEmbed } from '../functions/music/commands/queue/queueEmbed' -import { shuffleQueue } from '../utils/music/queueManipulation' +import { shuffleQueue } from '../services/musicManagement/queueManipulation' import type { GuildQueue } from 'discord-player' import { resolveGuildQueue } from '../utils/music/queueResolver' import type { CustomClient } from '../types' diff --git a/packages/bot/src/handlers/player/lifecycleHandlers.spec.ts b/packages/bot/src/handlers/player/lifecycleHandlers.spec.ts index 8ed924725..40308f30d 100644 --- a/packages/bot/src/handlers/player/lifecycleHandlers.spec.ts +++ b/packages/bot/src/handlers/player/lifecycleHandlers.spec.ts @@ -35,7 +35,7 @@ jest.mock('../../services/musicManagement/watchdog', () => ({ }, })) -jest.mock('../../utils/music/queueOperations', () => ({ +jest.mock('../../services/musicManagement/queueOperations', () => ({ replenishQueue: (...args: unknown[]) => replenishQueueMock(...args), })) diff --git a/packages/bot/src/handlers/player/lifecycleHandlers.ts b/packages/bot/src/handlers/player/lifecycleHandlers.ts index b4fde1bf2..5ec698626 100644 --- a/packages/bot/src/handlers/player/lifecycleHandlers.ts +++ b/packages/bot/src/handlers/player/lifecycleHandlers.ts @@ -5,7 +5,7 @@ import * as voiceStatus from '../../services/VoiceChannelStatusService' import { ENVIRONMENT_CONFIG } from '@lucky/shared/config' import { musicWatchdogService } from '../../services/musicManagement/watchdog' import { musicSessionSnapshotService } from '../../services/musicRecommendation/sessionSnapshots' -import { replenishQueue } from '../../utils/music/queueOperations' +import { replenishQueue } from '../../services/musicManagement/queueOperations' import type { QueueMetadata } from '../../types/QueueMetadata' export const setupVoiceKickDetection = (client: Client): void => { diff --git a/packages/bot/src/handlers/player/trackHandlers.spec.ts b/packages/bot/src/handlers/player/trackHandlers.spec.ts index fe83afaed..924b2ac04 100644 --- a/packages/bot/src/handlers/player/trackHandlers.spec.ts +++ b/packages/bot/src/handlers/player/trackHandlers.spec.ts @@ -44,7 +44,7 @@ jest.mock('@lucky/shared/services', () => ({ }, })) -jest.mock('../../utils/music/queueOperations', () => ({ +jest.mock('../../services/musicManagement/queueOperations', () => ({ replenishQueue: (...args: unknown[]) => replenishQueueMock(...args), })) diff --git a/packages/bot/src/handlers/player/trackHandlers.ts b/packages/bot/src/handlers/player/trackHandlers.ts index a76cad635..686406fc4 100644 --- a/packages/bot/src/handlers/player/trackHandlers.ts +++ b/packages/bot/src/handlers/player/trackHandlers.ts @@ -3,7 +3,7 @@ import { QueueRepeatMode } from 'discord-player' import { LRUCache } from 'lru-cache' import { infoLog, debugLog, errorLog, warnLog } from '@lucky/shared/utils' import { addTrackToHistory } from '../../utils/music/duplicateDetection' -import { replenishQueue } from '../../utils/music/queueOperations' +import { replenishQueue } from '../../services/musicManagement/queueOperations' import { resetAutoplayCount } from '../../utils/music/autoplayManager' import { featureToggleService } from '@lucky/shared/services' import { constants } from '@lucky/shared/config' diff --git a/packages/bot/src/utils/music/queue/asyncQueueManager.spec.ts b/packages/bot/src/services/musicManagement/queue/asyncQueueManager.spec.ts similarity index 100% rename from packages/bot/src/utils/music/queue/asyncQueueManager.spec.ts rename to packages/bot/src/services/musicManagement/queue/asyncQueueManager.spec.ts diff --git a/packages/bot/src/utils/music/queue/asyncQueueManager.ts b/packages/bot/src/services/musicManagement/queue/asyncQueueManager.ts similarity index 100% rename from packages/bot/src/utils/music/queue/asyncQueueManager.ts rename to packages/bot/src/services/musicManagement/queue/asyncQueueManager.ts diff --git a/packages/bot/src/utils/music/queueEditOps.spec.ts b/packages/bot/src/services/musicManagement/queueEditOps.spec.ts similarity index 100% rename from packages/bot/src/utils/music/queueEditOps.spec.ts rename to packages/bot/src/services/musicManagement/queueEditOps.spec.ts diff --git a/packages/bot/src/utils/music/queueEditOps.ts b/packages/bot/src/services/musicManagement/queueEditOps.ts similarity index 100% rename from packages/bot/src/utils/music/queueEditOps.ts rename to packages/bot/src/services/musicManagement/queueEditOps.ts diff --git a/packages/bot/src/utils/music/queueManipulation.autoplay.spec.ts b/packages/bot/src/services/musicManagement/queueManipulation.autoplay.spec.ts similarity index 100% rename from packages/bot/src/utils/music/queueManipulation.autoplay.spec.ts rename to packages/bot/src/services/musicManagement/queueManipulation.autoplay.spec.ts diff --git a/packages/bot/src/utils/music/queueManipulation.dedup.spec.ts b/packages/bot/src/services/musicManagement/queueManipulation.dedup.spec.ts similarity index 100% rename from packages/bot/src/utils/music/queueManipulation.dedup.spec.ts rename to packages/bot/src/services/musicManagement/queueManipulation.dedup.spec.ts diff --git a/packages/bot/src/utils/music/queueManipulation.operations.spec.ts b/packages/bot/src/services/musicManagement/queueManipulation.operations.spec.ts similarity index 100% rename from packages/bot/src/utils/music/queueManipulation.operations.spec.ts rename to packages/bot/src/services/musicManagement/queueManipulation.operations.spec.ts diff --git a/packages/bot/src/utils/music/queueManipulation.priority.spec.ts b/packages/bot/src/services/musicManagement/queueManipulation.priority.spec.ts similarity index 100% rename from packages/bot/src/utils/music/queueManipulation.priority.spec.ts rename to packages/bot/src/services/musicManagement/queueManipulation.priority.spec.ts diff --git a/packages/bot/src/utils/music/queueManipulation.replenish.spec.ts b/packages/bot/src/services/musicManagement/queueManipulation.replenish.spec.ts similarity index 100% rename from packages/bot/src/utils/music/queueManipulation.replenish.spec.ts rename to packages/bot/src/services/musicManagement/queueManipulation.replenish.spec.ts diff --git a/packages/bot/src/utils/music/queueManipulation.scoring.spec.ts b/packages/bot/src/services/musicManagement/queueManipulation.scoring.spec.ts similarity index 100% rename from packages/bot/src/utils/music/queueManipulation.scoring.spec.ts rename to packages/bot/src/services/musicManagement/queueManipulation.scoring.spec.ts diff --git a/packages/bot/src/utils/music/queueManipulation.ts b/packages/bot/src/services/musicManagement/queueManipulation.ts similarity index 94% rename from packages/bot/src/utils/music/queueManipulation.ts rename to packages/bot/src/services/musicManagement/queueManipulation.ts index 14b7f5baa..db5ba5af0 100644 --- a/packages/bot/src/utils/music/queueManipulation.ts +++ b/packages/bot/src/services/musicManagement/queueManipulation.ts @@ -20,7 +20,7 @@ export { export { calculateRecommendationScore } export { getTrackAudioFeatures } -export * from './trackNormalization' +export * from '../../utils/music/trackNormalization' export * from './queueEditOps' export * from '../../services/musicRecommendation/candidateFallback' export * from './queueRescue' diff --git a/packages/bot/src/utils/music/queueOperations.ts b/packages/bot/src/services/musicManagement/queueOperations.ts similarity index 97% rename from packages/bot/src/utils/music/queueOperations.ts rename to packages/bot/src/services/musicManagement/queueOperations.ts index c7326d60c..53d3487ed 100644 --- a/packages/bot/src/utils/music/queueOperations.ts +++ b/packages/bot/src/services/musicManagement/queueOperations.ts @@ -3,8 +3,8 @@ import type { QueueOperationResult, TrackManagementOptions, QueueManagementOptions, -} from './types' -import { validateTracks } from './trackValidator' +} from '../../utils/music/types' +import { validateTracks } from '../../utils/music/trackValidator' import { AsyncQueueManager } from './queue/asyncQueueManager' import { debugLog, errorLog } from '@lucky/shared/utils' export { diff --git a/packages/bot/src/utils/music/queueRescue.spec.ts b/packages/bot/src/services/musicManagement/queueRescue.spec.ts similarity index 100% rename from packages/bot/src/utils/music/queueRescue.spec.ts rename to packages/bot/src/services/musicManagement/queueRescue.spec.ts diff --git a/packages/bot/src/utils/music/queueRescue.ts b/packages/bot/src/services/musicManagement/queueRescue.ts similarity index 100% rename from packages/bot/src/utils/music/queueRescue.ts rename to packages/bot/src/services/musicManagement/queueRescue.ts diff --git a/packages/bot/src/utils/music/queueStateManager.spec.ts b/packages/bot/src/services/musicManagement/queueStateManager.spec.ts similarity index 100% rename from packages/bot/src/utils/music/queueStateManager.spec.ts rename to packages/bot/src/services/musicManagement/queueStateManager.spec.ts diff --git a/packages/bot/src/utils/music/queueStateManager.ts b/packages/bot/src/services/musicManagement/queueStateManager.ts similarity index 98% rename from packages/bot/src/utils/music/queueStateManager.ts rename to packages/bot/src/services/musicManagement/queueStateManager.ts index 565e65cf9..d7d1ccbd5 100644 --- a/packages/bot/src/utils/music/queueStateManager.ts +++ b/packages/bot/src/services/musicManagement/queueStateManager.ts @@ -1,5 +1,5 @@ import type { Track, GuildQueue } from 'discord-player' -import type { QueueState } from './types' +import type { QueueState } from '../../utils/music/types' import { debugLog } from '@lucky/shared/utils' /** diff --git a/packages/bot/src/services/musicRecommendation/autoplay/replenisher.spec.ts b/packages/bot/src/services/musicRecommendation/autoplay/replenisher.spec.ts index 11ad35ed3..090c1e68c 100644 --- a/packages/bot/src/services/musicRecommendation/autoplay/replenisher.spec.ts +++ b/packages/bot/src/services/musicRecommendation/autoplay/replenisher.spec.ts @@ -78,7 +78,7 @@ jest.mock('./diversitySelector', () => ({ purgeDuplicatesOfCurrentTrack: jest.fn(), })) -jest.mock('../../../utils/music/queueManipulation', () => ({ +jest.mock('../../../services/musicManagement/queueManipulation', () => ({ collectBroadFallbackCandidates: jest.fn(), collectLastFmCandidates: jest.fn(), collectGenreCandidates: jest.fn(), @@ -196,7 +196,7 @@ describe('replenishQueue', () => { getTrackAudioFeatures, interleaveByArtist, buildVcContributionWeights, - } = require('../../../utils/music/queueManipulation') + } = require('../../../services/musicManagement/queueManipulation') collectBroadFallbackCandidates.mockResolvedValue(undefined) collectLastFmCandidates.mockResolvedValue(undefined) collectGenreCandidates.mockResolvedValue(undefined) @@ -360,7 +360,7 @@ describe('replenishQueue', () => { const { interleaveByArtist, enrichWithAudioFeatures, - } = require('../../../utils/music/queueManipulation') + } = require('../../../services/musicManagement/queueManipulation') const mockScoredTracks = [ { diff --git a/packages/bot/src/utils/music/index.ts b/packages/bot/src/utils/music/index.ts index 95280cd8a..c316d948e 100644 --- a/packages/bot/src/utils/music/index.ts +++ b/packages/bot/src/utils/music/index.ts @@ -6,7 +6,7 @@ export type { TrackValidationResult, QueueOperationResult, TrackPriority, - QueueManagementOptions + QueueManagementOptions, } from './types' export { @@ -17,8 +17,8 @@ export { getNextTrack, getTrackAtPosition, isTrackInQueue, - getTrackPosition -} from './queueStateManager' + getTrackPosition, +} from '../../services/musicManagement/queueStateManager' export { addTracksToQueue, @@ -27,13 +27,10 @@ export { shuffleQueue, removeTrackFromQueue, moveTrackInQueue, - replenishQueue -} from './queueOperations' + replenishQueue, +} from '../../services/musicManagement/queueOperations' -export { - validateTrack, - validateTracks -} from './trackValidator' +export { validateTrack, validateTracks } from './trackValidator' // Create default instance import { TrackManagementService } from './service' diff --git a/packages/bot/src/utils/music/searchQueryCleaner.ts b/packages/bot/src/utils/music/searchQueryCleaner.ts index 547dd7c85..1b9052fcf 100644 --- a/packages/bot/src/utils/music/searchQueryCleaner.ts +++ b/packages/bot/src/utils/music/searchQueryCleaner.ts @@ -2,7 +2,7 @@ * Shared noise-stripping + query-cleaning helpers for music search. * * Used by: - * - autoplay / seed candidate search (queueManipulation.ts) + * - autoplay / seed candidate search (services/musicManagement/queueManipulation.ts) * - SoundCloud bridge in the YoutubeiExtractor (playerFactory.ts) * - last.fm scrobble normalization (lastfm/*) * @@ -51,10 +51,8 @@ const DYNAMIC_NOISE_PATTERNS: RegExp[] = [ ...noiseTerms.bareTitleNoise.map((t) => buildTermRe(t, 'word')), ] -const DYNAMIC_VERSION_KEYWORD_RE = new RegExp( // NOSONAR - `\\b(?:${noiseTerms.versionVariants.map(termInner).join('|')})\\b`, - 'i', -) +// prettier-ignore +const DYNAMIC_VERSION_KEYWORD_RE = new RegExp(`\\b(?:${noiseTerms.versionVariants.map(termInner).join('|')})\\b`, 'i') // NOSONAR const DYNAMIC_HYPHENATED_SUFFIXES: RegExp[] = noiseTerms.versionVariants.map( (t) => buildTermRe(t, 'suffix'), diff --git a/packages/bot/src/utils/music/service.spec.ts b/packages/bot/src/utils/music/service.spec.ts index e64313971..8c6870396 100644 --- a/packages/bot/src/utils/music/service.spec.ts +++ b/packages/bot/src/utils/music/service.spec.ts @@ -17,7 +17,7 @@ jest.mock('@lucky/shared/utils', () => ({ errorLog: (...args: unknown[]) => errorLogMock(...args), })) -jest.mock('./queueOperations', () => ({ +jest.mock('../../services/musicManagement/queueOperations', () => ({ addTrackToQueue: jest.fn(), addTracksToQueue: jest.fn(), clearQueue: jest.fn(), @@ -26,7 +26,7 @@ jest.mock('./queueOperations', () => ({ moveTrackInQueue: jest.fn(), })) -jest.mock('./queueStateManager', () => ({ +jest.mock('../../services/musicManagement/queueStateManager', () => ({ getQueueState: jest.fn(), getQueueStats: jest.fn(), isQueueEmpty: jest.fn(), @@ -34,8 +34,7 @@ jest.mock('./queueStateManager', () => ({ })) // Import mocked modules -import * as queueOps from './queueOperations' -import * as queueStateMgr from './queueStateManager' +import * as queueOps from '../../services/musicManagement/queueOperations' import { trackHistoryService } from '@lucky/shared/services' const queueOpsMock = queueOps as unknown as Record diff --git a/packages/bot/src/utils/music/service.ts b/packages/bot/src/utils/music/service.ts index 8dfad0423..e9d614e2e 100644 --- a/packages/bot/src/utils/music/service.ts +++ b/packages/bot/src/utils/music/service.ts @@ -13,13 +13,13 @@ import { shuffleQueue, removeTrackFromQueue, moveTrackInQueue, -} from './queueOperations' +} from '../../services/musicManagement/queueOperations' import { getQueueState, getQueueStats, isQueueEmpty, isQueueFull, -} from './queueStateManager' +} from '../../services/musicManagement/queueStateManager' import { trackHistoryService } from '@lucky/shared/services' import { debugLog, errorLog } from '@lucky/shared/utils' diff --git a/sonar-project.properties b/sonar-project.properties index 1d3fe4fbc..5e0966305 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -14,7 +14,7 @@ sonar.exclusions=**/node_modules/**,**/dist/**,**/build/**,**/coverage/**,**/*.t # See ADR 2026-07-11 for rationale: https://github.com/LucasSantana-Dev/Lucky/blob/main/decisions/2026-07-11-sonar-shared-coverage-exclusion.md sonar.coverage.exclusions=packages/shared/src/**,packages/bot/src/index.ts,packages/bot/src/scripts/*Cli.ts,packages/bot/src/handlers/eventHandler.ts,packages/bot/src/handlers/auditHandler.ts,packages/bot/src/handlers/clientHandler/**,packages/bot/src/functions/**,packages/bot/src/twitch/**,packages/bot/src/utils/guildAutomation/applyPlan.ts,packages/backend/src/bootstrap.ts,packages/frontend/src/pages/PreferredArtists.tsx,packages/frontend/src/pages/Admin.tsx,packages/frontend/src/pages/Config.tsx,packages/frontend/src/pages/GuildAutomation.tsx,packages/frontend/src/pages/LastFm.tsx,packages/frontend/src/pages/Spotify.tsx,packages/backend/src/routes/artists.ts,packages/backend/src/routes/roles.ts,packages/backend/src/schemas/management.ts,packages/backend/src/services/GuildService.ts,packages/frontend/src/services/artistsApi.ts,packages/shared/src/config/featureToggles.ts,packages/shared/src/types/featureToggle.ts,packages/frontend/src/components/Config/CommandsConfig.tsx,packages/frontend/src/components/Config/ModerationConfig.tsx,packages/frontend/src/components/Config/ModerationFilterOptions.tsx,packages/frontend/src/components/Config/MusicConfig.tsx,packages/frontend/src/pages/AutoMessages.tsx,packages/frontend/src/pages/ServerSettings.tsx,packages/frontend/src/pages/TwitchNotifications.tsx,packages/frontend/src/pages/AutoMod.tsx,packages/frontend/src/pages/Moderation.tsx,packages/frontend/src/pages/Roles.tsx,packages/frontend/src/pages/ReactionRoles.tsx,packages/frontend/src/services/reactionRolesApi.ts,packages/backend/src/routes/guilds.ts,packages/frontend/src/services/api.ts,packages/backend/src/routes/batchJobs.ts,packages/backend/src/schemas/batchJobs.ts,packages/frontend/src/services/batchJobsApi.ts -sonar.cpd.exclusions=**/*.test.ts,**/*.test.tsx,**/*.spec.ts,packages/frontend/src/locales/**,packages/bot/src/functions/management/**,packages/shared/src/services/twitch/TwitchControlService.ts,packages/shared/src/services/guildAutomation/**Executor.ts,packages/bot/src/utils/guildAutomation/applyPlan.ts,packages/bot/src/functions/music/commands/artist.ts,packages/bot/src/functions/music/commands/album.ts,packages/bot/src/functions/music/commands/spotify.ts,packages/bot/src/functions/music/commands/play/spotifyHandler.ts,packages/bot/src/functions/music/commands/previous.ts,packages/backend/src/routes/spotify.ts,packages/backend/src/routes/roles.ts,packages/backend/src/services/SpotifyAuthService.ts,packages/backend/src/services/GuildService.ts,packages/frontend/src/pages/Spotify.tsx,packages/bot/src/spotify/spotifyApi.ts,packages/bot/src/lastfm/lastFmApi.ts,packages/bot/src/services/musicRecommendation/autoplay/lastFmSeeds.ts,packages/bot/src/services/musicRecommendation/autoplay/lastFmSeeder.ts,packages/bot/src/utils/music/queueManipulation.ts,packages/bot/src/services/musicRecommendation/autoplay/sessionMood.ts,packages/bot/src/utils/music/queueEditOps.ts,packages/bot/src/utils/music/queueRescue.ts,packages/bot/src/utils/music/trackNormalization.ts,packages/bot/src/services/musicRecommendation/candidateFallback.ts,packages/bot/src/handlers/player/soundcloudMatcher.ts,packages/bot/src/handlers/player/streamBridge.ts,packages/bot/src/functions/music/commands/play/handlers/playHandler.ts,packages/bot/src/functions/music/commands/play/handlers/autoplayPreference.ts,packages/bot/src/functions/music/commands/autoplay/queueHandlers.ts,packages/bot/src/functions/music/commands/autoplay/settingsHandlers.ts,packages/bot/src/functions/music/commands/autoplay/artistHandlers.ts,packages/shared/src/services/database/DatabaseService.ts,packages/frontend/src/pages/BatchJobs.tsx,packages/frontend/src/services/batchJobsApi.ts,packages/bot/src/functions/moderation/batch/**,packages/bot/src/functions/moderation/commands/bulkMoveMessages.ts,packages/bot/src/functions/moderation/commands/batchResume.ts,packages/bot/src/utils/batch/**,packages/bot/src/workers/batchJobWorker.ts,packages/shared/src/services/batch/**,packages/bot/src/functions/general/commands/giveaway.ts,packages/bot/src/functions/general/commands/remind.ts +sonar.cpd.exclusions=**/*.test.ts,**/*.test.tsx,**/*.spec.ts,packages/frontend/src/locales/**,packages/bot/src/functions/management/**,packages/shared/src/services/twitch/TwitchControlService.ts,packages/shared/src/services/guildAutomation/**Executor.ts,packages/bot/src/utils/guildAutomation/applyPlan.ts,packages/bot/src/functions/music/commands/artist.ts,packages/bot/src/functions/music/commands/album.ts,packages/bot/src/functions/music/commands/spotify.ts,packages/bot/src/functions/music/commands/play/spotifyHandler.ts,packages/bot/src/functions/music/commands/previous.ts,packages/backend/src/routes/spotify.ts,packages/backend/src/routes/roles.ts,packages/backend/src/services/SpotifyAuthService.ts,packages/backend/src/services/GuildService.ts,packages/frontend/src/pages/Spotify.tsx,packages/bot/src/spotify/spotifyApi.ts,packages/bot/src/lastfm/lastFmApi.ts,packages/bot/src/services/musicRecommendation/autoplay/lastFmSeeds.ts,packages/bot/src/services/musicRecommendation/autoplay/lastFmSeeder.ts,packages/bot/src/services/musicManagement/queueManipulation.ts,packages/bot/src/services/musicRecommendation/autoplay/sessionMood.ts,packages/bot/src/services/musicManagement/queueEditOps.ts,packages/bot/src/services/musicManagement/queueRescue.ts,packages/bot/src/utils/music/trackNormalization.ts,packages/bot/src/services/musicRecommendation/candidateFallback.ts,packages/bot/src/handlers/player/soundcloudMatcher.ts,packages/bot/src/handlers/player/streamBridge.ts,packages/bot/src/functions/music/commands/play/handlers/playHandler.ts,packages/bot/src/functions/music/commands/play/handlers/autoplayPreference.ts,packages/bot/src/functions/music/commands/autoplay/queueHandlers.ts,packages/bot/src/functions/music/commands/autoplay/settingsHandlers.ts,packages/bot/src/functions/music/commands/autoplay/artistHandlers.ts,packages/shared/src/services/database/DatabaseService.ts,packages/frontend/src/pages/BatchJobs.tsx,packages/frontend/src/services/batchJobsApi.ts,packages/bot/src/functions/moderation/batch/**,packages/bot/src/functions/moderation/commands/bulkMoveMessages.ts,packages/bot/src/functions/moderation/commands/batchResume.ts,packages/bot/src/utils/batch/**,packages/bot/src/workers/batchJobWorker.ts,packages/shared/src/services/batch/**,packages/bot/src/functions/general/commands/giveaway.ts,packages/bot/src/functions/general/commands/remind.ts sonar.javascript.lcov.reportPaths=packages/backend/coverage/lcov.info,packages/bot/coverage/lcov.info,packages/frontend/coverage/lcov.info