Merge pull request #23 from Mr-Smarty/main

Command count for stats
mebrooks01 · Jun 12, 2021 · 1b0ef2b · 1b0ef2b
2 parents 1677594 + 5497777
commit 1b0ef2b
Show file tree

Hide file tree

Showing 38 changed files with 56 additions and 81 deletions.
diff --git a/commands/Missions/mars.js b/commands/Missions/mars.js
@@ -1,7 +1,6 @@
 const { Command } = require('discord.js-commando')
 const config = require('$root/config.json')
 const mission = require('$root/mission.json')
-const count = require('$util/count')
 
 module.exports = class Mars extends Command {
   constructor(client) {
@@ -16,7 +15,7 @@ module.exports = class Mars extends Command {
   }
 
   run(message) {
-    count.cmdRun(this.name, this.group, message)
+    this.client.cmdCount.run(this.name, this.group, message)
     let info = mission.other.mars
 
     message.embed({

diff --git a/commands/Rovers/curiosity.js b/commands/Rovers/curiosity.js
@@ -2,7 +2,6 @@ const { Command } = require('discord.js-commando')
 const axios = require('axios')
 const config = require('$root/config.json')
 const mission = require('$root/mission.json')
-const count = require('$util/count')
 
 module.exports = class Curiosity extends Command {
   constructor(client) {
@@ -39,7 +38,7 @@ module.exports = class Curiosity extends Command {
   }
 
   run(message, { type, sol, result_number }) {
-    count.cmdRun(this.name, this.group, message)
+    this.client.cmdCount.run(this.name, this.group, message)
 
     let info = mission.rover.curiosity
 

diff --git a/commands/Rovers/opportunity.js b/commands/Rovers/opportunity.js
@@ -2,7 +2,6 @@ const { Command } = require('discord.js-commando')
 const axios = require('axios')
 const config = require('$root/config.json')
 const mission = require('$root/mission.json')
-const count = require('$util/count')
 
 module.exports = class Opportunity extends Command {
   constructor(client) {
@@ -39,7 +38,7 @@ module.exports = class Opportunity extends Command {
   }
 
   run(message, { type, sol, result_number }) {
-    count.cmdRun(this.name, this.group, message)
+    this.client.cmdCount.run(this.name, this.group, message)
 
     let info = mission.rover.opportunity
 

diff --git a/commands/Rovers/perseverance.js b/commands/Rovers/perseverance.js
@@ -2,7 +2,6 @@ const { Command } = require('discord.js-commando')
 const axios = require('axios')
 const config = require('$root/config.json')
 const mission = require('$root/mission.json')
-const count = require('$util/count')
 
 module.exports = class Perseverance extends Command {
   constructor(client) {
@@ -39,7 +38,7 @@ module.exports = class Perseverance extends Command {
   }
 
   run(message, { type, sol, result_number }) {
-    count.cmdRun(this.name, this.group, message)
+    this.client.cmdCount.run(this.name, this.group, message)
 
     let info = mission.rover.perseverance
 

diff --git a/commands/Rovers/spirit.js b/commands/Rovers/spirit.js
@@ -2,7 +2,6 @@ const { Command } = require('discord.js-commando')
 const axios = require('axios')
 const config = require('$root/config.json')
 const mission = require('$root/mission.json')
-const count = require('$util/count')
 
 module.exports = class NAME extends Command {
   constructor(client) {
@@ -39,7 +38,7 @@ module.exports = class NAME extends Command {
   }
 
   run(message, { type, sol, result_number }) {
-    count.cmdRun(this.name, this.group, message)
+    this.client.cmdCount.run(this.name, this.group, message)
 
     let info = mission.rover.spirit
 

diff --git a/commands/missions/climate-orbiter.js b/commands/missions/climate-orbiter.js
@@ -16,7 +16,7 @@ module.exports = class ClimateOrbiter extends Command {
   }
 
   run(message) {
-    count.cmdRun(this.name, this.group, message)
+    this.client.cmdCount.run(this.name, this.group, message)
     let info = mission.missions.climate_orbiter
 
     message.embed({

diff --git a/commands/missions/exomars.js b/commands/missions/exomars.js
@@ -1,7 +1,6 @@
 const { Command } = require('discord.js-commando')
 const config = require('$root/config.json')
 const mission = require('$root/mission.json')
-const count = require('$util/count')
 
 module.exports = class ExoMars extends Command {
   constructor(client) {
@@ -17,7 +16,7 @@ module.exports = class ExoMars extends Command {
   }
 
   run(message) {
-    count.cmdRun(this.name, this.group, message)
+    this.client.cmdCount.run(this.name, this.group, message)
     let info = mission.missions.exomars
 
     message.embed({

diff --git a/commands/missions/global-surveyor.js b/commands/missions/global-surveyor.js
@@ -1,6 +1,5 @@
 const { Command } = require('discord.js-commando')
 const config = require('$root/config.json')
-const count = require('$util/count')
 
 module.exports = class globalsurveyor extends Command {
   constructor(client) {
@@ -16,7 +15,7 @@ module.exports = class globalsurveyor extends Command {
   }
 
   run(message) {
-    count.cmdRun(this.name, this.group, message)
+    this.client.cmdCount.run(this.name, this.group, message)
     let info = mission.missions.global_surveyor
 
     message.embed({

diff --git a/commands/missions/mariner.js b/commands/missions/mariner.js
@@ -1,7 +1,6 @@
 const { Command } = require('discord.js-commando')
 const config = require('$root/config.json')
 const mission = require('$root/mission.json')
-const count = require('$util/count')
 
 module.exports = class mariner extends Command {
   constructor(client) {
@@ -17,7 +16,7 @@ module.exports = class mariner extends Command {
   }
 
   run(message) {
-    count.cmdRun(this.name, this.group, message)
+    this.client.cmdCount.run(this.name, this.group, message)
     let info = mission.missions.mariner
 
     message.embed({

diff --git a/commands/missions/mars-express.js b/commands/missions/mars-express.js
@@ -1,7 +1,6 @@
 const { Command } = require('discord.js-commando')
 const config = require('$root/config.json')
 const mission = require('$root/mission.json')
-const count = require('$util/count')
 
 module.exports = class MarsExpress extends Command {
   constructor(client) {
@@ -17,7 +16,7 @@ module.exports = class MarsExpress extends Command {
   }
 
   run(message) {
-    count.cmdRun(this.name, this.group, message)
+    this.client.cmdCount.run(this.name, this.group, message)
     let info = mission.missions.express
 
     message.embed({

diff --git a/commands/missions/maven.js b/commands/missions/maven.js
@@ -1,7 +1,6 @@
 const { Command } = require('discord.js-commando')
 const config = require('$root/config.json')
 const mission = require('$root/mission.json')
-const count = require('$util/count')
 
 module.exports = class Maven extends Command {
   constructor(client) {
@@ -16,7 +15,7 @@ module.exports = class Maven extends Command {
   }
 
   run(message) {
-    count.cmdRun(this.name, this.group, message)
+    this.client.cmdCount.run(this.name, this.group, message)
     let info = mission.missions.maven
 
     message.embed({

diff --git a/commands/missions/mro.js b/commands/missions/mro.js
@@ -1,7 +1,6 @@
 const { Command } = require('discord.js-commando')
 const config = require('$root/config.json')
 const mission = require('$root/mission.json')
-const count = require('$util/count')
 
 module.exports = class MRO extends Command {
   constructor(client) {
@@ -16,7 +15,7 @@ module.exports = class MRO extends Command {
   }
 
   run(message) {
-    count.cmdRun(this.name, this.group, message)
+    this.client.cmdCount.run(this.name, this.group, message)
     let info = mission.missions.mro
 
     message.embed({

diff --git a/commands/missions/observer.js b/commands/missions/observer.js
@@ -1,7 +1,6 @@
 const { Command } = require('discord.js-commando')
 const config = require('$root/config.json')
 const mission = require('$root/mission.json')
-const count = require('$util/count')
 
 module.exports = class Observer extends Command {
   constructor(client) {
@@ -16,7 +15,7 @@ module.exports = class Observer extends Command {
   }
 
   run(message) {
-    count.cmdRun(this.name, this.group, message)
+    this.client.cmdCount.run(this.name, this.group, message)
     let info = mission.missions.observer
 
     message.embed({

diff --git a/commands/missions/odyssey.js b/commands/missions/odyssey.js
@@ -1,7 +1,6 @@
 const { Command } = require('discord.js-commando')
 const config = require('$root/config.json')
 const mission = require('$root/mission.json')
-const count = require('$util/count')
 
 module.exports = class Odyssey extends Command {
   constructor(client) {
@@ -16,7 +15,7 @@ module.exports = class Odyssey extends Command {
   }
 
   run(message) {
-    count.cmdRun(this.name, this.group, message)
+    this.client.cmdCount.run(this.name, this.group, message)
     let info = mission.missions.odyssey
 
     message.embed({

diff --git a/commands/missions/pathfinder.js b/commands/missions/pathfinder.js
@@ -1,7 +1,6 @@
 const { Command } = require('discord.js-commando')
 const config = require('$root/config.json')
 const mission = require('$root/mission.json')
-const count = require('$util/count')
 
 module.exports = class Pathfinder extends Command {
   constructor(client) {
@@ -16,7 +15,7 @@ module.exports = class Pathfinder extends Command {
   }
 
   run(message) {
-    count.cmdRun(this.name, this.group, message)
+    this.client.cmdCount.run(this.name, this.group, message)
     let info = mission.missions.pathfinder
 
     message.embed({

diff --git a/commands/missions/phoenix.js b/commands/missions/phoenix.js
@@ -1,7 +1,6 @@
 const { Command } = require('discord.js-commando')
 const config = require('$root/config.json')
 const mission = require('$root/mission.json')
-const count = require('$util/count')
 
 module.exports = class NAME extends Command {
   constructor(client) {
@@ -16,7 +15,7 @@ module.exports = class NAME extends Command {
   }
 
   run(message) {
-    count.cmdRun(this.name, this.group, message)
+    this.client.cmdCount.run(this.name, this.group, message)
     let info = mission.missions.phoenix
 
     message.embed({

diff --git a/commands/missions/polar-lander.js b/commands/missions/polar-lander.js
@@ -1,7 +1,6 @@
 const { Command } = require('discord.js-commando')
 const config = require('$root/config.json')
 const mission = require('$root/mission.json')
-const count = require('$util/count')
 
 module.exports = class NAME extends Command {
   constructor(client) {
@@ -17,7 +16,7 @@ module.exports = class NAME extends Command {
   }
 
   run(message) {
-    count.cmdRun(this.name, this.group, message)
+    this.client.cmdCount.run(this.name, this.group, message)
     let info = mission.missions.polar
 
     message.embed({

diff --git a/commands/missions/viking.js b/commands/missions/viking.js
@@ -1,7 +1,6 @@
 const { Command } = require('discord.js-commando')
 const config = require('$root/config.json')
 const mission = require('$root/mission.json')
-const count = require('$util/count')
 
 module.exports = class NAME extends Command {
   constructor(client) {
@@ -17,7 +16,7 @@ module.exports = class NAME extends Command {
   }
 
   run(message) {
-    count.cmdRun(this.name, this.group, message)
+    this.client.cmdCount.run(this.name, this.group, message)
     let info = mission.missions.mro
 
     message.embed({

diff --git a/commands/search/apod.js b/commands/search/apod.js
@@ -1,7 +1,6 @@
 const { Command } = require('discord.js-commando')
 const axios = require('axios')
 const config = require('$root/config.json')
-const count = require('$util/count')
 let img = ''
 
 module.exports = class APOD extends Command {
@@ -17,7 +16,7 @@ module.exports = class APOD extends Command {
   }
 
   run(message) {
-    count.cmdRun(this.name, this.group, message)
+    this.client.cmdCount.run(this.name, this.group, message)
 
     axios
       .get(`https://api.nasa.gov/planetary/apod?api_key=${config.api_key}`)

diff --git a/commands/search/image.js b/commands/search/image.js
@@ -3,7 +3,6 @@ const axios = require('axios')
 const moment = require('moment')
 const config = require('$root/config.json')
 const mission = require('$root/mission.json')
-const count = require('$util/count')
 
 module.exports = class Image extends Command {
   constructor(client) {
@@ -58,7 +57,7 @@ module.exports = class Image extends Command {
   run(message, { rover, date, camera, result_number }) {
     if (camera == undefined) camera = 'all'
 
-    count.cmdRun(this.name, this.group, message)
+    this.client.cmdCount.run(this.name, this.group, message)
     let url = `https://api.nasa.gov/mars-photos/api/v1/rovers/${rover}/photos?`
     let date_mod = date.replace('/', '-')
 

diff --git a/commands/search/insight.js b/commands/search/insight.js
@@ -2,7 +2,6 @@ const { Command } = require('discord.js-commando')
 const axios = require('axios')
 const config = require('$root/config.json')
 const mission = require('$root/mission.json')
-const count = require('$util/count')
 
 module.exports = class Insight extends Command {
   constructor(client) {
@@ -28,7 +27,7 @@ module.exports = class Insight extends Command {
   }
 
   run(message, { type }) {
-    count.cmdRun(this.name, this.group, message)
+    this.client.cmdCount.run(this.name, this.group, message)
 
     let info = mission.other.insight
 

diff --git a/commands/search/manifest.js b/commands/search/manifest.js
@@ -2,7 +2,6 @@ const { Command } = require('discord.js-commando')
 const axios = require('axios')
 const config = require('$root/config.json')
 const mission = require('$root/mission.json')
-const count = require('$util/count')
 
 module.exports = class Manifest extends Command {
   constructor(client) {
@@ -33,7 +32,7 @@ module.exports = class Manifest extends Command {
   }
 
   run(message, { rover, sol }) {
-    count.cmdRun(this.name, this.group, message)
+    this.client.cmdCount.run(this.name, this.group, message)
 
     axios
       .get(`https://api.nasa.gov/mars-photos/api/v1/manifests/${rover}?api_key=${config.api_key}`)

diff --git a/commands/search/search.js b/commands/search/search.js
@@ -1,7 +1,6 @@
 const { Command } = require('discord.js-commando')
 const axios = require('axios')
 const config = require('$root/config.json')
-const count = require('$util/count')
 
 module.exports = class Search extends Command {
   constructor(client) {
@@ -24,7 +23,7 @@ module.exports = class Search extends Command {
   }
 
   run(message, { search_term }) {
-    count.cmdRun(this.name, this.group, message)
+    this.client.cmdCount.run(this.name, this.group, message)
 
     axios
       .get('https://images-api.nasa.gov/search?q=' + search_term)

diff --git a/commands/util/bug.js b/commands/util/bug.js
@@ -1,7 +1,6 @@
 const { Command } = require('discord.js-commando')
 const config = require('$root/config.json')
 const mission = require('$root/mission.json')
-const count = require('$util/count')
 
 module.exports = class Bug extends Command {
   constructor(client) {
@@ -17,7 +16,7 @@ module.exports = class Bug extends Command {
   }
 
   run(message) {
-    count.cmdRun(this.name, this.group, message)
+    this.client.cmdCount.run(this.name, this.group, message)
     let info = mission.other.bug
 
     message.embed({