Merge pull request #876 from KartulUdus/develop

Sync master from develop
KartulUdus · Oct 16, 2023 · 8f1786c · 8f1786c
2 parents df7e8f0 + 3454d8c
commit 8f1786c
Show file tree

Hide file tree

Showing 68 changed files with 1,718 additions and 613 deletions.
diff --git a/config/default.json b/config/default.json
@@ -51,6 +51,7 @@
       "disableWeather": false,
       "disableNest": false,
       "disableGym": false,
+      "disableFortUpdate": false,
     // roleCheckMode (case sensitive)
     // "ignore" - log and don't delete/disable users once required roles/channel membership are removed
     // "delete" - delete user from database along with trackings once required role is removed
@@ -230,7 +231,7 @@
   // stats configuration
   //
   "stats": {
-    "maxPokemonId": 898,              // current max Pokemon Id to consider in lists
+    "maxPokemonId": 1010,              // current max Pokemon Id to consider in lists
     "minSampleSize": 10000,           // minimum number of Pokemon to process before broadcasting stats to the controllers
     "pokemonCountToKeep": 8,          // period for stats calculation in hours
     "rarityRefreshInterval": 5,       // interval for rarity stats broadcast to controllers in minutes
@@ -449,6 +450,10 @@
       "providerURL": "",
       "forwardOnly": false, // When true, disable reverse geocoding lookup
       "cacheDetail": 3,     // number of decimal places of lon/lat to use while caching geocoding (default 3 - or use 4 for 100x more detail)
+      "dayStyle": "", // Names of styles you want to use for different times of day using tileservercache
+      "dawnStyle": "", // Use style: "#(style)" in templates to utilize this config option
+      "duskStyle": "",
+      "nightStyle": "",
       "intersectionUsers": [], //list of geonames usernames to use for getting street intersections
     // staticProvider - this is your provider of map tiles; can be tileservercache
     //   (swift tile server - https://github.com/123FLO321/SwiftTileserverCache)

diff --git a/config/defaults/channelTemplate.json b/config/defaults/channelTemplate.json
@@ -2,17 +2,86 @@
   {
     "name":"newSection",
     "definition":{
-      "category":"{0} Pokemon",
+      "category":{
+        "categoryName":"{0} Pokemon",
+        "roles":[
+          {
+            "name":"{0}",
+            "view": true,
+            // Text
+            "viewHistory": true,
+            "send": false,
+            "react": true,
+            "pingEveryone": false,
+            "embedLinks": false,
+            "attachFiles": false,
+            "sendTTS": false,
+            "externalEmoji": false,
+            "externalStickers": false,
+            "createPublicThreads": false,
+            "createPrivateThreads": false,
+            "sendThreads": false,
+            "slashCommands": false,
+            // Voice
+            "connect": false,
+            "speak": false,
+            "autoMic": false,
+            "stream": false,
+            "vcActivities": false,
+            "prioritySpeaker": false,
+            // Admin
+            "createInvite": false,
+            "channels": false,
+            "messages": false,
+            "roles": false,
+            "webhooks": false,
+            "threads": false,
+            "events": false,
+            "mute": false,
+            "deafen": false,
+            "move": false
+          },
+          {
+            "name":"@everyone",
+            "view": false
+          }
+        ]
+      },
       "channels":[
         {
-          "channelName":"{0}-iv100",
-/*
+          "channelName":"{0}-chatroom",
+          "channelType":"text",
+          "topic": "Chat for {0} users",
           "roles":[
             {
-              "id":"11111111111111111", "view": true, "viewHistory": true, "send": true, "react": true
+              "name":"{0}",
+              "view": true,
+              "viewHistory": true,
+              "send": true,
+              "react": true,
+              "externalEmoji": true
+            },
+            {
+              "name":"{1}",
+              "view": true,
+              "viewHistory": true,
+              "send": false,
+              "react": true
+            },
+            {
+              "name":"@everyone",
+              "view": false
             }
-          ],
-*/
+          ]
+        },
+        {
+          "channelName":"{0}-voicechat",
+          "channelType":"voice",
+          "topic": "Voice for {0}"
+        },
+        {
+          "channelName":"{0}-iv100",
+          "channelType":"text",
           "topic": "Hundos for {0}",
           "controlType":"bot",
           "commands":[
@@ -22,6 +91,7 @@
         },
         {
           "channelName":"{0}-UltraRares",
+          "channelType":"text",
           "controlType":"webhook",
           "commands":[
             "area add {0}",
@@ -30,6 +100,7 @@
         },
         {
           "channelName":"{0}-Raids",
+          "channelType":"text",
           "controlType":"webhook",
           "commands":[
             "area add {0}",

diff --git a/config/defaults/dts.json b/config/defaults/dts.json
@@ -321,6 +321,25 @@
       ]
     }
   },
+  {
+    "id": 1,
+    "language": "en",
+    "type": "fort-update",
+    "default": true,
+    "platform": "discord",
+    "template": {
+      "embed": {
+        "title": "{{changeTypeText}} {{fortTypeText}} {{name}}",
+        "description": "{{#if description}}*{{description}}*\n\n{{/if}}{{#if isEditDescription}}**Old Description**\n> {{oldDescription}}\n\n**New Description**\n> {{newDescription}}\n\n{{/if}}{{#if isEditName}}### Old Name\n> {{oldName}}\n\n### New Name\n> {{newName}}\n\n{{/if}}\nMaps: [Google]({{{mapurl}}}) | [Apple]({{{applemap}}})",
+        "thumbnail": {
+          "url": "{{{imgUrl}}}"
+        },
+        "image": {
+          "url": "{{{staticMap}}}"
+        }
+      }
+    }
+  },
 {
   "id": 1,
   "language": "en",

diff --git a/config/defaults/testdata.json b/config/defaults/testdata.json
@@ -153,5 +153,15 @@
     "type": "pokestop",
     "test": "sparklylure",
     "webhook": {"name":"Memorial Sculpture & Verse","pokestop_id":"0d4b26adbf24446ba893f0aa3f8de337.16","latitude":51.284727,"longitude":1.060694,"updated":1643554276,"last_modified":1643553312,"lure_expiration":1643555112,"lure_id":506,"url":"http://lh3.googleusercontent.com/Ce-yPhm1FwGNbFzaM0ToMESZ57EWx1g8dKXXgEE4o-mmdP0XdsHk2nSEXOBk88H5PIXBHud-b7m6PUUJ3N8Pe_XB98NY"}
+  },
+  {
+    "type": "fort_update",
+    "test": "edit",
+    "webhook": {"change_type": "edit", "edit_types": ["name", "description"], "new": {"id": "f7430347f5c34facb838be376f16adea.16", "type": "gym", "name": "Journey Through Trees And Time", "description": "A beautiful trip through time, trees, and space", "image_url": "http://lh3.googleusercontent.com/9kWjcud4Eeh4nNC6jv8zBkEr8kuQbW-QY2sKRHQqLrwnxf3drxO5AtR2qsDEjmxz3-h_eTHnQrT3AFl5Xmg2MXVqChh5", "location": {"lat": 51.268716, "lon": 1.013956}}, "old": {"id": "f7430347f5c34facb838be376f16adea.16", "type": "gym", "name": "The old walkway", "description": "An ancient trip through time and space", "image_url": "http://lh3.googleusercontent.com/9kWjcud4Eeh4nNC6jv8zBkEr8kuQbW-QY2sKRHQqLrwnxf3drxO5AtR2qsDEjmxz3-h_eTHnQrT3AFl5Xmg2MXVqChh5", "location": {"lat": 51.268716, "lon": 1.013956}}}
+  },
+  {
+    "type": "fort_update",
+    "test": "new",
+    "webhook": {"change_type": "new", "new": {"id": "0b427e88a3254eeab442d425412e4505.16","type": "pokestop", "name": null, "description": null, "image_url": null, "location": {"lat": -36.842772, "lon": 174.761578 } } }
   }
 ]
diff --git a/examples/dts/NPlumb/dts examples.jpg b/examples/dts/NPlumb/dts examples.jpg