myxelium/Lunaris2.0
1
0
Fork 0
mirror of https://github.com/Myxelium/Lunaris2.0.git synced 2026-04-09 06:09:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add jellyfin source (#10)

Browse Source
This commit is contained in:
SocksOnHead
2026-02-13 21:03:21 +01:00
committed by GitHub
parent 3362c6bf8c
commit 430aad71fb
4 changed files with 242 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
Bot/Handler/MusicPlayer/PlayCommand/PlayHandler.cs
View File

@@ -6,6 +6,7 @@ using Lavalink4NET;
using Lavalink4NET.Events.Players;
using Lavalink4NET.Integrations.SponsorBlock;
using Lavalink4NET.Integrations.SponsorBlock.Extensions;
using Lavalink4NET.Jellyfin;
using Lavalink4NET.Players.Queued;
using Lavalink4NET.Rest.Entities.Tracks;
using Lavalink4NET.Tracks;
@@ -19,8 +20,7 @@ public class PlayHandler : IRequestHandler<PlayCommand>
private readonly MusicEmbed _musicEmbed;
private readonly DiscordSocketClient _client;
private readonly IAudioService _audioService;
private SocketSlashCommand _context;
private const int MaxTrackDuration = 30;
private SocketSlashCommand _context = default!; // ensure initialized before use
private LavalinkTrack? _previousTrack;
private static readonly HashSet<ulong> SubscribedGuilds = new();
@@ -34,15 +34,16 @@ public class PlayHandler : IRequestHandler<PlayCommand>
_audioService = audioService;
}
private async Task OnTrackEnded(object sender, TrackEndedEventArgs eventargs)
private Task OnTrackEnded(object sender, TrackEndedEventArgs eventargs)
{
// Reset the previous track when the track ends.
_previousTrack = null;
return Task.CompletedTask;
}
private async Task OnTrackStarted(object sender, TrackStartedEventArgs eventargs)
{
var player = sender as QueuedLavalinkPlayer;
var player = eventargs.Player as QueuedLavalinkPlayer;
if (player?.CurrentTrack is null)
{
@@ -60,22 +61,16 @@ public class PlayHandler : IRequestHandler<PlayCommand>
// Track has changed, update the previous track and send the embed
_previousTrack = currentTrack;
if (_context != null)
{
await _musicEmbed.NowPlayingEmbed(currentTrack, _context, _client);
}
}
public Task Handle(PlayCommand command, CancellationToken cancellationToken)
{
new Thread(PlayMusic).Start();
return Task.CompletedTask;
async void PlayMusic()
public async Task Handle(PlayCommand command, CancellationToken cancellationToken)
{
try
{
RegisterTrackStartedEventListerner(command);
await _audioService.StartAsync(cancellationToken);
var context = command.Message;
_context = context;
@@ -93,6 +88,10 @@ public class PlayHandler : IRequestHandler<PlayCommand>
return;
}
RegisterTrackStartedEventListerner(command);
await _audioService.StartAsync(cancellationToken);
await context.SendMessageAsync("📻 Searching...", _client);
var player = await _audioService.GetPlayerAsync(_client, context, connectToVoiceChannel: true);
@@ -103,12 +102,17 @@ public class PlayHandler : IRequestHandler<PlayCommand>
await ApplyFilters(cancellationToken, player);
await ConfigureSponsorBlock(cancellationToken, player);
// Parse the query to extract search mode and clean query
// Supports prefixes like jfsearch:, ytsearch:, scsearch:, etc.
// Default: Jellyfin (jfsearch:) when no prefix is specified
var (searchMode, queryToSearch) = SearchQueryParser.Parse(searchQuery, JellyfinSearchMode.Jellyfin);
var trackLoadOptions = new TrackLoadOptions
{
SearchMode = TrackSearchMode.YouTubeMusic,
SearchMode = searchMode,
};
var trackCollection = await _audioService.Tracks.LoadTracksAsync(searchQuery, trackLoadOptions, cancellationToken: cancellationToken);
var trackCollection = await _audioService.Tracks.LoadTracksAsync(queryToSearch, trackLoadOptions, cancellationToken: cancellationToken);
// Check if the result is a playlist or just a single track from the search result
if (trackCollection.IsPlaylist)
@@ -122,7 +126,7 @@ public class PlayHandler : IRequestHandler<PlayCommand>
if (trackCollection.Track != null)
{
await player.PlayAsync(trackCollection.Track, cancellationToken: cancellationToken).ConfigureAwait(false);
await _musicEmbed.NowPlayingEmbed(trackCollection.Track, _context, _client);
// rely on TrackStarted event to send Now Playing
}
else
{
@@ -150,7 +154,7 @@ public class PlayHandler : IRequestHandler<PlayCommand>
if (track != null)
{
await player.PlayAsync(track, cancellationToken: cancellationToken).ConfigureAwait(false);
await _musicEmbed.NowPlayingEmbed(track, _context, _client);
// rely on TrackStarted event to send Now Playing
}
else
{
@@ -163,16 +167,26 @@ public class PlayHandler : IRequestHandler<PlayCommand>
throw new Exception("Error occured in the Play handler!", error);
}
}
}
private void RegisterTrackStartedEventListerner(PlayCommand command)
{
if (SubscribedGuilds.Contains((ulong)command.Message.GuildId!))
var guildId = command.Message.GuildId;
if (!guildId.HasValue)
{
// Ignore registration for DMs or contexts without a guild.
return;
}
var gid = guildId.Value;
if (SubscribedGuilds.Contains(gid))
return;
// Ensure we don't accidentally double-subscribe.
_audioService.TrackStarted -= OnTrackStarted;
_audioService.TrackEnded -= OnTrackEnded;
_audioService.TrackStarted += OnTrackStarted;
_audioService.TrackEnded += OnTrackEnded;
SubscribedGuilds.Add((ulong)command.Message.GuildId!);
SubscribedGuilds.Add(gid);
}
private static async Task ApplyFilters(CancellationToken cancellationToken, QueuedLavalinkPlayer player)

4
Bot/Lunaris2.csproj
View File

@@ -30,6 +30,10 @@
<PackageReference Include="OllamaSharp" Version="1.1.10" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Lavalink4NET.Jellyfin\Lavalink4NET.Jellyfin\Lavalink4NET.Jellyfin.csproj" />
</ItemGroup>
<ItemGroup>
<None Include="../docker-compose.yml" pack="true" PackagePath="." />
<None Include="../application.yml" pack="true" PackagePath="." />

142
Bot/Service/VoiceChannelMonitorService.cs
View File

@@ -6,11 +6,14 @@ namespace Lunaris2.Service
public class VoiceChannelMonitorService
{
private readonly DiscordSocketClient _client;
private readonly Dictionary<ulong, Timer> _timers = new();
// Track a cancellation source per voice channel when the bot is alone
private readonly Dictionary<ulong, CancellationTokenSource> _leaveCtsByChannel = new();
public VoiceChannelMonitorService(DiscordSocketClient client)
{
_client = client;
// Subscribe to voice state updates to react immediately
_client.UserVoiceStateUpdated += OnUserVoiceStateUpdated;
}
public void StartMonitoring()
@@ -20,7 +23,7 @@ namespace Lunaris2.Service
while (true)
{
await CheckVoiceChannels();
await Task.Delay(TimeSpan.FromMinutes(1)); // Monitor every minute
await Task.Delay(TimeSpan.FromMinutes(1)); // Status refresh every minute
}
});
}
@@ -28,7 +31,7 @@ namespace Lunaris2.Service
private async Task CheckVoiceChannels()
{
SetStatus();
await LeaveOnAlone();
await EnsureCurrentAloneStatesScheduled();
}
private void SetStatus()
@@ -49,48 +52,137 @@ namespace Lunaris2.Service
_client.SetGameAsync($" in {channels} servers", type: ActivityType.Playing);
}
private async Task LeaveOnAlone()
// Monitor existing alone states during the periodic check to ensure timers exist
private async Task EnsureCurrentAloneStatesScheduled()
{
foreach (var guild in _client.Guilds)
{
// Find voice channels where only the bot is left
var voiceChannel = guild.VoiceChannels.FirstOrDefault(vc =>
vc.ConnectedUsers.Count == 1 &&
vc.Users.Any(u => u.Id == _client.CurrentUser.Id));
foreach (var voiceChannel in guild.VoiceChannels)
{
var botInChannel = voiceChannel.ConnectedUsers.Any(u => u.Id == _client.CurrentUser.Id);
var userCount = voiceChannel.ConnectedUsers.Count;
if (voiceChannel != null)
if (botInChannel && userCount == 1)
{
// If timer not set for this channel, start one
if (!_timers.ContainsKey(voiceChannel.Id))
// Schedule leave if not already scheduled
if (!_leaveCtsByChannel.ContainsKey(voiceChannel.Id))
{
Console.WriteLine($"Bot is alone in channel {voiceChannel.Name}, starting timer...");
_timers[voiceChannel.Id] = new Timer(async _ => await LeaveChannel(voiceChannel), null,
TimeSpan.FromMinutes(3), Timeout.InfiniteTimeSpan); // Set delay before leaving
ScheduleLeave(voiceChannel);
}
}
else
{
// Clean up timer if channel is no longer active
var timersToDispose = _timers.Where(t => guild.VoiceChannels.All(vc => vc.Id != t.Key)).ToList();
foreach (var timer in timersToDispose)
// Cancel if a schedule exists but the bot is not alone anymore
if (_leaveCtsByChannel.TryGetValue(voiceChannel.Id, out var cts))
{
await timer.Value.DisposeAsync();
_timers.Remove(timer.Key);
Console.WriteLine($"Disposed timer for inactive voice channel ID: {timer.Key}");
cts.Cancel();
_leaveCtsByChannel.Remove(voiceChannel.Id);
}
}
}
}
private async Task LeaveChannel(SocketVoiceChannel voiceChannel)
await Task.CompletedTask;
}
private Task OnUserVoiceStateUpdated(SocketUser user, SocketVoiceState before, SocketVoiceState after)
{
if (voiceChannel.ConnectedUsers.Count == 1 && voiceChannel.Users.Any(u => u.Id == _client.CurrentUser.Id))
// React only when events relate to the guild(s) and voice channels where the bot might be
var botId = _client.CurrentUser.Id;
// Determine affected channels
var beforeChannelId = before.VoiceChannel?.Id;
var afterChannelId = after.VoiceChannel?.Id;
// If the bot itself moved, we should cancel any old schedule and possibly set a new one
if (user.Id == botId)
{
if (beforeChannelId.HasValue && _leaveCtsByChannel.TryGetValue(beforeChannelId.Value, out var oldCts))
{
oldCts.Cancel();
_leaveCtsByChannel.Remove(beforeChannelId.Value);
}
if (afterChannelId.HasValue)
{
var channel = after.VoiceChannel!;
var isAlone = channel.ConnectedUsers.Count == 1 && channel.ConnectedUsers.Any(u => u.Id == botId);
if (isAlone && !_leaveCtsByChannel.ContainsKey(channel.Id))
{
ScheduleLeave(channel);
}
}
return Task.CompletedTask;
}
// For other users, if they join the bot's channel, cancel the leave; if they leave and bot becomes alone, schedule leave
if (afterChannelId.HasValue)
{
var channel = after.VoiceChannel!;
var botInChannel = channel.ConnectedUsers.Any(u => u.Id == botId);
var userCount = channel.ConnectedUsers.Count;
if (botInChannel && userCount > 1)
{
// Cancel any pending leave
if (_leaveCtsByChannel.TryGetValue(channel.Id, out var cts))
{
cts.Cancel();
_leaveCtsByChannel.Remove(channel.Id);
}
}
}
if (beforeChannelId.HasValue)
{
var channel = before.VoiceChannel!; // user left this channel
var botInChannel = channel.ConnectedUsers.Any(u => u.Id == botId);
var userCount = channel.ConnectedUsers.Count;
if (botInChannel && userCount == 1)
{
// Bot became alone, schedule leave
if (!_leaveCtsByChannel.ContainsKey(channel.Id))
{
ScheduleLeave(channel);
}
}
}
return Task.CompletedTask;
}
private void ScheduleLeave(SocketVoiceChannel voiceChannel)
{
var cts = new CancellationTokenSource();
_leaveCtsByChannel[voiceChannel.Id] = cts;
_ = Task.Run(async () =>
{
try
{
await Task.Delay(TimeSpan.FromMinutes(3), cts.Token);
// After delay, verify still alone
var botId = _client.CurrentUser.Id;
var isStillAlone = voiceChannel.ConnectedUsers.Count == 1 && voiceChannel.ConnectedUsers.Any(u => u.Id == botId);
if (isStillAlone)
{
Console.WriteLine($"Leaving channel {voiceChannel.Name} due to inactivity...");
await voiceChannel.DisconnectAsync();
await _timers[voiceChannel.Id].DisposeAsync();
_timers.Remove(voiceChannel.Id); // Clean up after leaving
}
}
}
catch (OperationCanceledException)
{
// Cancelled because someone joined or bot moved
}
finally
{
_leaveCtsByChannel.Remove(voiceChannel.Id);
cts.Dispose();
}
});
}
}
}

8
application.yml
View File

@@ -2,6 +2,14 @@ server: # REST and WS server
port: 2333
address: 0.0.0.0
plugins:
jellylink:
jellyfin:
baseUrl: "http://192.168.50.244:8096"
username: "Lunaris"
password: "Lunaris"
searchLimit: 5
audioQuality: "ORIGINAL" # ORIGINAL | HIGH | MEDIUM | LOW | custom number (kbps)
audioCodec: "mp3" # mp3 | aac | opus | vorbis | flac (only used when not ORIGINAL)
lavasrc:
providers: # Custom providers for track loading. This is the default
# - "dzisrc:%ISRC%" # Deezer ISRC provider