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

~# command (thanks to blaubeerwald, formatting

Browse Source
This commit is contained in:
Master Kwoth
2016-02-18 23:40:56 +01:00
parent e9b8084cc4
commit e1f5ba8169
3 changed files with 103 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,8 @@ namespace NadekoBot.Classes.Music {
if (SongQueue.Count > 0)
await LoadNextSong();
} else if (CurrentSong.State == StreamState.Completed || NextSong) {
}
else if (CurrentSong.State == StreamState.Completed || NextSong) {
NextSong = false;
await LoadNextSong();
}
@ -57,7 +58,8 @@ namespace NadekoBot.Classes.Music {
if (SongQueue.Count != 0) {
CurrentSong = SongQueue[0];
SongQueue.RemoveAt(0);
} else {
}
else {
VoiceClient?.Disconnect();
VoiceClient = null;
return;
@ -71,7 +73,8 @@ namespace NadekoBot.Classes.Music {
Console.WriteLine($"Joined voicechannel [{DateTime.Now.Second}]");
}
await Task.Factory.StartNew(async () => await CurrentSong?.Start(), TaskCreationOptions.LongRunning).Unwrap();
} catch (Exception ex) {
}
catch (Exception ex) {
Console.WriteLine($"Starting failed: {ex}");
CurrentSong?.Stop();
CurrentSong = null;
@ -95,7 +98,7 @@ namespace NadekoBot.Classes.Music {
value = 0;
if (value > 150)
value = 150;
this.Volume = value/100f;
this.Volume = value / 100f;
return value;
}

41
NadekoBot/Classes/SearchHelper.cs
View File

@ -14,7 +14,8 @@ namespace NadekoBot.Classes {
var wr = (HttpWebRequest)WebRequest.Create(v);
try {
return (await (wr).GetResponseAsync()).GetResponseStream();
} catch (Exception ex) {
}
catch (Exception ex) {
Console.WriteLine("error in getresponse stream " + ex);
return null;
}
@ -23,11 +24,9 @@ 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, IEnumerable<Tuple<string, string>> headers) {
public static async Task<string> GetResponseAsync(string v, WebHeaderCollection headers) {
var wr = (HttpWebRequest)WebRequest.Create(v);
foreach (var header in headers) {
wr.Headers.Add(header.Item1, header.Item2);
}
wr.Headers = headers;
return await new StreamReader((await wr.GetResponseAsync()).GetResponseStream()).ReadToEndAsync();
}
@ -47,7 +46,8 @@ namespace NadekoBot.Classes {
rq = new RestSharp.RestRequest("anime/" + smallObj["id"]);
rq.AddParameter("access_token", token);
return await Task.Run(() => JsonConvert.DeserializeObject<AnimeResult>(cl.Execute(rq).Content));
} catch {
}
catch {
return null;
}
}
@ -66,7 +66,8 @@ namespace NadekoBot.Classes {
rq = new RestSharp.RestRequest("manga/" + smallObj["id"]);
rq.AddParameter("access_token", token);
return await Task.Run(() => JsonConvert.DeserializeObject<MangaResult>(cl.Execute(rq).Content));
} catch (Exception ex) {
}
catch (Exception ex) {
Console.WriteLine(ex.ToString());
return null;
}
@ -82,7 +83,8 @@ namespace NadekoBot.Classes {
var exec = cl.Execute(rq);
token = JObject.Parse(exec.Content)["access_token"].ToString();
} catch (Exception ex) {
}
catch (Exception ex) {
Console.WriteLine($"Failed refreshing anilist token:\n {ex}");
}
}
@ -114,7 +116,8 @@ namespace NadekoBot.Classes {
dynamic obj = JObject.Parse(await sr.ReadToEndAsync());
return "http://www.youtube.com/watch?v=" + obj.items[0].id.videoId.ToString();
} catch (Exception ex) {
}
catch (Exception ex) {
Console.WriteLine($"Error in findyoutubeurl: {ex.Message}");
return string.Empty;
}
@ -132,7 +135,8 @@ namespace NadekoBot.Classes {
dynamic obj = JObject.Parse(await sr.ReadToEndAsync());
return obj.items[0].id.playlistId.ToString();
} catch (Exception ex) {
}
catch (Exception ex) {
Console.WriteLine($"Error in GetPlaylistId: {ex.Message}");
return string.Empty;
}
@ -156,7 +160,8 @@ namespace NadekoBot.Classes {
toReturn.Add("http://www.youtube.com/watch?v=" + item.contentDetails.videoId);
}
return toReturn;
} catch (Exception ex) {
}
catch (Exception ex) {
Console.WriteLine($"Error in GetPlaylistId: {ex.Message}");
return new List<string>();
}
@ -174,7 +179,8 @@ namespace NadekoBot.Classes {
var matches = Regex.Matches(webpage, "data-large-file-url=\"(?<id>.*?)\"");
return await $"http://danbooru.donmai.us{ matches[rng.Next(0, matches.Count)].Groups["id"].Value }".ShortenUrl();
} catch {
}
catch {
return null;
}
}
@ -190,7 +196,8 @@ namespace NadekoBot.Classes {
//now extract the image from post page
var match = Regex.Match(webpage, "\"(?<url>http://simg4.gelbooru.com//images.*?)\"");
return match.Groups["url"].Value;
} catch {
}
catch {
return null;
}
}
@ -201,8 +208,9 @@ namespace NadekoBot.Classes {
var url = $"https://e621.net/post/index/{rng.Next(0, 5)}/{Uri.EscapeUriString(tags)}";
var webpage = await GetResponseAsync(url); // first extract the post id and go to that posts page
var matches = Regex.Matches(webpage, "\"file_url\":\"(?<url>.*?)\"");
return matches[rng.Next(0,matches.Count)].Groups["url"].Value;
} catch {
return matches[rng.Next(0, matches.Count)].Groups["url"].Value;
}
catch {
return null;
}
}
@ -225,7 +233,8 @@ namespace NadekoBot.Classes {
string MATCH_PATTERN = @"""id"": ?""(?<id>.+)""";
return Regex.Match(responseText, MATCH_PATTERN).Groups["id"].Value;
}
} catch (Exception ex) { Console.WriteLine(ex.ToString()); return url; }
}
catch (Exception ex) { Console.WriteLine(ex.ToString()); return url; }
}
}
}