From d16374c57a5a1fc68b4c8ca06b97ee47c7b7ba05 Mon Sep 17 00:00:00 2001
From: Schnitzel5 <tangphilip3@gmail.com>
Date: Tue, 7 Jan 2025 23:38:20 +0100
Subject: [PATCH] adjusted novel sources

---
 javascript/novel/src/en/novelupdates.js       | 92 ++++++++++---------
 javascript/novel/src/en/wordrain69.js         | 10 +-
 .../novel/src/en => wip}/wuxiaclick.js        |  6 +-
 3 files changed, 60 insertions(+), 48 deletions(-)
 rename {javascript/novel/src/en => wip}/wuxiaclick.js (97%)

diff --git a/javascript/novel/src/en/novelupdates.js b/javascript/novel/src/en/novelupdates.js
index e83591c6..cca98911 100644
--- a/javascript/novel/src/en/novelupdates.js
+++ b/javascript/novel/src/en/novelupdates.js
@@ -7,7 +7,7 @@ const mangayomiSources = [{
     "https://raw.githubusercontent.com/kodjodevf/mangayomi-extensions/main/javascript/icon/en.novelupdates.png",
   "typeSource": "single",
   "itemType": 2,
-  "version": "0.0.2",
+  "version": "0.0.3",
   "dateFormat": "",
   "dateFormatLocale": "",
   "pkgPath": "novel/src/en/novelupdates.js",
@@ -188,8 +188,13 @@ class DefaultExtension extends MProvider {
       "User-Agent":
         "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Safari/537.36",
     });
-    const doc = new Document(res.body);
-    const domain = res.body;
+    return await this.cleanHtmlContent(res.body);
+  }
+
+  async cleanHtmlContent(html) {
+    const client = await new Client();
+    const doc = new Document(html);
+    const domain = html;
     
     if (domain.includes("anotivereads")) {
       const title =
@@ -424,50 +429,49 @@ class DefaultExtension extends MProvider {
       return e?.toLowerCase().includes("wordpress") || e?.toLowerCase().includes("site kit by google")
     });
 
-    
     let title =
-    doc.selectFirst(".entry-title")?.text.trim() ||
-    doc.selectFirst(".entry-title-main")?.text.trim() ||
-    doc.selectFirst(".chapter__title")?.text.trim() ||
-    doc.selectFirst(".sp-title")?.text.trim() ||
-    doc.selectFirst(".title-content")?.text.trim() ||
-    doc.selectFirst(".wp-block-post-title")?.text.trim() ||
-    doc.selectFirst(".title_story")?.text.trim() ||
-    doc.selectFirst(".active")?.text.trim() ||
-    doc.selectFirst("head title")?.text.trim() ||
-    doc.selectFirst("h1.leading-none ~ h2")?.text.trim() ||
-    "";
-  const subtitle =
-    doc.selectFirst(".cat-series")?.text.trim() ||
-    doc.selectFirst("h1.leading-none ~ span")?.text.trim() ||
-    "";
-  if (subtitle && subtitle != "") {
-    title = subtitle;
-  }
-  const content =
-    doc.selectFirst(".rdminimal")?.innerHtml ||
-    doc.selectFirst(".entry-content")?.innerHtml ||
-    doc.selectFirst(".chapter__content")?.innerHtml ||
-    doc.selectFirst(".prevent-select")?.innerHtml ||
-    doc.selectFirst(".text_story")?.innerHtml ||
-    doc.selectFirst(".contenta")?.innerHtml ||
-    doc.selectFirst(".single_post")?.innerHtml ||
-    doc.selectFirst(".post-entry")?.innerHtml ||
-    doc.selectFirst(".main-content")?.innerHtml ||
-    doc.selectFirst(".post-content")?.innerHtml ||
-    doc.selectFirst(".content")?.innerHtml ||
-    doc.selectFirst(".page-body")?.innerHtml ||
-    doc.selectFirst(".td-page-content")?.innerHtml ||
-    doc.selectFirst(".reader-content")?.innerHtml ||
-    doc.selectFirst("#content")?.innerHtml ||
-    doc.selectFirst("#the-content")?.innerHtml ||
-    doc.selectFirst("article.post")?.innerHtml;
-    
-    if (isWordpress || domain.includes("etherreads") || domain.includes("soafp")) {
-      return `<h2>${title}</h2><hr><br>${content}`;
+      doc.selectFirst(".entry-title")?.text.trim() ||
+      doc.selectFirst(".entry-title-main")?.text.trim() ||
+      doc.selectFirst(".chapter__title")?.text.trim() ||
+      doc.selectFirst(".sp-title")?.text.trim() ||
+      doc.selectFirst(".title-content")?.text.trim() ||
+      doc.selectFirst(".wp-block-post-title")?.text.trim() ||
+      doc.selectFirst(".title_story")?.text.trim() ||
+      doc.selectFirst(".active")?.text.trim() ||
+      doc.selectFirst("head title")?.text.trim() ||
+      doc.selectFirst("h1.leading-none ~ h2")?.text.trim() ||
+      "";
+    const subtitle =
+      doc.selectFirst(".cat-series")?.text.trim() ||
+      doc.selectFirst("h1.leading-none ~ span")?.text.trim() ||
+      "";
+    if (subtitle && subtitle != "") {
+      title = subtitle;
     }
+    const content =
+      doc.selectFirst(".rdminimal")?.innerHtml ||
+      doc.selectFirst(".entry-content")?.innerHtml ||
+      doc.selectFirst(".chapter__content")?.innerHtml ||
+      doc.selectFirst(".prevent-select")?.innerHtml ||
+      doc.selectFirst(".text_story")?.innerHtml ||
+      doc.selectFirst(".contenta")?.innerHtml ||
+      doc.selectFirst(".single_post")?.innerHtml ||
+      doc.selectFirst(".post-entry")?.innerHtml ||
+      doc.selectFirst(".main-content")?.innerHtml ||
+      doc.selectFirst(".post-content")?.innerHtml ||
+      doc.selectFirst(".content")?.innerHtml ||
+      doc.selectFirst(".page-body")?.innerHtml ||
+      doc.selectFirst(".td-page-content")?.innerHtml ||
+      doc.selectFirst(".reader-content")?.innerHtml ||
+      doc.selectFirst("#content")?.innerHtml ||
+      doc.selectFirst("#the-content")?.innerHtml ||
+      doc.selectFirst("article.post")?.innerHtml;
     
-    return `<p>Domain not supported yet. Content might not load properly!</p>
+      if (isWordpress || domain.includes("etherreads") || domain.includes("soafp")) {
+        return `<h2>${title}</h2><hr><br>${content}`;
+      }
+    
+      return `<p>Domain not supported yet. Content might not load properly!</p>
             <br><h2>${title}</h2><hr><br>${content}`;
   }
 
diff --git a/javascript/novel/src/en/wordrain69.js b/javascript/novel/src/en/wordrain69.js
index 80f2a996..d707c788 100644
--- a/javascript/novel/src/en/wordrain69.js
+++ b/javascript/novel/src/en/wordrain69.js
@@ -7,7 +7,7 @@ const mangayomiSources = [{
       "https://raw.githubusercontent.com/kodjodevf/mangayomi-extensions/main/javascript/icon/en.wordrain69.png",
     "typeSource": "single",
     "itemType": 2,
-    "version": "0.0.1",
+    "version": "0.0.2",
     "dateFormat": "",
     "dateFormatLocale": "",
     "pkgPath": "novel/src/en/wordrain69.js",
@@ -117,11 +117,15 @@ const mangayomiSources = [{
         chapters,
       };
     }
-  
+
     async getHtmlContent(url) {
       const client = await new Client();
       const res = await client.get(url);
-      const doc = new Document(res.body);
+      return await this.cleanHtmlContent(res.body);
+    }
+  
+    async cleanHtmlContent(html) {
+      const doc = new Document(html);
       const title =
           doc.selectFirst("#chapter-heading")?.text.trim() ||
           "";
diff --git a/javascript/novel/src/en/wuxiaclick.js b/wip/wuxiaclick.js
similarity index 97%
rename from javascript/novel/src/en/wuxiaclick.js
rename to wip/wuxiaclick.js
index 8d03ef4a..dc463839 100644
--- a/javascript/novel/src/en/wuxiaclick.js
+++ b/wip/wuxiaclick.js
@@ -111,7 +111,11 @@ class DefaultExtension extends MProvider {
   async getHtmlContent(url) {
     const client = await new Client();
     const res = await client.get(url);
-    const doc = new Document(res.body);
+    return await this.cleanHtmlContent(res.body);
+  }
+
+  async cleanHtmlContent(html) {
+    const doc = new Document(html);
     const title =
         doc.selectFirst("div.mantine-Center-root > h1.mantine-Title-root")?.text.trim() ||
         "";