From 67ef6085cef3bd0517fe1e64fb0f8a201715669d Mon Sep 17 00:00:00 2001
From: Miodec <bartnikjack@gmail.com>
Date: Thu, 14 Jul 2022 15:19:13 +0200
Subject: [PATCH] initialising at the beginning

---
 frontend/src/ts/controllers/ad-controller.ts | 38 +++++++++-----------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/frontend/src/ts/controllers/ad-controller.ts b/frontend/src/ts/controllers/ad-controller.ts
index dfef11028..aee752f62 100644
--- a/frontend/src/ts/controllers/ad-controller.ts
+++ b/frontend/src/ts/controllers/ad-controller.ts
@@ -8,9 +8,8 @@ import * as TestActive from "../states/test-active";
 const breakpoint = 900;
 let widerThanBreakpoint = true;
 
-let initialised = false;
-
 export function init(): void {
+  if (Config.ads === "off") return;
   $("head").append(`<script>
 !function(e){var s=new XMLHttpRequest;s.open("GET","https://api.enthusiastgaming.net/scripts/cdn.enthusiast.gg/script/eg-aps/release/eg-aps-bootstrap-v2.0.0.bundle.js?site=monkeytype.com",!0),s.onreadystatechange=function(){var t;4==s.readyState&&(200<=s.status&&s.status<300||304==s.status)&&((t=e.createElement("script")).type="text/javascript",t.text=s.responseText,e.head.appendChild(t))},s.send(null)}(document);
 (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
@@ -29,8 +28,6 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
     }
     refreshVisible();
   }, 30000);
-
-  initialised = true;
 }
 
 export function removeAll(): void {
@@ -112,10 +109,6 @@ export async function refreshVisible(): Promise<void> {
 
 export function reinstate(): boolean {
   if (Config.ads === "off") return false;
-  if (!initialised) {
-    init();
-    return true;
-  }
   try {
     //@ts-ignore
     window.egAps.reinstate();
@@ -128,9 +121,6 @@ export function reinstate(): boolean {
 
 export async function renderResult(): Promise<void> {
   if (Config.ads === "off") return;
-  if (!initialised) {
-    init();
-  }
   if (widerThanBreakpoint) {
     // $("#ad-result-wrapper").html(`
     // <div class="icon"><i class="fas fa-ad"></i></div>
@@ -171,18 +161,24 @@ $(window).on("resize", () => {
   debouncedBreakpointUpdate();
 });
 
-ConfigEvent.subscribe((event, value) => {
-  if (event === "ads") {
-    if (value == "off") {
-      removeAll();
-    } else if (value == "result") {
-      removeSellout();
-      removeOn();
-    } else if (value == "on") {
-      removeSellout();
+ConfigEvent.subscribe(
+  (event, _newvalue, _nosave, _previousValue, fullConfig) => {
+    if (!fullConfig) return;
+    if (event === "configApplied") {
+      if (fullConfig.ads !== "off") {
+        init();
+      }
+      if (fullConfig.ads === "off") {
+        removeAll();
+      } else if (fullConfig.ads === "result") {
+        removeSellout();
+        removeOn();
+      } else if (fullConfig.ads === "on") {
+        removeSellout();
+      }
     }
   }
-});
+);
 
 BannerEvent.subscribe(() => {
   updateVerticalMargin();