From dc7656faf49342e0dae9231a37ba432f45afb3d5 Mon Sep 17 00:00:00 2001
From: Fen Dweller <chemicalcrux@gmail.com>
Date: Sat, 6 Jun 2020 13:32:02 -0400
Subject: [PATCH] Get rid of most of the gross injection stuff

---
 filter.js     | 24 ++++++++++++++++++++----
 inject.js     | 22 +---------------------
 manifest.json |  7 +------
 run-filter.js | 11 -----------
 4 files changed, 22 insertions(+), 42 deletions(-)
 delete mode 100644 run-filter.js

diff --git a/filter.js b/filter.js
index d93af2c..2455f7d 100644
--- a/filter.js
+++ b/filter.js
@@ -1,7 +1,23 @@
 "use strict";
 
-const script = document.createElement("script");
-script.src = chrome.extension.getURL("inject.js");
-(document.head || document.documentElement).appendChild(script);
-script.onload = script.remove;
+chrome.storage.sync.get("blacklist", result => {
+    const blacklist = JSON.parse(result.blacklist);
+    const gallery = document.querySelector("#gallery-frontpage-submissions");
+    const submissions = gallery.querySelectorAll("figure");
+    
+    submissions.forEach(sub => {
+        const title = sub.querySelector("figcaption > p > a").title.toLowerCase();
+    
+        if (blacklist.some(word => title.indexOf(word) != -1)) {
+            gallery.removeChild(sub);
+        } else if (sub.style.display == "none") {
+            sub.style.display = "";
+        }
+    });    
+
+    const script = document.createElement("script");
+    script.src = chrome.extension.getURL("inject.js");
+    (document.head || document.documentElement).appendChild(script);
+    script.onload = script.remove;
+});
 
diff --git a/inject.js b/inject.js
index 5ff2b26..a2f9cbb 100644
--- a/inject.js
+++ b/inject.js
@@ -1,21 +1 @@
-"use strict";
-
-function fa_filter_execute(blacklist) {
-    console.log(blacklist);
-    const gallery = document.querySelector("#gallery-frontpage-submissions");
-    const submissions = gallery.querySelectorAll("figure");
-    
-    submissions.forEach(sub => {
-        const title = sub.querySelector("figcaption > p > a").title.toLowerCase();
-    
-        if (blacklist.some(word => title.indexOf(word) != -1)) {
-            gallery.removeChild(sub);
-        } else if (sub.style.display == "none") {
-            sub.style.display = "";
-        }
-        
-        
-    });
-    
-    _reflow_gallery(gallery);
-}
+_reflow_gallery("gallery-frontpage-submissions");
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 903bde2..ad39903 100644
--- a/manifest.json
+++ b/manifest.json
@@ -15,15 +15,10 @@
         "scripts": ["background.js"]
     },
     "content_scripts": [
-        {
-            "run_at": "document_start",
-            "matches": ["*://www.furaffinity.net/"],
-            "js": ["filter.js"]
-        },
         {
             "run_at": "document_end",
             "matches": ["*://www.furaffinity.net/"],
-            "js": ["run-filter.js"]
+            "js": ["filter.js"]
         }
     ],
     "browser_action": {
diff --git a/run-filter.js b/run-filter.js
deleted file mode 100644
index 0f73056..0000000
--- a/run-filter.js
+++ /dev/null
@@ -1,11 +0,0 @@
-
-chrome.storage.sync.get("blacklist", result => {
-    const runScript = document.createElement("script");
-    console.log("Result: " + result.blacklist);
-    console.log(JSON.parse(result.blacklist));
-    runScript.textContent = "(" + function(blacklist) {
-        console.log(blacklist)
-        fa_filter_execute(blacklist);
-    } + ")(" + result.blacklist + ")";
-    (document.head || document.documentElement).appendChild(runScript);
-});
\ No newline at end of file