New Invasion Webhook Support (#280)

* Implement new rdm invasion structure and separate invasion filters from pokestop filters * Fix gym and pokestop power level filtering for alarms * Add IWebhookPowerLevel interface to gym and pokestop webhook models * Update alarms.example.json * Update docs * - Add IWebhookFort interface for Pokestop and Gym webhook models to inherit from. - Update DTS docs. * fix spacing * fix spacing
versx · Jun 20, 2022 · 1e9bfa7 · 1e9bfa7
1 parent 4acd2b5
commit 1e9bfa7
Show file tree

Hide file tree

Showing 56 changed files with 1,241 additions and 732 deletions.
diff --git a/docs/config/alarms.md b/docs/config/alarms.md
@@ -12,17 +12,19 @@ There is no limit to the amount of alarms you can add under the `alarms` propert
 ## Example
 ```json
 {
-    // Enable or disable Pokemon alarms globally
+    // Enable or disable Pokemon filters globally
     "enablePokemon": true,
-    // Enable or disable Raid alarms globally
+    // Enable or disable Raid filters globally
     "enableRaids": true,
-    // Enable or disable Quest alarms globally
+    // Enable or disable Quest filters globally
     "enableQuests": true,
-    // Enable or disable Pokestop alarms globally
+    // Enable or disable Pokestop filters globally
     "enablePokestops": true,
-    // Enable or disable Gym alarms globally
+    // Enable or disable Invasion filters globally
+    "enableInvasions": true,
+    // Enable or disable Gym filters globally
     "enableGyms": true, 
-    // Enable or disable Weather alarms globally
+    // Enable or disable Weather filters globally
     "enableWeather": true,
     // List of alarms
 	"alarms":

diff --git a/docs/config/embeds.md b/docs/config/embeds.md
@@ -88,7 +88,10 @@ For a list of available dynamic text substitution/replacement options check out
             "{{#if team_changed}}Gym changed from {{old_gym_team_emoji}} {{old_gym_team}} to {{gym_team_emoji}} {{gym_team}}",
             "{{/if}}{{#if in_battle}}Gym is under attack!",
             "{{/if}}**Slots Available:** {{slots_available}}",
-            "{{#if is_ex}}{{ex_emoji}} Gym!",
+            "{{#if power_up_level}}**Power Level**",
+            "Level: {{power_up_level}} | Points: {{power_up_points}}",
+            "Time Left: {{power_up_end_time_left}}",
+            "{{/if}}{{#if is_ex}}{{ex_gym_emoji}} Gym!",
             "{{/if}}**[Google]({{gmaps_url}}) | [Apple]({{applemaps_url}}) | [Waze]({{wazemaps_url}}) | [Scanner]({{scanmaps_url}})**"
         ],
         "iconUrl": "{{gym_url}}",
@@ -111,6 +114,9 @@ For a list of available dynamic text substitution/replacement options check out
             "**Moveset:** {{moveset}}",
             "**Weaknesses:** {{weaknesses_emoji}}",
             "{{#if is_ex}}{{ex_emoji}} Gym!",
+            "{{/if}}{{#if power_up_level}}**Power Level**",
+            "Level: {{power_up_level}} | Points: {{power_up_points}}",
+            "Time Left: {{power_up_end_time_left}}",
             "{{/if}}**[Google]({{gmaps_url}}) | [Apple]({{applemaps_url}}) | [Waze]({{wazemaps_url}}) | [Scanner]({{scanmaps_url}})**"
         ],
         "iconUrl": "{{pkmn_img_url}}",
@@ -130,12 +136,15 @@ For a list of available dynamic text substitution/replacement options check out
             "**Ends:** {{end_time}} ({{end_time_left}} left)",
             "**Team:** {{team_emoji}}",
             "{{#if is_ex}}{{ex_emoji}} Gym!",
+            "{{/if}}{{#if power_up_level}}**Power Level**",
+            "Level: {{power_up_level}} | Points: {{power_up_points}}",
+            "Time Left: {{power_up_end_time_left}}",
             "{{/if}}**[Google]({{gmaps_url}}) | [Apple]({{applemaps_url}}) | [Waze]({{wazemaps_url}}) | [Scanner]({{scanmaps_url}})**"
         ],
         "iconUrl": "{{pkmn_img_url}}",
         "title": "{{geofence}}: {{gym_name}}",
         "url": "{{gmaps_url}}",
-        "username": "Level <lvl> Egg",
+        "username": "Level {{lvl}} Egg",
         "imageUrl": "{{tilemaps_url}}",
         "footer": {
             "text": "{{guild_name}} {{date_time}}",
@@ -147,12 +156,9 @@ For a list of available dynamic text substitution/replacement options check out
         "content": [
             "{{#if has_lure}}**Lure Expires** {{lure_expire_time}} ({{lure_expire_time_left}} left)",
             "**Lure Type:** {{lure_type}}",
-            "{{/if}}{{#if has_invasion}}**Expires:** {{invasion_expire_time}} ({{invasion_expire_time_left}} left)",
-            "**Type:** {{grunt_type_emoji}} | **Gender:** {{grunt_gender}}",
-            "**Encounter Reward Chance:**",
-            "{{#each invasion_encounters}}",
-            "{{chance}} - {{pokemon}}",
-            "{{/each}}",
+            "{{/if}}{{#if power_up_level}}**Power Level**",
+            "Level: {{power_up_level}} | Points: {{power_up_points}}",
+            "Time Left: {{power_up_end_time_left}}",
             "{{/if}}**[Google]({{gmaps_url}}) | [Apple]({{applemaps_url}}) | [Waze]({{wazemaps_url}}) | [Scanner]({{scanmaps_url}})**"
         ],
         "iconUrl": "{{pokestop_url}}",
@@ -188,8 +194,11 @@ For a list of available dynamic text substitution/replacement options check out
     "lures": {
         "avatarUrl": "{{lure_img_url}}",
         "content": [
-            "{{#if has_lure}}**Lure Expires:** {{lure_expire_time}} ({{lure_expire_time_left}} left)",
+            "{{#if has_lure}}**Lure Expires** {{lure_expire_time}} ({{lure_expire_time_left}} left)",
             "**Lure Type:** {{lure_type}}",
+            "{{/if}}{{#if power_up_level}}**Power Level**",
+            "Level: {{power_up_level}} | Points: {{power_up_points}}",
+            "Time Left: {{power_up_end_time_left}}",
             "{{/if}}**[Google]({{gmaps_url}}) | [Apple]({{applemaps_url}}) | [Waze]({{wazemaps_url}}) | [Scanner]({{scanmaps_url}})**"
         ],
         "iconUrl": "{{pokestop_url}}",