From 43555f5466a15aa78ab1aea9892cecdcc5fe9b15 Mon Sep 17 00:00:00 2001
From: z0ccc <z0cccccccc@gmail.com>
Date: Sat, 11 Sep 2021 17:31:58 -0400
Subject: [PATCH] Detect adblock

---
 frontend/src/components/OtherBlock.js | 47 ++++++++++++++++++---------
 frontend/src/components/main.js       | 37 ++++++++++++---------
 2 files changed, 54 insertions(+), 30 deletions(-)

diff --git a/frontend/src/components/OtherBlock.js b/frontend/src/components/OtherBlock.js
index c7082c2..8cd7553 100644
--- a/frontend/src/components/OtherBlock.js
+++ b/frontend/src/components/OtherBlock.js
@@ -1,3 +1,4 @@
+/* eslint-disable arrow-body-style */
 /* eslint-disable no-unused-vars */
 import { useState, useEffect } from 'react';
 import Bowser from 'bowser';
@@ -7,30 +8,47 @@ import {
   checkNavigatorProperties,
   checkWebWorker,
   checkScreenProperties,
-  getOther,
+  detectTor,
 } from './main';
 
 const OtherBlock = () => {
-  const [firstRender, setfirstRender] = useState(true);
-  const [workerData, setWorkerData] = useState('');
-  const [userAgent, setUserAgent] = useState();
+  const [adBlockDetected, setAdBlockDetected] = useState(false);
 
   useEffect(() => {
-    checkWebWorker('userAgent', setWorkerData);
+    fetch('https://www3.doubleclick.net', {
+      method: 'HEAD',
+      mode: 'no-cors',
+      cache: 'no-store',
+    }).catch(() => {
+      setAdBlockDetected(true);
+    });
   }, []);
 
-  useEffect(() => {
-    if (!workerData) {
-      setUserAgent(Bowser.parse(navigator.userAgent));
-    } else {
-      setUserAgent(Bowser.parse(workerData));
-    }
-  }, [workerData]);
-
   return (
     <ScanBlock>
       <h1>Other</h1>
-      <Table type="screen" data={getOther()} />
+      <div className="tableWrap">
+        <table>
+          <tbody>
+            <tr>
+              <td>Brave browser</td>
+              <td>{navigator.brave ? 'True' : 'False'}</td>
+            </tr>
+          </tbody>
+          <tbody>
+            <tr>
+              <td>Tor Browser</td>
+              <td>{detectTor() ? 'True' : 'False'}</td>
+            </tr>
+          </tbody>
+          <tbody>
+            <tr>
+              <td>Adblock</td>
+              <td>{adBlockDetected ? 'True' : 'False'}</td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
       <p>
         <b>Explanation:</b> JavaScript can be used to find information about
         your hardware. This information can be used to create a fingerprint.
@@ -38,5 +56,4 @@ const OtherBlock = () => {
     </ScanBlock>
   );
 };
-
 export default OtherBlock;
diff --git a/frontend/src/components/main.js b/frontend/src/components/main.js
index 8a098f1..1466fb5 100644
--- a/frontend/src/components/main.js
+++ b/frontend/src/components/main.js
@@ -8,7 +8,7 @@ export {
   checkWebWorker,
   getScreen,
   checkScreenProperties,
-  getOther,
+  detectTor,
 };
 
 const getDeviceMemory = () => ({
@@ -278,13 +278,6 @@ const getScreen = () => [
   getColorDepth(),
 ];
 
-const getBrave = () => ({
-  key: 'brave',
-  title: 'Brave browser',
-  value: navigator.brave ? 'True' : 'False',
-  issues: [],
-});
-
 const detectTor = () => {
   const date = new Date();
   if (
@@ -298,14 +291,28 @@ const detectTor = () => {
   return false;
 };
 
-const getTor = () => ({
-  key: 'tor',
-  title: 'Tor browser',
-  value: detectTor() ? 'True' : 'False',
-  issues: [],
-});
+// const getTor = () => ({
+//   key: 'tor',
+//   title: 'Tor browser',
+//   value: detectTor() ? 'True' : 'False',
+//   issues: [],
+// });
 
-const getOther = () => [getBrave(), getTor()];
+// const getAdblock = () => ({
+//   key: 'adblock',
+//   title: 'Adblock',
+//   value: Promise.resolve(detectAdblock()),
+//   issues: [],
+// });
+
+// const detectAdblock = () =>
+//   fetch('https://www3.doubleclick.net', {
+//     method: 'HEAD',
+//     mode: 'no-cors',
+//     cache: 'no-store',
+//   });
+
+// const getOther = () => [getBrave(), getTor(), getAdblock()];
 
 // sorts plugins object into comma separated list
 const sortPlugins = (data) => {