Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Allow overriding ILavalinkSessionProvider while resolving/joining player #179

Merged
merged 2 commits into from
Sep 8, 2024
Merged

Allow overriding ILavalinkSessionProvider while resolving/joining player #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c67bf8
Allow overriding ILavalinkSessionProvider while resolving/joining pla…
SKProCH Sep 2, 2024
604d09b
Add default implementation for new overload of JoinAsync, to not intr…
SKProCH Sep 2, 2024
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
9 changes: 9 additions & 0 deletions src/Lavalink4NET/Players/IPlayerManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,15 @@ ValueTask<TPlayer> JoinAsync<TPlayer, TOptions>(ulong guildId, ulong voiceChanne
where TPlayer : ILavalinkPlayer
where TOptions : LavalinkPlayerOptions;

ValueTask<TPlayer> JoinAsync<TPlayer, TOptions>(ulong guildId, ulong voiceChannelId,
PlayerFactory<TPlayer, TOptions> playerFactory, IOptions<TOptions> options,
ILavalinkSessionProvider? overridenLavalinkSessionProvider, CancellationToken cancellationToken = default)
where TPlayer : ILavalinkPlayer
where TOptions : LavalinkPlayerOptions
{
return JoinAsync(guildId, voiceChannelId, playerFactory, options, cancellationToken);
}

ValueTask<PlayerResult<TPlayer>> RetrieveAsync<TPlayer, TOptions>(
ulong guildId,
ulong? memberVoiceChannel,
Expand Down
19 changes: 16 additions & 3 deletions src/Lavalink4NET/Players/PlayerManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,18 +116,31 @@ public bool HasPlayer(ulong guildId)
return _handles.TryGetValue(guildId, out var handle)
&& handle is { Player.State: not PlayerState.Destroyed };
}

public ValueTask<TPlayer> JoinAsync<TPlayer, TOptions>(ulong guildId, ulong voiceChannelId, PlayerFactory<TPlayer, TOptions> playerFactory, IOptions<TOptions> options, CancellationToken cancellationToken = default)
where TPlayer : ILavalinkPlayer
where TOptions : LavalinkPlayerOptions
{
return JoinAsync(guildId, voiceChannelId, playerFactory, options, null, cancellationToken);
}

public async ValueTask<TPlayer> JoinAsync<TPlayer, TOptions>(ulong guildId, ulong voiceChannelId, PlayerFactory<TPlayer, TOptions> playerFactory, IOptions<TOptions> options, CancellationToken cancellationToken = default)
public async ValueTask<TPlayer> JoinAsync<TPlayer, TOptions>(ulong guildId, ulong voiceChannelId, PlayerFactory<TPlayer, TOptions> playerFactory, IOptions<TOptions> options, ILavalinkSessionProvider? overridenLavalinkSessionProvider, CancellationToken cancellationToken = default)
where TPlayer : ILavalinkPlayer
where TOptions : LavalinkPlayerOptions
{
cancellationToken.ThrowIfCancellationRequested();

LavalinkPlayerHandle<TPlayer, TOptions> Create(ulong guildId)
{
var playerContext = _playerContext;
if (overridenLavalinkSessionProvider is not null)
{
playerContext = playerContext with { SessionProvider = overridenLavalinkSessionProvider };
}

return new LavalinkPlayerHandle<TPlayer, TOptions>(
guildId: guildId,
playerContext: _playerContext,
playerContext: playerContext,
playerFactory: playerFactory,
options: options,
logger: _loggerFactory.CreateLogger<TPlayer>());
Expand Down Expand Up @@ -296,7 +309,7 @@ await DiscordClient
return PlayerResult<TPlayer>.BotNotConnected;
}

player = await JoinAsync(guildId, memberVoiceChannel.Value, playerFactory, options, cancellationToken).ConfigureAwait(false);
player = await JoinAsync(guildId, memberVoiceChannel.Value, playerFactory, options, retrieveOptions.OverridenSessionProvider, cancellationToken).ConfigureAwait(false);

return await CheckPreconditionsAsync(player, preconditions, cancellationToken).ConfigureAwait(false);
}
Expand Down
3 changes: 2 additions & 1 deletion src/Lavalink4NET/Players/PlayerRetrieveOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@
public readonly record struct PlayerRetrieveOptions(
PlayerChannelBehavior ChannelBehavior = PlayerChannelBehavior.None,
MemberVoiceStateBehavior VoiceStateBehavior = MemberVoiceStateBehavior.Ignore,
ImmutableArray<IPlayerPrecondition> Preconditions = default);
ImmutableArray<IPlayerPrecondition> Preconditions = default,
ILavalinkSessionProvider? OverridenSessionProvider = null);
7 changes: 7 additions & 0 deletions tests/Lavalink4NET.InactivityTracking.Tests/PlayerManagerMock.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,13 @@ public ValueTask<TPlayer> JoinAsync<TPlayer, TOptions>(ulong guildId, ulong voic
{
throw new NotImplementedException();
}

public ValueTask<TPlayer> JoinAsync<TPlayer, TOptions>(ulong guildId, ulong voiceChannelId, PlayerFactory<TPlayer, TOptions> playerFactory,
IOptions<TOptions> options, ILavalinkSessionProvider? overridenLavalinkSessionProvider,
CancellationToken cancellationToken = default) where TPlayer : ILavalinkPlayer where TOptions : LavalinkPlayerOptions
{
throw new NotImplementedException();
}

public bool TryGetPlayer(ulong guildId, [MaybeNullWhen(false)] out ILavalinkPlayer player)
{
Expand Down
Loading