Added exclude admin coins

Author: BolverBlitz

.env.example

@@ -2,7 +2,9 @@ DB_HOST=localhost
 DB_USER=
 DB_PASSWORD=
 DB_DATABASE=
+
 CheckDelayInMS=10000
+ExcludeAdminCoins=true
 
 Influx_Host=
 Influx_Protocol=

README.md

@@ -79,7 +79,9 @@ DB_HOST=localhost
 DB_USER=dashboarduser
 DB_PASSWORD=mysecretpassword
 DB_DATABASE=dashboard
+
 CheckDelayInMS=10000
+ExcludeAdminCoins=true // If true, the admin coins will not be shown in the stats.
 
 Influx_Host=InfluxDB Ip
 Influx_Protocol=http
@@ -89,6 +91,9 @@ Influx_Token=The token that you put into grafana data source
 orga=YourOrga
 bucket=YourDefaultBucket
 host=Dashboard
+
+PteroStatusURL= //Pterostatus URL (with protocol and port, like http://myserver.com:8080)
+PteroStatusToken= //Barer Token for the Pterostatus API
 ```
 4. Install node modules and setup pm2
 ```sh

lib/db/mysql.js

@@ -50,7 +50,7 @@ let GetAllUsers = function () {
 				console.log(err);
 				throw new Error("Error in MYSQL Connection" + err);
 			}
-			connection.query('SELECT credits, server_limit, email_verified_at, discord_verified_at, ip, suspended FROM users;', function (err, rows, fields) {
+			connection.query('SELECT credits, server_limit, email_verified_at, discord_verified_at, ip, suspended, role FROM users;', function (err, rows, fields) {
 				connection.release();
 				if (Object.entries(rows).length === 0) {
 					reject(0);

src/collectStats.js

@@ -1,59 +1,61 @@
 const geoip = require('geoip-country');
 const db = require('../lib/db/mysql');
 const pterostatus = require('../lib/pterostatus')
-const DBDelay = Number(process.env.CheckDelayInMS)/1000;
+const DBDelay = Number(process.env.CheckDelayInMS) / 1000;
 
-let StatsCollector = function() {
-	return new Promise(function(resolve, reject) {
+let StatsCollector = function () {
+    return new Promise(function (resolve, reject) {
         const Promisees = [db.GetAllUsers(), db.GetAllServers(), db.GetAllProducts(), db.GetFailedJobsSinceLastCheck(DBDelay)];
 
-        if(process.env.PteroStatusURL) {
+        if (process.env.PteroStatusURL) {
             Promisees.push(pterostatus.GetPteroStatusData())
         }
-        
+
         try {
-            Promise.all(Promisees).then(function(values) {
+            Promise.all(Promisees).then(function (values) {
                 const Users = values[0];
                 const Servers = values[1];
                 const Products = values[2];
                 const FailedJobs = values[3];
                 let PteroStatusData = {};
-                if(process.env.PteroStatusURL) {
-                    PteroStatusData = values[values.length-1];
+                if (process.env.PteroStatusURL) {
+                    PteroStatusData = values[values.length - 1];
                 }
-                
+
                 let [TotalCoins, TotalSuspendedUsers, TotalAllowedServers, TotalVerifiedUsers, TotalVerifiedDiscordUsers, TotalCPU, TotalRAM, TotalSWAP, TotalDisk, TotalAllocations, TotalDB, TotalServerCostMonthly, ServerSuspended] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
                 let UserCountrys = [];
                 let ServerProducts = [];
 
-                Users.map(function(User) {
-                    if(User.suspended === 0){
-                        TotalCoins += User.credits;
+                Users.map(function (User) {
+                    if (User.suspended === 0) {
+                        if (process.env.ExcludeAdminCoins !== 'true' || User.role !== "admin") {
+                            TotalCoins += User.credits;
+                        }
                         TotalAllowedServers += User.server_limit;
 
-                        if(User.email_verified_at !== null){
+                        if (User.email_verified_at !== null) {
                             TotalVerifiedUsers += 1;
                         }
 
-                        if(User.discord_verified_at !== null){
+                        if (User.discord_verified_at !== null) {
                             TotalVerifiedDiscordUsers += 1;
                         }
 
-                        if(User.ip !== null && geoip.lookup(User.ip)){
+                        if (User.ip !== null && geoip.lookup(User.ip)) {
                             UserCountrys.push(geoip.lookup(User.ip).country);
-                        }else{
-                           UserCountrys.push("Local");
+                        } else {
+                            UserCountrys.push("Local");
                         }
 
-                    }else{
+                    } else {
                         TotalSuspendedUsers += 1;
                     }
                 });
 
-                Servers.map(function(Server) {
-                    if(Server.suspended === null){
-                        Products.map(function(Product) {
-                            if(Server.product_id === Product.id){
+                Servers.map(function (Server) {
+                    if (Server.suspended === null) {
+                        Products.map(function (Product) {
+                            if (Server.product_id === Product.id) {
                                 TotalCPU += Product.cpu;
                                 TotalRAM += Product.memory;
                                 TotalSWAP += Product.swap;
@@ -62,13 +64,13 @@ let StatsCollector = function() {
                                 TotalAllocations += Product.allocations;
                                 TotalServerCostMonthly += Product.price;
                                 ServerProducts.push(Product.name);
-                            } 
+                            }
                         })
-                    }else{
+                    } else {
                         ServerSuspended += 1;
                     }
                 });
-                
+
                 const UserCountrysObject = UserCountrys.reduce(function (acc, curr) {
                     return acc[curr] ? ++acc[curr] : acc[curr] = 1, acc
                 }, {})
@@ -107,14 +109,18 @@ let StatsCollector = function() {
                         Failed: FailedJobs[0]['COUNT(*)'],
                     }
                 }
-                
-                if(process.env.PteroStatusURL) {
+
+                if (process.env.PteroStatusURL) {
                     ExportStats["PteroStatus"] = PteroStatusData;
                 }
-                
+
                 resolve(ExportStats);
-            }).catch(function(err) {
-                console.log(err);
+            }).catch(function (err) {
+                if (err.response.status === 403) {
+                    console.log("PteroStatus API Key is invalid");
+                } else {
+                    console.log(err);
+                }
             });
         } catch (error) {
             reject(error);