Browse Source

Update IAudioChannel.ConnectAsync()

- Remove ConfigAction from parameters
- Add SelfDeafen/SelfMute to parameters
pull/1057/head
NovusTheory 7 years ago
parent
commit
28f5d72815
6 changed files with 7 additions and 11 deletions
  1. +1
    -1
      src/Discord.Net.Core/Entities/Channels/IAudioChannel.cs
  2. +1
    -1
      src/Discord.Net.Rest/Entities/Channels/RestGroupChannel.cs
  3. +1
    -1
      src/Discord.Net.Rest/Entities/Channels/RestVoiceChannel.cs
  4. +1
    -1
      src/Discord.Net.WebSocket/Entities/Channels/SocketGroupChannel.cs
  5. +2
    -2
      src/Discord.Net.WebSocket/Entities/Channels/SocketVoiceChannel.cs
  6. +1
    -5
      src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs

+ 1
- 1
src/Discord.Net.Core/Entities/Channels/IAudioChannel.cs View File

@@ -7,7 +7,7 @@ namespace Discord
public interface IAudioChannel : IChannel public interface IAudioChannel : IChannel
{ {
/// <summary> Connects to this audio channel. </summary> /// <summary> Connects to this audio channel. </summary>
Task<IAudioClient> ConnectAsync(Action<IAudioClient> configAction = null, bool external = false);
Task<IAudioClient> ConnectAsync(bool selfDeaf = false, bool selfMute = false, bool external = false);


/// <summary> Disconnects from this audio channel. </summary> /// <summary> Disconnects from this audio channel. </summary>
Task DisconnectAsync(); Task DisconnectAsync();


+ 1
- 1
src/Discord.Net.Rest/Entities/Channels/RestGroupChannel.cs View File

@@ -143,7 +143,7 @@ namespace Discord.Rest
=> EnterTypingState(options); => EnterTypingState(options);


//IAudioChannel //IAudioChannel
Task<IAudioClient> IAudioChannel.ConnectAsync(Action<IAudioClient> configAction, bool external) { throw new NotSupportedException(); }
Task<IAudioClient> IAudioChannel.ConnectAsync(bool selfDeaf, bool selfMute, bool external) { throw new NotSupportedException(); }
Task IAudioChannel.DisconnectAsync() { throw new NotSupportedException(); } Task IAudioChannel.DisconnectAsync() { throw new NotSupportedException(); }


//IChannel //IChannel


+ 1
- 1
src/Discord.Net.Rest/Entities/Channels/RestVoiceChannel.cs View File

@@ -41,7 +41,7 @@ namespace Discord.Rest
private string DebuggerDisplay => $"{Name} ({Id}, Voice)"; private string DebuggerDisplay => $"{Name} ({Id}, Voice)";


//IAudioChannel //IAudioChannel
Task<IAudioClient> IAudioChannel.ConnectAsync(Action<IAudioClient> configAction, bool external) { throw new NotSupportedException(); }
Task<IAudioClient> IAudioChannel.ConnectAsync(bool selfDeaf, bool selfMute, bool external) { throw new NotSupportedException(); }
Task IAudioChannel.DisconnectAsync() { throw new NotSupportedException(); } Task IAudioChannel.DisconnectAsync() { throw new NotSupportedException(); }


//IGuildChannel //IGuildChannel


+ 1
- 1
src/Discord.Net.WebSocket/Entities/Channels/SocketGroupChannel.cs View File

@@ -206,7 +206,7 @@ namespace Discord.WebSocket
=> EnterTypingState(options); => EnterTypingState(options);


//IAudioChannel //IAudioChannel
Task<IAudioClient> IAudioChannel.ConnectAsync(Action<IAudioClient> configAction, bool external) { throw new NotSupportedException(); }
Task<IAudioClient> IAudioChannel.ConnectAsync(bool selfDeaf, bool selfMute, bool external) { throw new NotSupportedException(); }
Task IAudioChannel.DisconnectAsync() { throw new NotSupportedException(); } Task IAudioChannel.DisconnectAsync() { throw new NotSupportedException(); }


//IChannel //IChannel


+ 2
- 2
src/Discord.Net.WebSocket/Entities/Channels/SocketVoiceChannel.cs View File

@@ -40,9 +40,9 @@ namespace Discord.WebSocket
public Task ModifyAsync(Action<VoiceChannelProperties> func, RequestOptions options = null) public Task ModifyAsync(Action<VoiceChannelProperties> func, RequestOptions options = null)
=> ChannelHelper.ModifyAsync(this, Discord, func, options); => ChannelHelper.ModifyAsync(this, Discord, func, options);


public async Task<IAudioClient> ConnectAsync(Action<IAudioClient> configAction = null, bool external = false)
public async Task<IAudioClient> ConnectAsync(bool selfDeaf = false, bool selfMute = false, bool external = false)
{ {
return await Guild.ConnectAudioAsync(Id, false, false, configAction, external).ConfigureAwait(false);
return await Guild.ConnectAudioAsync(Id, selfDeaf, selfMute, external).ConfigureAwait(false);
} }


public async Task DisconnectAsync() public async Task DisconnectAsync()


+ 1
- 5
src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs View File

@@ -504,11 +504,8 @@ namespace Discord.WebSocket
{ {
return _audioClient?.GetInputStream(userId); return _audioClient?.GetInputStream(userId);
} }
internal async Task<IAudioClient> ConnectAudioAsync(ulong channelId, bool selfDeaf, bool selfMute, Action<IAudioClient> configAction, bool external)
internal async Task<IAudioClient> ConnectAudioAsync(ulong channelId, bool selfDeaf, bool selfMute, bool external)
{ {
selfDeaf = false;
selfMute = false;

TaskCompletionSource<AudioClient> promise; TaskCompletionSource<AudioClient> promise;


await _audioLock.WaitAsync().ConfigureAwait(false); await _audioLock.WaitAsync().ConfigureAwait(false);
@@ -548,7 +545,6 @@ namespace Discord.WebSocket
var _ = promise.TrySetResultAsync(_audioClient); var _ = promise.TrySetResultAsync(_audioClient);
return Task.Delay(0); return Task.Delay(0);
}; };
configAction?.Invoke(audioClient);
_audioClient = audioClient; _audioClient = audioClient;
} }




Loading…
Cancel
Save