From ad353d3c65912504e298351252a95479672b7aa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Engin=20=C3=9Cnel?= <engin.uenel502@gmail.com>
Date: Tue, 1 Aug 2023 12:48:51 +0200
Subject: [PATCH] adding allocated resources to node details

---
 package-lock.json                              | 18 +++++++++---------
 src/application/methods/nodes/listNodes.ts     |  4 ++++
 src/application/methods/nodes/nodeDetails.ts   |  4 ++++
 .../methods/servers/createServer.ts            |  2 +-
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bc5fdcb..1717488 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1755,9 +1755,9 @@
       "dev": true
     },
     "node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
       "dev": true,
       "optional": true,
       "dependencies": {
@@ -2412,9 +2412,9 @@
       ]
     },
     "node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
@@ -2738,9 +2738,9 @@
       }
     },
     "node_modules/word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
diff --git a/src/application/methods/nodes/listNodes.ts b/src/application/methods/nodes/listNodes.ts
index 34d14b0..9f33090 100644
--- a/src/application/methods/nodes/listNodes.ts
+++ b/src/application/methods/nodes/listNodes.ts
@@ -16,6 +16,10 @@ interface returnType {
 		maintenance_mode: boolean,
 		memory: number,
 		memory_overallocate: number,
+		allocated_resources: {
+			memory: number,
+			disk: number,
+		},
 		disk: number,
 		disk_overallocate: number,
 		upload_size: number,
diff --git a/src/application/methods/nodes/nodeDetails.ts b/src/application/methods/nodes/nodeDetails.ts
index e786d50..9b94329 100644
--- a/src/application/methods/nodes/nodeDetails.ts
+++ b/src/application/methods/nodes/nodeDetails.ts
@@ -20,6 +20,10 @@ interface returnType {
 	memory_overallocate: number,
 	disk: number,
 	disk_overallocate: number,
+	allocated_resources: {
+		memory: number,
+		disk: number,
+	},
 	upload_size: number,
 	daemon_listen: number,
 	daemon_sftp: number,
diff --git a/src/application/methods/servers/createServer.ts b/src/application/methods/servers/createServer.ts
index ac3293f..ab8eccc 100644
--- a/src/application/methods/servers/createServer.ts
+++ b/src/application/methods/servers/createServer.ts
@@ -158,7 +158,7 @@ function makeData(serverData: serverData, environment = {}) {
 			'VERSION': serverData.version,
 			'QUERY_PORT': '10101',
 			'FILE_PORT': '303030',
-			'SERVER_MOTD': 'TeaSpeak\n\rHosted on PureNodes!',
+			'SERVER_MOTD': 'TeaSpeak',
 			'LD_PRELOAD': './libs/libjemalloc.so.2',
 			'MATCH': 'ts3-manager-linux-x64',
 			'GITHUB_PACKAGE': 'joni1802/ts3-manager',