mattburchett/NadekoBot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

small changes, music queue to 50, takes 30 from pl

Browse Source
This commit is contained in:
Master Kwoth
2016-02-23 01:21:22 +01:00
parent 7d11f94088
commit 8d0fc191d8
10 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
NadekoBot/Classes/Music/MusicControls.cs
View File

@ -69,7 +69,7 @@ namespace NadekoBot.Classes.Music {
if (VoiceClient == null) {
Console.WriteLine($"Joining voice channel [{DateTime.Now.Second}]");
//todo add a new event, to tell people nadeko is trying to join
VoiceClient = await VoiceChannel.JoinAudio();
VoiceClient = await Task.Run(async () => await VoiceChannel.JoinAudio());
Console.WriteLine($"Joined voicechannel [{DateTime.Now.Second}]");
}
await Task.Factory.StartNew(async () => await CurrentSong?.Start(), TaskCreationOptions.LongRunning).Unwrap();

2
NadekoBot/Classes/Music/StreamRequest.cs
View File

@ -74,6 +74,8 @@ namespace NadekoBot.Classes.Music {
if (OnResolving != null)
OnResolving();
var links = await SearchHelper.FindYoutubeUrlByKeywords(Query);
if (links == String.Empty)
throw new OperationCanceledException("Not a valid youtube query.");
var allVideos = await Task.Factory.StartNew(async () => await YouTube.Default.GetAllVideosAsync(links)).Unwrap();
var videos = allVideos.Where(v => v.AdaptiveKind == AdaptiveKind.Audio);
var video = videos

21
NadekoBot/Classes/SearchHelper.cs
View File

@ -21,13 +21,13 @@ namespace NadekoBot.Classes {
}
}
public static async Task<string> GetResponseAsync(string v) =>
await new StreamReader((await ((HttpWebRequest)WebRequest.Create(v)).GetResponseAsync()).GetResponseStream()).ReadToEndAsync();
public static async Task<string> GetResponseAsync(string v, WebHeaderCollection headers) {
public static async Task<string> GetResponseAsync(string v, WebHeaderCollection headers = null) {
var wr = (HttpWebRequest)WebRequest.Create(v);
wr.Headers = headers;
return await new StreamReader((await wr.GetResponseAsync()).GetResponseStream()).ReadToEndAsync();
if (headers != null)
wr.Headers = headers;
using (var sr = new StreamReader((await wr.GetResponseAsync()).GetResponseStream())) {
return await sr.ReadToEndAsync();
}
}
private static string token = "";
@ -112,10 +112,11 @@ namespace NadekoBot.Classes {
WebRequest wr = WebRequest.Create("https://www.googleapis.com/youtube/v3/search?part=snippet&maxResults=1&q=" + Uri.EscapeDataString(v) + "&key=" + NadekoBot.GoogleAPIKey);
var sr = new StreamReader((await wr.GetResponseAsync()).GetResponseStream());
using (var sr = new StreamReader((await wr.GetResponseAsync()).GetResponseStream())) {
dynamic obj = JObject.Parse(await sr.ReadToEndAsync());
return "http://www.youtube.com/watch?v=" + obj.items[0].id.videoId.ToString();
dynamic obj = JObject.Parse(await sr.ReadToEndAsync());
return "http://www.youtube.com/watch?v=" + obj.items[0].id.videoId.ToString();
}
}
catch (Exception ex) {
Console.WriteLine($"Error in findyoutubeurl: {ex.Message}");
@ -150,7 +151,7 @@ namespace NadekoBot.Classes {
}
try {
WebRequest wr = WebRequest.Create($"https://www.googleapis.com/youtube/v3/playlistItems?part=contentDetails&maxResults={25}&playlistId={v}&key={ NadekoBot.creds.GoogleAPIKey }");
WebRequest wr = WebRequest.Create($"https://www.googleapis.com/youtube/v3/playlistItems?part=contentDetails&maxResults={30}&playlistId={v}&key={ NadekoBot.creds.GoogleAPIKey }");
var sr = new StreamReader((await wr.GetResponseAsync()).GetResponseStream());

8
NadekoBot/Classes/Trivia/TriviaGame.cs
View File

@ -77,12 +77,12 @@ namespace NadekoBot.Classes.Trivia {
// load next question if game is still running
await Task.Delay(2000);
}
End();
End().Wait();
}
private void End() {
_channel.SendMessage("**Trivia game ended**");
_channel.SendMessage(GetLeaderboard());
private async Task End() {
await _channel.SendMessage("**Trivia game ended**");
await _channel.SendMessage(GetLeaderboard());
TriviaGame throwAwayValue;
Commands.Trivia.runningTrivias.TryRemove(_server, out throwAwayValue);
}