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

things

Browse Source
This commit is contained in:
José Henrique Ivanchechen
2023-02-02 19:21:38 -03:00
parent 52c858cffb
commit 812fc0bf41
3 changed files with 115 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/master.yml vendored
View File

@@ -82,8 +82,6 @@ jobs:
needs: build_arm64
steps:
- uses: actions/checkout@v2
- name: Recreate container
uses: appleboy/ssh-action@v0.1.7
with:

2
Services/CommandHandlingService.cs
View File

@@ -37,7 +37,7 @@ namespace TextCommandFramework.Services
return;
var argPos = 0;
var prefix = "!";
var prefix = "-";
//Check if the message sent has the specified prefix
if (!message.HasStringPrefix(prefix, ref argPos)) return;

129
Services/PlayerService.cs
View File

@@ -1,6 +1,7 @@
using Discord;
using Discord.Audio;
using Discord.Commands;
using Discord.Rest;
using Discord.WebSocket;
using System.Diagnostics;
using YoutubeExplode;
@@ -10,19 +11,19 @@ namespace Kasbot.Services
{
public class PlayerService
{
public Dictionary<ulong, Media> Clients { get; set; }
public Dictionary<ulong, Connection> Clients { get; set; }
public PlayerService()
{
Clients = new Dictionary<ulong, Media>();
Clients = new Dictionary<ulong, Connection>();
}
private async Task<MemoryStream> DownloadAudioFromYoutube(string youtubeUrl)
private async Task<MemoryStream> DownloadAudioFromYoutube(Media media)
{
var memoryStream = new MemoryStream();
var youtube = new YoutubeClient();
var videoId = await youtube.Search.GetVideosAsync(youtubeUrl).FirstOrDefaultAsync();
var videoId = await youtube.Search.GetVideosAsync(media.Search).FirstOrDefaultAsync();
var streamInfoSet = await youtube.Videos.Streams.GetManifestAsync(videoId.Id);
var streamInfo = streamInfoSet.GetAudioOnlyStreams().GetWithHighestBitrate();
var streamVideo = await youtube.Videos.Streams.GetAsync(streamInfo);
@@ -31,31 +32,99 @@ namespace Kasbot.Services
streamVideo.CopyTo(memoryStream);
memoryStream.Position = 0;
media.Name = videoId.Title;
media.Length = videoId.Duration.GetValueOrDefault();
return memoryStream;
}
private Connection CreateConnection(IAudioClient audioClient, ulong guildId)
{
var conn = new Connection()
{
AudioClient = audioClient,
};
if (Clients.ContainsKey(guildId))
Clients.Remove(guildId);
Clients.Add(guildId, conn);
return conn;
}
public async Task Play(SocketCommandContext Context, string arguments)
{
IVoiceChannel channel = (Context.User as IVoiceState).VoiceChannel;
var mp3Stream = await DownloadAudioFromYoutube(arguments);
var ffmpeg = CreateStream();
var audioClient = await channel.ConnectAsync();
audioClient.ClientDisconnected += AudioClient_ClientDisconnected;
var media = new Media()
{
AudioClient = audioClient,
Message = Context.Message,
Search = arguments,
Name = ""
};
Clients.Add(Context.Guild.Id, media);
if (Clients.TryGetValue(Context.Guild.Id, out var conn))
{
conn.Queue.Enqueue(media);
Console.WriteLine("conn.Queue.Count " + conn.Queue.Count);
if (conn.Queue.Count == 1)
{
await PlayNext(Context.Guild.Id);
}
return;
}
IVoiceChannel channel = (Context.User as IVoiceState).VoiceChannel;
var audioClient = await channel.ConnectAsync();
audioClient.ClientDisconnected += (id) => AudioClient_ClientDisconnected(Context.Guild.Id);
audioClient.Disconnected += (ex) => AudioClient_ClientDisconnected(Context.Guild.Id);
conn = CreateConnection(audioClient, Context.Guild.Id);
conn.Queue.Enqueue(media);
Console.WriteLine("conn.Queue.Count " + conn.Queue.Count);
if (conn.Queue.Count == 1)
{
await PlayNext(Context.Guild.Id);
}
}
private async Task PlayNext(ulong guildId)
{
if (!Clients.ContainsKey(guildId) || Clients[guildId].Queue.Count == 0)
{
return;
}
var nextMedia = Clients[guildId].Queue.FirstOrDefault();
if (nextMedia == null)
{
await Stop(guildId);
return;
}
var mp3Stream = await DownloadAudioFromYoutube(nextMedia);
var audioClient = Clients[guildId].AudioClient;
var ffmpeg = CreateStream();
nextMedia.PlayMessage = await nextMedia.Message.Channel.SendMessageAsync($"⏯ Playing: {nextMedia.Name} **({nextMedia.Length.Minutes.ToString("00")}:{nextMedia.Length.Seconds:00})**");
Task stdin = new Task(() =>
{
using (var input = mp3Stream)
{
try
{
input.CopyTo(ffmpeg.StandardInput.BaseStream);
ffmpeg.StandardInput.Close();
}
finally
{
input.Flush();
input.Dispose();
}
}
});
@@ -63,9 +132,16 @@ namespace Kasbot.Services
{
using (var output = ffmpeg.StandardOutput.BaseStream)
using (var discord = audioClient.CreatePCMStream(AudioApplication.Music))
{
try
{
output.CopyTo(discord);
}
finally
{
discord.Flush();
output.Close();
}
}
});
@@ -74,7 +150,14 @@ namespace Kasbot.Services
Task.WaitAll(stdin, stdout);
ffmpeg.WaitForExit();
ffmpeg.Close();
await nextMedia.Message.DeleteAsync();
await nextMedia.PlayMessage.DeleteAsync();
Clients[guildId].Queue.Dequeue();
await PlayNext(guildId);
}
private async Task AudioClient_ClientDisconnected(ulong arg)
@@ -108,19 +191,29 @@ namespace Kasbot.Services
var media = Clients[guildId];
await media.Message.DeleteAsync();
foreach (var v in media.Queue)
{
await v.Message.DeleteAsync();
await v.PlayMessage.DeleteAsync();
}
await media.AudioClient.StopAsync();
Clients.Remove(guildId);
}
}
public class Connection
{
public IAudioClient AudioClient { get; set; }
public Queue<Media> Queue { get; set; } = new Queue<Media>();
}
public class Media
{
public string Search { get; set; }
public string Name { get; set; }
public int Length { get; set; }
public string FileName { get; set; }
public IAudioClient AudioClient { get; set; }
public TimeSpan Length { get; set; }
public SocketUserMessage Message { get; set; }
public RestUserMessage PlayMessage { get; set; }
}
}