Compare commits

...

5 Commits

58 changed files with 77 additions and 68 deletions

View File

@@ -3,7 +3,7 @@
<parent>
<artifactId>abstracto-modules</artifactId>
<groupId>dev.sheldan.abstracto-templates.templates</groupId>
<version>1.4.69</version>
<version>1.4.71-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.69</version>
<version>1.4.71-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.69</version>
<version>1.4.71-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<artifactId>core</artifactId>
<version>1.4.69</version>
<version>1.4.71-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.69</version>
<version>1.4.71-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.69</version>
<version>1.4.71-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.69</version>
<version>1.4.71-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<artifactId>experience-tracking</artifactId>
<version>1.4.69</version>
<version>1.4.71-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.69</version>
<version>1.4.71-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.69</version>
<version>1.4.71-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.69</version>
<version>1.4.71-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.69</version>
<version>1.4.71-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>

View File

@@ -37,7 +37,7 @@
</#if>
<#list embeddedMessage.embeds as embed>
<#if embed.description?has_content>
<#if embeddedMessage.content?has_content>,</#if>
<#if hasContent>,</#if>
<#if (embed.cachedImageInfo?has_content && embed.cachedImageInfo.proxyUrl?has_content) || (embed.cachedThumbnail?has_content && embed.cachedThumbnail.proxyUrl?has_content)>
{
<#assign hasContent=true>
@@ -62,6 +62,7 @@
<#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)>
<#if hasContent>,</#if>
<#assign hasContent=true>
{
"type": "mediaGallery",

View File

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

View File

@@ -4,14 +4,14 @@
<parent>
<groupId>dev.sheldan.abstracto-templates</groupId>
<artifactId>templates</artifactId>
<version>1.4.69</version>
<version>1.4.71-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.69</version>
<version>1.4.71-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.69</version>
<version>1.4.71-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.69</version>
<version>1.4.71-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.69</version>
<version>1.4.71-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.69</version>
<version>1.4.71-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>

View File

@@ -46,13 +46,15 @@
</#if>
<#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))>
<#if hasContent>,</#if>
<#assign hasContent=true>
<#if message.content?has_content>,</#if>{
{
"type": "textDisplay",
"content": "${embed.description?json_string}"
}
<#elseif embed.description?has_content && (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)>
<#if hasContent>,</#if>
<#assign hasContent=true>
,{
"type": "section",
@@ -69,6 +71,7 @@
}
<#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)>
<#if hasContent>,</#if>
<#assign hasContent=true>
{
"type": "mediaGallery",

View File

@@ -4,13 +4,13 @@
<parent>
<groupId>dev.sheldan.abstracto-templates.templates</groupId>
<artifactId>abstracto-modules</artifactId>
<version>1.4.69</version>
<version>1.4.71-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<artifactId>statistic</artifactId>
<version>1.4.69</version>
<version>1.4.71-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.69</version>
<version>1.4.71-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.69</version>
<version>1.4.71-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.69</version>
<version>1.4.71-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.69</version>
<version>1.4.71-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<artifactId>utility</artifactId>
<version>1.4.69</version>
<version>1.4.71-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.69</version>
<version>1.4.71-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.69</version>
<version>1.4.71-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.69</version>
<version>1.4.71-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.69</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.69</version>
<version>1.4.71-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.69</version>
<version>1.4.71-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.69</version>
<version>1.4.71-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<artifactId>core</artifactId>
<version>1.4.69</version>
<version>1.4.71-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.69</version>
<version>1.4.71-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.69</version>
<version>1.4.71-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.69</version>
<version>1.4.71-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<artifactId>experience-tracking</artifactId>
<version>1.4.69</version>
<version>1.4.71-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.69</version>
<version>1.4.71-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.69</version>
<version>1.4.71-SNAPSHOT</version>
</parent>
<artifactId>image-generation</artifactId>

View File

@@ -0,0 +1 @@
Responds with a red GRRR face

View File

@@ -0,0 +1 @@
[USER] Responds with a red GRRR face

View File

@@ -0,0 +1 @@
A red face indicating a GRRR emotion

View File

@@ -0,0 +1 @@
The text to add as the bottom text to the GRRR response

View File

@@ -3,7 +3,7 @@
<parent>
<artifactId>translations</artifactId>
<groupId>dev.sheldan.abstracto-templates.translations</groupId>
<version>1.4.69</version>
<version>1.4.71-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.69</version>
<version>1.4.71-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.69</version>
<version>1.4.71-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.69</version>
<version>1.4.71-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<artifactId>moderation</artifactId>
<version>1.4.69</version>
<version>1.4.71-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.69</version>
<version>1.4.71-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<artifactId>modmail</artifactId>
<version>1.4.69</version>
<version>1.4.71-SNAPSHOT</version>
<build>
<plugins>
<plugin>

View File

@@ -4,14 +4,14 @@
<parent>
<groupId>dev.sheldan.abstracto-templates</groupId>
<artifactId>templates</artifactId>
<version>1.4.69</version>
<version>1.4.71-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<groupId>dev.sheldan.abstracto-templates.translations</groupId>
<artifactId>translations</artifactId>
<version>1.4.69</version>
<version>1.4.71-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.69</version>
<version>1.4.71-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.69</version>
<version>1.4.71-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.69</version>
<version>1.4.71-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.69</version>
<version>1.4.71-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.69</version>
<version>1.4.71-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<artifactId>statistic</artifactId>
<version>1.4.69</version>
<version>1.4.71-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.69</version>
<version>1.4.71-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.69</version>
<version>1.4.71-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.69</version>
<version>1.4.71-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.69</version>
<version>1.4.71-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<artifactId>utility</artifactId>
<version>1.4.69</version>
<version>1.4.71-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.69</version>
<version>1.4.71-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.69</version>
<version>1.4.71-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>