From 89a79fa2a968318bf60fce0a6269e026983eef8e Mon Sep 17 00:00:00 2001
From: Elbert Alias <77259+AliasIO@users.noreply.github.com>
Date: Tue, 10 Nov 2020 09:49:10 +1100
Subject: [PATCH] Add Zoey detection, fix excludes

---
 src/drivers/webextension/images/icons/Zoey.svg |  4 ++++
 src/drivers/webextension/js/driver.js          |  2 +-
 src/wappalyzer.js                              | 14 ++++++++++----
 3 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 src/drivers/webextension/images/icons/Zoey.svg

diff --git a/src/drivers/webextension/images/icons/Zoey.svg b/src/drivers/webextension/images/icons/Zoey.svg
new file mode 100644
index 000000000..0f04f6172
--- /dev/null
+++ b/src/drivers/webextension/images/icons/Zoey.svg
@@ -0,0 +1,4 @@
+<svg width="74" height="74" viewBox="0 0 74 74" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M40.1203 10.1673H20.8608V0H54V8.97755L33.557 42.8327H54V53H20V44.0224L40.1203 10.1673Z" fill="#8E9CA6"/>
+<path d="M67.3 50C58.8 58.3 48.1 63 36.7 63C25.5 63 14.9 58.5 6.5 50.5L0 59.1C2.3 61.2 4.7 63.1 7.3 64.8C16.2 70.7 26.3 73.8 36.7 73.8C50.5 73.8 63.6 68.4 73.9 58.7L67.3 50Z" fill="#7ED5F1"/>
+</svg>
diff --git a/src/drivers/webextension/js/driver.js b/src/drivers/webextension/js/driver.js
index 72a845591..4552ed0e6 100644
--- a/src/drivers/webextension/js/driver.js
+++ b/src/drivers/webextension/js/driver.js
@@ -13,7 +13,7 @@ const { agent, promisify, getOption, setOption, open } = Utils
 
 const expiry = 1000 * 60 * 60 * 24
 
-const hostnameIgnoreList = /((local|dev(elop(ment)?)?|stag(e|ing)?|preprod|test(ing)?|demo(shop)?|admin|cache)[.-]|localhost|wappalyzer|google|facebook|twitter|reddit|yahoo|wikipedia|amazon|youtube|\/admin|\.local|\.test|\.dev|127\.|0\.)/
+const hostnameIgnoreList = /((local|dev(elop(ment)?)?|stag(e|ing)?|preprod|test(ing)?|demo(shop)?|admin|cache)[.-]|localhost|wappalyzer|google|facebook|twitter|reddit|yahoo|wikipedia|amazon|youtube|\/admin|\.local|\.test|\.dev|^[0-9.]$)/
 
 const Driver = {
   lastPing: Date.now(),
diff --git a/src/wappalyzer.js b/src/wappalyzer.js
index e51b464ec..9f69ea21a 100644
--- a/src/wappalyzer.js
+++ b/src/wappalyzer.js
@@ -131,11 +131,17 @@ const Wappalyzer = {
           throw new Error(`Excluded technology does not exist: ${name}`)
         }
 
-        const index = resolved.findIndex(({ name }) => name === excluded.name)
+        let index
 
-        if (index !== -1) {
-          resolved.splice(index, 1)
-        }
+        do {
+          index = resolved.findIndex(
+            ({ technology: { name } }) => name === excluded.name
+          )
+
+          if (index !== -1) {
+            resolved.splice(index, 1)
+          }
+        } while (index !== -1)
       })
     })
   },