feat: add config to set scanner cooldown by role

example config setup (scanZone accepts the same format) "scanNext": { ... // Discord roles that will be allowed to use scanNext "discordRoles": ["Supporter","Scanner", "Mod"], // Default cooldown if no role specific cooldown "userCooldownSeconds": 60, //List of role/cooldown pair shortest matching time will apply "discordRoleCooldown":[["Supporter",30],["Mod",0]], ... } Expected outcome: Supporter: 30 second cooldown Mod: 0 second cooldown Scanner: will get the default 60 second cooldown. Supporter & Mod role: the lower 0 second cooldown would apply.
WatWowMap · May 21, 2024 · 47cbbdb · 47cbbdb
1 parent 8be85b6
commit 47cbbdb
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 11 deletions.
diff --git a/packages/types/lib/server.d.ts b/packages/types/lib/server.d.ts
@@ -174,6 +174,7 @@ export interface Permissions {
   scanner: string[]
   areaRestrictions: string[]
   webhooks: string[]
+  scannerCooldowns: string[]
 }
 
 export interface Waypoint {

diff --git a/server/src/configs/default.json b/server/src/configs/default.json
@@ -615,6 +615,7 @@
       "pokemon": false,
       "gmf": true,
       "scanNextInstance": "scanNext",
+      "rules": [],
       "scanNextDevice": "Device01",
       "scanNextSleeptime": 5,
       "userCooldownSeconds": 0,
@@ -634,6 +635,7 @@
       "gmf": false,
       "scanZoneMaxSize": 10,
       "userCooldownSeconds": 0,
+      "rules": [],
       "advancedScanZoneOptions": false,
       "scanZoneRadius": {
         "pokemon": 70,
@@ -1025,4 +1027,4 @@
       "tracesSampleRate": 0.1
     }
   }
-}
+}
diff --git a/server/src/graphql/resolvers.js b/server/src/graphql/resolvers.js
@@ -384,15 +384,19 @@ const resolvers = {
               gymRadius: scanner.scanZone.scanZoneRadius.gym,
               spacing: scanner.scanZone.scanZoneSpacing,
               maxSize: scanner.scanZone.scanZoneMaxSize,
-              cooldown: scanner.scanZone.userCooldownSeconds,
+              cooldown:
+                perms?.scannerCooldowns?.[mode] ||
+                scanner.scanZone.userCooldownSeconds,
               refreshQueue: scanner.backendConfig.queueRefreshInterval,
               enabled: scanner[mode].enabled,
             }
           : {
               scannerType: scanner.backendConfig.platform,
               showScanCount: scanner.scanNext.showScanCount,
               showScanQueue: scanner.scanNext.showScanQueue,
-              cooldown: scanner.scanNext.userCooldownSeconds,
+              cooldown:
+                perms?.scannerCooldowns?.[mode] ||
+                scanner.scanZone.userCooldownSeconds,
               refreshQueue: scanner.backendConfig.queueRefreshInterval,
               enabled: scanner[mode].enabled,
             }
@@ -597,11 +601,11 @@ const resolvers = {
         (!req.session.cooldown || req.session.cooldown < Date.now())
       ) {
         const validCoords = getValidCoords(category, data?.scanCoords, perms)
-
+        const cooldownSeconds =
+          perms?.scannerCooldowns?.[category] ||
+          config.getSafe(`scanner.${category}.userCooldownSeconds`)
         const cooldown =
-          config.getSafe(`scanner.${category}.userCooldownSeconds`) *
-            validCoords.filter(Boolean).length *
-            1000 +
+          cooldownSeconds * validCoords.filter(Boolean).length * 1000 +
           Date.now()
         req.session.cooldown = cooldown
         return scannerApi(

diff --git a/server/src/services/DiscordClient.js b/server/src/services/DiscordClient.js
@@ -129,17 +129,23 @@ class DiscordClient {
       webhooks: new Set(),
       scanner: new Set(),
       blockedGuildNames: new Set(),
+      rules: new Map(),
     }
     const scanner = config.getSafe('scanner')
+    perms.scannerCooldowns = {}
+
     try {
       const guilds = user.guilds.map((guild) => guild.id)
       if (this.strategy.allowedUsers.includes(user.id)) {
         Object.keys(this.perms).forEach((key) => (perms[key] = true))
         perms.admin = true
         config.getSafe('webhooks').forEach((x) => permSets.webhooks.add(x.name))
-        Object.keys(scanner).forEach(
-          (x) => scanner[x]?.enabled && permSets.scanner.add(x),
-        )
+        Object.keys(scanner).forEach((x) => {
+          if (scanner[x]?.enabled) {
+            permSets.scanner.add(x)
+            scanner[x].userCooldownSeconds = 0
+          }
+        })
         log.info(
           HELPERS.custom(this.rmStrategy, '#7289da'),
           `User ${user.username} (${user.id}) in allowed users list, skipping guild and role check.`,
@@ -188,7 +194,21 @@ class DiscordClient {
                 (x) => permSets.webhooks.add(x),
               )
               scannerPerms(userRoles, 'discordRoles', trialActive).forEach(
-                (x) => permSets.scanner.add(x),
+                (x) => {
+                  permSets.scanner.add(x)
+                  perms.scannerCooldowns[x] = scanner[x].rules.reduce(
+                    (acc, rule) => {
+                      if (
+                        userRoles.includes(rule?.role) &&
+                        rule.cooldown < acc
+                      ) {
+                        return rule.cooldown
+                      }
+                      return acc
+                    },
+                    scanner[x].userCooldownSeconds,
+                  )
+                },
               )
             }
           }),

diff --git a/server/src/services/config.js b/server/src/services/config.js
@@ -340,6 +340,14 @@ if (Array.isArray(config.webhooks)) {
 }
 Object.keys(config.scanner || {}).forEach((key) => {
   config.scanner[key] = replaceBothAliases(config.scanner[key] || {})
+  config.scanner[key]?.rules?.forEach((rule) => {
+    rule.role = replaceAliases(rule.role)
+  })
+  if (config.scanner[key]?.rules) {
+    config.scanner[key].rulesObj = Object.fromEntries(
+      config.scanner[key]?.rules?.map((rule) => [rule.role, rule.cooldown]),
+    )
+  }
 })
 
 if (