Compare commits

..

3 Commits

56 changed files with 106 additions and 93 deletions

View File

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

View File

@@ -3,7 +3,7 @@
<parent>
<artifactId>abstracto-modules</artifactId>
<groupId>dev.sheldan.abstracto-templates.templates</groupId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</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.4.65</version>
<version>1.4.66-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<artifactId>core</artifactId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</version>
<build>
<plugins>

View File

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

View File

@@ -3,7 +3,7 @@
<parent>
<artifactId>abstracto-modules</artifactId>
<groupId>dev.sheldan.abstracto-templates.templates</groupId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</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.4.65</version>
<version>1.4.66-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<artifactId>experience-tracking</artifactId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</version>
<build>
<plugins>
<plugin>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>dev.sheldan.abstracto-templates.templates</groupId>
<artifactId>abstracto-modules</artifactId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</version>
</parent>
<artifactId>giveaway</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>dev.sheldan.abstracto-templates.templates</groupId>
<artifactId>abstracto-modules</artifactId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</version>
</parent>
<artifactId>image-generation</artifactId>

View File

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

View File

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

View File

@@ -37,22 +37,29 @@
</#if>
<#list embeddedMessage.embeds as embed>
<#if embed.description?has_content>
,{
<#assign hasContent=true>
"type": "section",
"components": [
<#if embeddedMessage.content?has_content>,</#if>
<#if (embed.cachedImageInfo?has_content && embed.cachedImageInfo.proxyUrl?has_content) || (embed.cachedThumbnail?has_content && embed.cachedThumbnail.proxyUrl?has_content)>
{
<#assign hasContent=true>
"accessory": {
"type": "thumbnail",
"url": "${(embed.cachedImageInfo.proxyUrl)!embed.cachedThumbnail.proxyUrl}"
},
"type": "section",
"components": [
{
"type": "textDisplay",
"content": "${embed.description?json_string}"
}
]
}
<#else>
{
"type": "textDisplay",
"content": "${embed.description?json_string}"
}
]
<#if (embed.cachedImageInfo?has_content && embed.cachedImageInfo.proxyUrl?has_content) || (embed.cachedThumbnail?has_content && embed.cachedThumbnail.proxyUrl?has_content)>
,"accessory": {
"type": "thumbnail",
"url": "${(embed.cachedImageInfo.proxyUrl)!embed.cachedThumbnail.proxyUrl}"
}
</#if>
}
<#assign hasContent=true>
<#elseif (embed.cachedImageInfo?has_content && embed.cachedImageInfo.proxyUrl?has_content && embed.cachedImageInfo.width gt 0)
|| (embed.cachedThumbnail?has_content && embed.cachedThumbnail.proxyUrl?has_content && embed.cachedThumbnail.width gt 0)>
<#assign hasContent=true>
@@ -67,18 +74,18 @@
</#if>
</#list>
<#if embeddedMessage.attachments?size gt 0>
<#list embeddedMessage.attachments?filter(x -> x.width gt 0)>
,{
<#assign hasContent=true>
"type": "mediaGallery",
"images": [
<#items as attachment>
{
"url": "${attachment.proxyUrl}"
}<#sep>,</#items>
]
}</#list>
</#if>
<#list embeddedMessage.attachments?filter(x -> x.width gt 0)>
<#if hasContent>,</#if>{
<#assign hasContent=true>
"type": "mediaGallery",
"images": [
<#items as attachment>
{
"url": "${attachment.proxyUrl}"
}<#sep>,</#items>
]
}</#list>
</#if>
<#if hasContent==false>
{
"type": "textDisplay",

View File

@@ -3,7 +3,7 @@
<parent>
<groupId>dev.sheldan.abstracto-templates.templates</groupId>
<artifactId>abstracto-modules</artifactId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</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.4.65</version>
<version>1.4.66-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<artifactId>moderation</artifactId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</version>
<build>
<plugins>
<plugin>

View File

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

View File

@@ -4,14 +4,14 @@
<parent>
<groupId>dev.sheldan.abstracto-templates</groupId>
<artifactId>templates</artifactId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<groupId>dev.sheldan.abstracto-templates.templates</groupId>
<artifactId>abstracto-modules</artifactId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</version>
<modules>
<module>core</module>

View File

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

View File

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

View File

@@ -23,7 +23,11 @@
"value": "[<@safe_include "remind_reminder_link_content_display_text"/>](${messageUrl})"
}
</#if>
]
]<#if !reminderDisplay.userCommand>,
"footer": {
"text": "<@safe_include "remind_reminder_snooze_hint"/>"
}
</#if>
}
]
<#if !reminderDisplay.userCommand>,

View File

@@ -3,7 +3,7 @@
<parent>
<artifactId>abstracto-modules</artifactId>
<groupId>dev.sheldan.abstracto-templates.templates</groupId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</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.4.65</version>
<version>1.4.66-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>

View File

@@ -47,7 +47,7 @@
<#list message.embeds as embed>
<#if embed.description?has_content && !((embed.cachedImageInfo?has_content && embed.cachedImageInfo.proxyUrl?has_content) || (embed.cachedThumbnail?has_content && embed.cachedThumbnail.proxyUrl?has_content))>
<#assign hasContent=true>
{
<#if message.content?has_content>,</#if>{
"type": "textDisplay",
"content": "${embed.description?json_string}"
}
@@ -82,8 +82,8 @@
</#list>
<#if message.attachments?size gt 0>
<#list message.attachments?filter(x -> x.width gt 0)>
<#assign hasContent=true>
,{
<#if hasContent>,</#if><#assign hasContent=true>
{
"type": "mediaGallery",
"images": [
<#items as attachment>

View File

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

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>dev.sheldan.abstracto-templates.templates</groupId>
<artifactId>abstracto-modules</artifactId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</version>
</parent>
<artifactId>sticky-roles</artifactId>

View File

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

View File

@@ -3,7 +3,7 @@
<parent>
<groupId>dev.sheldan.abstracto-templates.templates</groupId>
<artifactId>abstracto-modules</artifactId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</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.4.65</version>
<version>1.4.66-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<artifactId>utility</artifactId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</version>
<build>
<plugins>
<plugin>

View File

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

View File

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

View File

@@ -5,7 +5,7 @@
<groupId>dev.sheldan.abstracto-templates</groupId>
<artifactId>templates</artifactId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</version>
<modules>
<module>abstracto-modules</module>
@@ -24,7 +24,7 @@
<connection>scm:git:${project.scm.url}</connection>
<developerConnection>scm:git:${project.scm.url}</developerConnection>
<url>https://github.com/Sheldan/abstracto-templates.git</url>
<tag>templates-1.4.65</tag>
<tag>HEAD</tag>
</scm>
<repositories>

View File

@@ -3,7 +3,7 @@
<parent>
<artifactId>translations</artifactId>
<groupId>dev.sheldan.abstracto-templates.translations</groupId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@@ -3,7 +3,7 @@
<parent>
<artifactId>translations</artifactId>
<groupId>dev.sheldan.abstracto-templates.translations</groupId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@@ -4,13 +4,13 @@
<parent>
<groupId>dev.sheldan.abstracto-templates.translations</groupId>
<artifactId>translations</artifactId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<artifactId>core</artifactId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</version>
<build>
<plugins>
<plugin>

View File

@@ -3,7 +3,7 @@
<parent>
<groupId>dev.sheldan.abstracto-templates.translations</groupId>
<artifactId>translations</artifactId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@@ -3,7 +3,7 @@
<parent>
<artifactId>translations</artifactId>
<groupId>dev.sheldan.abstracto-templates.translations</groupId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>

View File

@@ -4,13 +4,13 @@
<parent>
<groupId>dev.sheldan.abstracto-templates.translations</groupId>
<artifactId>translations</artifactId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<artifactId>experience-tracking</artifactId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</version>
<build>
<plugins>
<plugin>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>dev.sheldan.abstracto-templates.translations</groupId>
<artifactId>translations</artifactId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</version>
</parent>
<artifactId>giveaway</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>dev.sheldan.abstracto-templates.translations</groupId>
<artifactId>translations</artifactId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</version>
</parent>
<artifactId>image-generation</artifactId>

View File

@@ -3,7 +3,7 @@
<parent>
<artifactId>translations</artifactId>
<groupId>dev.sheldan.abstracto-templates.translations</groupId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@@ -3,7 +3,7 @@
<parent>
<artifactId>translations</artifactId>
<groupId>dev.sheldan.abstracto-templates.translations</groupId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>

View File

@@ -3,7 +3,7 @@
<parent>
<artifactId>translations</artifactId>
<groupId>dev.sheldan.abstracto-templates.translations</groupId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@@ -4,13 +4,13 @@
<parent>
<groupId>dev.sheldan.abstracto-templates.translations</groupId>
<artifactId>translations</artifactId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<artifactId>moderation</artifactId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</version>
<build>
<plugins>
<plugin>

View File

@@ -4,13 +4,13 @@
<parent>
<groupId>dev.sheldan.abstracto-templates.translations</groupId>
<artifactId>translations</artifactId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<artifactId>modmail</artifactId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</version>
<build>
<plugins>
<plugin>

View File

@@ -4,14 +4,14 @@
<parent>
<groupId>dev.sheldan.abstracto-templates</groupId>
<artifactId>templates</artifactId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<groupId>dev.sheldan.abstracto-templates.translations</groupId>
<artifactId>translations</artifactId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</version>
<modules>
<module>core</module>

View File

@@ -3,7 +3,7 @@
<parent>
<groupId>dev.sheldan.abstracto-templates.translations</groupId>
<artifactId>translations</artifactId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@@ -3,7 +3,7 @@
<parent>
<artifactId>translations</artifactId>
<groupId>dev.sheldan.abstracto-templates.translations</groupId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>

View File

@@ -0,0 +1 @@
In case you want to be reminded at a different time, you can set a new duration using the snooze command.

View File

@@ -3,7 +3,7 @@
<parent>
<artifactId>translations</artifactId>
<groupId>dev.sheldan.abstracto-templates.translations</groupId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>

View File

@@ -3,7 +3,7 @@
<parent>
<artifactId>translations</artifactId>
<groupId>dev.sheldan.abstracto-templates.translations</groupId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>

View File

@@ -4,13 +4,13 @@
<parent>
<groupId>dev.sheldan.abstracto-templates.translations</groupId>
<artifactId>translations</artifactId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<artifactId>statistic</artifactId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</version>
<build>
<plugins>
<plugin>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>dev.sheldan.abstracto-templates.translations</groupId>
<artifactId>translations</artifactId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</version>
</parent>
<artifactId>sticky-roles</artifactId>

View File

@@ -3,7 +3,7 @@
<parent>
<artifactId>translations</artifactId>
<groupId>dev.sheldan.abstracto-templates.translations</groupId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>

View File

@@ -3,7 +3,7 @@
<parent>
<artifactId>translations</artifactId>
<groupId>dev.sheldan.abstracto-templates.translations</groupId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>

View File

@@ -4,13 +4,13 @@
<parent>
<groupId>dev.sheldan.abstracto-templates.translations</groupId>
<artifactId>translations</artifactId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<artifactId>utility</artifactId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</version>
<build>
<plugins>
<plugin>

View File

@@ -3,7 +3,7 @@
<parent>
<artifactId>translations</artifactId>
<groupId>dev.sheldan.abstracto-templates.translations</groupId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@@ -3,7 +3,7 @@
<parent>
<groupId>dev.sheldan.abstracto-templates.translations</groupId>
<artifactId>translations</artifactId>
<version>1.4.65</version>
<version>1.4.66-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>