From 2f12ac2d65b7b7cd05a0e6199fb209af181acd2b Mon Sep 17 00:00:00 2001
From: dthung1602 <dthung1602@gmail.com>
Date: Sun, 19 Jun 2022 15:13:48 +0700
Subject: [PATCH] Fix bug keep adding restore button

---
 manifest-v2.json       |  2 +-
 manifest-v3.json       |  2 +-
 popup/popup.html       |  2 +-
 scripts/clean-spams.js | 34 ++++++++++++++++++++++------------
 4 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/manifest-v2.json b/manifest-v2.json
index d5f3060..f9d263c 100644
--- a/manifest-v2.json
+++ b/manifest-v2.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "TheSpamminator",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Remove banger alert spams from comment section of mangakakalot & manganato",
   "icons": {
     "16": "images/logo/spam-logo-16.png",
diff --git a/manifest-v3.json b/manifest-v3.json
index f2d9f39..82c0512 100644
--- a/manifest-v3.json
+++ b/manifest-v3.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "TheSpamminator",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Remove banger alert spams from comment section of mangakakalot & manganato",
   "icons": {
     "16": "images/logo/spam-logo-16.png",
diff --git a/popup/popup.html b/popup/popup.html
index 0b5dcab..7e133b0 100644
--- a/popup/popup.html
+++ b/popup/popup.html
@@ -77,7 +77,7 @@
     </section>
     <section id="about" class="hidden">
         <div id="version">
-            <span>Version 1.2.0</span>
+            <span>Version 1.2.1</span>
         </div>
         <div id="what-new">
             <a href="https://github.com/dthung1602/the-spamminator/releases" target="_blank">
diff --git a/scripts/clean-spams.js b/scripts/clean-spams.js
index 2d97df7..f1149aa 100644
--- a/scripts/clean-spams.js
+++ b/scripts/clean-spams.js
@@ -74,7 +74,7 @@ function createRestoreButton(node, restoreKey) {
 }
 
 function createBlackListButton(spamDomain) {
-  const button = htmlToElement(`<span class="additional-button">✖ Blacklist domain</span>`);
+  const button = htmlToElement(`<span class="additional-button" title="Add this domain to The Spamminator's blacklist">✖ Blacklist domain</span>`);
   button.addEventListener("click", async () => {
     let { banDomains } = await browser.storage.local.get(["banDomains"]);
     banDomains = Array.from(new Set([...banDomains, spamDomain]));
@@ -158,27 +158,37 @@ async function cleanSpams() {
   ]);
 
   const action = actionMapping.get(cleanSpamAction);
-  const filter = (node) => containBanDomain(node, banDomains);
+  const filterContainSpam = (node) => containBanDomain(node, banDomains);
 
   let spamCount = 0;
   const count = () => spamCount += 1;
 
-  // replace links in nested comments
+  const performAction = (node) => {
+    node.classList.add("spam-free");
+    action(node);
+  }
+
+  // first, find the nested spam comments
+  // if the outer comment & the nested comment belongs to the same account, perform action on the outer comment
+  // the nested spammer comment is handled later
   const linksInNestedComments = window.document.querySelectorAll(".UFIImageBlockContent .UFIImageBlockContent ._5mdd a");
   Array.from(linksInNestedComments)
-    .filter(filter)
-    .map((node) => getAncestor(node, 11).querySelector("._3-8m"))
-    .map(action)
+    .filter(filterContainSpam)
+    .map((node) => {
+      const spammerName = getAncestor(node, 5).querySelector(".UFICommentActorName").text;
+      const outerComment = getAncestor(node, 11);
+      const outerCommenterName = outerComment.querySelector(".UFICommentActorName").text;
+      return spammerName === outerCommenterName ? outerComment.querySelector("._3-8m") : null;
+    })
+    .filter(Boolean)
+    .map(performAction)
     .map(count);
 
-  // replace text spams in comments & nested comments
+  // find all spam comments, nested or not, and perform actions on them
   const uncheckedComments = window.document.querySelectorAll("._3-8m:not(.spam-free)");
   Array.from(uncheckedComments)
-    .filter(filter)
-    .map((node) => {
-      node.classList.add("spam-free");
-      action(node)
-    })
+    .filter(filterContainSpam)
+    .map(performAction)
     .map(count);
 
   console.log(`Found ${spamCount} spams`);