zap integration done 🚀

tabarra · Mar 31, 2021 · a170a05 · a170a05
1 parent 6df97d4
commit a170a05
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/dev_notes.md b/dev_notes.md
@@ -19,6 +19,7 @@
 - [x] zap: increase `txAdminVersionBestBy` by 10d when running in zap;
 - [x] zap: Ad placement on login page, main interface (desk/mobile), and home-hosting warning (CLI);
 - [x] make chart available without auth (since its public info anyways) and add thread filter
+> v3.5.0
 - [ ] allow 3 chars admin names NOTE: `\webroutes\adminManager\actions.js` `nameRegex`
 - [ ] disable server auto-start when no admins configured
 - [ ] login page indicate if the `admins.json` file is not found

diff --git a/fxmanifest.lua b/fxmanifest.lua
@@ -5,7 +5,7 @@
 author 'Tabarra'
 description 'Remotely Manage & Monitor your GTA5 FiveM Server'
 repository 'https://github.com/tabarra/txAdmin'
-version '3.5.0-dev'
+version '3.5.0'
 
 rdr3_warning 'I acknowledge that this is a prerelease build of RedM, and I am aware my resources *will* become incompatible once RedM ships.'
 fx_version 'cerulean'

diff --git a/src/index.js b/src/index.js
@@ -198,12 +198,12 @@ if(verbose) dir({isZapHosting, forceInterface, forceFXServerPort, txAdminPort, l
 const txVerBBLastUpdate = 1615200000;
 const txVerBBDelta = 28 + ((isZapHosting)? 10 : 0);
 const txAdminVersionBestBy = txVerBBLastUpdate + (txVerBBDelta * 86400); 
-dir({
-    lastUpdate: new Date(txVerBBLastUpdate*1000).toLocaleString(),
-    nextUpdate: new Date(txAdminVersionBestBy*1000).toLocaleString(),
-    timeUntil: require('humanize-duration')(((now() - txAdminVersionBestBy)*1000)),
-    delta: txVerBBDelta
-})
+// dir({
+//     updateDelta: txVerBBDelta,
+//     lastUpdate: new Date(txVerBBLastUpdate*1000).toLocaleString(),
+//     nextUpdate: new Date(txAdminVersionBestBy*1000).toLocaleString(),
+//     timeUntil: require('humanize-duration')(((now() - txAdminVersionBestBy)*1000)),  
+// })
 if(now() > txAdminVersionBestBy){
     logError(`This version of txAdmin is outdated.`);
     logError(`Please update as soon as possible.`);

diff --git a/version.json b/version.json
@@ -1,5 +1,5 @@
 {
-    "version": "3.4.0",
+    "version": "3.5.0",
     "allVersions": [
         {
             "version": "1.0.1",
@@ -244,6 +244,10 @@
         {
             "version": "3.4.0",
             "changelog": "Preventing DDoS on txAdmin to cause false crash detection. Imporved onboarding experience."
+        },
+        {
+            "version": "3.5.0",
+            "changelog": "Zap integration and minot tweaks, fixes and improvements."
         }
     ]
 }