From 38ab15e5d5f8d8bcd28adfe0fafbc67362743eea Mon Sep 17 00:00:00 2001
From: ThaUnknown <kapi.skowronek@gmail.com>
Date: Wed, 28 Oct 2020 23:52:46 +0100
Subject: [PATCH] proper feed parsing

---
 app/js/animeHandler.js | 10 ++++++----
 request/index.php      |  8 ++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/js/animeHandler.js b/app/js/animeHandler.js
index 8ddff61..e27c29e 100644
--- a/app/js/animeHandler.js
+++ b/app/js/animeHandler.js
@@ -339,9 +339,11 @@ async function nyaaRss(url) {
 }
 
 
-const regex = /((?:\[[^\]]*\])*)?\s*((?:[^\d\[\.](?!S\d))*)?\s*((?:S\d+[^\w\[]*E?)?[\d\-]*)\s*(.*)?/i,
-    eregex = /(\[.*\]\ ?)?(.+?(?=\ \–\ \d))?(\ \–\ )?(\d+)?/i,
-    plsregex = /(\[.[^\]]*\]\ ?)?(.+?(?=\ \-\ \d))?(\ \-\ )?(\d+)?(.*)?/i
+const nameParseRegex = {
+    "https://subsplease.org/rss/?r=": /(\[.[^\]]*\]\ ?)?(.+?(?=\ \-\ \d))?(\ \-\ )?(\d+)?(.*)?/i,
+    "https://miru.kirdow.com/request/?url=https://www.erai-raws.info/rss-": /(\[.*\]\ ?)?(.+?(?=\ \–\ \d))?(\ \–\ )?(\d+)?/i,
+    fallback: /((?:\[[^\]]*\])*)?\s*((?:[^\d\[\.](?!S\d))*)?\s*((?:S\d+[^\w\[]*E?)?[\d\-]*)\s*(.*)?/i
+}
 let store = {},
     lastResult
 
@@ -361,7 +363,7 @@ async function hsRss() {
                     let items = doc.querySelectorAll("item")
                     for (let item of items) {
                         let i = item.querySelector.bind(item),
-                            regexParse = plsregex.exec(i("title").textContent)
+                            regexParse = (nameParseRegex[settings.torrent4]||nameParseRegex.parse).exec(i("title").textContent)
                         if (!store.hasOwnProperty(regexParse[2]) && !alResponse.data.Page.media.some(media => (Object.values(media.title).concat(media.synonyms).filter(name => name != null).includes(regexParse[2]) && ((store[regexParse[2]] = media) && true)))) {
                             //shit not found, lookup
                             let res = await alRequest(regexParse[2], 1)
diff --git a/request/index.php b/request/index.php
index a20eaa2..2ede630 100644
--- a/request/index.php
+++ b/request/index.php
@@ -32,14 +32,14 @@ $url = str_replace("$", "&", $_GET['url']);
 			}
 		}
 	}
-    elseif (substr($url, 0, 30) === "https://www.erai-rss.info/rss-") {
-		$query = explode("https://www.erai-rss.info/", $url) [1];
+    elseif (substr($url, 0, 31) === "https://www.erai-raws.info/rss-") {
+		$query = explode("https://www.erai-raws.info/rss-", $url) [1];
 		$query_check = basename(realpath($query));
 		if ($query_check === "") {
 			if (strpos($query, '/') === false) {
 				$cache_file = './cache_erai/' . $query;
-				//echo $url.'\n';
-				//echo $cache_file.'\n';
+				// echo $url.'\n';
+				// echo $cache_file.'\n';
 					if (file_exists($cache_file) && (filemtime($cache_file) > (time() - 60 * 1))) {
 						// Cache file is less than five minutes old.
 						// Don't bother refreshing, just use the file as-is.