ivanch/kasbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix wrong channel

Browse Source
This commit is contained in:
José Henrique Ivanchechen 2023-07-29 01:32:32 -03:00
parent c9c7a15e3a
commit 59aa6a13a3
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Services/PlayerService.cs
View File

@ -3,6 +3,7 @@ using Discord.Audio;
using Discord.Commands; using Discord.Commands;
using Kasbot.Extensions; using Kasbot.Extensions;
using System.Diagnostics; using System.Diagnostics;
using System.Linq;
namespace Kasbot.Services namespace Kasbot.Services
{ {
@ -23,9 +24,6 @@ namespace Kasbot.Services
var conn = new Connection(); var conn = new Connection();
IAudioClient audioClient = await voiceChannel.ConnectAsync(selfDeaf: true); IAudioClient audioClient = await voiceChannel.ConnectAsync(selfDeaf: true);
// audioClient.Disconnected += (ex) => Stop(guildId);
audioClient.StreamDestroyed += (ex) => Stop(guildId);
conn.AudioClient = audioClient; conn.AudioClient = audioClient;
conn.AudioChannel = voiceChannel; conn.AudioChannel = voiceChannel;
@ -45,15 +43,23 @@ namespace Kasbot.Services
Search = arguments, Search = arguments,
Name = "" Name = ""
}; };
var guildId = Context.Guild.Id;
var userVoiceChannel = (Context.User as IVoiceState).VoiceChannel;
if (Clients.TryGetValue(Context.Guild.Id, out var conn)) if (Clients.TryGetValue(guildId, out var conn))
{ {
await Enqueue(Context.Guild.Id, conn, media); if (conn.AudioChannel.Id != userVoiceChannel.Id)
return; {
await Stop(guildId);
conn = await CreateConnection(guildId, userVoiceChannel);
}
}
else
{
conn = await CreateConnection(guildId, userVoiceChannel);
} }
conn = await CreateConnection(Context.Guild.Id, (Context.User as IVoiceState).VoiceChannel); await Enqueue(guildId, conn, media);
await Enqueue(Context.Guild.Id, conn, media);
} }
private async Task Enqueue(ulong guildId, Connection conn, Media media) private async Task Enqueue(ulong guildId, Connection conn, Media media)
@ -256,7 +262,7 @@ namespace Kasbot.Services
var media = Clients[guildId]; var media = Clients[guildId];
foreach (var v in media.Queue.Skip(1)) foreach (var v in media.Queue.Skip(0))
{ {
await v.PlayMessage.TryDeleteAsync(); await v.PlayMessage.TryDeleteAsync();
} }