Updated with new API

AdamT20054 · May 29, 2022 · fa05e89 · fa05e89
1 parent 00d59f0
commit fa05e89
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 16 deletions.
diff --git a/.vs/GasWatch/FileContentIndex/0ba60dce-19f1-4007-a668-7b6fbe2c0e08.vsidx b/.vs/GasWatch/FileContentIndex/0ba60dce-19f1-4007-a668-7b6fbe2c0e08.vsidx
diff --git a/.vs/GasWatch/FileContentIndex/read.lock b/.vs/GasWatch/FileContentIndex/read.lock
diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
diff --git a/cooldownvalue.json b/cooldownvalue.json
@@ -1 +1 @@
-3600000
+3600000
diff --git a/gasvalue.json b/gasvalue.json
@@ -1 +1 @@
-70
+200
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/Events/ready.js b/src/Events/ready.js
@@ -15,11 +15,9 @@ module.exports = new Event("ready", client => {
     let i = 0 // for the alternating status
     try {
         setInterval(async () => {
-            const slow = await axios.get(`https://ethergas.io/low`);
-            const standard = await axios.get(`https://ethergas.io/standard`);
-            const fastest = await axios.get(`https://ethergas.io/fast`);      
+            const res = await `https://www.ethgasstation.info/api/ethgasAPI.json`;  
 
-            client.user.setActivity(`${fastest.data} | ${standard.data} | ${slow.data}`)
+            client.user.setActivity(`${res.data.fastest} | ${res.data.average} | ${res.data.slow}`)
 
         }, 15000);
     }

diff --git a/src/Structures/Client.js b/src/Structures/Client.js
@@ -47,17 +47,18 @@ class Client extends Discord.Client {
 	async watchGas() {
 		const res = await axios.get(this.endpoint).catch(console.error);
 		const gasvalue = fs.readFileSync("gasvalue.json").toString();
+        console.log(res)
 
         if (!res)
             return setTimeout(() => { this.watchGas(); }, 500000);
 
-		const gas = res.data;
+		const gas = res.data.average;
 
 		if ((gas) <= gasvalue && (ping() == true )) {
 			cooldownfunc()
-			const slow = await axios.get(`https://ethergas.io/low`);
-            const standard = await axios.get(`https://ethergas.io/standard`);
-            const fastest = await axios.get(`https://ethergas.io/fast`);      
+			const slow = res.data.safelow;
+            const standard = res.data.average;
+            const fastest = res.data.fastest;      
 
 			// Construct embed
 			const pingEmbed = new Discord.MessageEmbed();
@@ -66,15 +67,15 @@ class Client extends Discord.Client {
                 .setColor("#00FFFF")
 				.addFields({
 					name: "Fastest",
-					value: `${fastest.data}`,
+					value: `${fastest}`,
 					inline: true
 				},{
 					name: "Standard",
-					value: `${standard.data}`,
+					value: `${standard}`,
 					inline: true
 				}, {
 					name: "Slowest",
-					value: `${slow.data}`,
+					value: `${slow}`,
 					inline: true
 				});
 
@@ -89,7 +90,7 @@ class Client extends Discord.Client {
 	}
 
 	get endpoint() {
-		return `https://ethergas.io/standard`;
+		return `https://www.ethgasstation.info/api/ethgasAPI.json`;
 	}
 
 	start(token) {