feat: flexibilized ad options

Author: tabarra

core/components/DynamicAds.js

@@ -3,6 +3,7 @@ import xss from 'xss';
 import defaultAds from '../../dynamicAds.json';
 import got from '@core/extras/got.js';
 import consoleFactory from '@extras/console';
+import { convars } from '@core/globalData';
 const console = consoleFactory(modulename);
 
 
@@ -24,10 +25,18 @@ export default class DynamicAds {
         this.adOptions = false;
 
         //Set default ads
-        if (Array.isArray(defaultAds.login) && Array.isArray(defaultAds.main)) {
+        let loginAds, mainAds;
+        if(convars.isZapHosting){
+            loginAds = defaultAds.loginZap;
+            mainAds = defaultAds.mainZap;
+        } else {
+            loginAds = defaultAds.login;
+            mainAds = defaultAds.main;
+        }
+        if (Array.isArray(loginAds) && Array.isArray(mainAds)) {
             this.adOptions = {
-                login: cleanAds(defaultAds.login),
-                main: cleanAds(defaultAds.main),
+                login: cleanAds(loginAds),
+                main: cleanAds(mainAds),
             };
         }
 
@@ -46,10 +55,18 @@ export default class DynamicAds {
         const indexURL = 'https://raw.githubusercontent.com/tabarra/txAdmin/master/dynamicAds.json';
         try {
             const res = await got(indexURL).json();
-            if (Array.isArray(defaultAds.login) && Array.isArray(defaultAds.main)) {
+            let loginAds, mainAds;
+            if(convars.isZapHosting){
+                loginAds = res.loginZap;
+                mainAds = res.mainZap;
+            } else {
+                loginAds = res.login;
+                mainAds = res.main;
+            }
+            if (Array.isArray(loginAds) && Array.isArray(mainAds)) {
                 this.adOptions = {
-                    login: cleanAds(res.login),
-                    main: cleanAds(res.main),
+                    login: cleanAds(loginAds),
+                    main: cleanAds(mainAds),
                 };
                 this.adIndex = {
                     login: 0,

docs/dev_notes.md

@@ -108,7 +108,7 @@
 
 - [x] bot should check if it has any dangerous permission
 - [x] improve zap/ptero detection
-- [ ] flexibilized ad options
+- [x] flexibilized ad options
 - [ ] stats: 
     - [ ] adapt the new runtime specs, separate temp stats from classic stats
     - [ ] add bot enabled / whitelist back into stats

dynamicAds.json

@@ -15,5 +15,22 @@
             "linkDesktop": "http://zap-hosting.com/txAdmin5",
             "linkMobile": "http://zap-hosting.com/txAdmin7"
         }
+    ],
+    "loginZap": [
+        {
+            "text": "DDoS protected & preconfigured FiveM txAdmin servers",
+            "logoLightMode": "img/zap256_black.png",
+            "logoDarkMode": "img/zap256_white.png",
+            "link": "http://zap-hosting.com/txAdmin3"
+        }
+    ],
+    "mainZap": [
+        {
+            "text": "DDoS protected & preconfigured <br> FiveM txAdmin servers",
+            "logoLightMode": "img/zap256_black.png",
+            "logoDarkMode": "img/zap256_white.png",
+            "linkDesktop": "http://zap-hosting.com/txAdmin5",
+            "linkMobile": "http://zap-hosting.com/txAdmin7"
+        }
     ]
 }