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

Update SearchHelper.cs

Browse Source 
Changed e621 search helper to use XML + site's built in random function. Search results return 100% of the time + isn't fussy with tag order
This commit is contained in:
Gaboer 2016-04-18 21:10:43 -05:00
parent d7e0a0662e
commit 5e1a7c9465
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
NadekoBot/Classes/SearchHelper.cs
View File

@ -1,4 +1,4 @@
using NadekoBot.Classes.JSONModels; using NadekoBot.Classes.JSONModels;
using NadekoBot.Extensions; using NadekoBot.Extensions;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
@ -11,6 +11,7 @@ using System.Net.Http;
using System.Security.Authentication; using System.Security.Authentication;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Xml.Linq;
namespace NadekoBot.Classes namespace NadekoBot.Classes
{ {
@ -260,11 +261,18 @@ namespace NadekoBot.Classes
internal static async Task<string> GetE621ImageLink(string tags) internal static async Task<string> GetE621ImageLink(string tags)
{ {
var rng = new Random(); try
var url = $"https://e621.net/post/index/{rng.Next(0, 5)}/{Uri.EscapeUriString(tags)}"; {
var webpage = await GetResponseStringAsync(url).ConfigureAwait(false); // first extract the post id and go to that posts page ServicePointManager.Expect100Continue = true;
var matches = Regex.Matches(webpage, "\"file_url\":\"(?<url>.*?)\""); ServicePointManager.SecurityProtocol = SecurityProtocolType.Ssl3 | SecurityProtocolType.Tls | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls12;
return matches[rng.Next(0, matches.Count)].Groups["url"].Value; XDocument doc = XDocument.Load(" https://e621.net/post/index.xml?tags="+Uri.EscapeUriString(tags)+"%20order:random&limit=1");
int id = Convert.ToInt32(doc.Root.Element("post").Element("id").Value);
return (doc.Root.Element("post").Element("file_url").Value);
}
catch (Exception)
{
return "Error, do you have too many tags?";
}
} }
public static async Task<string> ShortenUrl(string url) public static async Task<string> ShortenUrl(string url)
@ -301,4 +309,4 @@ namespace NadekoBot.Classes
} }
} }
} }
} }