[SIS-xxx] upgrading abstracto version

upgrading abstracto version
adding avatar to quote response

.env

@@ -1,4 +1,4 @@
 REGISTRY_PREFIX=harbor.sheldan.dev/sissi/
 ABSTRACTO_PREFIX=harbor.sheldan.dev/abstracto/
-VERSION=1.5.6
-ABSTRACTO_VERSION=1.6.10
+VERSION=1.5.11
+ABSTRACTO_VERSION=1.6.13

.github/workflows/build.yml

@@ -31,3 +31,23 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           user: Sheldan
           token: ${{ secrets.ABSTRACTO_PAT }}
+      - name: Login to Harbor
+        uses: docker/login-action@v3
+        with:
+          registry: harbor.sheldan.dev
+          username: ${{ secrets.HARBOR_USERNAME }}
+          password: ${{ secrets.HARBOR_TOKEN }}
+      - name: Load env file
+        id: dotenv
+        uses: falti/dotenv-action@v1.0.4
+        with:
+          path: .env
+      - name: Docker build
+        run: docker compose build
+        env:
+          REGISTRY_PREFIX: ${{ steps.dotenv.outputs.registry_prefix }}
+          VERSION: ${{ steps.dotenv.outputs.version }}
+      - name: Helm package and push
+        working-directory: ./deployment/helm/
+        run: |-
+          helm package sissi

application/executable/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.application</groupId>
         <artifactId>application</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>executable</artifactId>

application/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi</groupId>
         <artifactId>sissi</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/sissi-customizations/image-generation-custom/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.application.module.custom</groupId>
         <artifactId>sissi-customizations</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.12-SNAPSHOT</version>
     </parent>
 
     <artifactId>image-generation-custom</artifactId>

application/sissi-customizations/image-generation-custom/src/main/java/dev/sheldan/sissi/module/custom/imagegeneration/command/OrangeSunDogeCommandAlternative.java

@@ -50,16 +50,13 @@ public class OrangeSunDogeCommandAlternative implements CommandAlternative {
 
     @Override
     public boolean shouldExecute(UnParsedCommandParameter parameter, Guild guild, Message message) {
-        String contentStripped = message.getContentRaw();
-        String[] parameters = contentStripped.split(" ");
-        return parameters.length == 1 && featureFlagService.isFeatureEnabled(imageGenerationFeatureConfig, guild.getIdLong());
+        return featureFlagService.isFeatureEnabled(imageGenerationFeatureConfig, guild.getIdLong());
     }
 
     @Override
     public void execute(UnParsedCommandParameter parameter, Message message) {
         String contentStripped = message.getContentRaw();
-        List<String> parameters = Arrays.asList(contentStripped.split(" "));
-        String inputText = commandRegistry.getCommandName(parameters.get(0), message.getGuild().getIdLong());
+        String inputText = commandRegistry.getCommandName(contentStripped, message.getGuild().getIdLong());
         File triggeredGifFile = imageGenerationService.getOrangeSunDogeImage(inputText);
         MessageToSend messageToSend = templateService.renderEmbedTemplate(DOGE_ORANGE_SUN_RESPONSE_TEMPLATE_KEY, new Object(), message.getGuildIdLong());
         // template support does not support binary files

application/sissi-customizations/image-generation-custom/src/main/java/dev/sheldan/sissi/module/custom/imagegeneration/service/ImageGenerationService.java

@@ -8,6 +8,8 @@ import org.springframework.stereotype.Component;
 
 import java.io.File;
 import java.io.IOException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 
 @Component
 public class ImageGenerationService {
@@ -20,7 +22,7 @@ public class ImageGenerationService {
 
     public File getOrangeSunDogeImage(String inputText) {
         try {
-            return httpService.downloadFileToTempFile(dogeOrangeSunUrl.replace("{1}", inputText));
+            return httpService.downloadFileToTempFile(dogeOrangeSunUrl.replace("{1}", URLEncoder.encode(inputText, StandardCharsets.UTF_8)));
         } catch (IOException e) {
             throw new AbstractoRunTimeException(String.format("Failed to download orange doge image for url %s with error %s", inputText, e.getMessage()));
         }

application/sissi-customizations/moderation-custom/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.application.module.custom</groupId>
         <artifactId>sissi-customizations</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/sissi-customizations/moderation-custom/src/main/java/dev/sheldan/sissi/module/custom/moderation/commands/SelfMute.java

@@ -0,0 +1,68 @@
+package dev.sheldan.sissi.module.custom.moderation.commands;
+
+import dev.sheldan.abstracto.core.command.UtilityModuleDefinition;
+import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
+import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
+import dev.sheldan.abstracto.core.command.config.HelpInfo;
+import dev.sheldan.abstracto.core.command.config.Parameter;
+import dev.sheldan.abstracto.core.command.execution.CommandContext;
+import dev.sheldan.abstracto.core.command.execution.CommandResult;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
+import dev.sheldan.sissi.module.custom.moderation.config.ModerationCustomFeatureDefinition;
+import dev.sheldan.sissi.module.custom.moderation.service.SelfMuteServiceBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.time.Duration;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+@Component
+public class SelfMute extends AbstractConditionableCommand {
+
+    public static final String DURATION_PARAMETER = "duration";
+
+    @Autowired
+    private SelfMuteServiceBean selfMuteServiceBean;
+
+    @Override
+    public CompletableFuture<CommandResult> executeAsync(CommandContext commandContext) {
+        List<Object> parameters = commandContext.getParameters().getParameters();
+        Duration muteDuration = (Duration) parameters.get(0);
+        return selfMuteServiceBean.selfMuteMember(commandContext.getAuthor(), muteDuration)
+                .thenApply(unused -> CommandResult.fromSuccess());
+    }
+
+    @Override
+    public CommandConfiguration getConfiguration() {
+        Parameter durationParameter = Parameter
+                .builder()
+                .name(DURATION_PARAMETER)
+                .type(Duration.class)
+                .templated(true)
+                .build();
+        List<Parameter> parameters = Arrays.asList(durationParameter);
+
+        HelpInfo helpInfo = HelpInfo
+                .builder()
+                .templated(true)
+                .build();
+
+        return CommandConfiguration.builder()
+                .name("selfMute")
+                .async(true)
+                .module(UtilityModuleDefinition.UTILITY)
+                .templated(true)
+                .supportsEmbedException(true)
+                .causesReaction(true)
+                .parameters(parameters)
+                .help(helpInfo)
+                .build();
+    }
+
+    @Override
+    public FeatureDefinition getFeature() {
+        return ModerationCustomFeatureDefinition.MODERATION_CUSTOM;
+    }
+}

application/sissi-customizations/moderation-custom/src/main/java/dev/sheldan/sissi/module/custom/moderation/service/SelfMuteServiceBean.java

@@ -0,0 +1,30 @@
+package dev.sheldan.sissi.module.custom.moderation.service;
+
+import dev.sheldan.abstracto.core.service.MemberService;
+import dev.sheldan.abstracto.core.templating.service.TemplateService;
+import lombok.extern.slf4j.Slf4j;
+import net.dv8tion.jda.api.entities.Member;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.time.Duration;
+import java.util.concurrent.CompletableFuture;
+
+@Slf4j
+@Component
+public class SelfMuteServiceBean {
+
+    @Autowired
+    private MemberService memberService;
+
+    @Autowired
+    private TemplateService templateService;
+
+    private static final String SELF_MUTE_REASON_TEMPLATE = "self_mute_reason";
+
+    public CompletableFuture<Void> selfMuteMember(Member member, Duration duration) {
+        String reason = templateService.renderSimpleTemplate(SELF_MUTE_REASON_TEMPLATE, member.getGuild().getIdLong());
+        log.info("Self muting user {} in server {}.", member.getIdLong(), member.getGuild().getIdLong());
+        return memberService.timeoutUser(member, duration, reason);
+    }
+}

application/sissi-customizations/moderation-custom/src/main/resources/migrations/1.5.9/collection.xml

@@ -0,0 +1,6 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd"  >
+    <include file="seedData/data.xml" relativeToChangelogFile="true"/>
+</databaseChangeLog>

application/sissi-customizations/moderation-custom/src/main/resources/migrations/1.5.9/seedData/command.xml

@@ -0,0 +1,14 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd"  >
+    <property name="moderationCustomFeature" value="(SELECT id FROM feature WHERE key = 'moderationCustom')"/>
+    <property name="utilityModule" value="(SELECT id FROM module WHERE name = 'utility')"/>
+    <changeSet  author="Sheldan" id="moderationCustom_selfmute-commands">
+        <insert tableName="command">
+            <column name="name" value="selfMute"/>
+            <column name="module_id" valueComputed="${utilityModule}"/>
+            <column name="feature_id" valueComputed="${moderationCustomFeature}"/>
+        </insert>
+    </changeSet>
+</databaseChangeLog>

application/sissi-customizations/moderation-custom/src/main/resources/migrations/1.5.9/seedData/data.xml

@@ -0,0 +1,6 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd"  >
+    <include file="command.xml" relativeToChangelogFile="true"/>
+</databaseChangeLog>

application/sissi-customizations/moderation-custom/src/main/resources/migrations/moderation-custom-changeLog.xml

@@ -5,4 +5,5 @@
     <include file="1.1.0/collection.xml" relativeToChangelogFile="true"/>
     <include file="1.2.1/collection.xml" relativeToChangelogFile="true"/>
     <include file="1.4.45/collection.xml" relativeToChangelogFile="true"/>
+    <include file="1.5.9/collection.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>

application/sissi-customizations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>application</artifactId>
         <groupId>dev.sheldan.sissi.application</groupId>
-        <version>1.5.7</version>
+        <version>1.5.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/sissi-modules/debra/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.application</groupId>
         <artifactId>sissi-modules</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/sissi-modules/meetup/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.application</groupId>
         <artifactId>sissi-modules</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/commands/CreateMeetup.java

@@ -166,6 +166,7 @@ public class CreateMeetup extends AbstractConditionableCommand {
         Parameter topicParameter = Parameter
                 .builder()
                 .templated(true)
+                .validators(Arrays.asList(MaxStringLengthValidator.max(256)))
                 .name(TOPIC_PARAMETER)
                 .type(String.class)
                 .build();
@@ -174,6 +175,7 @@ public class CreateMeetup extends AbstractConditionableCommand {
                 .builder()
                 .templated(true)
                 .name(DESCRIPTION_PARAMETER)
+                .validators(Arrays.asList(MaxStringLengthValidator.max(2048)))
                 .remainder(true)
                 .optional(true)
                 .type(String.class)
@@ -184,6 +186,7 @@ public class CreateMeetup extends AbstractConditionableCommand {
                 .templated(true)
                 .name(LOCATION_PARAMETER)
                 .remainder(true)
+                .validators(Arrays.asList(MaxStringLengthValidator.max(100)))
                 .optional(true)
                 .slashCommandOnly(true)
                 .type(String.class)

application/sissi-modules/miepscord/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sissi-modules</artifactId>
         <groupId>dev.sheldan.sissi.application</groupId>
-        <version>1.5.7</version>
+        <version>1.5.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/sissi-modules/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.application</groupId>
         <artifactId>application</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -14,6 +14,7 @@
         <module>quotes</module>
         <module>meetup</module>
         <module>debra</module>
+        <module>miepscord</module>
         <module>rss-news</module>
     </modules>
 

application/sissi-modules/quotes/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.application</groupId>
         <artifactId>sissi-modules</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/commands/QuoteCommand.java

@@ -23,6 +23,7 @@ import dev.sheldan.sissi.module.quotes.config.QuotesModuleDefinition;
 import dev.sheldan.sissi.module.quotes.exception.QuoteNotFoundException;
 import dev.sheldan.sissi.module.quotes.model.database.Quote;
 import dev.sheldan.sissi.module.quotes.service.QuoteServiceBean;
+import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
@@ -37,6 +38,7 @@ import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 
 @Component
+@Slf4j
 public class QuoteCommand extends AbstractConditionableCommand {
 
     private static final String QUOTE_COMMAND = "quote";
@@ -76,6 +78,7 @@ public class QuoteCommand extends AbstractConditionableCommand {
             foundQuote = quoteServiceBean.getRandomQuoteForMember(user);
         }
         Quote quoteToDisplay = foundQuote.orElseThrow(QuoteNotFoundException::new);
+        log.info("Displaying quote {} in server {}.", quoteToDisplay.getId(), quoteToDisplay.getServer().getId());
         return quoteServiceBean.renderQuoteToMessageToSend(quoteToDisplay)
                 .thenCompose(messageToSend -> self.sendMessageToChannel(messageToSend, commandContext.getChannel()))
                 .thenApply(unused -> CommandResult.fromSuccess());
@@ -98,6 +101,7 @@ public class QuoteCommand extends AbstractConditionableCommand {
             foundQuote = quoteServiceBean.getRandomQuote(server);
         }
         Quote quoteToDisplay = foundQuote.orElseThrow(QuoteNotFoundException::new);
+        log.info("Displaying quote {} in server {}.", quoteToDisplay.getId(), quoteToDisplay.getServer().getId());
         return quoteServiceBean.renderQuoteToMessageToSend(quoteToDisplay)
                 .thenCompose(messageToSend -> self.replyMessage(event, messageToSend))
                 .thenApply(unused -> CommandResult.fromSuccess());

application/sissi-modules/rss-news/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sissi-modules</artifactId>
         <groupId>dev.sheldan.sissi.application</groupId>
-        <version>1.5.7</version>
+        <version>1.5.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

deployment/helm/sissi/Chart.yaml

@@ -2,4 +2,4 @@ apiVersion: v2
 name: sissi
 description: A Helm chart for Kubernetes
 type: application
-version: 1.5.6
+version: 1.5.11

deployment/helm/sissi/values.yaml

@@ -3,7 +3,7 @@ bot:
   repository: harbor.sheldan.dev/sissi
   pullPolicy: Always
   image: sissi-bot
-  tag: 1.5.6
+  tag: 1.5.11
   livenessProbe:
     initialDelaySeconds: 60
     periodSeconds: 5
@@ -22,7 +22,7 @@ restApi:
   repository: harbor.sheldan.dev/sissi
   pullPolicy: Always
   image: sissi-rest-api
-  tag: 1.5.6
+  tag: 1.5.11
   podAnnotations: {}
   podSecurityContext: {}
   securityContext: {}
@@ -62,7 +62,7 @@ privateRestApi:
   repository: harbor.sheldan.dev/sissi
   pullPolicy: Always
   image: sissi-private-rest-api
-  tag: 1.5.6
+  tag: 1.5.11
   podAnnotations: {}
   podSecurityContext: {}
   securityContext: {}
@@ -93,23 +93,23 @@ templateDeployment:
   repository: harbor.sheldan.dev/abstracto
   pullPolicy: Always
   image: abstracto-template-deployment
-  tag: 1.6.10
+  tag: 1.6.13
 templateDeploymentData:
   repository: harbor.sheldan.dev/sissi
   pullPolicy: Always
   image: sissi-template-data
-  tag: 1.5.6
+  tag: 1.5.11
 dbConfigDeployment:
   enabled: true
   repository: harbor.sheldan.dev/abstracto
   pullPolicy: Always
   image: abstracto-db-deployment
-  tag: 1.6.10
+  tag: 1.6.13
 dbConfigDeploymentData:
   repository: harbor.sheldan.dev/sissi
   pullPolicy: Always
   image: sissi-db-data
-  tag: 1.5.6
+  tag: 1.5.11
 dbCredentials:
   host: null
   port: null

deployment/image-packaging/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi</groupId>
         <artifactId>deployment</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -885,6 +885,16 @@
                                     <destFileName>logging-template-overrides.zip</destFileName>
                                 </artifactItem>
 
+                                <artifactItem>
+                                    <groupId>dev.sheldan.sissi.templates</groupId>
+                                    <artifactId>starboard-template-overrides</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>zip</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
+                                    <destFileName>starboard-template-overrides.zip</destFileName>
+                                </artifactItem>
+
                                 <!-- overrides translations -->
 
                                 <artifactItem>

deployment/image-packaging/src/main/docker/db-data/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.19.1
+FROM alpine:3.22.1
 MAINTAINER Sheldan
 ADD config/ /var/db-config/
 ADD liquibase-artifacts /var/db-config/liquibase-zips

deployment/image-packaging/src/main/docker/private-rest-api/Dockerfile

@@ -4,7 +4,7 @@ ARG VERSION
 ARG ABSTRACTO_VERSION
 FROM ${REGISTRY_PREFIX}abstracto-rest-api-image-gen:${ABSTRACTO_VERSION:-latest} AS image-gen-api
 
-FROM ${SISSI_REGISTRY_PREFIX}sissi-image-gen-api:${VERSION:-latest} AS sissi-image-gen-api
+FROM image_gen AS sissi-image-gen-api
 
 FROM ${REGISTRY_PREFIX}abstracto-rest-api:${ABSTRACTO_VERSION:-latest} AS running-image
 COPY --from=image-gen-api /python /python

deployment/image-packaging/src/main/docker/rest-api/Dockerfile

@@ -2,7 +2,7 @@ ARG REGISTRY_PREFIX
 ARG SISSI_REGISTRY_PREFIX
 ARG VERSION
 ARG ABSTRACTO_VERSION
-FROM ${SISSI_REGISTRY_PREFIX}sissi-debra-rest-api:${VERSION:-latest} AS debra-api
+FROM debra_rest AS debra-api
 FROM ${REGISTRY_PREFIX}abstracto-rest-api-experience:${ABSTRACTO_VERSION:-latest} AS experience-api
 FROM ${REGISTRY_PREFIX}abstracto-rest-api-core:${ABSTRACTO_VERSION:-latest} AS core-api
 

deployment/image-packaging/src/main/docker/sissi/Dockerfile

@@ -12,7 +12,7 @@ RUN $JAVA_HOME/bin/jlink \
          --compress=2 \
          --output /customjre
 
-FROM alpine:3.21
+FROM alpine:3.22.1
 
 ENV JAVA_HOME=/jre
 ENV PATH="${JAVA_HOME}/bin:${PATH}"

deployment/image-packaging/src/main/docker/template-data/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.19.1
+FROM alpine:3.22.1
 MAINTAINER Sheldan
 ADD config /var/template-config/
 ADD template-artifacts /var/template-config/templates

deployment/image-packaging/src/main/docker/template-data/config/artifact_versions.json

@@ -5,7 +5,7 @@
     "image-generation",
     "quotes", "meetup", "debra", "rss-news", "miepscord",
     "moderation-custom", "image-generation-custom",
-    "moderation-template-overrides", "experience-template-overrides", "logging-template-overrides"
+    "moderation-template-overrides", "experience-template-overrides", "logging-template-overrides", "starboard-template-overrides"
   ],
   "translation_artifacts": [
     "core",

deployment/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi</groupId>
         <artifactId>sissi</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

docker-compose.yml

@@ -1,4 +1,3 @@
-version: "3.7"
 
 services:
   bot-packaging:
@@ -23,9 +22,9 @@ services:
         REGISTRY_PREFIX: ${ABSTRACTO_PREFIX}
         VERSION: ${VERSION}
         ABSTRACTO_VERSION: ${ABSTRACTO_VERSION}
+      additional_contexts:
+        debra_rest: "service:debra-rest-api"
     image: ${REGISTRY_PREFIX}sissi-rest-api:${VERSION:-latest}
-    depends_on:
-      - debra-rest-api
   private-rest-api-packaging:
     build:
       context: deployment/image-packaging/src/main/docker/private-rest-api
@@ -34,9 +33,9 @@ services:
         SISSI_REGISTRY_PREFIX: ${REGISTRY_PREFIX}
         ABSTRACTO_VERSION: ${ABSTRACTO_VERSION}
         VERSION: ${VERSION}
+      additional_contexts:
+        image_gen: "service:image-gen-api"
     image: ${REGISTRY_PREFIX}sissi-private-rest-api:${VERSION:-latest}
-    depends_on:
-      - image-gen-api
   db-data:
     build:
       context: deployment/image-packaging/src/main/docker/db-data

pom.xml

@@ -13,13 +13,13 @@
     <groupId>dev.sheldan.sissi</groupId>
     <artifactId>sissi</artifactId>
     <name>Sissi</name>
-    <version>1.5.7</version>
+    <version>1.5.12-SNAPSHOT</version>
 
     <properties>
         <maven.compiler.target>17</maven.compiler.target>
         <maven.compiler.source>17</maven.compiler.source>
-        <abstracto.version>1.6.10</abstracto.version>
-        <abstracto.templates.version>1.4.58</abstracto.templates.version>
+        <abstracto.version>1.6.13</abstracto.version>
+        <abstracto.templates.version>1.4.60</abstracto.templates.version>
         <apache-jena.version>4.9.0</apache-jena.version>
         <rssreader.version>3.5.0</rssreader.version>
     </properties>
@@ -28,7 +28,6 @@
         <module>application</module>
         <module>templates</module>
         <module>deployment</module>
-        <module>application/sissi-modules/miepscord</module>
     </modules>
 
     <repositories>
@@ -73,7 +72,7 @@
         <connection>scm:git:${project.scm.url}</connection>
         <developerConnection>scm:git:${project.scm.url}</developerConnection>
         <url>https://github.com/Sheldan/Sissi.git</url>
-        <tag>sissi-1.5.7</tag>
+        <tag>HEAD</tag>
     </scm>
 
 </project>

templates/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi</groupId>
         <artifactId>sissi</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-templates/customization-templates/image-generation-customization-templates/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>customization-templates</artifactId>
         <groupId>dev.sheldan.sissi.templates</groupId>
-        <version>1.5.7</version>
+        <version>1.5.12-SNAPSHOT</version>
     </parent>
 
     <artifactId>image-generation-customization-templates</artifactId>

templates/sissi-templates/customization-templates/moderation-customization-templates/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates</groupId>
         <artifactId>customization-templates</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-templates/customization-templates/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sissi-templates</artifactId>
         <groupId>dev.sheldan.sissi.templates</groupId>
-        <version>1.5.7</version>
+        <version>1.5.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-templates/module-templates/debra-templates/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>module-templates</artifactId>
         <groupId>dev.sheldan.sissi.templates</groupId>
-        <version>1.5.7</version>
+        <version>1.5.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-templates/module-templates/meetup-templates/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>module-templates</artifactId>
         <groupId>dev.sheldan.sissi.templates</groupId>
-        <version>1.5.7</version>
+        <version>1.5.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-templates/module-templates/miepscord-templates/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates</groupId>
         <artifactId>module-templates</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.12-SNAPSHOT</version>
     </parent>
 
     <artifactId>miepscord-templates</artifactId>

templates/sissi-templates/module-templates/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates</groupId>
         <artifactId>sissi-templates</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-templates/module-templates/quotes-templates/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates</groupId>
         <artifactId>module-templates</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-templates/module-templates/quotes-templates/src/main/resources/default/commands/quote/quote_response_embed.ftl

@@ -2,12 +2,29 @@
 {
     "components": [
         {
+            <#assign userFound=authorUserDisplay?has_content>
             <#assign authorName><#if authorMemberDisplay?has_content>${authorMemberDisplay.name}<#elseif authorUserDisplay?has_content>${authorUserDisplay.name}<#else><@safe_include "quote_response_default_author_name"/></#if></#assign>
-            <#assign adderUserName><#if adderMemberDisplay?has_content>${adderMemberDisplay.name}<#elseif adderUserDisplay?has_content>${adderMemberDisplay.name}<#else><@safe_include "quote_response_default_adder_name"/></#if></#assign>
+            <#assign adderUserName><#if adderMemberDisplay?has_content>${adderMemberDisplay.name}<#elseif adderUserDisplay?has_content>${adderUserDisplay.name}<#else><@safe_include "quote_response_default_adder_name"/></#if></#assign>
             <#assign channelName><@default_template_if_null sourceChannelName "quote_response_default_channel_name"/></#assign>
             <#assign creationDate><@format_instant_date_time instant=creationDate/></#assign>
-            "type": "textDisplay",
-            "content": "<@safe_include "quote_response_header_author_name"/>"
+            <#if userFound>
+                <#assign authorAvatar><#if userFound>${authorUserDisplay.avatarUrl}</#if></#assign>
+                "type": "section",
+                "components": [
+                    {
+                        "type": "textDisplay",
+                        "content": "<@safe_include "quote_response_header_author_name"/>"
+                    }
+                ],
+                "accessory": {
+                    "type": "thumbnail",
+                    "url": "${authorAvatar}"
+                }
+            <#else>
+                "type": "textDisplay",
+                "content": "<@safe_include "quote_response_header_author_name"/>"
+            </#if>
+
         },
         {
             "type": "section",
@@ -34,7 +51,7 @@
                 <#assign hasContent=true>
                 {
                     "type": "textDisplay",
-                    <#assign quoteDescription=quoteContent>
+                    <#assign quoteDescription=quoteContent?json_string>
                     "content": "${quoteDescription}"
                 }
             </#if>

templates/sissi-templates/module-templates/rss-news-templates/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>module-templates</artifactId>
         <groupId>dev.sheldan.sissi.templates</groupId>
-        <version>1.5.7</version>
+        <version>1.5.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-templates/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates</groupId>
         <artifactId>templates</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-templates/template-overrides/experience-template-overrides/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates</groupId>
         <artifactId>template-overrides</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-templates/template-overrides/logging-template-overrides/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates</groupId>
         <artifactId>template-overrides</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-templates/template-overrides/moderation-template-overrides/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates</groupId>
         <artifactId>template-overrides</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-templates/template-overrides/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sissi-templates</artifactId>
         <groupId>dev.sheldan.sissi.templates</groupId>
-        <version>1.5.7</version>
+        <version>1.5.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -13,6 +13,7 @@
         <module>moderation-template-overrides</module>
         <module>experience-template-overrides</module>
         <module>logging-template-overrides</module>
+        <module>starboard-template-overrides</module>
     </modules>
 
 </project>

templates/sissi-templates/template-overrides/starboard-template-overrides/pom.xml

@@ -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>
+        <groupId>dev.sheldan.sissi.templates</groupId>
+        <artifactId>template-overrides</artifactId>
+        <version>1.5.12-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>starboard-template-overrides</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>moderation-template-overrides-${project.version}</finalName>
+                            <appendAssemblyId>false</appendAssemblyId>
+                            <descriptors>
+                                <descriptor>src/main/assembly/assembly.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

templates/sissi-templates/template-overrides/starboard-template-overrides/src/main/assembly/assembly.xml

@@ -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>

templates/sissi-templates/template-overrides/starboard-template-overrides/src/main/resources/default/config/starboard_post_container_color.ftl

@@ -0,0 +1,23 @@
+"color" : {
+<#if starCount gte 15>
+    "r": 192,
+    "g": 31,
+    "b": 1
+<#elseif starCount gte 10>
+    "r": 67,
+    "g": 150,
+    "b": 154
+<#elseif starCount gte 5>
+    "r": 212,
+    "g": 175,
+    "b": 55
+<#elseif starCount gte 3>
+    "r": 49,
+    "g": 55,
+    "b": 61
+<#else>
+    "r": 0,
+    "g": 0,
+    "b": 0
+</#if>
+},

templates/sissi-translations/customization-translations/moderation-customization-translations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates.translations</groupId>
         <artifactId>customization-translations</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-translations/customization-translations/moderation-customization-translations/src/main/resources/default/commands/selfmute/help/selfMute_description.ftl

@@ -0,0 +1 @@
+Mute yourself for a duration

templates/sissi-translations/customization-translations/moderation-customization-translations/src/main/resources/default/commands/selfmute/help/selfMute_long_help.ftl

@@ -0,0 +1,2 @@
+Mute yourself for a given duration. This can be used in case you want to stay away from the server and do not feel you have the self-control.
+This cannot be undone by yourself.

templates/sissi-translations/customization-translations/moderation-customization-translations/src/main/resources/default/commands/selfmute/help/selfMute_parameter_duration.ftl

@@ -0,0 +1 @@
+The duration to be muted for.

templates/sissi-translations/customization-translations/moderation-customization-translations/src/main/resources/default/commands/selfmute/self_mute_reason.ftl

@@ -0,0 +1 @@
+Self mute

templates/sissi-translations/customization-translations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sissi-translations</artifactId>
         <groupId>dev.sheldan.sissi.templates.translations</groupId>
-        <version>1.5.7</version>
+        <version>1.5.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-translations/module-translations/debra-translations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>module-translations</artifactId>
         <groupId>dev.sheldan.sissi.templates.translations</groupId>
-        <version>1.5.7</version>
+        <version>1.5.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-translations/module-translations/meetup-translations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates.translations</groupId>
         <artifactId>module-translations</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-translations/module-translations/miepscord-translations/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates.translations</groupId>
         <artifactId>module-translations</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.12-SNAPSHOT</version>
     </parent>
 
     <artifactId>miepscord-translations</artifactId>

templates/sissi-translations/module-translations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates.translations</groupId>
         <artifactId>sissi-translations</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-translations/module-translations/quote-translations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates.translations</groupId>
         <artifactId>module-translations</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-translations/module-translations/rss-news-translations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>module-translations</artifactId>
         <groupId>dev.sheldan.sissi.templates.translations</groupId>
-        <version>1.5.7</version>
+        <version>1.5.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-translations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates</groupId>
         <artifactId>templates</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-translations/translation-overrides/experience-translation-overrides/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates.translations.overrides</groupId>
         <artifactId>translation-overrides</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-translations/translation-overrides/giveaway-translation-overrides/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates.translations.overrides</groupId>
         <artifactId>translation-overrides</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-translations/translation-overrides/logging-translation-overrides/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates.translations.overrides</groupId>
         <artifactId>translation-overrides</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-translations/translation-overrides/moderation-translation-overrides/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates.translations.overrides</groupId>
         <artifactId>translation-overrides</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-translations/translation-overrides/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates.translations</groupId>
         <artifactId>sissi-translations</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>