Merge pull request #11 from marcmascarell/dev

Fix destroyable servers query
marcmascarell · May 19, 2018 · d1e7d23 · d1e7d23
2 parents cb84841 + 726f66d
commit d1e7d23
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 9 deletions.
diff --git a/src/Models/Server.ts b/src/Models/Server.ts
@@ -50,7 +50,8 @@ export default class Server extends Model {
                         .query()
                         .where('id', match.server.id)
                         .update({
-                            destroyed_at: moment().format('YYYY-MM-DD HH:mm:ss')
+                            destroyed_at: moment().format('YYYY-MM-DD HH:mm:ss'),
+                            status: 'destroyed'
                         })
             })
             .catch((e : Error) => {

diff --git a/src/Seeds/matches.js b/src/Seeds/matches.js
@@ -15,7 +15,7 @@ exports.seed = function(knex, Promise) {
                     last_activity_at: moment().format('YYYY-MM-DD HH:mm:ss'),
                     guild_id: '439806672911859713',
                     channel_id: '439806672911859717',
-                    maps: 'carentan,harbor'
+                    maps: 'germantown,carentan,harbor'
                 },
                 {
                     id: 2,

diff --git a/src/Types/MapArgumentType.ts b/src/Types/MapArgumentType.ts
@@ -39,16 +39,20 @@ export default class MapArgumentType extends ArgumentType {
 
     static get maps() : Array<string> {
         return [
+            // Active map pool 7 maps (7/11)
             'Carentan',
             'Dawnville',
             'Harbor',
             'Neuville',
             'Railyard',
+            'Depot',
+            'GermanTown',
 
+            // 'Container',
+            // 'Priory',
             // 'Brecourt',
-            // 'Depot',
             // 'Tigertown',
-            //
+
             // 'Pavlov',
             // 'POW Camp',
             // 'Stalingrad',

diff --git a/src/secrets.example.ts b/src/secrets.example.ts
@@ -1,11 +1,10 @@
-export default {
+const secrets = {
     passwordSalt: '',
     rconSalt: '',
     discordOwner: '',
     discordToken: '',
     digitalOceanToken: '',
     jsonStore: '',
-
     discordAdmins: [],
     discordModerators: [],
 
@@ -14,5 +13,9 @@ export default {
         development: [
             '' // guild id
         ]
-    }
+    },
+
+    firebase: {}
 }
+
+export default secrets
diff --git a/src/tasks.ts b/src/tasks.ts
@@ -19,7 +19,7 @@ const lookForDestroyableServers = () => {
         .query()
         .where('destroy_at', '<', moment().format('YYYY-MM-DD HH:mm:ss'))
         .where('destroyed_at', null)
-        .where('ip', '!=', null)
+        .whereNotNull('ip')
         .where('user_id', null) // user provided servers can't be destroyed
         .then(servers => {
             if (servers.length) {
@@ -34,7 +34,7 @@ const lookForDestroyableServers = () => {
 
                     const gameState = await Gamedig.query({
                         type: 'cod',
-                        host: serverInfo[0], // Mugs server
+                        host: serverInfo[0],
                         port: serverInfo[1]
                     })