From a4fa1a32bd5d47ff5696d03985b496dff6241db4 Mon Sep 17 00:00:00 2001
From: Sheldan <5037282+Sheldan@users.noreply.github.com>
Date: Sun, 23 May 2021 22:56:15 +0200
Subject: [PATCH] [AB-xxx] fixing small issues with emote tracking templates

---
 .../en_US/exceptions/incorrect_feature_mode_exception_en_US.ftl | 2 +-
 .../deletedEmoteStats_animated_response_embed_en_US.ftl         | 2 +-
 .../deletedEmoteStats_static_response_embed_en_US.ftl           | 2 +-
 .../emoteStats/emoteStats_animated_response_embed_en_US.ftl     | 2 +-
 .../emoteStats/emoteStats_static_response_embed_en_US.ftl       | 2 +-
 .../externalEmoteStats_animated_response_embed_en_US.ftl        | 2 +-
 .../externalEmoteStats_static_response_embed_en_US.ftl          | 2 +-
 .../showExternalTrackedEmote_response_embed_en_US.ftl           | 2 +-
 .../showTrackedEmotes_animated_response_embed_en_US.ftl         | 2 +-
 .../showTrackedEmotes_deleted_animated_response_embed_en_US.ftl | 2 +-
 .../showTrackedEmotes_deleted_static_response_embed_en_US.ftl   | 2 +-
 ...showTrackedEmotes_external_animated_response_embed_en_US.ftl | 2 +-
 .../showTrackedEmotes_external_static_response_embed_en_US.ftl  | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/abstracto-modules/core/src/main/resources/en_US/exceptions/incorrect_feature_mode_exception_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/exceptions/incorrect_feature_mode_exception_en_US.ftl
index aa73b370..6e10ee11 100644
--- a/abstracto-modules/core/src/main/resources/en_US/exceptions/incorrect_feature_mode_exception_en_US.ftl
+++ b/abstracto-modules/core/src/main/resources/en_US/exceptions/incorrect_feature_mode_exception_en_US.ftl
@@ -1,3 +1,3 @@
-<#assign featureName=model.featureEnum.key/>
+<#assign featureName=model.featureDefinition.key/>
 <#assign featureModes><#list model.requiredModes as mode>${mode.key}<#sep>,</#list></#assign>
 <#include "incorrect_feature_mode_exception_text">
\ No newline at end of file
diff --git a/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/deletedEmoteStats/deletedEmoteStats_animated_response_embed_en_US.ftl b/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/deletedEmoteStats/deletedEmoteStats_animated_response_embed_en_US.ftl
index 86353a07..5e597e5a 100644
--- a/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/deletedEmoteStats/deletedEmoteStats_animated_response_embed_en_US.ftl
+++ b/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/deletedEmoteStats/deletedEmoteStats_animated_response_embed_en_US.ftl
@@ -3,5 +3,5 @@
     "title": "<@safe_include "deletedEmoteStats_animated_emotes_title"/>"
   },
   <#include "statistic_color">,
-  "description": "<#list animatedEmotes as emote>`${emote.trackedEmote.emoteName}:${emote.trackedEmote.trackedEmoteId.emoteId?c}`x${emote.result.amount}<#sep>, </#list>"
+  "description": "<#list animatedEmotes as emote>`${emote.trackedEmote.emoteName}:${emote.trackedEmote.trackedEmoteId.id?c}`x${emote.result.amount?c}<#sep>, </#list>"
 }
\ No newline at end of file
diff --git a/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/deletedEmoteStats/deletedEmoteStats_static_response_embed_en_US.ftl b/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/deletedEmoteStats/deletedEmoteStats_static_response_embed_en_US.ftl
index 12cf9603..c8d8f669 100644
--- a/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/deletedEmoteStats/deletedEmoteStats_static_response_embed_en_US.ftl
+++ b/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/deletedEmoteStats/deletedEmoteStats_static_response_embed_en_US.ftl
@@ -3,5 +3,5 @@
     "title": "<@safe_include "deletedEmoteStats_static_emotes_title"/>"
   },
   <#include "statistic_color">,
-  "description": "<#list staticEmotes as emote>`${emote.trackedEmote.emoteName}:${emote.trackedEmote.trackedEmoteId.emoteId?c}`x${emote.result.amount}<#sep>, </#list>"
+  "description": "<#list staticEmotes as emote>`${emote.trackedEmote.emoteName}:${emote.trackedEmote.trackedEmoteId.id?c}`x${emote.result.amount?c}<#sep>, </#list>"
 }
\ No newline at end of file
diff --git a/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/emoteStats/emoteStats_animated_response_embed_en_US.ftl b/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/emoteStats/emoteStats_animated_response_embed_en_US.ftl
index b0841227..662df19a 100644
--- a/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/emoteStats/emoteStats_animated_response_embed_en_US.ftl
+++ b/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/emoteStats/emoteStats_animated_response_embed_en_US.ftl
@@ -3,5 +3,5 @@
     "title": "<@safe_include "emoteStats_animated_emotes_title"/>"
   },
   <#include "statistic_color">,
-  "description": "<#list animatedEmotes as emote><#if emote.emote?has_content>${emote.emote.asMention}x${emote.result.amount}<#sep> </#if></#list>"
+  "description": "<#list animatedEmotes as emote><#if emote.emote?has_content>${emote.emote.asMention}x${emote.result.amount?c}<#sep> </#if></#list>"
 }
\ No newline at end of file
diff --git a/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/emoteStats/emoteStats_static_response_embed_en_US.ftl b/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/emoteStats/emoteStats_static_response_embed_en_US.ftl
index f981513a..7d032ad7 100644
--- a/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/emoteStats/emoteStats_static_response_embed_en_US.ftl
+++ b/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/emoteStats/emoteStats_static_response_embed_en_US.ftl
@@ -3,5 +3,5 @@
     "title": "<@safe_include "emoteStats_static_emotes_title"/>"
   },
   <#include "statistic_color">,
-  "description": "<#list staticEmotes as emote><#if emote.emote?has_content>${emote.emote.asMention}x${emote.result.amount}<#sep> </#if></#list>"
+  "description": "<#list staticEmotes as emote><#if emote.emote?has_content>${emote.emote.asMention}x${emote.result.amount?c}<#sep> </#if></#list>"
 }
\ No newline at end of file
diff --git a/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/externalEmoteStats/externalEmoteStats_animated_response_embed_en_US.ftl b/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/externalEmoteStats/externalEmoteStats_animated_response_embed_en_US.ftl
index 17af68ba..fef1bb7a 100644
--- a/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/externalEmoteStats/externalEmoteStats_animated_response_embed_en_US.ftl
+++ b/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/externalEmoteStats/externalEmoteStats_animated_response_embed_en_US.ftl
@@ -3,5 +3,5 @@
     "title": "<@safe_include "externalEmoteStats_animated_emotes_title"/>"
   },
   <#include "statistic_color">,
-  "description": "<#list animatedEmotes as emote>`${emote.trackedEmote.emoteName}:${emote.trackedEmote.trackedEmoteId.emoteId?c}`x${emote.result.amount}<#sep>, </#list>"
+  "description": "<#list animatedEmotes as emote>`${emote.trackedEmote.emoteName}:${emote.trackedEmote.trackedEmoteId.id?c}`x${emote.result.amount?c}<#sep>, </#list>"
 }
\ No newline at end of file
diff --git a/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/externalEmoteStats/externalEmoteStats_static_response_embed_en_US.ftl b/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/externalEmoteStats/externalEmoteStats_static_response_embed_en_US.ftl
index fa737fcd..0377ce69 100644
--- a/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/externalEmoteStats/externalEmoteStats_static_response_embed_en_US.ftl
+++ b/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/externalEmoteStats/externalEmoteStats_static_response_embed_en_US.ftl
@@ -3,5 +3,5 @@
     "title": "<@safe_include "externalEmoteStats_static_emotes_title"/>"
   },
   <#include "statistic_color">,
-  "description": "<#list staticEmotes as emote>`${emote.trackedEmote.emoteName}:${emote.trackedEmote.trackedEmoteId.id?c}`x${emote.result.amount}<#sep>, </#list>"
+  "description": "<#list staticEmotes as emote>`${emote.trackedEmote.emoteName}:${emote.trackedEmote.trackedEmoteId.id?c}`x${emote.result.amount?c}<#sep>, </#list>"
 }
\ No newline at end of file
diff --git a/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/showExternalTrackedEmote/showExternalTrackedEmote_response_embed_en_US.ftl b/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/showExternalTrackedEmote/showExternalTrackedEmote_response_embed_en_US.ftl
index a8e4151c..783b49b5 100644
--- a/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/showExternalTrackedEmote/showExternalTrackedEmote_response_embed_en_US.ftl
+++ b/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/showExternalTrackedEmote/showExternalTrackedEmote_response_embed_en_US.ftl
@@ -10,7 +10,7 @@
       },
       {
           "name": "<@safe_include "showExternalTrackedEmote_response_embed_emote_id_field_title"/>",
-          "value": "${trackedEmoteId.emoteId?c}"
+          "value": "${trackedEmoteId.id?c}"
       },
       {
           "name": "<@safe_include "showExternalTrackedEmote_response_embed_link_field_title"/>",
diff --git a/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/showTrackedEmotes/showTrackedEmotes_animated_response_embed_en_US.ftl b/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/showTrackedEmotes/showTrackedEmotes_animated_response_embed_en_US.ftl
index 66d0170f..bc66e46e 100644
--- a/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/showTrackedEmotes/showTrackedEmotes_animated_response_embed_en_US.ftl
+++ b/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/showTrackedEmotes/showTrackedEmotes_animated_response_embed_en_US.ftl
@@ -3,5 +3,5 @@
     "title": "<@safe_include "showTrackedEmotes_animated_tracked_emotes_title"/>"
   },
   <#include "statistic_color">,
-  "description": "<#list animatedEmotes as emote><#if emote.emote?has_content>${emote.emote.asMention}<#if !emote.trackedEmote.trackingEnabled>(<#include "showTrackedEmotes_emote_tracking_disabled">)</#if><#sep>, </#if></#list>"
+  "description": "<#list animatedEmotes as emote><#if emote.emote?has_content>${emote.emote.asMention}<#if !emote.trackedEmote.trackingEnabled>(<#include "showTrackedEmotes_emote_tracking_disabled">)</#if><#sep> </#if></#list>"
 }
\ No newline at end of file
diff --git a/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/showTrackedEmotes/showTrackedEmotes_deleted_animated_response_embed_en_US.ftl b/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/showTrackedEmotes/showTrackedEmotes_deleted_animated_response_embed_en_US.ftl
index 8d17d64b..5c59fee9 100644
--- a/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/showTrackedEmotes/showTrackedEmotes_deleted_animated_response_embed_en_US.ftl
+++ b/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/showTrackedEmotes/showTrackedEmotes_deleted_animated_response_embed_en_US.ftl
@@ -3,5 +3,5 @@
     "title": "<@safe_include "showTrackedEmotes_deleted_animated_tracked_emotes_title"/>"
   },
   <#include "statistic_color">,
-  "description": "<#list deletedAnimatedEmotes as emote>`${emote.emoteName}:${emote.trackedEmoteId.emoteId?c}`<#if !emote.trackingEnabled>(<#include "showTrackedEmotes_emote_tracking_disabled">)</#if><#sep>, </#list>"
+  "description": "<#list deletedAnimatedEmotes as emote>`${emote.emoteName}:${emote.trackedEmoteId.id?c}`<#if !emote.trackingEnabled>(<#include "showTrackedEmotes_emote_tracking_disabled">)</#if><#sep> </#list>"
 }
\ No newline at end of file
diff --git a/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/showTrackedEmotes/showTrackedEmotes_deleted_static_response_embed_en_US.ftl b/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/showTrackedEmotes/showTrackedEmotes_deleted_static_response_embed_en_US.ftl
index a22c1e13..ca121124 100644
--- a/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/showTrackedEmotes/showTrackedEmotes_deleted_static_response_embed_en_US.ftl
+++ b/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/showTrackedEmotes/showTrackedEmotes_deleted_static_response_embed_en_US.ftl
@@ -3,5 +3,5 @@
     "title": "<@safe_include "showTrackedEmotes_deleted_static_tracked_emotes_title"/>"
   },
   <#include "statistic_color">,
-  "description": "<#list deletedStaticEmotes as emote>`${emote.emoteName}:${emote.trackedEmoteId.emoteId?c}`<#if !emote.trackingEnabled>(<#include "showTrackedEmotes_emote_tracking_disabled">)</#if><#sep>, </#list>"
+  "description": "<#list deletedStaticEmotes as emote>`${emote.emoteName}:${emote.trackedEmoteId.id?c}`<#if !emote.trackingEnabled>(<#include "showTrackedEmotes_emote_tracking_disabled">)</#if><#sep> </#list>"
 }
\ No newline at end of file
diff --git a/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/showTrackedEmotes/showTrackedEmotes_external_animated_response_embed_en_US.ftl b/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/showTrackedEmotes/showTrackedEmotes_external_animated_response_embed_en_US.ftl
index df193d9a..251de646 100644
--- a/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/showTrackedEmotes/showTrackedEmotes_external_animated_response_embed_en_US.ftl
+++ b/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/showTrackedEmotes/showTrackedEmotes_external_animated_response_embed_en_US.ftl
@@ -3,5 +3,5 @@
     "title": "<@safe_include "showTrackedEmotes_external_animated_tracked_emotes_title"/>"
   },
   <#include "statistic_color">,
-  "description": "<#list externalAnimatedEmotes as emote>`${emote.emoteName}:${emote.trackedEmoteId.emoteId?c}`<#if !emote.trackingEnabled>(<#include "showTrackedEmotes_emote_tracking_disabled">)</#if><#sep>, </#list>"
+  "description": "<#list externalAnimatedEmotes as emote>`${emote.emoteName}:${emote.trackedEmoteId.id?c}`<#if !emote.trackingEnabled>(<#include "showTrackedEmotes_emote_tracking_disabled">)</#if><#sep> </#list>"
 }
\ No newline at end of file
diff --git a/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/showTrackedEmotes/showTrackedEmotes_external_static_response_embed_en_US.ftl b/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/showTrackedEmotes/showTrackedEmotes_external_static_response_embed_en_US.ftl
index a8c6c791..e1d4f26f 100644
--- a/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/showTrackedEmotes/showTrackedEmotes_external_static_response_embed_en_US.ftl
+++ b/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/showTrackedEmotes/showTrackedEmotes_external_static_response_embed_en_US.ftl
@@ -3,5 +3,5 @@
     "title": "<@safe_include "showTrackedEmotes_external_static_tracked_emotes_title"/>"
   },
   <#include "statistic_color">,
-  "description": "<#list externalStaticEmotes as emote>`${emote.emoteName}:${emote.trackedEmoteId.emoteId?c}`<#if !emote.trackingEnabled>(<#include "showTrackedEmotes_emote_tracking_disabled">)</#if><#sep>, </#list>"
+  "description": "<#list externalStaticEmotes as emote>`${emote.emoteName}:${emote.trackedEmoteId.id?c}`<#if !emote.trackingEnabled>(<#include "showTrackedEmotes_emote_tracking_disabled">)</#if><#sep> </#list>"
 }
\ No newline at end of file