Compare commits

...

43 Commits

Author SHA1 Message Date
Sheldan
0767e3509a [maven-release-plugin] prepare release templates-1.2.12 2021-06-02 12:42:09 +02:00
Sheldan
2e1f6e20b6 [AB-285] adding help templates for moderation commands and fixing my warnings template 2021-06-02 02:29:17 +02:00
Sheldan
e9cff14c28 [maven-release-plugin] prepare for next development iteration 2021-06-02 00:40:00 +02:00
Sheldan
8662bc0be2 [maven-release-plugin] prepare release templates-1.2.11 2021-06-02 00:39:48 +02:00
Sheldan
8252a1752d [AB-284] adding templates for warn decay notification
fixing some templates related to moderation
2021-06-02 00:34:10 +02:00
Sheldan
c6d6fb1c8f [AB-281] adapting templates for ban rework 2021-06-01 21:10:44 +02:00
Sheldan
14bfbaae80 [AB-273] improving display of server features and adding text and voice channel count to server info 2021-05-29 01:20:01 +02:00
Sheldan
60d1c40153 [maven-release-plugin] prepare for next development iteration 2021-05-26 21:44:50 +02:00
Sheldan
39cf84b946 [maven-release-plugin] prepare release templates-1.2.10 2021-05-26 21:44:41 +02:00
Sheldan
7aeea1d12e [AB-272] changing leaderboard & rank template to adapt the changes
adding missing help template
2021-05-26 21:41:51 +02:00
Sheldan
a0ba5092b1 [maven-release-plugin] prepare for next development iteration 2021-05-26 13:50:22 +02:00
Sheldan
ffa93f8bc1 [maven-release-plugin] prepare release templates-1.2.9 2021-05-26 13:50:14 +02:00
Sheldan
9092e83680 [AB-270] adding template for experience gain channel group 2021-05-26 11:30:04 +02:00
Sheldan
f0a9d235c2 [AB-247] adding templates for levelRoles command
adding templates for experience role not found exception
fixing layout for help command detail response with validators
2021-05-26 00:55:04 +02:00
Sheldan
f9a83d7b20 [AB-251] improving leaderboard response embed and adapting rank help template 2021-05-25 00:21:53 +02:00
Sheldan
985a1cfc3f [AB-262] adding templates related to suggestion reminder 2021-05-24 17:39:30 +02:00
Sheldan
8e027fd881 [AB-265] fixing templates for exportEmoteStats help and incorrect feature mode exception template 2021-05-24 13:38:43 +02:00
Sheldan
9e34917549 [maven-release-plugin] prepare for next development iteration 2021-05-23 23:23:34 +02:00
Sheldan
3c6d3ad803 [maven-release-plugin] prepare release templates-1.2.8 2021-05-23 23:23:26 +02:00
Sheldan
a4fa1a32bd [AB-xxx] fixing small issues with emote tracking templates 2021-05-23 22:56:15 +02:00
AnonymousWP
08c96ecf46 Added missing format for weeks (#1)
Adding core template 'duration_format_help'
2021-05-20 19:04:40 +02:00
Sheldan
d7dd4cd39a [AB-84] adding templates for profanity filter 2021-05-16 23:46:32 +02:00
Sheldan
a9267822dc [AB-258] adding templates for urban dictionary exception 2021-05-12 15:39:37 +02:00
Sheldan
4d2294f0b4 [maven-release-plugin] prepare for next development iteration 2021-05-12 00:47:10 +02:00
Sheldan
24138cf72e [maven-release-plugin] prepare release templates-1.2.7 2021-05-12 00:47:01 +02:00
Sheldan
d71871a924 [AB-256] adding timezone to various places 2021-05-12 00:44:04 +02:00
Sheldan
6b6f5bcb10 [AB-240] moving invite filtering to separate module
adding templates for effects rework
changed display of optional parameters in help
2021-05-10 20:57:09 +02:00
Sheldan
3d7db690a5 [AB-253] adding templates for unsuggest 2021-05-04 13:20:53 +02:00
Sheldan
0400637847 [maven-release-plugin] prepare for next development iteration 2021-05-02 23:11:42 +02:00
Sheldan
fe7558ec0d [maven-release-plugin] prepare release templates-1.2.6 2021-05-02 23:11:34 +02:00
Sheldan
d5bd0acbfd [AB-248] adding templates for everyone role rejection 2021-05-02 21:37:47 +02:00
Sheldan
5b238af062 [AB-250] adding templates for no experience tracked exception
slight rewording for experience related help
fixing parameter template name for disableExpGain
2021-05-02 01:27:46 +02:00
Sheldan
efc5a72339 [AB-242] adding templates for suggestion improvements containing veto, unsuggest and splitting suggest message templates
updating help templates
fixing template for deleted users doing a double safe include leading to incorrect json structure
2021-04-30 01:29:15 +02:00
Sheldan
d0cce94d09 [AB-174] adding templates for snooze behaviour
added bell icon to reminder notification
added explicit mention of reminder ID
2021-04-25 14:48:26 +02:00
Sheldan
d94abd975b [maven-release-plugin] prepare for next development iteration 2021-04-24 22:17:48 +02:00
Sheldan
4accef7166 [maven-release-plugin] prepare release templates-1.2.5 2021-04-24 22:17:41 +02:00
Sheldan
b57efc809a [AB-233] adding templates for delete attachment feature which leads to an message updated event
removing duplicate field on show emote response
2021-04-24 18:04:19 +02:00
Sheldan
73ca42bd66 [AB-232] splitting logging functionality to separate module
changing user join/leave template to be an embed
2021-04-24 16:03:07 +02:00
Sheldan
9ab95c32bc [AB-234] updating templates to new meta config 2021-04-24 02:06:12 +02:00
Sheldan
4342747ab9 [AB-xxx] reducing amount of vertical space used by uptime embed 2021-04-19 22:24:45 +02:00
Sheldan
2c4c1c1079 [AB-128] adding templates to cooldown restrictions
changing duration formatting to also show seconds in case there are 0 (if its the only time period shown)
2021-04-19 00:40:36 +02:00
Sheldan
147a7142fd [AB-97] adding templates for react command 2021-04-13 23:48:16 +02:00
Sheldan
5828fe3bd9 [maven-release-plugin] prepare for next development iteration 2021-04-11 00:19:49 +02:00
338 changed files with 875 additions and 248 deletions

View File

@@ -3,7 +3,7 @@
<parent>
<artifactId>abstracto-modules</artifactId>
<groupId>dev.sheldan.abstracto-templates.templates</groupId>
<version>1.2.4</version>
<version>1.2.12</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@@ -4,13 +4,13 @@
<parent>
<groupId>dev.sheldan.abstracto-templates.templates</groupId>
<artifactId>abstracto-modules</artifactId>
<version>1.2.4</version>
<version>1.2.12</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<artifactId>core</artifactId>
<version>1.2.4</version>
<version>1.2.12</version>
<build>
<plugins>

View File

@@ -1 +1 @@
<#if days gt 1><#include "duration_days"><#elseif days = 1><#include "duration_day"></#if> <#if hours gt 1><#include "duration_hours"><#elseif hours = 1><#include "duration_hour"></#if> <#if minutes gt 1><#include "duration_minutes"><#elseif minutes = 1><#include "duration_minute"></#if> <#if seconds gt 1><#include "duration_seconds"><#elseif seconds = 1><#include "duration_second"></#if>
<#if days gt 1><#include "duration_days"><#elseif days = 1><#include "duration_day"></#if> <#if hours gt 1><#include "duration_hours"><#elseif hours = 1><#include "duration_hour"></#if> <#if minutes gt 1><#include "duration_minutes"><#elseif minutes = 1><#include "duration_minute"></#if> <#if seconds gt 1 || (seconds = 0 && days = 0 && hours = 0 && minutes = 0)><#include "duration_seconds"><#elseif seconds = 1><#include "duration_second"></#if>

View File

@@ -0,0 +1 @@
<#macro user_detail user>${user.name?json_string}#${user.discriminator} (${user.idLong?c})</#macro>

View File

@@ -26,23 +26,41 @@
<#if serverSpecificAliases?size gt 0>
<@safe_include "help_command_embed_command_server_aliases"/>: `${serverSpecificAliases?join("`, `")?json_string}`
</#if>
<#if cooldowns??>
<@safe_include "help_command_embed_command_cooldowns"/>:
<#if cooldowns.serverCoolDown?has_content>
<#assign serverCooldown>${fmtDuration(cooldowns.serverCoolDown)}</#assign>
<@safe_include "help_command_embed_command_cooldown_server"/>
</#if>
<#if cooldowns.channelCoolDown?has_content>
<#assign channelCooldown>${fmtDuration(cooldowns.channelCoolDown)}</#assign>
<@safe_include "help_command_embed_command_cooldown_channel"/>
</#if>
<#if cooldowns.memberCoolDown?has_content>
<#assign memberCooldown>${fmtDuration(cooldowns.memberCoolDown)}</#assign>
<@safe_include "help_command_embed_command_cooldown_member"/>
</#if>
</#if>
<#if restricted?? && restricted>
<@safe_include "help_command_embed_command_executable_by"/>:<#if allowedRoles??> <#list allowedRoles as allowedRole> ${allowedRole.asMention?json_string}<#sep><@safe_include "help_command_embed_or"/><#else><@safe_include "help_command_embed_command_executable_by_nobody"/></#list> </#if>
<#if immuneRoles?? ><@safe_include "help_command_embed_command_immune"/>: <#list immuneRoles as immuneRole> ${immuneRole.asMention?json_string}<#sep><@safe_include "help_command_embed_or"/><#else><@safe_include "help_command_embed_command_immune_none"/></#list> </#if>
<#else>
<@safe_include "help_command_embed_command_not_restricted"/>
</#if>
<#if effects??><@safe_include "help_command_embed_command_effects"/>: <#list effects as effect> <@safe_include "effect_type_${effect}"/><#sep>,<#else><@safe_include "help_command_embed_command_effects_none"/></#list> </#if>
</#if>
**<@safe_include "help_command_embed_command_parameters"/>**:
<#if command.parameters??>
<#list command.parameters as parameter><#assign parameter=parameter>
<@safe_include "help_command_embed_command_description"/> `${parameter.name?json_string}`: <#if parameter.templated?? && parameter.templated><@safe_include "${command.name}_parameter_${parameter.name}"/><#else>${(parameter.description?json_string)!""}</#if>
<@safe_include "help_command_embed_command_description"/> `${parameter.name?json_string}`: <#if parameter.templated?? && parameter.templated><@safe_include "${command.name}_parameter_${parameter.name}"/><#else>${(parameter.description?json_string)!""}</#if> <@safe_include "help_command_embed_command_optional"/>
<#list parameter.validators as validator><#assign validator=validator><#assign model=validator.templateModel/><@safe_include "${validator.templateName}"/>
</#list>
<@safe_include "help_command_embed_command_optional"/><#sep>
<#sep>
<#else>
<@safe_include "help_command_embed_command_no_parameters"/>
</#list>

View File

@@ -9,8 +9,9 @@
"fields": [
<#list groups as group>
{
"name": "${group.name?json_string} (<@safe_include "channel_group_type_${group.typeKey}_name"/>)",
"name": "${group.name?json_string} (<@safe_include "channel_group_type_${group.typeKey}_name"/> ${group.enabled?string('✅', '❌')})",
"value": "
<#if group.channelGroupInformation??><#assign model=group.channelGroupInformation.templateModel/> <@safe_include "${group.channelGroupInformation.templateName}"/></#if>
<#list group.channels as channel><#if channel.discordChannel??>${channel.discordChannel.asMention?json_string}<#else>${channel.channel.id?c}</#if><#sep>,<#else> <@safe_include "listChannelGroups_no_channels"/></#list>
"
}<#sep>,

View File

@@ -0,0 +1,8 @@
{
<#include "abstracto_color">,
"description": "
<#list effects as effect>
`${effect}` <@safe_include "effect_type_${effect}_description"/>
</#list>
"
}

View File

@@ -1,15 +1,9 @@
{
<#include "abstracto_color">,
"fields": [
{
"name": "<@safe_include "uptime_response_embed_start_date_field_title"/>",
<#assign startDate>${formatDate(startDate, "yyyy-MM-dd HH:mm:ss z")}</#assign>
"value": "${startDate}"
},
{
"name": "<@safe_include "uptime_response_embed_uptime_field_title"/>",
<#assign uptime>${fmtDuration(uptime)}</#assign>
"value": "${uptime}"
}
]
<#assign uptime>${fmtDuration(uptime)}</#assign>
"description": "${uptime}",
"footer": {
"text": "<@safe_include "uptime_response_embed_start_date_field_title"/>"
},
"timeStamp": "${startDate}"
}

View File

@@ -0,0 +1,3 @@
<#assign executeIn>${fmtDuration(model.reason.executeIn)}</#assign>
<#assign reason>${model.reason.reason}</#assign>
<#include "command_cool_down_detail_text">

View File

@@ -2,7 +2,9 @@
<#include "member_author">
<@member_author member=guildChannelMember.member/>,
<#include "warning_color">,
"preventEmptyEmbed": "true",
"metaConfig" : {
"preventEmptyEmbed": "true"
},
<#assign model=conditionDetail.templateModel/>
"description": "<@safe_include "${conditionDetail.templateName}"/>"
}

View File

@@ -1,2 +1,3 @@
<#assign roleName>${model.role.name}</#assign>
<#assign effect><#include "effect_type_${model.effectTypeKey}"></#assign>
<#include "immune_role_exception_text">

View File

@@ -1,3 +1,3 @@
<#assign featureName=model.featureEnum.key/>
<#assign featureName=model.featureDefinition.key/>
<#assign featureModes><#list model.requiredModes as mode>${mode.key}<#sep>,</#list></#assign>
<#include "incorrect_feature_mode_exception_text">

View File

@@ -1 +0,0 @@
<#assign user>${user.name}#${user.discriminator} (${user.asMention})</#assign><@safe_include "user_joined_text"/>

View File

@@ -1 +0,0 @@
<#assign user>${user.name}#${user.discriminator} (${user.asMention})</#assign><@safe_include "user_left_text"/>

View File

@@ -0,0 +1,2 @@
<#assign channelGroupName>${model.channelGroupName}</#assign>
<#include "channel_in_multiple_channel_groups_exception_text">

View File

@@ -0,0 +1,2 @@
<#assign channelGroupName>${model.channelGroupName}</#assign>
<#include "command_in_multiple_channel_groups_exception_text">

View File

@@ -0,0 +1 @@
<#include "command_not_found_in_group_exception_text">

View File

@@ -0,0 +1 @@
<#include "effect_type_not_found_exception_text">

View File

@@ -0,0 +1 @@
<#include "everyone_role_not_allowed_exception_text">

View File

@@ -10,7 +10,9 @@
},
</#if>
<#include "exception_color">,
"preventEmptyEmbed": "true",
"metaConfig" : {
"preventEmptyEmbed": "true"
},
<#if template?has_content>
<#if template.templateModel?has_content>
<#assign model=template.templateModel/>

View File

@@ -1,3 +1,3 @@
<#assign featureName=model.featureEnum.key/>
<#assign featureName=model.featureDefinition.key/>
<#assign featureModes><#list model.requiredModes as mode>${mode.key}<#sep>,</#list></#assign>
<#include "incorrect_feature_mode_exception_text">

View File

@@ -0,0 +1 @@
<#include "no_user_found_exception_text">

View File

@@ -0,0 +1,3 @@
<#assign channelCoolDown>${fmtDuration(model.channelCoolDown)}</#assign>
<#assign memberCoolDown>${fmtDuration(model.memberCoolDown)}</#assign>
<#include "channel_group_provider_cool_down_display_text">

View File

@@ -3,7 +3,7 @@
<parent>
<artifactId>abstracto-modules</artifactId>
<groupId>dev.sheldan.abstracto-templates.templates</groupId>
<version>1.2.4</version>
<version>1.2.12</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>

View File

@@ -0,0 +1 @@
<#include "react_duplicate_character_exception_text">

View File

@@ -0,0 +1 @@
<#include "react_too_many_reactions_exception_text">

View File

@@ -4,13 +4,13 @@
<parent>
<groupId>dev.sheldan.abstracto-templates.templates</groupId>
<artifactId>abstracto-modules</artifactId>
<version>1.2.4</version>
<version>1.2.12</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<artifactId>experience-tracking</artifactId>
<version>1.2.4</version>
<version>1.2.12</version>
<build>
<plugins>
<plugin>

View File

@@ -1,15 +1,20 @@
{
<#macro userDisplay user>
${user.rank} <#if user.member?has_content><@member_user_name member=user.member/> <#else>${user.experience.user.userReference.id?c}</#if> ${user.experience.experience} ${user.experience.currentLevel.level} ${user.experience.messageCount}
[${user.rank}] -> <#if user.member?has_content>**<@member_user_name member=user.member/>**<#else>${user.userId?c}</#if>
<@safe_include "leaderboard_experience_column"/>: ${user.experience} | <@safe_include "leaderboard_level_column"/>: ${user.level} | <@safe_include "leaderboard_messages_column"/>: ${user.messageCount}
</#macro>
<#include "member_author">
<@member_author member=member/>,
<#include "success_color">,
"description": "
<@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 />
</#list>
<@safe_include "leaderboard_own_placement"/>:
<@userDisplay user=userExecuting />
"
",
"footer": {
"text": "<@safe_include "leaderboard_footer"/>"
}
}

View File

@@ -0,0 +1,5 @@
{
<#include "success_color">,
"description": "<#list levelRoles as role><#if role.role??><#assign roleRepr=role.role.asMention><#else><#assign roleRepr=role.roleId?c></#if><#assign levelRepr=role.level><@safe_include "levelRoles_response_description"/><#sep>
<#else><@safe_include "levelRoles_no_roles_found"/></#list>"
}

View File

@@ -5,17 +5,17 @@
"fields": [
{
"name": "<@safe_include "rank_xp_field_title"/>",
"value": "${rankUser.experience.experience}",
"value": "${rankUser.experience}",
"inline": "true"
},
{
"name": "<@safe_include "rank_level_field_title"/>",
"value": "${rankUser.experience.currentLevel.level}",
"value": "${rankUser.level}",
"inline": "true"
},
{
"name": "<@safe_include "rank_messages_field_title"/>",
"value": "${rankUser.experience.messageCount}",
"value": "${rankUser.messageCount}",
"inline": "true"
},
{

View File

@@ -0,0 +1 @@
<#include "experience_role_not_found_exception_text">

View File

@@ -0,0 +1 @@
<#include "no_experience_tracked_exception_text">

View File

@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>abstracto-modules</artifactId>
<groupId>dev.sheldan.abstracto-templates.templates</groupId>
<version>1.2.12</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>invite-filter</artifactId>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<finalName>invite-filter-templates-${project.version}</finalName>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/main/assembly/assembly.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@@ -0,0 +1,15 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
<id>zip</id>
<includeBaseDirectory>false</includeBaseDirectory>
<formats>
<format>zip</format>
</formats>
<fileSets>
<fileSet>
<outputDirectory>.</outputDirectory>
<directory>${project.basedir}/src/main/resources</directory>
</fileSet>
</fileSets>
</assembly>

View File

@@ -4,7 +4,7 @@
},
<#include "success_color">,
"description": "<#list inviteLinks as link><#assign link=link/>
<#assign linkText>${link.code}</#assign>
<#assign linkText>${link.serverName}</#assign>
<#assign linkUses>${link.uses}</#assign>
<@safe_include "tracked_invite_links_link_display"/><#else><@safe_include "tracked_invite_links_no_links"/>
</#list>"

View File

@@ -3,7 +3,7 @@
<parent>
<artifactId>abstracto-modules</artifactId>
<groupId>dev.sheldan.abstracto-templates.templates</groupId>
<version>1.2.4</version>
<version>1.2.12</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>

View File

@@ -3,7 +3,7 @@
<#include "user_author">
<@user_author user=author/>
<#else>
<@safe_include "deleted_user_author"/>
<#include "deleted_user_author"/>
</#if>,
<#include "abstracto_color">,
<#if embeddedMessage.content?has_content || embeddedMessage.embeds?size gt 0>

View File

@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>dev.sheldan.abstracto-templates.templates</groupId>
<artifactId>abstracto-modules</artifactId>
<version>1.2.12</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>logging</artifactId>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<finalName>logging-templates-${project.version}</finalName>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/main/assembly/assembly.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@@ -0,0 +1,15 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
<id>zip</id>
<includeBaseDirectory>false</includeBaseDirectory>
<formats>
<format>zip</format>
</formats>
<fileSets>
<fileSet>
<outputDirectory>.</outputDirectory>
<directory>${project.basedir}/src/main/resources</directory>
</fileSet>
</fileSets>
</assembly>

View File

@@ -1,5 +1,6 @@
{
"imageUrl": "${imageUrl}",
<#include "abstracto_color"/>,
"fields": [
{
"name": "<@safe_include "messageDeleted_attachment_link_field_title"/>",

View File

@@ -0,0 +1,14 @@
{
"imageUrl": "${imageUrl}",
<#include "abstracto_color"/>,
"description": "<@safe_include "messageEdited_attachment_removed_description"/>",
"fields": [
{
"name": "<@safe_include "messageDeleted_attachment_link_field_title"/>",
"value": "[<@safe_include "messageDeleted_attachment_link_display_text"/>](${imageUrl})"
}
],
"footer": {
"text": "<@safe_include "messageDeleted_attachment_footer"/> #${counter}"
}
}

View File

@@ -0,0 +1,5 @@
{
<#assign user>${member.user.name}#${member.user.discriminator} (${member.asMention}: ${member.id})</#assign>
"description": "<@safe_include "user_joined_text"/>",
<#include "abstracto_color"/>
}

View File

@@ -0,0 +1,5 @@
{
<#assign user>${user.name}#${user.discriminator} (${user.id})</#assign>
"description": "<@safe_include "user_left_text"/>",
<#include "abstracto_color"/>
}

View File

@@ -4,13 +4,13 @@
<parent>
<groupId>dev.sheldan.abstracto-templates.templates</groupId>
<artifactId>abstracto-modules</artifactId>
<version>1.2.4</version>
<version>1.2.12</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<artifactId>moderation</artifactId>
<version>1.2.4</version>
<version>1.2.12</version>
<build>
<plugins>
<plugin>

View File

@@ -1,7 +1,6 @@
{
<#include "user_detail">
<#include "full_member_info">
<#include "member_author">
<@member_author member=bannedUser/>,
"title": {
"title": "<@safe_include "ban_log_title"/>"
},
@@ -9,15 +8,15 @@
"fields": [
{
"name": "<@safe_include "ban_log_banned_user_field_title"/>",
"value": "<@full_member_info member=bannedUser/>"
"value": "<@user_detail user=bannedUser/>"
},
{
"name": "<@safe_include "ban_log_banning_user_field_title"/>",
"value": "<@full_member_info member=banningUser/>"
"value": "<@full_member_info member=banningMember/>"
},
{
"name": "<@safe_include "ban_log_jump_link_field_title"/>",
"value": "[${messageChannel.name?json_string}](${message.jumpUrl})"
"value": "[${commandMessage.channel.name?json_string}](${commandMessage.jumpUrl})"
},
{
"name": "<@safe_include "ban_log_reason_field_title"/>",

View File

@@ -1,25 +0,0 @@
{
<#include "full_member_info">
"title": {
"title": "<@safe_include "ban_log_title"/>"
},
<#include "moderation_action_color">,
"fields": [
{
"name": "<@safe_include "ban_log_banned_user_field_title"/>",
"value": "${bannedUserId?c}"
},
{
"name": "<@safe_include "ban_log_banning_user_field_title"/>",
"value": "<@full_member_info member=banningUser/>"
},
{
"name": "<@safe_include "ban_log_jump_link_field_title"/>",
"value": "[${messageChannel.name?json_string}](${message.jumpUrl})"
},
{
"name": "<@safe_include "ban_log_reason_field_title"/>",
"value": "${reason?json_string}"
}
]
}

View File

@@ -21,7 +21,7 @@
<#assign user><#if note.fullUser.member?has_content>${note.fullUser.member.asMention?json_string}<#else>${note.fullUser.aUserInAServer.userReference.id?c}</#if></#assign>
<#assign noteText>${note.note.note?json_string}</#assign>
<#assign noteId>${note.note.userNoteId.id}</#assign>
<#assign date>${formatDate(note.note.created, "yyyy-MM-dd HH:mm:ss")}</#assign>
<#assign date>${formatDate(note.note.created, "yyyy-MM-dd HH:mm:ss zz")}</#assign>
<@safe_include "user_notes_note_entry"/><#else><@safe_include "user_notes_no_notes"/>
</#list>"
}

View File

@@ -29,7 +29,7 @@
},
{
"name": "<@safe_include "mute_log_muted_until_field_title"/>",
"value": "${formatDate(muteTargetDate, "yyyy-MM-dd HH:mm:ss")}"
"value": "${formatDate(muteTargetDate, "yyyy-MM-dd HH:mm:ss zz")}"
}
],
"footer": {

View File

@@ -12,7 +12,7 @@
{
"name": "<@safe_include "unMute_log_unmuted_user_field_title"/>",
<#if unMutedUser?has_content>
"value": "<@full_member_info member=mutingUser/>"
"value": "<@full_member_info member=unMutedUser/>"
<#else>
"value": "<@safe_include "user_left_server"/> (${mute.mutedUser.userReference.id?c})"
</#if>
@@ -32,7 +32,7 @@
},
{
"name": "<@safe_include "unMute_log_muted_since_field_title"/>",
"value": "${formatDate(mute.muteDate, "yyyy-MM-dd HH:mm:ss")}"
"value": "${formatDate(mute.muteDate, "yyyy-MM-dd HH:mm:ss zz")}"
},
{
"name": "<@safe_include "mute_log_mute_duration_field_title"/>",

View File

@@ -3,6 +3,5 @@
<@member_author member=member/>,
<#include "success_color">,
<#assign userMention><@member_user_name member=member/></#assign>
,"description" :"<@safe_include "myWarnings_with_decay_embed_description"/>"
</#if>
"description" :"<@safe_include "myWarnings_with_decay_embed_description"/>"
}

View File

@@ -0,0 +1,18 @@
{
<#include "user_detail">
<#include "full_member_info">
"title": {
"title": "<@safe_include "ban_log_title"/>"
},
<#include "moderation_action_color">,
"fields": [
{
"name": "<@safe_include "unBan_log_un_banned_user_field_title"/>",
"value": "<@user_detail user=bannedUser/>"
},
{
"name": "<@safe_include "unBan_log_un_banning_user_field_title"/>",
"value": "<@full_member_info member=unBanningMember/>"
}
]
}

View File

@@ -2,10 +2,10 @@
<#assign reason>${warning.warning.reason}</#assign>
<#assign warnedUserText><#if warning.warnedUser.member??>${warning.warnedUser.member.asMention}(${warning.warnedUser.member.user.id})<#else>${warning.warnedUser.aUserInAServer.id?c}</#if></#assign>
<#assign warningUserText><#if warning.warningUser.member??>${warning.warningUser.member.asMention}(${warning.warningUser.member.user.id})<#else>${warning.warningUser.aUserInAServer.id?c}</#if></#assign>
<#assign warnDate>${formatDate(warning.warning.warnDate, "yyyy-MM-dd HH:mm:ss")}</#assign>
<#assign warnDate>${formatDate(warning.warning.warnDate, "yyyy-MM-dd HH:mm:ss zz")}</#assign>
<#include "warnings_warn_entry_text">
<#if warning.warning.decayed>
<#assign decayDate>${formatDate(warning.warning.decayDate, "yyyy-MM-dd HH:mm:ss")}</#assign>
<#assign decayDate>${formatDate(warning.warning.decayDate, "yyyy-MM-dd HH:mm:ss zz")}</#assign>
<#include "warnings_warn_is_decayed">
</#if>

View File

@@ -0,0 +1,11 @@
{
<#include "abstracto_color">,
<#assign messageLink=reportedMessage.messageUrl>
"description" : "<@safe_include "reactionReport_notification_embed_description"/>",
"fields": [
{
"name": "<@safe_include "reactionReport_notification_embed_report_counter_field_title"/>",
"value": "${reportCount}"
}
]
}

View File

@@ -0,0 +1,25 @@
{
<#include "user_detail">
<#include "abstracto_color">,
"description" : "User was banned.",
"fields": [
{
"name": "Banned user",
"value": ""<@user_detail user=bannedUser/>"
}
<#if banningUser??>
,
{
"name": "Banning user",
"value": "<@user_detail user=banningUser/>"
}
</#if>
<#if reason??>
,
{
"name": "reason",
"value": "${reason}"
}
</#if>
]
}

View File

@@ -0,0 +1,18 @@
{
<#include "user_detail">
<#include "abstracto_color">,
"description" : "User was un-banned.",
"fields": [
{
"name": "Un-Banned user",
"value": "<@user_detail user=unBannedUser/>"
}
<#if unBanningUser??>
,
{
"name": "Un-banning user",
"value": "<@user_detail user=unBanningUser/>"
}
</#if>
]
}

View File

@@ -4,7 +4,7 @@
},
<#include "moderation_action_color">,
"description": "<#list warnings as warning><#assign warning=warning/>
<#if warning.warnedMember??><#assign warnedUser>${warning.warnedMember.asMention?json_string} (${warning.warnedMember.id?c})</#assign><#else><#assign warnedUser> ${warning.warnedUser.userId?c}</#assign></#if> <#if warning.warningMember??><#assign warningUser> ${warning.warningMember.asMention?json_string} (${warning.warningMember.id})</#assign><#else><#assign warningUser>${warning.warningUser.warningUser.userId?c}</#assign></#if> <#assign warnDate>${formatDate(warning.warning.warnDate, "yyyy-MM-dd HH:mm:ss")}</#assign><#assign warnReason=warning.warning.reason/> <@safe_include "warnDecay_log_warn_entry"/>
<#if warning.warnedMember??><#assign warnedUser>${warning.warnedMember.asMention?json_string} (${warning.warnedMember.idLong?c})</#assign><#else><#assign warnedUser> ${warning.warnedUser.userId?c}</#assign></#if> <#if warning.warningMember??><#assign warningUser> ${warning.warningMember.asMention?json_string} (${warning.warningMember.idLong?c})</#assign><#else><#assign warningUser>${warning.warningUser.warningUser.userId?c}</#assign></#if> <#assign warnDate>${formatDate(warning.warning.warnDate, "yyyy-MM-dd HH:mm:ss zz")}</#assign><#assign warnReason=warning.warning.reason/> <@safe_include "warnDecay_log_warn_entry"/>
<#else>
<@safe_include "warnDecay_log_no_warnings"/>
</#list>"

View File

@@ -0,0 +1,6 @@
{
<#assign reason=warnReason>
<#assign warningDate>${formatDate(warnDate, "yyyy-MM-dd HH:mm:ss zz")}</#assign>
<#assign remainingWarningsCount=remainingWarningsCount>
"additionalMessage": "<@safe_include "warnDecay_member_notification_text"/>"
}

View File

@@ -4,13 +4,13 @@
<parent>
<groupId>dev.sheldan.abstracto-templates.templates</groupId>
<artifactId>abstracto-modules</artifactId>
<version>1.2.4</version>
<version>1.2.12</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<artifactId>modmail</artifactId>
<version>1.2.4</version>
<version>1.2.12</version>
<build>
<plugins>
<plugin>

View File

@@ -5,7 +5,7 @@
<#include "modmail_color">,
<#assign messageCount>${closedThread.messages?size}</#assign>
<#assign user>user</#assign>
<#assign startDate>${formatDate(closedThread.created,"yyyy-MM-dd HH:mm:ss")}</#assign>
<#assign startDate>${formatDate(closedThread.created,"yyyy-MM-dd HH:mm:ss zz")}</#assign>
<#assign duration>${fmtDuration(duration)}</#assign>
"description": "<@safe_include "close_closing_description"/>"
}

View File

@@ -4,14 +4,14 @@
<parent>
<groupId>dev.sheldan.abstracto-templates</groupId>
<artifactId>templates</artifactId>
<version>1.2.4</version>
<version>1.2.12</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<groupId>dev.sheldan.abstracto-templates.templates</groupId>
<artifactId>abstracto-modules</artifactId>
<version>1.2.4</version>
<version>1.2.12</version>
<modules>
<module>core</module>
@@ -28,6 +28,9 @@
<module>starboard</module>
<module>suggestion</module>
<module>webservices</module>
<module>logging</module>
<module>invite-filter</module>
<module>profanity-filter</module>
</modules>
</project>

View File

@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>dev.sheldan.abstracto-templates.templates</groupId>
<artifactId>abstracto-modules</artifactId>
<version>1.2.12</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>profanity-filter</artifactId>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<finalName>profanity-filter-templates-${project.version}</finalName>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/main/assembly/assembly.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@@ -0,0 +1,15 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
<id>zip</id>
<includeBaseDirectory>false</includeBaseDirectory>
<formats>
<format>zip</format>
</formats>
<fileSets>
<fileSet>
<outputDirectory>.</outputDirectory>
<directory>${project.basedir}/src/main/resources</directory>
</fileSet>
</fileSets>
</assembly>

View File

@@ -0,0 +1,32 @@
{
<#include "full_member_info">
<#include "abstracto_color">,
<#include "member_author">
<@member_author member=member/>,
"fields": [
{
"name": "<@safe_include "profanities_response_embed_true_profanities_field_title"/>",
"value": "${truePositives?c}",
"inline": "true"
},
{
"name": "<@safe_include "profanities_response_embed_false_profanities_field_title"/>",
"value": "${falsePositives?c}",
"inline": "true"
}<#if recentPositiveReports?size gt 0>
,
{
"name": "",
"value": "",
"inline": "true"
},
<#list recentPositiveReports as report><#assign report=report>
{
<#assign reportIndex>${report?index + 1}</#assign>
"name": "<@safe_include "profanities_response_embed_true_profanities_report_field_value"/>",
"value": "[<@safe_include "profanities_response_embed_true_profanities_link_field_title"/>](${report.jumpUrl})",
"inline": "true"
}<#sep>,</#list>
</#if>
]
}

View File

@@ -0,0 +1,27 @@
{
<#include "full_member_info">
<#include "abstracto_color">,
"description": "<@safe_include "profanityListener_report_embed_description"/>",
"fields": [
{
"name": "<@safe_include "profanityListener_report_embed_member_field_title"/>",
"value": "<@full_member_info member=profaneMessage.member/>",
"inline": "true"
},
{
"name": "<@safe_include "profanityListener_report_embed_message_link_field_title"/>",
"value": "[${profaneMessage.channel.name?json_string}](${profaneMessage.jumpUrl?json_string})",
"inline": "true"
},
{
"name": "<@safe_include "profanityListener_report_embed_profanity_type_field_title"/>",
"value": "${profanityGroupKey}",
"inline": "true"
},
{
"name": "<@safe_include "profanityListener_report_embed_message_content_field_title"/>",
"value": "${profaneMessage.contentRaw}",
"inline": "true"
}
]
}

View File

@@ -3,7 +3,7 @@
<parent>
<artifactId>abstracto-modules</artifactId>
<groupId>dev.sheldan.abstracto-templates.templates</groupId>
<version>1.2.4</version>
<version>1.2.12</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>

View File

@@ -17,5 +17,5 @@
"value": "[<@safe_include "remind_reminder_link_content_display_text"/>](${messageUrl})"
}
],
"additionalMessage": "${member.asMention?json_string}"
"additionalMessage": "${member.asMention?json_string} 🔔"
}

View File

@@ -12,7 +12,7 @@
<#list reminders as reminderDisplay><#assign reminderDisplay=reminderDisplay/>
{
<#assign id>${reminderDisplay.reminder.id}</#assign>
<#assign reminderTargetDate>${formatDate(reminderDisplay.reminder.targetDate,"yyyy-MM-dd HH:mm:ss")}</#assign>
<#assign reminderTargetDate>${formatDate(reminderDisplay.reminder.targetDate,"yyyy-MM-dd HH:mm:ss zz")}</#assign>
<#assign reminderText=reminderDisplay.reminder.text/>
<#assign messageLink=reminderDisplay.message.jumpUrl/>
"name": "<@safe_include "reminders_reminder_field_title"/>",

View File

@@ -0,0 +1 @@
<#include "reminder_snooze_not_possible_exception_text">

View File

@@ -3,7 +3,7 @@
<parent>
<artifactId>abstracto-modules</artifactId>
<groupId>dev.sheldan.abstracto-templates.templates</groupId>
<version>1.2.4</version>
<version>1.2.12</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>

View File

@@ -3,7 +3,7 @@
<parent>
<artifactId>abstracto-modules</artifactId>
<groupId>dev.sheldan.abstracto-templates.templates</groupId>
<version>1.2.4</version>
<version>1.2.12</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>

View File

@@ -4,13 +4,13 @@
<parent>
<groupId>dev.sheldan.abstracto-templates.templates</groupId>
<artifactId>abstracto-modules</artifactId>
<version>1.2.4</version>
<version>1.2.12</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<artifactId>statistic</artifactId>
<version>1.2.4</version>
<version>1.2.12</version>
<build>
<plugins>
<plugin>

View File

@@ -3,5 +3,5 @@
"title": "<@safe_include "deletedEmoteStats_animated_emotes_title"/>"
},
<#include "statistic_color">,
"description": "<#list animatedEmotes as emote>`${emote.trackedEmote.emoteName}:${emote.trackedEmote.trackedEmoteId.emoteId?c}`x${emote.result.amount}<#sep>, </#list>"
"description": "<#list animatedEmotes as emote>`${emote.trackedEmote.emoteName}:${emote.trackedEmote.trackedEmoteId.id?c}`x${emote.result.amount?c}<#sep>, </#list>"
}

View File

@@ -3,5 +3,5 @@
"title": "<@safe_include "deletedEmoteStats_static_emotes_title"/>"
},
<#include "statistic_color">,
"description": "<#list staticEmotes as emote>`${emote.trackedEmote.emoteName}:${emote.trackedEmote.trackedEmoteId.emoteId?c}`x${emote.result.amount}<#sep>, </#list>"
"description": "<#list staticEmotes as emote>`${emote.trackedEmote.emoteName}:${emote.trackedEmote.trackedEmoteId.id?c}`x${emote.result.amount?c}<#sep>, </#list>"
}

View File

@@ -3,5 +3,5 @@
"title": "<@safe_include "emoteStats_animated_emotes_title"/>"
},
<#include "statistic_color">,
"description": "<#list animatedEmotes as emote><#if emote.emote?has_content>${emote.emote.asMention}x${emote.result.amount}<#sep> </#if></#list>"
"description": "<#list animatedEmotes as emote><#if emote.emote?has_content>${emote.emote.asMention}x${emote.result.amount?c}<#sep> </#if></#list>"
}

View File

@@ -3,5 +3,5 @@
"title": "<@safe_include "emoteStats_static_emotes_title"/>"
},
<#include "statistic_color">,
"description": "<#list staticEmotes as emote><#if emote.emote?has_content>${emote.emote.asMention}x${emote.result.amount}<#sep> </#if></#list>"
"description": "<#list staticEmotes as emote><#if emote.emote?has_content>${emote.emote.asMention}x${emote.result.amount?c}<#sep> </#if></#list>"
}

View File

@@ -3,5 +3,5 @@
"title": "<@safe_include "externalEmoteStats_animated_emotes_title"/>"
},
<#include "statistic_color">,
"description": "<#list animatedEmotes as emote>`${emote.trackedEmote.emoteName}:${emote.trackedEmote.trackedEmoteId.emoteId?c}`x${emote.result.amount}<#sep>, </#list>"
"description": "<#list animatedEmotes as emote>`${emote.trackedEmote.emoteName}:${emote.trackedEmote.trackedEmoteId.id?c}`x${emote.result.amount?c}<#sep>, </#list>"
}

View File

@@ -3,5 +3,5 @@
"title": "<@safe_include "externalEmoteStats_static_emotes_title"/>"
},
<#include "statistic_color">,
"description": "<#list staticEmotes as emote>`${emote.trackedEmote.emoteName}:${emote.trackedEmote.trackedEmoteId.id?c}`x${emote.result.amount}<#sep>, </#list>"
"description": "<#list staticEmotes as emote>`${emote.trackedEmote.emoteName}:${emote.trackedEmote.trackedEmoteId.id?c}`x${emote.result.amount?c}<#sep>, </#list>"
}

View File

@@ -10,7 +10,7 @@
},
{
"name": "<@safe_include "showExternalTrackedEmote_response_embed_emote_id_field_title"/>",
"value": "${trackedEmoteId.emoteId?c}"
"value": "${trackedEmoteId.id?c}"
},
{
"name": "<@safe_include "showExternalTrackedEmote_response_embed_link_field_title"/>",

View File

@@ -3,5 +3,5 @@
"title": "<@safe_include "showTrackedEmotes_animated_tracked_emotes_title"/>"
},
<#include "statistic_color">,
"description": "<#list animatedEmotes as emote><#if emote.emote?has_content>${emote.emote.asMention}<#if !emote.trackedEmote.trackingEnabled>(<#include "showTrackedEmotes_emote_tracking_disabled">)</#if><#sep>, </#if></#list>"
"description": "<#list animatedEmotes as emote><#if emote.emote?has_content>${emote.emote.asMention}<#if !emote.trackedEmote.trackingEnabled>(<#include "showTrackedEmotes_emote_tracking_disabled">)</#if><#sep> </#if></#list>"
}

View File

@@ -3,5 +3,5 @@
"title": "<@safe_include "showTrackedEmotes_deleted_animated_tracked_emotes_title"/>"
},
<#include "statistic_color">,
"description": "<#list deletedAnimatedEmotes as emote>`${emote.emoteName}:${emote.trackedEmoteId.emoteId?c}`<#if !emote.trackingEnabled>(<#include "showTrackedEmotes_emote_tracking_disabled">)</#if><#sep>, </#list>"
"description": "<#list deletedAnimatedEmotes as emote>`${emote.emoteName}:${emote.trackedEmoteId.id?c}`<#if !emote.trackingEnabled>(<#include "showTrackedEmotes_emote_tracking_disabled">)</#if><#sep> </#list>"
}

View File

@@ -3,5 +3,5 @@
"title": "<@safe_include "showTrackedEmotes_deleted_static_tracked_emotes_title"/>"
},
<#include "statistic_color">,
"description": "<#list deletedStaticEmotes as emote>`${emote.emoteName}:${emote.trackedEmoteId.emoteId?c}`<#if !emote.trackingEnabled>(<#include "showTrackedEmotes_emote_tracking_disabled">)</#if><#sep>, </#list>"
"description": "<#list deletedStaticEmotes as emote>`${emote.emoteName}:${emote.trackedEmoteId.id?c}`<#if !emote.trackingEnabled>(<#include "showTrackedEmotes_emote_tracking_disabled">)</#if><#sep> </#list>"
}

View File

@@ -3,5 +3,5 @@
"title": "<@safe_include "showTrackedEmotes_external_animated_tracked_emotes_title"/>"
},
<#include "statistic_color">,
"description": "<#list externalAnimatedEmotes as emote>`${emote.emoteName}:${emote.trackedEmoteId.emoteId?c}`<#if !emote.trackingEnabled>(<#include "showTrackedEmotes_emote_tracking_disabled">)</#if><#sep>, </#list>"
"description": "<#list externalAnimatedEmotes as emote>`${emote.emoteName}:${emote.trackedEmoteId.id?c}`<#if !emote.trackingEnabled>(<#include "showTrackedEmotes_emote_tracking_disabled">)</#if><#sep> </#list>"
}

View File

@@ -3,5 +3,5 @@
"title": "<@safe_include "showTrackedEmotes_external_static_tracked_emotes_title"/>"
},
<#include "statistic_color">,
"description": "<#list externalStaticEmotes as emote>`${emote.emoteName}:${emote.trackedEmoteId.emoteId?c}`<#if !emote.trackingEnabled>(<#include "showTrackedEmotes_emote_tracking_disabled">)</#if><#sep>, </#list>"
"description": "<#list externalStaticEmotes as emote>`${emote.emoteName}:${emote.trackedEmoteId.id?c}`<#if !emote.trackingEnabled>(<#include "showTrackedEmotes_emote_tracking_disabled">)</#if><#sep> </#list>"
}

View File

@@ -3,7 +3,7 @@
<parent>
<artifactId>abstracto-modules</artifactId>
<groupId>dev.sheldan.abstracto-templates.templates</groupId>
<version>1.2.4</version>
<version>1.2.12</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>

View File

@@ -0,0 +1,15 @@
{
<#include "user_author">
<@user_author user=suggester/>,
<#include "user_user_name">
<#assign user><@user_user_name user=suggester/></#assign>
<#include "abstracto_color">,
<#assign id>${suggestionId}</#assign>
"description": "${text?json_string}",
<#if message?? && message.attachments?size gt 0>
"imageUrl": "${message.attachments[0].proxyUrl}",
</#if>
"footer": {
"text": "<@safe_include "suggest_suggestion_id_footer"/>"
}
}

View File

@@ -1,45 +0,0 @@
{
"author": {
<#if suggester?has_content>
"name": "<@member_user_name member=suggester/>",
"avatar": "${suggester.user.effectiveAvatarUrl}"
<#else>
"name": "${suggesterUser.userReference.id?c} (<@safe_include "user_left_server"/>)"
</#if>
},
<#assign user><@member_user_name member=member/></#assign>
<#if state = "ACCEPTED">
"title": {
"title": "<@safe_include "suggest_accepted_by"/>"
},
<#elseif state = "REJECTED">
"title": {
"title": "<@safe_include "suggest_rejected_by"/>"
},
</#if>
<#include "abstracto_color">,
<#assign id>${suggestionId}</#assign>
<#if state = "ACCEPTED" || state = "REJECTED">
"description": "~~${text?json_string}~~",
<#else>
"description": "${text?json_string}",
</#if>
<#if state = "ACCEPTED" || state = "REJECTED">
"fields": [
{
"name": "<@safe_include "suggest_link_field_title"/>",
"value": "[<@safe_include "suggest_link_display_value"/>](${originalMessageUrl})"
}
<#if reason?has_content>
,
{
"name": "<@safe_include "suggest_reason_field_title"/>",
"value": "${reason?json_string}"
}
</#if>
],
</#if>
"footer": {
"text": "<@safe_include "suggest_suggestion_id_footer"/>"
}
}

View File

@@ -0,0 +1,7 @@
{
<#assign suggestionId=suggestionId>
<#assign suggestionDate>${formatDate(suggestionCreationDate, "yyyy-MM-dd HH:mm:ss zz")}</#assign>
<#assign suggestionLink=suggestionMessage.jumpUrl>
<#include "abstracto_color"/>,
"description": "<@safe_include "suggestionReminderJob_description"/>"
}

View File

@@ -0,0 +1,19 @@
{
<#assign id>${suggestionId}</#assign>
"additionalMessage": "<@safe_include "suggest_state_${state?lower_case}_comment"/>",
<#if reason?has_content || message?? && message.attachments?size gt 0>
<#include "abstracto_color">,
<#if message?? && message.attachments?size gt 0>
"imageUrl": "${message.attachments[0].proxyUrl}",
</#if>
<#if reason?has_content>
"fields": [
{
"name": "<@safe_include "suggest_reason_field_title"/>",
"value": "${reason?json_string}"
}
],
</#if>
</#if>
"referencedMessageId": "${originalMessageId?c}"
}

View File

@@ -1 +0,0 @@
<#include "suggestion_update_exception_text">

View File

@@ -0,0 +1 @@
<#include "un_suggest_not_possible_exception_text">

View File

@@ -4,13 +4,13 @@
<parent>
<groupId>dev.sheldan.abstracto-templates.templates</groupId>
<artifactId>abstracto-modules</artifactId>
<version>1.2.4</version>
<version>1.2.12</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<artifactId>utility</artifactId>
<version>1.2.4</version>
<version>1.2.12</version>
<build>
<plugins>
<plugin>

View File

@@ -29,6 +29,16 @@
"value": "${guild.timeCreated}",
"inline": "true"
},
{
"name": "<@safe_include "serverinfo_embed_text_channel_count_field_title"/>",
"value": "${guild.textChannels?size}",
"inline": "true"
},
{
"name": "<@safe_include "serverinfo_embed_voice_channel_count_field_title"/>",
"value": "${guild.voiceChannels?size}",
"inline": "true"
},
{
"name": "<@safe_include "serverinfo_embed_emote_count_title"/>",
"value": "${guild.emotes?size}",
@@ -41,7 +51,7 @@
},
{
"name": "<@safe_include "serverinfo_embed_features_field_title"/>",
"value": "<#list guild.features as feature>${feature}<#else><@safe_include "serverinfo_embed_features_no_features"/></#list>",
"value": "<#list guild.features as feature>${feature}<#sep>, <#else><@safe_include "serverinfo_embed_features_no_features"/></#list>",
"inline": "true"
}
]

View File

@@ -7,11 +7,6 @@
"value": "${emote.name}",
"inline": "true"
},
{
"name": "<@safe_include "showEmote_response_embed_emote_link_field_title"/>",
"value": "[<@safe_include "showEmote_response_embed_emote_link_field_text"/>](${emote.imageUrl})",
"inline": "true"
},
{
"name": "<@safe_include "showEmote_response_embed_emote_link_field_title"/>",
"value": "${emote.imageUrl}",

View File

@@ -23,12 +23,12 @@
},
{
"name": "<@safe_include "userInfo_response_embed_joined_field_title"/>",
"value": "${formatDate(memberInfo.timeJoined, "yyyy-MM-dd HH:mm:ss")}",
"value": "${formatDate(memberInfo.timeJoined, "yyyy-MM-dd HH:mm:ss zz")}",
"inline": "true"
},
{
"name": "<@safe_include "userInfo_response_embed_registered_field_title"/>",
"value": "${formatDate(memberInfo.timeCreated, "yyyy-MM-dd HH:mm:ss")}",
"value": "${formatDate(memberInfo.timeCreated, "yyyy-MM-dd HH:mm:ss zz")}",
"inline": "true"
}
<#if memberInfo.activities?size gt 0>

View File

@@ -3,7 +3,7 @@
<parent>
<artifactId>abstracto-modules</artifactId>
<groupId>dev.sheldan.abstracto-templates.templates</groupId>
<version>1.2.4</version>
<version>1.2.12</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Some files were not shown because too many files have changed in this diff Show More