diff --git a/abstracto-modules/assignable-roles/src/main/resources/en_US/command/showAssignablePlaceConfig/assignable_roles_config_post_embed_en_US.ftl b/abstracto-modules/assignable-roles/src/main/resources/en_US/command/showAssignablePlaceConfig/assignable_roles_config_post_embed_en_US.ftl deleted file mode 100644 index 9b974b25..00000000 --- a/abstracto-modules/assignable-roles/src/main/resources/en_US/command/showAssignablePlaceConfig/assignable_roles_config_post_embed_en_US.ftl +++ /dev/null @@ -1,14 +0,0 @@ -{ - "color" : { - "r": 200, - "g": 0, - "b": 255 - }, - "description": "<#include "assignable_roles_config_embed_place_description"> - <#include "assignable_roles_config_embed_role_header">: - <#list roles as role> - <#include "assignable_roles_config_embed_emote_description"> - - - " -} \ No newline at end of file diff --git a/abstracto-modules/assignable-roles/src/main/resources/en_US/command/showAssignableRolePlaceConfig/assignable_roles_config_post_embed_en_US.ftl b/abstracto-modules/assignable-roles/src/main/resources/en_US/command/showAssignableRolePlaceConfig/assignable_roles_config_post_embed_en_US.ftl new file mode 100644 index 00000000..2518d422 --- /dev/null +++ b/abstracto-modules/assignable-roles/src/main/resources/en_US/command/showAssignableRolePlaceConfig/assignable_roles_config_post_embed_en_US.ftl @@ -0,0 +1,14 @@ +{ + "color" : { + "r": 200, + "g": 0, + "b": 255 + }, + "description": "<@safe_include "assignable_roles_config_embed_place_description"/> + <@safe_include "assignable_roles_config_embed_role_header"/>: + <#list roles as role><#assign role=role/> + <@safe_include "assignable_roles_config_embed_emote_description"/> + + + " +} \ No newline at end of file diff --git a/abstracto-modules/assignable-roles/src/main/resources/en_US/command/showAssignableRolePlaces/assignable_role_places_overview_embed_en_US.ftl b/abstracto-modules/assignable-roles/src/main/resources/en_US/command/showAssignableRolePlaces/assignable_role_places_overview_embed_en_US.ftl index 99b157d7..7b8aceb8 100644 --- a/abstracto-modules/assignable-roles/src/main/resources/en_US/command/showAssignableRolePlaces/assignable_role_places_overview_embed_en_US.ftl +++ b/abstracto-modules/assignable-roles/src/main/resources/en_US/command/showAssignableRolePlaces/assignable_role_places_overview_embed_en_US.ftl @@ -4,7 +4,7 @@ "g": 0, "b": 255 }, - "description": "<#include "assignable_role_places_overview_description">: - <#list places as place>`<#include "assignable_role_places_overview_place">`<#sep>, <#else> <#include "assignable_role_places_overview_no_places"> + "description": "<@safe_include "assignable_role_places_overview_description"/>: + <#list places as place>`<#assign place=place/><@safe_include "assignable_role_places_overview_place"/>`<#sep>, <#else> <@safe_include "assignable_role_places_overview_no_places"/> " } \ No newline at end of file diff --git a/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_assigned_user_not_found_exception_en_US.ftl b/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_assigned_user_not_found_exception_en_US.ftl index 89eb5a7c..c9c56cbc 100644 --- a/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_assigned_user_not_found_exception_en_US.ftl +++ b/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_assigned_user_not_found_exception_en_US.ftl @@ -1 +1 @@ -"description": "<#include "assignable_role_place_assigned_user_not_found_exception_text">" \ No newline at end of file +"description": "<@safe_include "assignable_role_place_assigned_user_not_found_exception_text"/>" \ No newline at end of file diff --git a/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_channel_does_not_exist_exception_en_US.ftl b/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_channel_does_not_exist_exception_en_US.ftl index 5be31f8b..3177843a 100644 --- a/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_channel_does_not_exist_exception_en_US.ftl +++ b/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_channel_does_not_exist_exception_en_US.ftl @@ -1 +1 @@ -"description": "<#include "assignable_role_place_channel_does_not_exist_exception_text">" \ No newline at end of file +"description": "<@safe_include "assignable_role_place_channel_does_not_exist_exception_text"/>" \ No newline at end of file diff --git a/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_emote_already_defined_exception_en_US.ftl b/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_emote_already_defined_exception_en_US.ftl index 5a42bacf..3344824f 100644 --- a/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_emote_already_defined_exception_en_US.ftl +++ b/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_emote_already_defined_exception_en_US.ftl @@ -1 +1 @@ -"description": "<#include "assignable_role_place_emote_already_defined_exception_text">" \ No newline at end of file +"description": "<@safe_include "assignable_role_place_emote_already_defined_exception_text"/>" \ No newline at end of file diff --git a/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_exists_exception_en_US.ftl b/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_exists_exception_en_US.ftl index 5450a93c..2ce32daf 100644 --- a/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_exists_exception_en_US.ftl +++ b/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_exists_exception_en_US.ftl @@ -1 +1 @@ -"additionalMessage": "<#include "assignable_role_place_exists_exception_text">" \ No newline at end of file +"additionalMessage": "<@safe_include "assignable_role_place_exists_exception_text"/>" \ No newline at end of file diff --git a/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_not_found_exception_en_US.ftl b/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_not_found_exception_en_US.ftl index 9a45b4ff..8d436f26 100644 --- a/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_not_found_exception_en_US.ftl +++ b/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_not_found_exception_en_US.ftl @@ -1 +1 @@ -"description": "<#include "assignable_role_place_not_found_exception_text">" \ No newline at end of file +"description": "<@safe_include "assignable_role_place_not_found_exception_text">/" \ No newline at end of file diff --git a/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_post_not_found_exception_en_US.ftl b/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_post_not_found_exception_en_US.ftl index 2b4b290d..743ab47a 100644 --- a/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_post_not_found_exception_en_US.ftl +++ b/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_post_not_found_exception_en_US.ftl @@ -1 +1 @@ -"description": "<#include "assignable_role_place_post_not_found_exception_text">" \ No newline at end of file +"description": "<@safe_include "assignable_role_place_post_not_found_exception_text"/>" \ No newline at end of file diff --git a/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_role_not_usable_exception_en_US.ftl b/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_role_not_usable_exception_en_US.ftl index 0dce1128..67385e61 100644 --- a/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_role_not_usable_exception_en_US.ftl +++ b/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_role_not_usable_exception_en_US.ftl @@ -1 +1 @@ -"description": "<#include "assignable_role_place_role_not_usable_exception_text">" \ No newline at end of file +"description": "<@safe_include "assignable_role_place_role_not_usable_exception_text"/>" \ No newline at end of file diff --git a/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/emote_not_in_assignable_role_place_exception_en_US.ftl b/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/emote_not_in_assignable_role_place_exception_en_US.ftl index 69a7d9f1..5ed10ab7 100644 --- a/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/emote_not_in_assignable_role_place_exception_en_US.ftl +++ b/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/emote_not_in_assignable_role_place_exception_en_US.ftl @@ -1 +1 @@ -"description": "<#include "emote_not_in_assignable_role_place_exception_text">" \ No newline at end of file +"description": "<@safe_include "emote_not_in_assignable_role_place_exception_text"/>" \ No newline at end of file diff --git a/abstracto-modules/assignable-roles/src/main/resources/en_US/messages/assignable_roles_post_embed_en_US.ftl b/abstracto-modules/assignable-roles/src/main/resources/en_US/messages/assignable_roles_post_embed_en_US.ftl index c15ca0ba..3453cc9b 100644 --- a/abstracto-modules/assignable-roles/src/main/resources/en_US/messages/assignable_roles_post_embed_en_US.ftl +++ b/abstracto-modules/assignable-roles/src/main/resources/en_US/messages/assignable_roles_post_embed_en_US.ftl @@ -4,12 +4,12 @@ "g": 0, "b": 255 }, - "description": "${place.text}", + "description": "${place.text?js_string}", "fields": [ <#list roles as role> { - "name": "${role.emote.emoteRepr}", - "value": "${role.description}", + "name": "${role.emote.emoteRepr?js_string}", + "value": "${role.description?js_string}", "inline": "${place.inline?string('true', 'false')}" <#if role.forceNewMessage> ,"forceNewMessage": "true" diff --git a/abstracto-modules/core/src/main/resources/en_US/builtins/macros_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/builtins/macros_en_US.ftl new file mode 100644 index 00000000..d066bba4 --- /dev/null +++ b/abstracto-modules/core/src/main/resources/en_US/builtins/macros_en_US.ftl @@ -0,0 +1 @@ +<#macro safe_include template_key><#assign rendered><#include "${template_key}">${rendered?js_string} diff --git a/abstracto-modules/core/src/main/resources/en_US/coreCommands/features/features_response_embed_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/coreCommands/features/features_response_embed_en_US.ftl index 18bea023..b36da2c3 100644 --- a/abstracto-modules/core/src/main/resources/en_US/coreCommands/features/features_response_embed_en_US.ftl +++ b/abstracto-modules/core/src/main/resources/en_US/coreCommands/features/features_response_embed_en_US.ftl @@ -1,6 +1,6 @@ { "title": { - "title": "<#include "features_embed_title">" + "title": "<@safe_include "features_embed_title"/>" }, "color" : { "r": 200, @@ -9,7 +9,7 @@ }, "description": " <#list features as feature> -${feature.featureFlag.enabled?string('✅', '❌')} **<#include "${feature.featureConfig.feature.key}_feature">** <#include "feature_embed_key">: `${feature.featureConfig.feature.key}` +${feature.featureFlag.enabled?string('✅', '❌')} **<@safe_include "${feature.featureConfig.feature.key}_feature"/>** <@safe_include "feature_embed_key"/>: `${feature.featureConfig.feature.key}` " } \ No newline at end of file diff --git a/abstracto-modules/core/src/main/resources/en_US/coreCommands/help/help_command_details_response_embed_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/coreCommands/help/help_command_details_response_embed_en_US.ftl index 35eeca74..d8656c8c 100644 --- a/abstracto-modules/core/src/main/resources/en_US/coreCommands/help/help_command_details_response_embed_en_US.ftl +++ b/abstracto-modules/core/src/main/resources/en_US/coreCommands/help/help_command_details_response_embed_en_US.ftl @@ -1,51 +1,51 @@ { "title": { - "title": "<#include "help_command_embed_title">" + "title": "<@safe_include "help_command_embed_title"/>" }, "color" : { "r": 200, "g": 0, "b": 255 }, - "description": "<#include "help_command_embed_command_name">: **${command.name}** -<#include "help_command_embed_command_description">: <#if command.templated> <#include "${command.name}_description"> <#else> ${command.description} + "description": "<@safe_include "help_command_embed_command_name"/>: **${command.name?js_string}** +<@safe_include "help_command_embed_command_description"/>: <#if command.templated> <@safe_include "${command.name}_description"/> <#else> ${command.description?js_string} <#if command.help??> <#if command.help.templated> -**<#include "help_command_embed_command_usage">**: `<#include "${command.name}_usage">` -**<#include "help_command_embed_command_detailed_help">**: <#include "${command.name}_long_help"> +**<@safe_include "help_command_embed_command_usage"/>**: `<@safe_include "${command.name}_usage"/>` +**<@safe_include "help_command_embed_command_detailed_help"/>**: <@safe_include "${command.name}_long_help"/> <#if command.help.hasExample> -<#include "help_command_embed_command_example">: <#include "${command.name}_example"> +<@safe_include "help_command_embed_command_example"/>: <@safe_include "${command.name}_example"/> <#else> -**<#include "help_command_embed_command_usage">**: `${command.help.usage}` -**<#include "help_command_embed_command_detailed_help">**: ${command.help.longHelp} +**<@safe_include "help_command_embed_command_usage"/>**: `${command.help.usage?js_string}` +**<@safe_include "help_command_embed_command_detailed_help"/>**: ${command.help.longHelp?js_string} <#if command.help.hasExample> -<#include "help_command_embed_command_example">:${command.help.example} +<@safe_include "help_command_embed_command_example"/>:${command.help.example?js_string} <#if command.aliases?? && command.aliases?size gt 0> -<#include "help_command_embed_command_aliases">: `${command.aliases?join("`, `")}` +<@safe_include "help_command_embed_command_aliases"/>: `${command.aliases?join("`, `")?js_string}` <#if restricted?? && restricted> -<#include "help_command_embed_command_executable_by">:<#if allowedRoles??> <#list allowedRoles as allowedRole> ${allowedRole.asMention}<#sep><#include "help_command_embed_or"><#else><#include "help_command_embed_command_executable_by_nobody"> -<#if immuneRoles?? ><#include "help_command_embed_command_immune">: <#list immuneRoles as immuneRole> ${immuneRole.asMention}<#sep><#include "help_command_embed_or"><#else>None +<@safe_include "help_command_embed_command_executable_by"/>:<#if allowedRoles??> <#list allowedRoles as allowedRole> ${allowedRole.asMention?js_string}<#sep><@safe_include "help_command_embed_or"/><#else><@safe_include "help_command_embed_command_executable_by_nobody"/> +<#if immuneRoles?? ><@safe_include "help_command_embed_command_immune"/>: <#list immuneRoles as immuneRole> ${immuneRole.asMention?js_string}<#sep><@safe_include "help_command_embed_or"/><#else><@safe_include "help_command_embed_command_immune_none"/> <#else> -<#include "help_command_embed_command_not_restricted"> +<@safe_include "help_command_embed_command_not_restricted"/> -**<#include "help_command_embed_command_parameters">**: +**<@safe_include "help_command_embed_command_parameters"/>**: <#if command.parameters??> <#list command.parameters as parameter> -<#include "help_command_embed_command_description"> `${parameter.name}`: <#if parameter.templated?? && parameter.templated><#include "${command.name}_parameter_${parameter.name}"><#else>${(parameter.description)!""} -<#include "help_command_embed_command_optional"><#sep> +<@safe_include "help_command_embed_command_description"/> `${parameter.name?js_string}`: <#if parameter.templated?? && parameter.templated><@safe_include "${command.name}_parameter_${parameter.name}"/><#else>${(parameter.description?js_string)!""} +<@safe_include "help_command_embed_command_optional"/><#sep> <#else> -<#include "help_command_embed_command_no_parameters"> +<@safe_include "help_command_embed_command_no_parameters"/> <#else> -<#include "help_command_embed_command_no_parameters"> +<@safe_include "help_command_embed_command_no_parameters"/> " } \ No newline at end of file diff --git a/abstracto-modules/core/src/main/resources/en_US/coreCommands/help/help_module_details_response_embed_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/coreCommands/help/help_module_details_response_embed_en_US.ftl index cca2cd40..b5e407d0 100644 --- a/abstracto-modules/core/src/main/resources/en_US/coreCommands/help/help_module_details_response_embed_en_US.ftl +++ b/abstracto-modules/core/src/main/resources/en_US/coreCommands/help/help_module_details_response_embed_en_US.ftl @@ -1,7 +1,7 @@ { <#assign name>${module.moduleInterface.info.name} "title": { - "title": "<#include "help_module_embed_title">" + "title": "<@safe_include "help_module_embed_title"/>" }, "color" : { "r": 200, @@ -9,15 +9,15 @@ "b": 255 }, "description": " - <#include "help_module_embed_module_name">: **${module.moduleInterface.info.name}** - <#include "help_module_embed_module_description">: ${module.moduleInterface.info.description} - <#include "help_module_embed_commands">: - <#list module.commands as command>`${command.configuration.name}`<#sep>, + <@safe_include "help_module_embed_module_name"/>: **${module.moduleInterface.info.name?js_string}** + <@safe_include "help_module_embed_module_description"/>: ${module.moduleInterface.info.description?js_string} + <@safe_include "help_module_embed_commands"/>: + <#list module.commands as command>`${command.configuration.name?js_string}`<#sep>, <#if module.subModules??> - <#include "help_module_embed_sub_modules">: <#list module.subModules as module>`${module.info.name}`<#sep>, + <@safe_include "help_module_embed_sub_modules"/>: <#list module.subModules as module>`${module.info.name?js_string}`<#sep>, ", "footer": { - "text": "<#include "help_command_embed_hint_footer">" + "text": "<@safe_include "help_command_embed_hint_footer"/>" } } \ No newline at end of file diff --git a/abstracto-modules/core/src/main/resources/en_US/coreCommands/help/help_module_overview_response_embed_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/coreCommands/help/help_module_overview_response_embed_en_US.ftl index dbd69ee3..6bfa1273 100644 --- a/abstracto-modules/core/src/main/resources/en_US/coreCommands/help/help_module_overview_response_embed_en_US.ftl +++ b/abstracto-modules/core/src/main/resources/en_US/coreCommands/help/help_module_overview_response_embed_en_US.ftl @@ -1,6 +1,6 @@ { "title": { - "title": "<#include "help_modules_embed_title">" + "title": "<@safe_include "help_modules_embed_title"/>" }, "color" : { "r": 200, @@ -8,12 +8,12 @@ "b": 255 }, "description": " - <#list modules as module> - <#include "help_module_embed_module_name">: **${module.info.name}** - <#include "help_module_embed_module_description">: ${module.info.description} + <#list modules as module><#assign module=module/> + <@safe_include "help_module_embed_module_name"/>: **${module.info.name?js_string}** + <@safe_include "help_module_embed_module_description"/>: ${module.info.description?js_string} ", "footer": { - "text": "<#include "help_modules_embed_footer_hint">" + "text": "<@safe_include "help_modules_embed_footer_hint"/>" } } \ No newline at end of file diff --git a/abstracto-modules/core/src/main/resources/en_US/coreCommands/listChannelGroups/listChannelGroups_response_embed_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/coreCommands/listChannelGroups/listChannelGroups_response_embed_en_US.ftl index 8f16012c..95b8792a 100644 --- a/abstracto-modules/core/src/main/resources/en_US/coreCommands/listChannelGroups/listChannelGroups_response_embed_en_US.ftl +++ b/abstracto-modules/core/src/main/resources/en_US/coreCommands/listChannelGroups/listChannelGroups_response_embed_en_US.ftl @@ -1,6 +1,6 @@ { "title": { - "title": "<#include "listChannelGroups_embed_title">" + "title": "<@safe_include "listChannelGroups_embed_title"/>" }, "color" : { "r": 200, @@ -8,14 +8,14 @@ "b": 255 }, <#if groups?size = 0> - "description": "<#include "listChannelGroups_no_channel_group">", + "description": "<@safe_include "listChannelGroups_no_channel_group"/>", "fields": [ <#list groups as group> { - "name": "${group.name}", + "name": "${group.name?js_string}", "value": " - <#list group.channels as channel>${channel.discordChannel.asMention}<#sep>, + <#list group.channels as channel>${channel.discordChannel.asMention?js_string}<#sep>, " }<#sep>, <#else> diff --git a/abstracto-modules/core/src/main/resources/en_US/coreCommands/posttarget/posttarget_show_targets_embed_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/coreCommands/posttarget/posttarget_show_targets_embed_en_US.ftl index 16ea09f0..1a4bc7cf 100644 --- a/abstracto-modules/core/src/main/resources/en_US/coreCommands/posttarget/posttarget_show_targets_embed_en_US.ftl +++ b/abstracto-modules/core/src/main/resources/en_US/coreCommands/posttarget/posttarget_show_targets_embed_en_US.ftl @@ -1,6 +1,6 @@ { "title": { - "title": "<#include "posttarget_embed_title">" + "title": "<@safe_include "posttarget_embed_title"/>" }, "color" : { "r": 200, @@ -8,12 +8,12 @@ "b": 255 }, "description": " -<#list postTargets as postTarget> -<#assign postTargetName>${postTarget.postTarget.name} -<#assign channelMention><#if postTarget.channel?has_content>${postTarget.channel.asMention}<#else><#include "posttarget_no_channel"> -<#include "posttarget_post_target_text"> +<#list postTargets as postTarget><#assign postTarget=postTarget/> +<#assign postTargetName>${postTarget.postTarget.name?js_string} +<#assign channelMention><#if postTarget.channel?has_content>${postTarget.channel.asMention?js_string}<#else><@safe_include "posttarget_no_channel"/> +<@safe_include "posttarget_post_target_text"/> <#else> -<#include "posttarget_no_post_targets_found"> +<@safe_include "posttarget_no_post_targets_found"/> " } \ No newline at end of file diff --git a/abstracto-modules/core/src/main/resources/en_US/coreCommands/setup/setup_confirmation_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/coreCommands/setup/setup_confirmation_en_US.ftl index 8c19eec2..46d31ecf 100644 --- a/abstracto-modules/core/src/main/resources/en_US/coreCommands/setup/setup_confirmation_en_US.ftl +++ b/abstracto-modules/core/src/main/resources/en_US/coreCommands/setup/setup_confirmation_en_US.ftl @@ -1,5 +1,5 @@ -<#list actionConfigs as actionConfig> +<#list actionConfigs as actionConfig><#assign actionConfig=actionConfig/> <#assign param=actionConfig.templateModel> -<#include "${actionConfig.templateName}"> +<@safe_include "${actionConfig.templateName}"/> \ No newline at end of file diff --git a/abstracto-modules/core/src/main/resources/en_US/coreCommands/setup/setup_initial_message_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/coreCommands/setup/setup_initial_message_en_US.ftl index b9d5dc09..9e3ae7a7 100644 --- a/abstracto-modules/core/src/main/resources/en_US/coreCommands/setup/setup_initial_message_en_US.ftl +++ b/abstracto-modules/core/src/main/resources/en_US/coreCommands/setup/setup_initial_message_en_US.ftl @@ -1 +1 @@ -<#assign featureName><#include "${featureConfig.feature.key}_feature"><#include "setup_initial_message_display"> \ No newline at end of file +<#assign featureName><@safe_include "${featureConfig.feature.key}_feature"/><#include "setup_initial_message_display"> \ No newline at end of file diff --git a/abstracto-modules/core/src/main/resources/en_US/coreCommands/setup/setup_post_target_action_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/coreCommands/setup/setup_post_target_action_en_US.ftl index ac509af8..e8370f0d 100644 --- a/abstracto-modules/core/src/main/resources/en_US/coreCommands/setup/setup_post_target_action_en_US.ftl +++ b/abstracto-modules/core/src/main/resources/en_US/coreCommands/setup/setup_post_target_action_en_US.ftl @@ -1 +1 @@ -<#assign postTargetKey>${param.postTargetKey}<#assign channel>${param.channel.asMention}<#include "setup_post_target_action_display"> \ No newline at end of file +<#assign postTargetKey>${param.postTargetKey}<#assign channel>${param.channel.asMention}<@safe_include "setup_post_target_action_display"/> \ No newline at end of file diff --git a/abstracto-modules/core/src/main/resources/en_US/coreCommands/setup/setup_post_target_message_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/coreCommands/setup/setup_post_target_message_en_US.ftl index cc5cb86e..b3ba7b52 100644 --- a/abstracto-modules/core/src/main/resources/en_US/coreCommands/setup/setup_post_target_message_en_US.ftl +++ b/abstracto-modules/core/src/main/resources/en_US/coreCommands/setup/setup_post_target_message_en_US.ftl @@ -1 +1 @@ -<#assign currentTarget><#if currentTextChannel?has_content>${currentTextChannel.asMention}<#else><#include "setup_post_target_no_channel_set"><#include "setup_posttarget_${postTargetKey}"> \ No newline at end of file +<#assign currentTarget><#if currentTextChannel?has_content>${currentTextChannel.asMention}<#else><@safe_include "setup_post_target_no_channel_set"/><@safe_include "setup_posttarget_${postTargetKey}"/> \ No newline at end of file diff --git a/abstracto-modules/core/src/main/resources/en_US/coreCommands/setup/setup_system_config_action_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/coreCommands/setup/setup_system_config_action_en_US.ftl index bb693f02..ef7fc765 100644 --- a/abstracto-modules/core/src/main/resources/en_US/coreCommands/setup/setup_system_config_action_en_US.ftl +++ b/abstracto-modules/core/src/main/resources/en_US/coreCommands/setup/setup_system_config_action_en_US.ftl @@ -1 +1 @@ -<#assign configKey>${param.configKey}<#assign newValue>${param.newValue}<#include "setup_system_config_action_display"> \ No newline at end of file +<#assign configKey>${param.configKey}<#assign newValue>${param.newValue}<@safe_include "setup_system_config_action_display"/> \ No newline at end of file diff --git a/abstracto-modules/core/src/main/resources/en_US/coreCommands/setup/setup_system_config_message_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/coreCommands/setup/setup_system_config_message_en_US.ftl index 50b03927..0581afaa 100644 --- a/abstracto-modules/core/src/main/resources/en_US/coreCommands/setup/setup_system_config_message_en_US.ftl +++ b/abstracto-modules/core/src/main/resources/en_US/coreCommands/setup/setup_system_config_message_en_US.ftl @@ -1 +1 @@ -<#assign defaultValue=defaultConfig.valueAsString><#include "setup_config_${configKey}"> \ No newline at end of file +<#assign defaultValue=defaultConfig.valueAsString><@safe_include "setup_config_${configKey}"/> \ No newline at end of file diff --git a/abstracto-modules/core/src/main/resources/en_US/coreEvents/user_join_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/coreEvents/user_join_en_US.ftl index b00f5488..c3111d44 100644 --- a/abstracto-modules/core/src/main/resources/en_US/coreEvents/user_join_en_US.ftl +++ b/abstracto-modules/core/src/main/resources/en_US/coreEvents/user_join_en_US.ftl @@ -1 +1 @@ -<#assign user>${user.name}#${user.discriminator} (${user.asMention})<#include "user_joined_text"> +<#assign user>${user.name}#${user.discriminator} (${user.asMention})<@safe_include "user_joined_text"/> diff --git a/abstracto-modules/core/src/main/resources/en_US/coreEvents/user_leave_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/coreEvents/user_leave_en_US.ftl index b9ac0f63..c1fc8ebe 100644 --- a/abstracto-modules/core/src/main/resources/en_US/coreEvents/user_leave_en_US.ftl +++ b/abstracto-modules/core/src/main/resources/en_US/coreEvents/user_leave_en_US.ftl @@ -1 +1 @@ -<#assign user>${user.name}#${user.discriminator} (${user.asMention})<#include "user_left_text"> +<#assign user>${user.name}#${user.discriminator} (${user.asMention})<@safe_include "user_left_text"/> diff --git a/abstracto-modules/core/src/main/resources/en_US/exceptions/generic_command_exception_embed_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/exceptions/generic_command_exception_embed_en_US.ftl index dd4dea9a..a2b970ed 100644 --- a/abstracto-modules/core/src/main/resources/en_US/exceptions/generic_command_exception_embed_en_US.ftl +++ b/abstracto-modules/core/src/main/resources/en_US/exceptions/generic_command_exception_embed_en_US.ftl @@ -1,7 +1,7 @@ { "author": { - "name": "${user.member.effectiveName}", - "avatar": "${user.member.user.effectiveAvatarUrl}" + "name": "${user.member.effectiveName?js_string}", + "avatar": "${user.member.user.effectiveAvatarUrl?js_string}" }, "color" : { "r": 200, @@ -12,8 +12,7 @@ <#if template?has_content> <#if template.templateModel?has_content> <#assign model=template.templateModel/> - <#assign rendered><#include "${template.templateName}"> - ${rendered?js_string} + <#include "${template.templateName}"/> <#elseif throwable.localizedMessage?has_content> "description": "${throwable.localizedMessage?js_string}" diff --git a/abstracto-modules/core/src/main/resources/en_US/exceptions/insufficient_role_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/exceptions/insufficient_role_en_US.ftl index d9668e70..3f580288 100644 --- a/abstracto-modules/core/src/main/resources/en_US/exceptions/insufficient_role_en_US.ftl +++ b/abstracto-modules/core/src/main/resources/en_US/exceptions/insufficient_role_en_US.ftl @@ -1 +1 @@ -<#assign roles><#list allowedRoles as role>${role.name}<#sep>,<#else>None configured.<#include "insufficient_role_text"> \ No newline at end of file +<#assign roles><#list allowedRoles as role>${role.name}<#sep>,<#else><#include "insufficient_role_none_configured"><#include "insufficient_role_text"> \ No newline at end of file diff --git a/abstracto-modules/core/src/main/resources/en_US/exceptions/role_disabled_exception_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/exceptions/role_disabled_exception_en_US.ftl index d291fe37..085d85cb 100644 --- a/abstracto-modules/core/src/main/resources/en_US/exceptions/role_disabled_exception_en_US.ftl +++ b/abstracto-modules/core/src/main/resources/en_US/exceptions/role_disabled_exception_en_US.ftl @@ -1 +1 @@ -"description": "<#include "role_disabled_exception_message">" \ No newline at end of file +"description": "<@safe_include "role_disabled_exception_message"/>" \ No newline at end of file diff --git a/abstracto-modules/experience-tracking/src/main/resources/en_US/commands/leaderboard/leaderboard_post_embed_en_US.ftl b/abstracto-modules/experience-tracking/src/main/resources/en_US/commands/leaderboard/leaderboard_post_embed_en_US.ftl index 99ed0528..26547627 100644 --- a/abstracto-modules/experience-tracking/src/main/resources/en_US/commands/leaderboard/leaderboard_post_embed_en_US.ftl +++ b/abstracto-modules/experience-tracking/src/main/resources/en_US/commands/leaderboard/leaderboard_post_embed_en_US.ftl @@ -1,10 +1,10 @@ { <#macro userDisplay user> - ${user.rank} ${user.member.effectiveName} ${user.experience.experience} ${user.experience.currentLevel.level} ${user.experience.messageCount} + ${user.rank} ${user.member.effectiveName?js_string} ${user.experience.experience} ${user.experience.currentLevel.level} ${user.experience.messageCount} "author": { - "name": "${member.effectiveName}", - "avatar": "${member.user.effectiveAvatarUrl}" + "name": "${member.effectiveName?js_string}", + "avatar": "${member.user.effectiveAvatarUrl?js_string}" }, "color" : { "r": 200, @@ -12,7 +12,7 @@ "b": 255 }, "description": " - <#include "leaderboard_rank_column"> | <#include "leaderboard_name_column"> | <#include "leaderboard_experience_column"> | <#include "leaderboard_level_column"> | <#include "leaderboard_messages_column"> + <@safe_include "leaderboard_rank_column"/> | <@safe_include "leaderboard_name_column"/> | <@safe_include "leaderboard_experience_column"/> | <@safe_include "leaderboard_level_column"/> | <@safe_include "leaderboard_messages_column"/> <#list userExperiences as user> <@userDisplay user=user /> diff --git a/abstracto-modules/experience-tracking/src/main/resources/en_US/commands/listDisabledExperienceRoles/list_disabled_experience_roles_embed_en_US.ftl b/abstracto-modules/experience-tracking/src/main/resources/en_US/commands/listDisabledExperienceRoles/list_disabled_experience_roles_embed_en_US.ftl index 54c1f9b0..937e9126 100644 --- a/abstracto-modules/experience-tracking/src/main/resources/en_US/commands/listDisabledExperienceRoles/list_disabled_experience_roles_embed_en_US.ftl +++ b/abstracto-modules/experience-tracking/src/main/resources/en_US/commands/listDisabledExperienceRoles/list_disabled_experience_roles_embed_en_US.ftl @@ -1,10 +1,10 @@ { "author": { - "name": "${member.effectiveName}", + "name": "${member.effectiveName?js_string}", "avatar": "${member.user.effectiveAvatarUrl}" }, "title": { - "title": "<#include "list_disabled_experience_roles_embed_title">" + "title": "<@safe_include "list_disabled_experience_roles_embed_title"/>" }, "color" : { "r": 200, @@ -13,9 +13,9 @@ }, "description": " <#list roles as role> - ${role.role.asMention} + ${role.role.asMention?js_string} <#else> - <#include "list_disabled_experience_roles_embed_no_roles"> + <@safe_include "list_disabled_experience_roles_embed_no_roles"/> " } \ No newline at end of file diff --git a/abstracto-modules/experience-tracking/src/main/resources/en_US/commands/rank/rank_post_embed_en_US.ftl b/abstracto-modules/experience-tracking/src/main/resources/en_US/commands/rank/rank_post_embed_en_US.ftl index bddbb1e2..e81fb664 100644 --- a/abstracto-modules/experience-tracking/src/main/resources/en_US/commands/rank/rank_post_embed_en_US.ftl +++ b/abstracto-modules/experience-tracking/src/main/resources/en_US/commands/rank/rank_post_embed_en_US.ftl @@ -1,6 +1,6 @@ { "author": { - "name": "${member.effectiveName}", + "name": "${member.effectiveName?js_string}", "avatar": "${member.user.effectiveAvatarUrl}" }, "color" : { @@ -10,27 +10,27 @@ }, "fields": [ { - "name": "<#include "rank_xp_field_title">", + "name": "<@safe_include "rank_xp_field_title"/>", "value": "${rankUser.experience.experience}", "inline": "true" }, { - "name": "<#include "rank_level_field_title">", + "name": "<@safe_include "rank_level_field_title"/>", "value": "${rankUser.experience.currentLevel.level}", "inline": "true" }, { - "name": "<#include "rank_messages_field_title">", + "name": "<@safe_include "rank_messages_field_title"/>", "value": "${rankUser.experience.messageCount}", "inline": "true" }, { - "name": "<#include "rank_to_next_level_field_title">", + "name": "<@safe_include "rank_to_next_level_field_title"/>", "value": "${experienceToNextLevel}", "inline": "true" }, { - "name": "<#include "rank_rank_field_title">", + "name": "<@safe_include "rank_rank_field_title"/>", "value": "${rankUser.rank}", "inline": "true" } diff --git a/abstracto-modules/experience-tracking/src/main/resources/en_US/commands/syncExpRoles/user_sync_status_message_embed_en_US.ftl b/abstracto-modules/experience-tracking/src/main/resources/en_US/commands/syncExpRoles/user_sync_status_message_embed_en_US.ftl index 6da663a7..b9fc81ff 100644 --- a/abstracto-modules/experience-tracking/src/main/resources/en_US/commands/syncExpRoles/user_sync_status_message_embed_en_US.ftl +++ b/abstracto-modules/experience-tracking/src/main/resources/en_US/commands/syncExpRoles/user_sync_status_message_embed_en_US.ftl @@ -1,3 +1,3 @@ { - "additionalMessage": "<#include "syncExpRoles_updating_users_label">: ${currentCount}/${totalUserCount}." + "additionalMessage": "<@safe_include "syncExpRoles_updating_users_label"/>: ${currentCount}/${totalUserCount}." } \ No newline at end of file diff --git a/abstracto-modules/moderation/src/main/resources/en_US/command/ban/ban_log_embed_en_US.ftl b/abstracto-modules/moderation/src/main/resources/en_US/command/ban/ban_log_embed_en_US.ftl index 42bd94b8..bcd47ab4 100644 --- a/abstracto-modules/moderation/src/main/resources/en_US/command/ban/ban_log_embed_en_US.ftl +++ b/abstracto-modules/moderation/src/main/resources/en_US/command/ban/ban_log_embed_en_US.ftl @@ -1,10 +1,10 @@ { "author": { - "name": "${bannedUser.effectiveName}", + "name": "${bannedUser.effectiveName?js_string}", "avatar": "${bannedUser.user.effectiveAvatarUrl}" }, "title": { - "title": "<#include "ban_log_title">" + "title": "<@safe_include "ban_log_title"/>" }, "color" : { "r": 200, @@ -13,20 +13,20 @@ }, "fields": [ { - "name": "<#include "ban_log_banned_user_field_title">", - "value": "${bannedUser.effectiveName} ${bannedUser.asMention} (${bannedUser.idLong?c})" + "name": "<@safe_include "ban_log_banned_user_field_title"/>", + "value": "${bannedUser.effectiveName?js_string} ${bannedUser.asMention?js_string} (${bannedUser.idLong?c})" }, { - "name": "<#include "ban_log_banning_user_field_title">", - "value": "${banningUser.effectiveName} ${banningUser.asMention} (${banningUser.idLong?c})" + "name": "<@safe_include "ban_log_banning_user_field_title"/>", + "value": "${banningUser.effectiveName?js_string} ${banningUser.asMention?js_string} (${banningUser.idLong?c})" }, { - "name": "<#include "ban_log_jump_link_field_title">", - "value": "[${messageChannel.name}](${message.jumpUrl})" + "name": "<@safe_include "ban_log_jump_link_field_title"/>", + "value": "[${messageChannel.name?js_string}](${message.jumpUrl})" }, { - "name": "<#include "ban_log_reason_field_title">", - "value": "${reason}" + "name": "<@safe_include "ban_log_reason_field_title"/>", + "value": "${reason?js_string}" } ] } \ No newline at end of file diff --git a/abstracto-modules/moderation/src/main/resources/en_US/command/banId_log_embed_en_US.ftl b/abstracto-modules/moderation/src/main/resources/en_US/command/banId_log_embed_en_US.ftl index 11b5cf76..f48c568e 100644 --- a/abstracto-modules/moderation/src/main/resources/en_US/command/banId_log_embed_en_US.ftl +++ b/abstracto-modules/moderation/src/main/resources/en_US/command/banId_log_embed_en_US.ftl @@ -1,6 +1,6 @@ { "title": { - "title": "<#include "ban_log_title">" + "title": "<@safe_include "ban_log_title"/>" }, "color" : { "r": 200, @@ -9,20 +9,20 @@ }, "fields": [ { - "name": "<#include "ban_log_banned_user_field_title">", + "name": "<@safe_include "ban_log_banned_user_field_title"/>", "value": "${bannedUserId?c}" }, { - "name": "<#include "ban_log_banning_user_field_title">", - "value": "${banningUser.effectiveName} ${banningUser.asMention} (${banningUser.idLong?c})" + "name": "<@safe_include "ban_log_banning_user_field_title"/>", + "value": "${banningUser.effectiveName?js_string} ${banningUser.asMention?js_string} (${banningUser.idLong?c})" }, { - "name": "<#include "ban_log_jump_link_field_title">", - "value": "[${messageChannel.name}](${message.jumpUrl})" + "name": "<@safe_include "ban_log_jump_link_field_title"/>", + "value": "[${messageChannel.name?js_string}](${message.jumpUrl})" }, { - "name": "<#include "ban_log_reason_field_title">", - "value": "${reason}" + "name": "<@safe_include "ban_log_reason_field_title"/>", + "value": "${reason?js_string}" } ] } \ No newline at end of file diff --git a/abstracto-modules/moderation/src/main/resources/en_US/command/kick/kick_log_embed_en_US.ftl b/abstracto-modules/moderation/src/main/resources/en_US/command/kick/kick_log_embed_en_US.ftl index 4719e852..ea88ddff 100644 --- a/abstracto-modules/moderation/src/main/resources/en_US/command/kick/kick_log_embed_en_US.ftl +++ b/abstracto-modules/moderation/src/main/resources/en_US/command/kick/kick_log_embed_en_US.ftl @@ -1,10 +1,10 @@ { "author": { - "name": "${kickedUser.effectiveName}", + "name": "${kickedUser.effectiveName?js_string}", "avatar": "${kickedUser.user.effectiveAvatarUrl}" }, "title": { - "title": "<#include "kick_log_title">" + "title": "<@safe_include "kick_log_title"/>" }, "color" : { "r": 200, @@ -13,20 +13,20 @@ }, "fields": [ { - "name": "<#include "kick_log_kicked_user_field_title">", - "value": "${kickedUser.effectiveName} ${kickedUser.asMention} (${kickedUser.idLong?c})" + "name": "<@safe_include "kick_log_kicked_user_field_title"/>", + "value": "${kickedUser.effectiveName?js_string} ${kickedUser.asMention?js_string} (${kickedUser.idLong?c})" }, { - "name": "<#include "kick_log_kicking_user_field_title">", - "value": "${kickingUser.effectiveName} ${kickingUser.asMention} (${kickingUser.idLong?c})" + "name": "<@safe_include "kick_log_kicking_user_field_title"/>", + "value": "${kickingUser.effectiveName?js_string} ${kickingUser.asMention?js_string} (${kickingUser.idLong?c})" }, { - "name": "<#include "kick_log_jump_link_field_title">", - "value": "[${messageChannel.name}](${message.jumpUrl})" + "name": "<@safe_include "kick_log_jump_link_field_title"/>", + "value": "[${messageChannel.name?js_string}](${message.jumpUrl})" }, { - "name": "<#include "kick_log_reason_field_title">", - "value": "${reason}" + "name": "<@safe_include "kick_log_reason_field_title"/>", + "value": "${reason?js_string}" } ] } \ No newline at end of file diff --git a/abstracto-modules/moderation/src/main/resources/en_US/command/listNotes/user_notes_response_embed_en_US.ftl b/abstracto-modules/moderation/src/main/resources/en_US/command/listNotes/user_notes_response_embed_en_US.ftl index a398b7c1..6000029e 100644 --- a/abstracto-modules/moderation/src/main/resources/en_US/command/listNotes/user_notes_response_embed_en_US.ftl +++ b/abstracto-modules/moderation/src/main/resources/en_US/command/listNotes/user_notes_response_embed_en_US.ftl @@ -1,19 +1,19 @@ { "author": { <#if specifiedUser??> - "name": "${specifiedUser.member.effectiveName}", + "name": "${specifiedUser.member.effectiveName?js_string}", "avatar": "${specifiedUser.member.user.effectiveAvatarUrl}" <#else> - "name": "${member.effectiveName}", + "name": "${member.effectiveName?js_string}", "avatar": "${member.user.effectiveAvatarUrl}" }, "title": { <#if specifiedUser??> - <#assign user>${specifiedUser.member.effectiveName} - "title": "<#include "user_notes_embed_user_title">" + <#assign user>${specifiedUser.member.effectiveName?js_string} + "title": "<@safe_include "user_notes_embed_user_title"/>" <#else> - "title": "<#include "user_notes_embed_title">" + "title": "<@safe_include "user_notes_embed_title"/>" }, "color" : { @@ -21,11 +21,11 @@ "g": 0, "b": 255 }, - "description": "<#list userNotes as note> - <#assign user>${note.fullUser.member.asMention} - <#assign noteText>${note.note.note} + "description": "<#list userNotes as note><#assign note=note/> + <#assign user>${note.fullUser.member.asMention?js_string} + <#assign noteText>${note.note.note?js_string} <#assign noteId>${note.note.id} <#assign date>${formatDate(note.note.created, "yyyy-MM-dd HH:mm:ss")} - <#include "user_notes_note_entry"><#else><#include "user_notes_no_notes"> + <@safe_include "user_notes_note_entry"/><#else><@safe_include "user_notes_no_notes"/> " } \ No newline at end of file diff --git a/abstracto-modules/moderation/src/main/resources/en_US/command/mute/mute_log_embed_en_US.ftl b/abstracto-modules/moderation/src/main/resources/en_US/command/mute/mute_log_embed_en_US.ftl index 310ec4f1..79c9a808 100644 --- a/abstracto-modules/moderation/src/main/resources/en_US/command/mute/mute_log_embed_en_US.ftl +++ b/abstracto-modules/moderation/src/main/resources/en_US/command/mute/mute_log_embed_en_US.ftl @@ -1,10 +1,10 @@ { "author": { - "name": "${mutedUser.effectiveName}", + "name": "${mutedUser.effectiveName?js_string}", "avatar": "${mutedUser.user.effectiveAvatarUrl}" }, "title": { - "title": "<#include "mute_log_title">" + "title": "<@safe_include "mute_log_title"/>" }, "color" : { "r": 200, @@ -13,32 +13,32 @@ }, "fields": [ { - "name": "<#include "mute_log_muted_user_field_title">", - "value": "${mutedUser.effectiveName} ${mutedUser.asMention} (${mutedUser.idLong?c})" + "name": "<@safe_include "mute_log_muted_user_field_title"/>", + "value": "${mutedUser.effectiveName?js_string} ${mutedUser.asMention?js_string} (${mutedUser.idLong?c})" }, { - "name": "<#include "mute_log_muting_user_field_title">", - "value": "${mutingUser.effectiveName} ${mutingUser.asMention} (${mutingUser.idLong?c})" + "name": "<@safe_include "mute_log_muting_user_field_title"/>", + "value": "${mutingUser.effectiveName?js_string} ${mutingUser.asMention?js_string} (${mutingUser.idLong?c})" }, { - "name": "<#include "mute_log_mute_location_field_title">", - "value": "[${messageChannel.name}](${message.jumpUrl})" + "name": "<@safe_include "mute_log_mute_location_field_title"/>", + "value": "[${messageChannel.name?js_string}](${message.jumpUrl})" }, { - "name": "<#include "mute_log_mute_reason_field_title">", - "value": "${mute.reason}" + "name": "<@safe_include "mute_log_mute_reason_field_title"/>", + "value": "${mute.reason?js_string}" }, { - "name": "<#include "mute_log_mute_duration_field_title">", + "name": "<@safe_include "mute_log_mute_duration_field_title"/>", "value": "${fmtDuration(muteDuration)}" }, { - "name": "<#include "mute_log_muted_until_field_title">", + "name": "<@safe_include "mute_log_muted_until_field_title"/>", "value": "${formatDate(mute.muteTargetDate, "yyyy-MM-dd HH:mm:ss")}" } ], "footer": { - "text": "<#include "mute_log_mute_id_footer"> #${mute.id}" + "text": "<@safe_include "mute_log_mute_id_footer"/> #${mute.id}" }, "timeStamp": "${mute.muteDate}" } \ No newline at end of file diff --git a/abstracto-modules/moderation/src/main/resources/en_US/command/mute/unmute_log_embed_en_US.ftl b/abstracto-modules/moderation/src/main/resources/en_US/command/mute/unmute_log_embed_en_US.ftl index 9d39f2eb..0cee054e 100644 --- a/abstracto-modules/moderation/src/main/resources/en_US/command/mute/unmute_log_embed_en_US.ftl +++ b/abstracto-modules/moderation/src/main/resources/en_US/command/mute/unmute_log_embed_en_US.ftl @@ -1,12 +1,12 @@ { <#if unMutedUser?has_content> "author": { - "name": "${unMutedUser.effectiveName}", + "name": "${unMutedUser.effectiveName?js_string}", "avatar": "${unMutedUser.user.effectiveAvatarUrl}" }, "title": { - "title": "<#include "unMute_log_title">" + "title": "<@safe_include "unMute_log_title"/>" }, "color" : { "r": 200, @@ -15,41 +15,41 @@ }, "fields": [ { - "name": "<#include "unMute_log_unmuted_user_field_title">", + "name": "<@safe_include "unMute_log_unmuted_user_field_title"/>", <#if unMutedUser?has_content> - "value": "${unMutedUser.effectiveName} ${unMutedUser.asMention} (${unMutedUser.idLong?c})" + "value": "${unMutedUser.effectiveName?js_string} ${unMutedUser.asMention?js_string} (${unMutedUser.idLong?c})" <#else> - "value": "<#include "user_left_server"> (${mute.mutedUser.userReference.id?c})" + "value": "<@safe_include "user_left_server"/> (${mute.mutedUser.userReference.id?c})" }, { - "name": "<#include "mute_log_muting_user_field_title">", + "name": "<@safe_include "mute_log_muting_user_field_title"/>", <#if mutingUser?has_content> - "value": "${mutingUser.effectiveName} ${mutingUser.asMention} (${mutingUser.idLong?c})" + "value": "${mutingUser.effectiveName?js_string} ${mutingUser.asMention?js_string} (${mutingUser.idLong?c})" <#else> - "value": "<#include "user_left_server"> (${mute.mutingUser.userReference.id?c})" + "value": "<@safe_include "user_left_server"/> (${mute.mutingUser.userReference.id?c})" }, { - "name": "<#include "mute_log_mute_location_field_title">", + "name": "<@safe_include "mute_log_mute_location_field_title"/>", "value": "[Link](${messageUrl})" }, { - "name": "<#include "unMute_log_muted_since_field_title">", + "name": "<@safe_include "unMute_log_muted_since_field_title"/>", "value": "${formatDate(mute.muteDate, "yyyy-MM-dd HH:mm:ss")}" }, { - "name": "<#include "mute_log_mute_duration_field_title">", + "name": "<@safe_include "mute_log_mute_duration_field_title"/>", "value": "${fmtDuration(muteDuration)}" }, { - "name": "<#include "mute_log_mute_reason_field_title">", - "value": "${mute.reason}" + "name": "<@safe_include "mute_log_mute_reason_field_title"/>", + "value": "${mute.reason?js_string}" } ], "footer": { - "text": "<#include "mute_log_mute_id_footer"> #${mute.id}" + "text": "<@safe_include "mute_log_mute_id_footer"/> #${mute.id}" }, "timeStamp": "${unmuteDate}" } \ No newline at end of file diff --git a/abstracto-modules/moderation/src/main/resources/en_US/command/myWarnings/myWarnings_response_embed_en_US.ftl b/abstracto-modules/moderation/src/main/resources/en_US/command/myWarnings/myWarnings_response_embed_en_US.ftl index 5f7e1e40..03fcb7ed 100644 --- a/abstracto-modules/moderation/src/main/resources/en_US/command/myWarnings/myWarnings_response_embed_en_US.ftl +++ b/abstracto-modules/moderation/src/main/resources/en_US/command/myWarnings/myWarnings_response_embed_en_US.ftl @@ -1,6 +1,6 @@ { "author": { - "name": "${member.effectiveName}", + "name": "${member.effectiveName?js_string}", "avatar": "${member.user.effectiveAvatarUrl}" }, "color" : { @@ -8,7 +8,7 @@ "g": 0, "b": 255 } - <#assign userMention>${member.effectiveName} - ,"description" :"<#include "myWarnings_with_decay_embed_description">" + <#assign userMention>${member.effectiveName?js_string} + ,"description" :"<@safe_include "myWarnings_with_decay_embed_description"/>" } \ No newline at end of file diff --git a/abstracto-modules/moderation/src/main/resources/en_US/command/warn/warn_log_embed_en_US.ftl b/abstracto-modules/moderation/src/main/resources/en_US/command/warn/warn_log_embed_en_US.ftl index 294b98d5..a523f7d0 100644 --- a/abstracto-modules/moderation/src/main/resources/en_US/command/warn/warn_log_embed_en_US.ftl +++ b/abstracto-modules/moderation/src/main/resources/en_US/command/warn/warn_log_embed_en_US.ftl @@ -1,10 +1,10 @@ { "author": { - "name": "${warnedUser.effectiveName}", + "name": "${warnedUser.effectiveName?js_string}", "avatar": "${warnedUser.user.effectiveAvatarUrl}" }, "title": { - "title": "<#include "warn_log_title">" + "title": "<@safe_include "warn_log_title"/>" }, "color" : { "r": 200, @@ -13,29 +13,29 @@ }, "fields": [ { - "name": "<#include "warn_log_warned_user_field_title">", - "value": "${warnedUser.effectiveName} ${warnedUser.asMention} (${warnedUser.idLong?c})" + "name": "<@safe_include "warn_log_warned_user_field_title"/>", + "value": "${warnedUser.effectiveName?js_string} ${warnedUser.asMention?js_string} (${warnedUser.idLong?c})" }, <#if warningUser?has_content> { - "name": "<#include "warn_log_warning_user_field_title">", - "value": "${warningUser.effectiveName} ${warningUser.asMention} (${warningUser.idLong?c})" + "name": "<@safe_include "warn_log_warning_user_field_title"/>", + "value": "${warningUser.effectiveName?js_string} ${warningUser.asMention?js_string} (${warningUser.idLong?c})" }, <#if warning?has_content> { - "name": "<#include "warn_log_warn_location_field_title">", - "value": "[${messageChannel.name}](${message.jumpUrl})" + "name": "<@safe_include "warn_log_warn_location_field_title"/>", + "value": "[${messageChannel.name?js_string}](${message.jumpUrl})" }, { - "name": "<#include "warn_log_warn_reason_field_title">", - "value": "${reason}" + "name": "<@safe_include "warn_log_warn_reason_field_title"/>", + "value": "${reason?js_string}" } ], "footer": { <#if warningUser?has_content> - "text": "<#include "warn_log_warn_id_footer"> #${warning.id}" + "text": "<@safe_include "warn_log_warn_id_footer"/> #${warning.id}" } } \ No newline at end of file diff --git a/abstracto-modules/moderation/src/main/resources/en_US/command/warnings/warnings_response_paginator_en_US.ftl b/abstracto-modules/moderation/src/main/resources/en_US/command/warnings/warnings_response_paginator_en_US.ftl index 3b3e5647..3df09baa 100644 --- a/abstracto-modules/moderation/src/main/resources/en_US/command/warnings/warnings_response_paginator_en_US.ftl +++ b/abstracto-modules/moderation/src/main/resources/en_US/command/warnings/warnings_response_paginator_en_US.ftl @@ -1,7 +1,7 @@ { <#assign warnCount>${warnings?size} - "headerText": "<#include "warnings_header_text">", + "headerText": "<@safe_include "warnings_header_text"/>", "items": [ - <#list warnings as warning>"<#include "warnings_warn_entry">"<#sep>, + <#list warnings as warning><#assign warning=warning/>"<@safe_include "warnings_warn_entry"/>"<#sep>, ] } \ No newline at end of file diff --git a/abstracto-modules/moderation/src/main/resources/en_US/listener/message_deleted/message_deleted_attachment_embed_en_US.ftl b/abstracto-modules/moderation/src/main/resources/en_US/listener/message_deleted/message_deleted_attachment_embed_en_US.ftl index 13c267ac..22b8f0db 100644 --- a/abstracto-modules/moderation/src/main/resources/en_US/listener/message_deleted/message_deleted_attachment_embed_en_US.ftl +++ b/abstracto-modules/moderation/src/main/resources/en_US/listener/message_deleted/message_deleted_attachment_embed_en_US.ftl @@ -2,11 +2,11 @@ "imageUrl": "${imageUrl}", "fields": [ { - "name": "<#include "messageDeleted_attachment_link_field_title">", - "value": "[<#include "messageDeleted_attachment_link_display_text">](${imageUrl})" + "name": "<@safe_include "messageDeleted_attachment_link_field_title"/>", + "value": "[<@safe_include "messageDeleted_attachment_link_display_text"/>](${imageUrl})" } ], "footer": { - "text": "<#include "messageDeleted_attachment_footer"> #${counter}" + "text": "<@safe_include "messageDeleted_attachment_footer"/> #${counter}" } } \ No newline at end of file diff --git a/abstracto-modules/moderation/src/main/resources/en_US/listener/message_deleted/message_deleted_embed_en_US.ftl b/abstracto-modules/moderation/src/main/resources/en_US/listener/message_deleted/message_deleted_embed_en_US.ftl index ada35460..b269bbef 100644 --- a/abstracto-modules/moderation/src/main/resources/en_US/listener/message_deleted/message_deleted_embed_en_US.ftl +++ b/abstracto-modules/moderation/src/main/resources/en_US/listener/message_deleted/message_deleted_embed_en_US.ftl @@ -1,9 +1,9 @@ { "author": { - "name": "${member.effectiveName}#${member.user.discriminator}", + "name": "${member.effectiveName?js_string}#${member.user.discriminator}", "avatar": "${member.user.effectiveAvatarUrl}" }, - "description": "<#include "messageDeleted_description_text">", + "description": "<@safe_include "messageDeleted_description_text"/>", "color" : { "r": 200, "g": 0, @@ -11,12 +11,12 @@ }, "fields": [ { - "name": "<#include "messageDeleted_original_message_field_title">", - "value": "${cachedMessage.content}" + "name": "<@safe_include "messageDeleted_original_message_field_title"/>", + "value": "${cachedMessage.content?js_string}" }, { - "name": "<#include "messageDeleted_message_link_field_title">", - "value": "[${messageChannel.name}](${cachedMessage.messageUrl})" + "name": "<@safe_include "messageDeleted_message_link_field_title"/>", + "value": "[${messageChannel.name?js_string}](${cachedMessage.messageUrl})" } ] } \ No newline at end of file diff --git a/abstracto-modules/moderation/src/main/resources/en_US/listener/message_edited/message_edited_embed_en_US.ftl b/abstracto-modules/moderation/src/main/resources/en_US/listener/message_edited/message_edited_embed_en_US.ftl index 5df87aa5..b5a30656 100644 --- a/abstracto-modules/moderation/src/main/resources/en_US/listener/message_edited/message_edited_embed_en_US.ftl +++ b/abstracto-modules/moderation/src/main/resources/en_US/listener/message_edited/message_edited_embed_en_US.ftl @@ -1,9 +1,9 @@ { "author": { - "name": "${member.effectiveName}#${member.user.discriminator}", + "name": "${member.effectiveName?js_string}#${member.user.discriminator}", "avatar": "${member.user.effectiveAvatarUrl}" }, - "description": "<#include "messageEdited_description_text">", + "description": "<@safe_include "messageEdited_description_text"/>", "color" : { "r": 200, "g": 0, @@ -11,16 +11,16 @@ }, "fields": [ { - "name": "<#include "messageEdited_original_message_field_title">", - "value": "${messageBefore.content}" + "name": "<@safe_include "messageEdited_original_message_field_title"/>", + "value": "${messageBefore.content?js_string}" }, { - "name": "<#include "messageEdited_new_message_field_title">", - "value": "${messageAfter.contentRaw}" + "name": "<@safe_include "messageEdited_new_message_field_title"/>", + "value": "${messageAfter.contentRaw?js_string}" }, { - "name": "<#include "messageEdited_link_field_title">", - "value": "[${messageChannel.name}](${messageBefore.messageUrl})" + "name": "<@safe_include "messageEdited_link_field_title"/>", + "value": "[${messageChannel.name?js_string}](${messageBefore.messageUrl})" } ] } \ No newline at end of file diff --git a/abstracto-modules/moderation/src/main/resources/en_US/scheduler/warnDecay/warn_decay_log_embed_en_US.ftl b/abstracto-modules/moderation/src/main/resources/en_US/scheduler/warnDecay/warn_decay_log_embed_en_US.ftl index 8f714a7a..59b83634 100644 --- a/abstracto-modules/moderation/src/main/resources/en_US/scheduler/warnDecay/warn_decay_log_embed_en_US.ftl +++ b/abstracto-modules/moderation/src/main/resources/en_US/scheduler/warnDecay/warn_decay_log_embed_en_US.ftl @@ -1,15 +1,15 @@ { "title": { - "title": "<#include "warnDecay_title">" + "title": "<@safe_include "warnDecay_title"/>" }, "color" : { "r": 200, "g": 0, "b": 255 }, - "description": "<#list warnings as warning> - <#if warning.warnedMember??><#assign warnedUser>${warning.warnedMember.asMention} (${warning.warnedMember.id})<#else><#assign warnedUser> ${warning.warning.warnedUser.userReference.id?c} <#if warning.warningMember??><#assign warningUser> ${warning.warningMember.asMention} (${warning.warningMember.id})<#else><#assign warningUser>${warning.warning.warningUser.userReference.id?c} <#include "warnDecay_log_warn_entry"> + "description": "<#list warnings as warning><#assign warning=warning/> + <#if warning.warnedMember??><#assign warnedUser>${warning.warnedMember.asMention?js_string} (${warning.warnedMember.id})<#else><#assign warnedUser> ${warning.warning.warnedUser.userReference.id?c} <#if warning.warningMember??><#assign warningUser> ${warning.warningMember.asMention?js_string} (${warning.warningMember.id})<#else><#assign warningUser>${warning.warning.warningUser.userReference.id?c} <@safe_include "warnDecay_log_warn_entry"/> <#else> - <#include "warnDecay_log_no_warnings"> + <@safe_include "warnDecay_log_no_warnings"/> " } \ No newline at end of file diff --git a/abstracto-modules/modmail/src/main/resources/en_US/command/contact/modmail_thread_already_exists_embed_en_US.ftl b/abstracto-modules/modmail/src/main/resources/en_US/command/contact/modmail_thread_already_exists_embed_en_US.ftl index ade880f1..5f26dd53 100644 --- a/abstracto-modules/modmail/src/main/resources/en_US/command/contact/modmail_thread_already_exists_embed_en_US.ftl +++ b/abstracto-modules/modmail/src/main/resources/en_US/command/contact/modmail_thread_already_exists_embed_en_US.ftl @@ -1,6 +1,6 @@ { "author": { - "name": "${member.effectiveName}", + "name": "${member.effectiveName?js_string}", "avatar": "${member.user.effectiveAvatarUrl}" }, "color" : { @@ -8,11 +8,11 @@ "g": 0, "b": 255 }, - "description": "<#include "modmail_thread_already_exists">", + "description": "<@safe_include "modmail_thread_already_exists"/>", "fields": [ { - "name": "<#include "modmail_existing_thread_link_field_title">", - "value": "[<#include "modmail_existing_thread_link_content_display_text">](${threadUrl})" + "name": "<@safe_include "modmail_existing_thread_link_field_title"/>", + "value": "[<@safe_include "modmail_existing_thread_link_content_display_text"/>](${threadUrl})" } ] } diff --git a/abstracto-modules/modmail/src/main/resources/en_US/exception/modmail_exception_cannot_delete_channel_embed_en_US.ftl b/abstracto-modules/modmail/src/main/resources/en_US/exception/modmail_exception_cannot_delete_channel_embed_en_US.ftl index 80bad841..d1a17a31 100644 --- a/abstracto-modules/modmail/src/main/resources/en_US/exception/modmail_exception_cannot_delete_channel_embed_en_US.ftl +++ b/abstracto-modules/modmail/src/main/resources/en_US/exception/modmail_exception_cannot_delete_channel_embed_en_US.ftl @@ -1,6 +1,6 @@ { "author": { - "name": "${user.member.effectiveName}", + "name": "${user.member.effectiveName?js_string}", "avatar": "${user.member.user.effectiveAvatarUrl}" }, "color" : { @@ -8,5 +8,5 @@ "g": 0, "b": 255 }, - "description": "<#include "close_failed_to_delete_text_channel">" + "description": "<@safe_include "close_failed_to_delete_text_channel"/>" } \ No newline at end of file diff --git a/abstracto-modules/modmail/src/main/resources/en_US/exception/modmail_exception_cannot_message_user_embed_en_US.ftl b/abstracto-modules/modmail/src/main/resources/en_US/exception/modmail_exception_cannot_message_user_embed_en_US.ftl index 2206378d..a3ca5294 100644 --- a/abstracto-modules/modmail/src/main/resources/en_US/exception/modmail_exception_cannot_message_user_embed_en_US.ftl +++ b/abstracto-modules/modmail/src/main/resources/en_US/exception/modmail_exception_cannot_message_user_embed_en_US.ftl @@ -1,6 +1,6 @@ { "author": { - "name": "${user.member.effectiveName}", + "name": "${user.member.effectiveName?js_string}", "avatar": "${user.member.user.effectiveAvatarUrl}" }, "color" : { @@ -8,5 +8,5 @@ "g": 0, "b": 255 }, - "description": "<#include "reply_exception_cannot_send_message_to_use">" + "description": "<@safe_include "reply_exception_cannot_send_message_to_use"/>" } \ No newline at end of file diff --git a/abstracto-modules/modmail/src/main/resources/en_US/exception/modmail_exception_failed_to_create_mod_mail_thread_embed_en_US.ftl b/abstracto-modules/modmail/src/main/resources/en_US/exception/modmail_exception_failed_to_create_mod_mail_thread_embed_en_US.ftl index 26f6a67b..2bd5b58c 100644 --- a/abstracto-modules/modmail/src/main/resources/en_US/exception/modmail_exception_failed_to_create_mod_mail_thread_embed_en_US.ftl +++ b/abstracto-modules/modmail/src/main/resources/en_US/exception/modmail_exception_failed_to_create_mod_mail_thread_embed_en_US.ftl @@ -1,6 +1,6 @@ { "author": { - "name": "${user.member.effectiveName}", + "name": "${user.member.effectiveName?js_string}", "avatar": "${user.member.user.effectiveAvatarUrl}" }, "color" : { @@ -8,5 +8,5 @@ "g": 0, "b": 255 }, - "description": "<#include "modmail_failed_to_create_mod_mail_thread">" + "description": "<@safe_include "modmail_failed_to_create_mod_mail_thread"/>" } \ No newline at end of file diff --git a/abstracto-modules/modmail/src/main/resources/en_US/exception/modmail_exception_generic_embed_en_US.ftl b/abstracto-modules/modmail/src/main/resources/en_US/exception/modmail_exception_generic_embed_en_US.ftl index 8f5d3bec..a121da4f 100644 --- a/abstracto-modules/modmail/src/main/resources/en_US/exception/modmail_exception_generic_embed_en_US.ftl +++ b/abstracto-modules/modmail/src/main/resources/en_US/exception/modmail_exception_generic_embed_en_US.ftl @@ -1,6 +1,6 @@ { "author": { - "name": "${user.member.effectiveName}", + "name": "${user.member.effectiveName?js_string}", "avatar": "${user.member.user.effectiveAvatarUrl}" }, "color" : { @@ -8,5 +8,5 @@ "g": 0, "b": 255 }, - "description": "<#include "modmail_generic_error">" + "description": "<@safe_include "modmail_generic_error"/>" } \ No newline at end of file diff --git a/abstracto-modules/modmail/src/main/resources/en_US/exception/modmail_exception_post_target_not_defined_embed_en_US.ftl b/abstracto-modules/modmail/src/main/resources/en_US/exception/modmail_exception_post_target_not_defined_embed_en_US.ftl index 5187db61..3caa996d 100644 --- a/abstracto-modules/modmail/src/main/resources/en_US/exception/modmail_exception_post_target_not_defined_embed_en_US.ftl +++ b/abstracto-modules/modmail/src/main/resources/en_US/exception/modmail_exception_post_target_not_defined_embed_en_US.ftl @@ -1,6 +1,6 @@ { "author": { - "name": "${user.member.effectiveName}", + "name": "${user.member.effectiveName?js_string}", "avatar": "${user.member.user.effectiveAvatarUrl}" }, "color" : { @@ -8,5 +8,5 @@ "g": 0, "b": 255 }, - "description": "<#include "modmail_post_target_error">" + "description": "<@safe_include "modmail_post_target_error"/>" } \ No newline at end of file diff --git a/abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_modal_server_choice_en_US.ftl b/abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_modal_server_choice_en_US.ftl index e40aba80..e56b40b5 100644 --- a/abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_modal_server_choice_en_US.ftl +++ b/abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_modal_server_choice_en_US.ftl @@ -1,4 +1,4 @@ -<#include "server_chooser_server_list_description"> +<@safe_include "server_chooser_server_list_description"/> <#list commonGuilds as guild> ${guild.reactionEmote} ${guild.guild.guild.name} diff --git a/abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_no_server_available_embed_en_US.ftl b/abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_no_server_available_embed_en_US.ftl index ad0bf190..6c501889 100644 --- a/abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_no_server_available_embed_en_US.ftl +++ b/abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_no_server_available_embed_en_US.ftl @@ -4,5 +4,5 @@ "g": 0, "b": 255 }, - "description": "<#include "modmail_no_server_available">" + "description": "<@safe_include "modmail_no_server_available"/>" } \ No newline at end of file diff --git a/abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_notification_message_embed_en_US.ftl b/abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_notification_message_embed_en_US.ftl index ad34a977..28659079 100644 --- a/abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_notification_message_embed_en_US.ftl +++ b/abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_notification_message_embed_en_US.ftl @@ -1,19 +1,19 @@ { "author": { - "name": "${threadUser.member.effectiveName}", + "name": "${threadUser.member.effectiveName?js_string}", "avatar": "${threadUser.member.user.effectiveAvatarUrl}" }, "title": { - "title": "<#include "modmail_notification_message_title">" + "title": "<@safe_include "modmail_notification_message_title"/>" }, "color" : { "r": 200, "g": 0, "b": 255 }, - <#assign user>${threadUser.member.effectiveName}#${threadUser.member.user.discriminator}(${threadUser.member.user.id}) - "description": "<#include "modmail_notification_message_description">" + <#assign user>${threadUser.member.effectiveName?js_string}#${threadUser.member.user.discriminator}(${threadUser.member.user.id}) + "description": "<@safe_include "modmail_notification_message_description"/>" <#if roles?size gt 0> - ,"additionalMessage": "<#list roles as role>${role.role.asMention}<#sep>," + ,"additionalMessage": "<#list roles as role>${role.role.asMention?js_string}<#sep>," } \ No newline at end of file diff --git a/abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_user_message_embed_en_US.ftl b/abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_user_message_embed_en_US.ftl index 156b31a3..5c464e3a 100644 --- a/abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_user_message_embed_en_US.ftl +++ b/abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_user_message_embed_en_US.ftl @@ -1,10 +1,10 @@ { "author": { - "name": "${threadUser.member.effectiveName}", + "name": "${threadUser.member.effectiveName?js_string}", "avatar": "${threadUser.member.user.effectiveAvatarUrl}" }, "title": { - "title": "<#include "modmail_thread_user_message_title">" + "title": "<@safe_include "modmail_thread_user_message_title"/>" }, "color" : { "r": 200, @@ -12,12 +12,12 @@ "b": 255 }, <#if postedMessage.contentRaw?has_content> - "description": "${postedMessage.contentRaw}" + "description": "${postedMessage.contentRaw?js_string}" <#if postedMessage.attachments?size gt 0> ,"imageUrl": "${postedMessage.attachments[0].proxyUrl}" <#if subscribers?size gt 0> - ,"additionalMessage": "<#list subscribers as subscriber>${subscriber.member.asMention}<#sep>," + ,"additionalMessage": "<#list subscribers as subscriber>${subscriber.member.asMention?js_string}<#sep>," } \ No newline at end of file diff --git a/abstracto-modules/modmail/src/main/resources/en_US/modmail/closing/logging/modmail_close_header_embed_en_US.ftl b/abstracto-modules/modmail/src/main/resources/en_US/modmail/closing/logging/modmail_close_header_embed_en_US.ftl index 8373141f..ce1b6acb 100644 --- a/abstracto-modules/modmail/src/main/resources/en_US/modmail/closing/logging/modmail_close_header_embed_en_US.ftl +++ b/abstracto-modules/modmail/src/main/resources/en_US/modmail/closing/logging/modmail_close_header_embed_en_US.ftl @@ -1,6 +1,6 @@ { "title": { - "title": "<#include "modmail_closing_notification_title">" + "title": "<@safe_include "modmail_closing_notification_title"/>" }, "color" : { "r": 200, @@ -11,5 +11,5 @@ <#assign user>user <#assign startDate>${formatDate(closedThread.created,"yyyy-MM-dd HH:mm:ss")} <#assign duration>${fmtDuration(duration)} - "description": "<#include "close_closing_description">" + "description": "<@safe_include "close_closing_description"/>" } diff --git a/abstracto-modules/modmail/src/main/resources/en_US/modmail/closing/logging/modmail_close_logged_message_embed_en_US.ftl b/abstracto-modules/modmail/src/main/resources/en_US/modmail/closing/logging/modmail_close_logged_message_embed_en_US.ftl index 6c4b1c56..7f1495a3 100644 --- a/abstracto-modules/modmail/src/main/resources/en_US/modmail/closing/logging/modmail_close_logged_message_embed_en_US.ftl +++ b/abstracto-modules/modmail/src/main/resources/en_US/modmail/closing/logging/modmail_close_logged_message_embed_en_US.ftl @@ -1,6 +1,6 @@ { "author": { - "name": "${author.member.effectiveName}", + "name": "${author.member.effectiveName?js_string}", "avatar": "${author.member.user.effectiveAvatarUrl}" }, "color" : { @@ -9,13 +9,13 @@ "b": 255 } <#if message.embeds[0].description?has_content> - ,"description": "${message.embeds[0].description}" + ,"description": "${message.embeds[0].description?js_string}" <#if message.attachments?size gt 0> ,"imageUrl": "${message.embeds[0].image.proxyUrl}" <#if modMailMessage.anonymous> - , "additionalMessage": "<#include "modmail_anonymous_message_note">" + , "additionalMessage": "<@safe_include "modmail_anonymous_message_note"/>" ,"timeStamp": "${message.timeCreated}" } diff --git a/abstracto-modules/modmail/src/main/resources/en_US/modmail/closing/modmail_closing_user_message_embed_en_US.ftl b/abstracto-modules/modmail/src/main/resources/en_US/modmail/closing/modmail_closing_user_message_embed_en_US.ftl index acba982f..1e96be91 100644 --- a/abstracto-modules/modmail/src/main/resources/en_US/modmail/closing/modmail_closing_user_message_embed_en_US.ftl +++ b/abstracto-modules/modmail/src/main/resources/en_US/modmail/closing/modmail_closing_user_message_embed_en_US.ftl @@ -4,5 +4,5 @@ "g": 0, "b": 255 }, - "description": "${closingMessage}" + "description": "${closingMessage?js_string}" } \ No newline at end of file diff --git a/abstracto-modules/modmail/src/main/resources/en_US/modmail/modmail_staff_message_embed_en_US.ftl b/abstracto-modules/modmail/src/main/resources/en_US/modmail/modmail_staff_message_embed_en_US.ftl index a7470d76..54454835 100644 --- a/abstracto-modules/modmail/src/main/resources/en_US/modmail/modmail_staff_message_embed_en_US.ftl +++ b/abstracto-modules/modmail/src/main/resources/en_US/modmail/modmail_staff_message_embed_en_US.ftl @@ -1,10 +1,10 @@ { "author": { - "name": "${moderator.effectiveName}", + "name": "${moderator.effectiveName?js_string}", "avatar": "${moderator.user.effectiveAvatarUrl}" }, "title": { - "title": "<#include "modmail_thread_staff_message_title">" + "title": "<@safe_include "modmail_thread_staff_message_title"/>" }, "color" : { "r": 200, @@ -12,7 +12,7 @@ "b": 255 } <#if text?has_content> - , "description": "${text}" + , "description": "${text?js_string}" <#if postedMessage.attachments?size gt 0> ,"imageUrl": "${postedMessage.attachments[0].proxyUrl}" diff --git a/abstracto-modules/modmail/src/main/resources/en_US/modmail/modmail_thread_header_embed_en_US.ftl b/abstracto-modules/modmail/src/main/resources/en_US/modmail/modmail_thread_header_embed_en_US.ftl index 906afa4f..d2632575 100644 --- a/abstracto-modules/modmail/src/main/resources/en_US/modmail/modmail_thread_header_embed_en_US.ftl +++ b/abstracto-modules/modmail/src/main/resources/en_US/modmail/modmail_thread_header_embed_en_US.ftl @@ -1,6 +1,6 @@ { "author": { - "name": "${threadUser.member.effectiveName}", + "name": "${threadUser.member.effectiveName?js_string}", "avatar": "${threadUser.member.user.effectiveAvatarUrl}" }, "color" : { @@ -8,8 +8,8 @@ "g": 0, "b": 255 }, - <#assign user>${threadUser.member.effectiveName}#${threadUser.member.user.discriminator} (${threadUser.member.user.id}) + <#assign user>${threadUser.member.effectiveName?js_string}#${threadUser.member.user.discriminator} (${threadUser.member.user.id}) <#assign joinDate>${threadUser.member.timeJoined} - <#assign roles><#list threadUser.member.roles as role>${role.asMention}<#sep>,<#else><#include "modmail_thread_header_no_roles"> - "description": "<#include "modmail_thread_header_embed_description">" + <#assign roles><#list threadUser.member.roles as role>${role.asMention?js_string}<#sep>,<#else><@safe_include "modmail_thread_header_no_roles"/> + "description": "<@safe_include "modmail_thread_header_embed_description"/>" } \ No newline at end of file diff --git a/abstracto-modules/utility/src/main/resources/en_US/commands/remind/remind_reminder_embed_en_US.ftl b/abstracto-modules/utility/src/main/resources/en_US/commands/remind/remind_reminder_embed_en_US.ftl index 8bb5c31b..2e5c20a9 100644 --- a/abstracto-modules/utility/src/main/resources/en_US/commands/remind/remind_reminder_embed_en_US.ftl +++ b/abstracto-modules/utility/src/main/resources/en_US/commands/remind/remind_reminder_embed_en_US.ftl @@ -1,6 +1,6 @@ { "author": { - "name": "${member.effectiveName}", + "name": "${member.effectiveName?js_string}", "avatar": "${member.user.effectiveAvatarUrl}" }, "color" : { @@ -8,20 +8,20 @@ "g": 0, "b": 255 }, - "description": "<#include "remind_reminder_description">", + "description": "<@safe_include "remind_reminder_description"/>", "fields": [ { - "name": "<#include "remind_reminder_duration_field_title">", + "name": "<@safe_include "remind_reminder_duration_field_title"/>", "value": "${fmtDuration(duration)}" }, { - "name": "<#include "remind_reminder_note_field_title">", - "value": "${reminder.text}" + "name": "<@safe_include "remind_reminder_note_field_title"/>", + "value": "${reminder.text?js_string}" }, { - "name": "<#include "remind_reminder_link_field_title">", - "value": "[<#include "remind_reminder_link_content_display_text">](${messageUrl})" + "name": "<@safe_include "remind_reminder_link_field_title"/>", + "value": "[<@safe_include "remind_reminder_link_content_display_text"/>](${messageUrl})" } ], - "additionalMessage": "${member.asMention}" + "additionalMessage": "${member.asMention?js_string}" } \ No newline at end of file diff --git a/abstracto-modules/utility/src/main/resources/en_US/commands/remind/remind_response_embed_en_US.ftl b/abstracto-modules/utility/src/main/resources/en_US/commands/remind/remind_response_embed_en_US.ftl index f560ac6c..7c7551ce 100644 --- a/abstracto-modules/utility/src/main/resources/en_US/commands/remind/remind_response_embed_en_US.ftl +++ b/abstracto-modules/utility/src/main/resources/en_US/commands/remind/remind_response_embed_en_US.ftl @@ -2,7 +2,7 @@ <#assign id>${reminder.id} <#assign messageUrl>${message.jumpUrl} "author": { - "name": "${member.effectiveName}", + "name": "${member.effectiveName?js_string}", "avatar": "${member.user.effectiveAvatarUrl}" }, "color" : { @@ -10,6 +10,6 @@ "g": 0, "b": 255 }, - "description": "<#include "remind_reminding_description_text">", - "additionalMessage": "${member.asMention}" + "description": "<@safe_include "remind_reminding_description_text"/>", + "additionalMessage": "${member.asMention?js_string}" } \ No newline at end of file diff --git a/abstracto-modules/utility/src/main/resources/en_US/commands/reminders/reminders_response_embed_en_US.ftl b/abstracto-modules/utility/src/main/resources/en_US/commands/reminders/reminders_response_embed_en_US.ftl index 59768670..8c9480c1 100644 --- a/abstracto-modules/utility/src/main/resources/en_US/commands/reminders/reminders_response_embed_en_US.ftl +++ b/abstracto-modules/utility/src/main/resources/en_US/commands/reminders/reminders_response_embed_en_US.ftl @@ -1,6 +1,6 @@ { "author": { - "name": "${member.effectiveName}", + "name": "${member.effectiveName?js_string}", "avatar": "${member.user.effectiveAvatarUrl}" }, "color" : { @@ -9,14 +9,14 @@ "b": 255 }, "title": { - "title": "<#include "reminders_reminders_embed_title">" + "title": "<@safe_include "reminders_reminders_embed_title"/>" }, "fields": [ - <#list reminders as reminder> + <#list reminders as reminder><#assign reminder=reminder/> { <#assign id>${reminder.id} - "name": "<#include "reminders_reminder_field_title">", - "value": "<#include "reminders_due_on">" + "name": "<@safe_include "reminders_reminder_field_title"/>", + "value": "<@safe_include "reminders_due_on"/>" } <#sep>, diff --git a/abstracto-modules/utility/src/main/resources/en_US/commands/serverInfo/serverinfo_response_embed_en_US.ftl b/abstracto-modules/utility/src/main/resources/en_US/commands/serverInfo/serverinfo_response_embed_en_US.ftl index 6fd3d0fa..d961f37f 100644 --- a/abstracto-modules/utility/src/main/resources/en_US/commands/serverInfo/serverinfo_response_embed_en_US.ftl +++ b/abstracto-modules/utility/src/main/resources/en_US/commands/serverInfo/serverinfo_response_embed_en_US.ftl @@ -1,6 +1,6 @@ { "title": { - "title": "<#assign name=guild.name><#include "serverinfo_embed_title">" + "title": "<#assign name=guild.name><@safe_include "serverinfo_embed_title"/>" }, "color" : { "r": 200, @@ -9,33 +9,33 @@ }, "fields": [ { - "name": "<#include "serverinfo_embed_id_field_title">", + "name": "<@safe_include "serverinfo_embed_id_field_title"/>", "value": "${guild.id}", "inline": "true" }, { - "name": "<#include "serverinfo_embed_owner_field_title">", - "value": "${guild.owner.effectiveName}#${guild.owner.user.discriminator}", + "name": "<@safe_include "serverinfo_embed_owner_field_title"/>", + "value": "${guild.owner.effectiveName?js_string}#${guild.owner.user.discriminator}", "inline": "true" }, { - "name": "<#include "serverinfo_embed_members_field_title">", + "name": "<@safe_include "serverinfo_embed_members_field_title"/>", "value": "${guild.memberCount}", "inline": "true" }, { - "name": "<#include "serverinfo_embed_role_count_field_title">", + "name": "<@safe_include "serverinfo_embed_role_count_field_title"/>", "value": "${guild.roles?size}", "inline": "true" }, { - "name": "<#include "serverinfo_embed_created_field_title">", + "name": "<@safe_include "serverinfo_embed_created_field_title">", "value": "${guild.timeCreated}", "inline": "true" }, ${safeFieldLength(guild.emotes, 'emote_mention', 'serverinfo_embed_emotes_field_title', 'false')}, { - "name": "<#include "serverinfo_embed_features_field_title">", + "name": "<@safe_include "serverinfo_embed_features_field_title"/>", "value": "<#list guild.features as feature>${feature}<#else>No features", "inline": "true" } diff --git a/abstracto-modules/utility/src/main/resources/en_US/commands/showAvatar/showAvatar_response_embed_en_US.ftl b/abstracto-modules/utility/src/main/resources/en_US/commands/showAvatar/showAvatar_response_embed_en_US.ftl index ace76f0c..1bb070d2 100644 --- a/abstracto-modules/utility/src/main/resources/en_US/commands/showAvatar/showAvatar_response_embed_en_US.ftl +++ b/abstracto-modules/utility/src/main/resources/en_US/commands/showAvatar/showAvatar_response_embed_en_US.ftl @@ -1,6 +1,6 @@ { "author": { - "name": "${memberInfo.user.name}#${memberInfo.user.discriminator}", + "name": "${memberInfo.user.name?js_string}#${memberInfo.user.discriminator}", "avatar": "${memberInfo.user.effectiveAvatarUrl}" }, "color" : { @@ -11,13 +11,13 @@ "imageUrl": "${memberInfo.user.effectiveAvatarUrl}", "fields": [ { - "name": "<#include "showAvatar_response_embed_user_field_title">", - "value": "${memberInfo.user.name}#${memberInfo.user.discriminator}", + "name": "<@safe_include "showAvatar_response_embed_user_field_title"/>", + "value": "${memberInfo.user.name?js_string}#${memberInfo.user.discriminator}", "inline": "true" }, { - "name": "<#include "showAvatar_response_embed_image_field_title">", - "value": "[<#include "showAvatar_response_embed_image_field_value_display">](${memberInfo.user.effectiveAvatarUrl})", + "name": "<@safe_include "showAvatar_response_embed_image_field_title"/>", + "value": "[<@safe_include "showAvatar_response_embed_image_field_value_display"/>](${memberInfo.user.effectiveAvatarUrl})", "inline": "true" } ] diff --git a/abstracto-modules/utility/src/main/resources/en_US/commands/starStats/starStats_response_embed_en_US.ftl b/abstracto-modules/utility/src/main/resources/en_US/commands/starStats/starStats_response_embed_en_US.ftl index fafbf404..b3f11ef2 100644 --- a/abstracto-modules/utility/src/main/resources/en_US/commands/starStats/starStats_response_embed_en_US.ftl +++ b/abstracto-modules/utility/src/main/resources/en_US/commands/starStats/starStats_response_embed_en_US.ftl @@ -1,51 +1,51 @@ { "title": { - "title": "<#include "starStats_response_title">" + "title": "<@safe_include "starStats_response_title"/>" }, "color" : { "r": 200, "g": 0, "b": 255 }, - "description": "<#include "startStats_description">", + "description": "<@safe_include "startStats_description"/>", "fields": [ { - "name": "<#include "starStats_top_starred_field_title">", + "name": "<@safe_include "starStats_top_starred_field_title"/>", "value": " - <#list topPosts as post> - <#assign badge>${badgeEmotes[post?index]}<#assign count>${post.starCount}<#assign link>${post.messageUrl} <#include "starStats_starred_entry"> + <#list topPosts as post><#assign post=post/> + <#assign badge>${badgeEmotes[post?index]}<#assign count>${post.starCount}<#assign link>${post.messageUrl} <@safe_include "starStats_starred_entry"/> <#else> - <#include "starStats_no_starred_messages"> + <@safe_include "starStats_no_starred_messages"/> " }, { - "name": "<#include "starStats_top_starrer_field_title">", + "name": "<@safe_include "starStats_top_starrer_field_title"/>", "value": " - <#list starGiver as starrer> + <#list starGiver as starrer><#assign starrer=starrer/> <#assign badge>${badgeEmotes[starrer?index]}<#assign count>${starrer.starCount} <#if starrer.member?has_content> - <#assign user>${starrer.member.asMention} <#include "starStats_starrer_entry"> + <#assign user>${starrer.member.asMention?js_string} <@safe_include "starStats_starrer_entry"/> <#else> - <#assign user>${starrer.user.id?c} <#include "starStats_starrer_entry_left_guild_en_US.ftl"> + <#assign user>${starrer.user.id?c} <@safe_include "starStats_starrer_entry_left_guild"/> <#else> - <#include "starStats_no_starred_messages"> + <@safe_include "starStats_no_starred_messages"/> " }, { - "name": "<#include "starStats_top_receiver_field_title">", + "name": "<@safe_include "starStats_top_receiver_field_title"/>", "value": " - <#list starReceiver as starred> + <#list starReceiver as starred><#assign starred=starred/> <#assign badge>${badgeEmotes[starred?index]}<#assign count>${starred.starCount} <#if starred.member?has_content> - <#assign user>${starred.member.asMention} <#include "starStats_receiver_entry"> + <#assign user>${starred.member.asMention?js_string} <@safe_include "starStats_receiver_entry"/> <#else> - <#assign user>${starred.user.id?c} <#include "starStats_receiver_entry_left_guild"> + <#assign user>${starred.user.id?c} <@safe_include "starStats_receiver_entry_left_guild"/> <#else> - <#include "starStats_no_starred_messages"> + <@safe_include "starStats_no_starred_messages"/> " } diff --git a/abstracto-modules/utility/src/main/resources/en_US/commands/suggest/suggest_log_embed_en_US.ftl b/abstracto-modules/utility/src/main/resources/en_US/commands/suggest/suggest_log_embed_en_US.ftl index ddea7b3f..5594740c 100644 --- a/abstracto-modules/utility/src/main/resources/en_US/commands/suggest/suggest_log_embed_en_US.ftl +++ b/abstracto-modules/utility/src/main/resources/en_US/commands/suggest/suggest_log_embed_en_US.ftl @@ -1,7 +1,7 @@ { "author": { <#if suggester?has_content> - "name": "${suggester.effectiveName}", + "name": "${suggester.effectiveName?js_string}", "avatar": "${suggester.user.effectiveAvatarUrl}" <#else> "name": "${suggesterUser.userReference.id}" @@ -12,24 +12,24 @@ "g": 0, "b": 255 }, - <#assign user>${member.effectiveName} + <#assign user>${member.effectiveName?js_string} <#assign id>${suggestion.id} <#if suggestion.state = "ACCEPTED"> - "description": "~~${text}~~ \n✅ ${reason} - <#include "suggest_accepted_by">", + "description": "~~${text?js_string}~~ \n✅ ${reason} - <@safe_include "suggest_accepted_by"/>", <#elseif suggestion.state = "REJECTED"> - "description": "~~${text}~~ \n❌ ${reason} - <#include "suggest_rejected_by">", + "description": "~~${text?js_string}~~ \n❌ ${reason} - <@safe_include "suggest_rejected_by"/>", <#else> - "description": "${text}", + "description": "${text?js_string}", <#if suggestion.state = "ACCEPTED" || suggestion.state = "REJECTED"> "fields": [ { - "name": "<#include "suggest_link_field_title">", - "value": "[<#include "suggest_link_display_value">](${originalMessageUrl})" + "name": "<@safe_include "suggest_link_field_title"/>", + "value": "[<@safe_include "suggest_link_display_value"/>](${originalMessageUrl})" } ], "footer": { - "text": "<#include "suggest_suggestion_id_footer">" + "text": "<@safe_include "suggest_suggestion_id_footer"/>" } } \ No newline at end of file diff --git a/abstracto-modules/utility/src/main/resources/en_US/commands/userInfo/userInfo_response_embed_en_US.ftl b/abstracto-modules/utility/src/main/resources/en_US/commands/userInfo/userInfo_response_embed_en_US.ftl index 7114908c..98499ccd 100644 --- a/abstracto-modules/utility/src/main/resources/en_US/commands/userInfo/userInfo_response_embed_en_US.ftl +++ b/abstracto-modules/utility/src/main/resources/en_US/commands/userInfo/userInfo_response_embed_en_US.ftl @@ -1,6 +1,6 @@ { "author": { - "name": "${memberInfo.user.name}#${memberInfo.user.discriminator}", + "name": "${memberInfo.user.name?js_string}#${memberInfo.user.discriminator}", "avatar": "${memberInfo.user.effectiveAvatarUrl}" }, "color" : { @@ -11,37 +11,37 @@ "thumbnail": "${memberInfo.user.effectiveAvatarUrl}", "fields": [ { - "name": "<#include "userInfo_response_embed_id_field_title">", + "name": "<@safe_include "userInfo_response_embed_id_field_title"/>", "value": "${memberInfo.user.id}", "inline": "true" }, <#if memberInfo.nickname?has_content> { - "name": "<#include "userInfo_response_embed_nickname_field_title">", - "value": "${memberInfo.nickname}", + "name": "<@safe_include "userInfo_response_embed_nickname_field_title"/>", + "value": "${memberInfo.nickname?js_string}", "inline": "true" }, { - "name": "<#include "userInfo_response_embed_status_field_title">", + "name": "<@safe_include "userInfo_response_embed_status_field_title"/>", "value": "${memberInfo.onlineStatus.key}", "inline": "true" }, { - "name": "<#include "userInfo_response_embed_joined_field_title">", + "name": "<@safe_include "userInfo_response_embed_joined_field_title"/>", "value": "${formatDate(memberInfo.timeJoined, "yyyy-MM-dd HH:mm:ss")}", "inline": "true" }, { - "name": "<#include "userInfo_response_embed_registered_field_title">", + "name": "<@safe_include "userInfo_response_embed_registered_field_title"/>", "value": "${formatDate(memberInfo.timeCreated, "yyyy-MM-dd HH:mm:ss")}", "inline": "true" } <#if memberInfo.activities?size gt 0> , { - "name": "<#include "userInfo_response_embed_activity_field_title">", - "value": "<#list memberInfo.activities as activity>${activity.type}<#sep>, ", + "name": "<@safe_include "userInfo_response_embed_activity_field_title"/>", + "value": "<#list memberInfo.activities as activity>${activity.type?js_string}<#sep>, ", "inline": "true" } diff --git a/abstracto-modules/utility/src/main/resources/en_US/listener/embed/message_embed_embed_en_US.ftl b/abstracto-modules/utility/src/main/resources/en_US/listener/embed/message_embed_embed_en_US.ftl index c4e6d711..8a04bbcc 100644 --- a/abstracto-modules/utility/src/main/resources/en_US/listener/embed/message_embed_embed_en_US.ftl +++ b/abstracto-modules/utility/src/main/resources/en_US/listener/embed/message_embed_embed_en_US.ftl @@ -1,6 +1,6 @@ { "author": { - "name": "${author.effectiveName}", + "name": "${author.effectiveName?js_string}", "avatar": "${author.user.effectiveAvatarUrl}" }, "color" : { @@ -9,11 +9,11 @@ "b": 255 }, <#if embeddedMessage.content?has_content || embeddedMessage.embeds?size gt 0> - "description": "${embeddedMessage.content} + "description": "${embeddedMessage.content?js_string} <#list embeddedMessage.embeds> - <#include "message_embed_embed_embeds_name">: - <#items as embed> - <#include "message_embed_embed_description">: <#if embed.description?has_content >${embed.description} <#if embed.imageUrl?has_content> <#include "message_embed_embed_image_url">: ${embed.imageUrl} + <@safe_include "message_embed_embed_embeds_name"/>: + <#items as embed><#assign embed=embed/> + <@safe_include "message_embed_embed_description"/>: <#if embed.description?has_content >${embed.description?js_string} <#if embed.imageUrl?has_content> <@safe_include "message_embed_embed_image_url"/>: ${embed.imageUrl} ", @@ -23,11 +23,11 @@ "fields": [ { - "name": "<#include "message_embed_embed_quoted_by_field_title">", - <#assign user>${embeddingUser.asMention} - <#assign channelName>${sourceChannel.name} + "name": "<@safe_include "message_embed_embed_quoted_by_field_title"/>", + <#assign user>${embeddingUser.asMention?js_string} + <#assign channelName>${sourceChannel.name?js_string} <#assign messageLink>${embeddedMessage.messageUrl} - "value": "<#include "message_embed_embed_quoted_by_field_value">" + "value": "<@safe_include "message_embed_embed_quoted_by_field_value"/>" } ], "timeStamp": "${embeddedMessage.timeCreated}" diff --git a/abstracto-modules/utility/src/main/resources/en_US/listener/starboard/starboard_post_embed_en_US.ftl b/abstracto-modules/utility/src/main/resources/en_US/listener/starboard/starboard_post_embed_en_US.ftl index 4d7e7ad2..92ac5867 100644 --- a/abstracto-modules/utility/src/main/resources/en_US/listener/starboard/starboard_post_embed_en_US.ftl +++ b/abstracto-modules/utility/src/main/resources/en_US/listener/starboard/starboard_post_embed_en_US.ftl @@ -4,7 +4,7 @@ "name": "${author.effectiveName}", "avatar": "${author.user.effectiveAvatarUrl}" <#else> - "name": "${user.id?c} (<#include "user_left_server">)" + "name": "${user.id?c} (<@safe_include "user_left_server"/>)" }, "color" : { @@ -13,11 +13,11 @@ "b": 255 } <#if message.content?has_content || message.embeds?size gt 0> - ,"description": "${message.content} + ,"description": "${message.content?js_string} <#list message.embeds> - <#include "starboard_post_embed_embeds_name">: + <@safe_include "starboard_post_embed_embeds_name"/>: <#items as embed> - <#include "starboard_post_embed_description">: ${embed.description} <#if embed.imageUrl?has_content> <#include "starboard_post_embed_image_url">: ${embed.imageUrl} + <@safe_include "starboard_post_embed_description"/>: ${embed.description?js_string} <#if embed.imageUrl?has_content> <@safe_include "starboard_post_embed_image_url"/>: ${embed.imageUrl} " @@ -26,20 +26,20 @@ <#assign count>${starCount} <#assign messageId>${message.messageId?c} <#if channel?has_content> - <#assign channelMention>${channel.asMention} - ,"additionalMessage": "<#include "starboard_post_embed_additional_message">" + <#assign channelMention>${channel.asMention?js_string} + ,"additionalMessage": "<@safe_include "starboard_post_embed_additional_message"/>" <#else> <#assign channelMention>${aChannel.id?c} - ,"additionalMessage": "<#include "starboard_post_embed_additional_message">" + ,"additionalMessage": "<@safe_include "starboard_post_embed_additional_message"/>" <#if message.attachmentUrls?size gt 0> ,"imageUrl": "${message.attachmentUrls[0]}" ,"fields": [ { - "name": "<#include "starboard_post_embed_original_field_title">" + "name": "<@safe_include "starboard_post_embed_original_field_title"/>" <#if channel?has_content> - ,"value": "[${channel.name}](${message.messageUrl})" + ,"value": "[${channel.name?js_string}](${message.messageUrl})" <#else> ,"value": "[${aChannel.id?c}](${message.messageUrl})" diff --git a/translations/assignable-roles/src/main/resources/en_US/commands/showAssignableRolePlaces/assignable_role_places_overview_place_en_US.ftl b/translations/assignable-roles/src/main/resources/en_US/commands/showAssignableRolePlaces/assignable_role_places_overview_place_en_US.ftl index 92fdf6fa..b987e7bc 100644 --- a/translations/assignable-roles/src/main/resources/en_US/commands/showAssignableRolePlaces/assignable_role_places_overview_place_en_US.ftl +++ b/translations/assignable-roles/src/main/resources/en_US/commands/showAssignableRolePlaces/assignable_role_places_overview_place_en_US.ftl @@ -1 +1 @@ -${place.key} \ No newline at end of file +${place.key}${place?size} \ No newline at end of file diff --git a/translations/core/src/main/resources/en_US/exception/insufficient_role_none_configured_en_US.ftl b/translations/core/src/main/resources/en_US/exception/insufficient_role_none_configured_en_US.ftl new file mode 100644 index 00000000..210be19b --- /dev/null +++ b/translations/core/src/main/resources/en_US/exception/insufficient_role_none_configured_en_US.ftl @@ -0,0 +1 @@ +None configured. \ No newline at end of file