[maven-release-plugin] prepare release sissi-1.5.7

changing meetup and quote command responses to use components v2
changing column name of quote attachment

.env

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

.github/workflows/release_manual.yaml

@@ -38,7 +38,7 @@ jobs:
           maven-args: "-Dmaven.javadoc.skip=true -s settings.xml -DskipTests"
           access-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Login to Harbor
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: harbor.sheldan.dev
           username: ${{ secrets.HARBOR_USERNAME }}

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 Sheldan
+Copyright (c) 2025 Sheldan
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

PRIVACY_POLICY.md

@@ -0,0 +1,164 @@
+# Sissi Discord bot privacy policy
+
+Last updated: 23.02.2025
+
+## Description
+
+The bot requires some information to function properly and in a reasonable way. These features heavily depend which features are enabled for which server, and this list just presents ALL of the features available.
+The detailed list of what information is stored and processed is the following:
+
+### General
+* your Discord user ID (in combination with the server ID) is used to uniquely identify you and associate various properties, such as experience, level, opened modmail threads etc
+* the IDs of the servers this bot is in
+* the IDs of the channel in the servers this bot is in
+* the names of channel groups which were given by their creator
+* the server aliases which were created for commands
+* the name of emotes which are used in the bot for convenience, if they are customized
+* towards which channel (identified by ID) certain messages by the bot are posted. e.g. logging, news, starboard
+* **no message content, username, channel name or role name is stored, except at the places where its mentioned**
+* most of the stored records have a 'created' and 'updated' timestamp, in order to assist in examining bugs and malfunctions
+* which commands have which cooldown in which channel group and in which channel group they are disabled
+* which channel is in which channel group
+* which role is allowed to execute which command
+* which features are enabled
+* which feature modes are enabled
+* **aliases** created for the commands
+* **information** necessary to handle components (buttons, select menus). This information is of varying nature and can be user identifiable information
+* **emotes** which should be used for varying places (assignable roles, particular emotes which are overwriten, such as star board)
+
+
+### Moderation
+* **mute reason**, duration, mute date, who muted whom and in which message was the mute executed
+* the names of filtered invite link servers in order to find out if it would be valid to allow the invite
+* any configured allowed invite links the server ID and the actually used invite
+    * this is necessary in order to determine the server via its ID and allow other unknown invite links. The invite link is necessary as there is no way to map server ID to actual server
+* configured profanity regexes
+    * reported profanities, including which message contains the profanity, and the message which was used to report the profanity, and whether it was identified as a true profanity
+* **the text of notes regarding users**
+    * this is used to enable taking notes about users, and the content is stored directly
+* meta information regarding warnings
+    * **reason for the warning**
+    * date of the warning
+    * the user who warned a user
+    * whether the warning was decayed and when
+* the infractions of each user accompanied with **reason** (if available): warns, mutes, bans, kicks
+
+### Giveaway
+* the give away information: **description**, provider, manager, target date, winners and participants
+
+### Embedded messages
+* embedded message information
+    * this information includes who embedded which message in which channel and is deleted after a few days
+
+### Emote usage tracking
+* the name of emotes which are being tracked in the emote usage tracking system for purely convenience reasons
+* **who** used which emote is **not** tracked
+* at which day an emote was used how many times
+* whether the emote was a reaction
+
+### Reminder
+* **the message content** in order to provide you with the reminder text
+* the date it was created, and the date it is due
+* the id of the message which contained the command
+* whether you have been reminded
+* the users who have joined the reminders
+
+### Modmail
+* the information that a modmail thread existed (creation, status and close date), and the IDs of the messages that have been sent in both directions
+
+### News
+* the ORF integration stores which posts from ORF RSS were already sent.
+* which ORF RSS feeds were subscribed
+
+### Polls
+* the **text** of polls, the creator of polls and who made which decision in polls
+
+### Starboard (best-of)
+* the message which was the origin for the starboard post
+* the message which was the resulting starboard post
+* the author of the message and the amount of stars
+* who reacted to a starboard post
+    * this is necessary to provide the information about 'top star giver' and to disallow duplicate starboard reactions
+
+### Suggestion
+* **the message content** of the message used to create the suggestion
+    * this was used for the message used to update the status of a suggestion, but this is currently disabled
+* the author of the suggestion and the message which has been posted in the suggestions channel
+* every suggestion will be deleted completely from the database a few days after it has reached a final state (rejected, denied, accepted)
+* whether you voted for a suggestion and which decision you made
+
+### Leveling system
+* the amount of messages which were considered for the leveling system
+    * it only considers a message once per minute, so it does not directly translate to your absolute message count
+* the amount of experience, and the experience level you have
+* whether experience gain has been disabled for you
+* the role you received because of the experience system
+* which roles are configured to be used as experience roles and at which level they are assigned
+* which roles are used to disable experience gain
+
+### Entertainment
+* PressF: for **what** the pressF was initiated by whom and who participated
+
+### Economy
+* The amount of credits for each user
+
+### Assignable roles
+* the names of assignable role places and assignable role button text, together with the associated emote markdown (if given)
+* the assigned assignable roles for each member in order to provide the 'unique' assignable role functionality
+* custom configured conditions to enable a level restriction
+
+### Weekly items (for Miepscord)
+* The text of the weekly art posts and the creator of them
+
+### Sticky roles
+* The roles a user had when leaving the server to be re-applied when re-joining (opt out possible)
+
+### Meetups
+* The meta data of meetups: text, location, creator and the decision of each user interacting with the meetup. This information will be deleted a few days after a meetup has passed/is cancelled.
+
+### Twitch
+* The ID/**name** of streamers to follow accompanied with their discord ID
+* The start/end dates of their streams
+    * The individual sections of streams identified by title and game for updating the message
+
+### Custom commands
+* the **names** given to custom commands and the configured **response text**
+
+## Grafana dashboard
+
+There is also a [Grafana](https://grafana.com/) dashboard in order to inspect how the bot is operating.
+The information visible in this dashboard is:
+
+* message events
+* Discord gateway ping
+* starboard reactions
+* amount of command executions
+* emotes currently being processed for tracking
+* embedded messages
+* invite filter activity
+* amount of experience which is currently being processed
+
+All of this information cannot be linked to any user (or any server for that matter, if the bot would be in multiple servers) and is deleted after 15 days.
+
+
+## How can I decide which information is collected?
+It is not possible to opt-out of singular sub-services of the bot. Should you decide that your information should not be collected, please cease usage of the bot immediately (leave any guild the bot operates in).
+
+_Should you decide to no longer utilize the bot, you may request your data to be erased within 30 days as per GDPR if you are a citizen of the EU. You can do this by sending a message to the user "sheldan" on Discord: GDPR Data removal <Username> <UserId>. If your request is incomplete, we cannot acknowledge it and therefore your data will not be removed. In order to identify authentic requests, please contact modmail beforehand by sending a direct message to the bot and stating your intention._
+
+## Open source content
+This bot uses the following open source libraries and frameworks:
+
+* [abstracto](https://github.com/Sheldan/abstracto) is used as a base for this bot, providing most of the functionalities
+* [JDA](https://github.com/DV8FromTheWorld/JDA/) The Discord API Wrapper used
+* [Spring boot](https://github.com/spring-projects/spring-boot) is used as a framework to create standalone application in Java with Java EE methods. (including Dependency injection and more)
+* [Hibernate](https://github.com/hibernate/hibernate-orm) is used as a reference implementation of JPA.
+* [Freemarker](https://github.com/apache/freemarker) is used as a templating engine. This is used to provide internationalization for user facing text and enable dynamic embed configuration.
+* [Ehcache](https://github.com/ehcache/ehcache3) is used as a caching implementation.
+* [Lombok](https://github.com/rzwitserloot/lombok) is used as a framework in order to speed up creation of container classes and builders.
+* [Quartz](https://github.com/quartz-scheduler/quartz) is used as a scheduling framework in order to provide functionalities which either require a delayed or cronjob behaviour.
+* [Docker](https://github.com/docker) is used to package the application into a container and [k3s](https://k3s.io/) to orchestrate the containers
+* [Liquibase](https://github.com/liquibase/liquibase) is used to manage changes to the database
+* [Prometheus](https://prometheus.io) to scrap and collect the metrics about how the bot is operating
+
+* [Grafana](https://grafana.com) to visualize metrics of the bot and [Loki](https://grafana.com/oss/loki/) for logging

application/executable/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.application</groupId>
         <artifactId>application</artifactId>
-        <version>1.4.67</version>
+        <version>1.5.7</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.4.67</version>
+        <version>1.5.7</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.4.67</version>
+        <version>1.5.7</version>
     </parent>
 
     <artifactId>image-generation-custom</artifactId>

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.4.67</version>
+        <version>1.5.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -9,6 +9,7 @@ import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.interaction.InteractionService;
 import dev.sheldan.abstracto.core.interaction.slash.SlashCommandConfig;
+import dev.sheldan.abstracto.core.interaction.slash.SlashCommandPrivilegeLevels;
 import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandParameterService;
 import dev.sheldan.abstracto.moderation.config.ModerationModuleDefinition;
 import dev.sheldan.sissi.module.custom.moderation.config.ModerationCustomFeatureDefinition;
@@ -72,6 +73,7 @@ public class ModMode extends AbstractConditionableCommand {
                 .builder()
                 .enabled(true)
                 .rootCommandName(ModerationCustomSlashCommandNames.MODERATION)
+                .defaultPrivilege(SlashCommandPrivilegeLevels.ADMIN)
                 .commandName(MOD_MODE_COMMAND)
                 .build();
 

application/sissi-customizations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>application</artifactId>
         <groupId>dev.sheldan.sissi.application</groupId>
-        <version>1.4.67</version>
+        <version>1.5.7</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.4.67</version>
+        <version>1.5.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/commands/DebraInfoButton.java

@@ -9,6 +9,7 @@ import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.interaction.InteractionService;
 import dev.sheldan.abstracto.core.interaction.slash.SlashCommandConfig;
+import dev.sheldan.abstracto.core.interaction.slash.SlashCommandPrivilegeLevels;
 import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandParameterService;
 import dev.sheldan.sissi.module.debra.config.DebraFeatureDefinition;
 import dev.sheldan.sissi.module.debra.config.DebraSlashCommandNames;
@@ -58,6 +59,7 @@ public class DebraInfoButton extends AbstractConditionableCommand {
                 .enabled(true)
                 .rootCommandName(DebraSlashCommandNames.DEBRA_INTERNAL)
                 .commandName("debrainfobutton")
+                .defaultPrivilege(SlashCommandPrivilegeLevels.ADMIN)
                 .build();
 
         Parameter targetChannelParameter = Parameter

application/sissi-modules/meetup/pom.xml

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

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

@@ -10,6 +10,7 @@ import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.interaction.InteractionService;
 import dev.sheldan.abstracto.core.interaction.slash.SlashCommandConfig;
+import dev.sheldan.abstracto.core.interaction.slash.SlashCommandPrivilegeLevels;
 import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandParameterService;
 import dev.sheldan.abstracto.core.utils.FutureUtils;
 import dev.sheldan.sissi.module.meetup.config.MeetupFeatureDefinition;
@@ -88,6 +89,7 @@ public class CancelMeetup extends AbstractConditionableCommand {
                 .builder()
                 .enabled(true)
                 .rootCommandName(MeetupSlashCommandNames.MEETUP)
+                .defaultPrivilege(SlashCommandPrivilegeLevels.ADMIN)
                 .commandName("cancel")
                 .build();
 

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

@@ -10,6 +10,7 @@ import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.interaction.InteractionService;
 import dev.sheldan.abstracto.core.interaction.slash.SlashCommandConfig;
+import dev.sheldan.abstracto.core.interaction.slash.SlashCommandPrivilegeLevels;
 import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandParameterService;
 import dev.sheldan.sissi.module.meetup.config.MeetupFeatureDefinition;
 import dev.sheldan.sissi.module.meetup.config.MeetupSlashCommandNames;
@@ -131,6 +132,7 @@ public class ChangeMeetup extends AbstractConditionableCommand {
                 .builder()
                 .enabled(true)
                 .rootCommandName(MeetupSlashCommandNames.MEETUP)
+                .defaultPrivilege(SlashCommandPrivilegeLevels.ADMIN)
                 .commandName("changeMeetup")
                 .build();
 

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

@@ -11,6 +11,7 @@ import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.interaction.ComponentService;
 import dev.sheldan.abstracto.core.interaction.InteractionService;
 import dev.sheldan.abstracto.core.interaction.slash.SlashCommandConfig;
+import dev.sheldan.abstracto.core.interaction.slash.SlashCommandPrivilegeLevels;
 import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandParameterService;
 import dev.sheldan.abstracto.core.service.ChannelService;
 import dev.sheldan.abstracto.core.templating.model.MessageToSend;
@@ -150,6 +151,7 @@ public class ChangeMeetupTime extends AbstractConditionableCommand {
                 .builder()
                 .enabled(true)
                 .rootCommandName(MeetupSlashCommandNames.MEETUP)
+                .defaultPrivilege(SlashCommandPrivilegeLevels.ADMIN)
                 .commandName("changeTime")
                 .build();
 

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

@@ -12,6 +12,7 @@ import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.interaction.ComponentService;
 import dev.sheldan.abstracto.core.interaction.InteractionService;
 import dev.sheldan.abstracto.core.interaction.slash.SlashCommandConfig;
+import dev.sheldan.abstracto.core.interaction.slash.SlashCommandPrivilegeLevels;
 import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandParameterService;
 import dev.sheldan.abstracto.core.models.database.AChannel;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
@@ -198,6 +199,7 @@ public class CreateMeetup extends AbstractConditionableCommand {
                 .builder()
                 .enabled(true)
                 .rootCommandName(MeetupSlashCommandNames.MEETUP)
+                .defaultPrivilege(SlashCommandPrivilegeLevels.ADMIN)
                 .commandName("create")
                 .build();
 

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

@@ -10,6 +10,7 @@ import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.interaction.InteractionService;
 import dev.sheldan.abstracto.core.interaction.slash.SlashCommandConfig;
+import dev.sheldan.abstracto.core.interaction.slash.SlashCommandPrivilegeLevels;
 import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandParameterService;
 import dev.sheldan.sissi.module.meetup.config.MeetupFeatureDefinition;
 import dev.sheldan.sissi.module.meetup.config.MeetupSlashCommandNames;
@@ -22,6 +23,7 @@ import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEve
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
@@ -48,19 +50,6 @@ public class NotifyMeetupParticipants extends AbstractConditionableCommand {
     private static final String NOTIFY_MEETUP_PARTICIPANTS_COMMAND = "notifyMeetupParticipants";
     private static final String NOTIFY_MEETUP_PARTICIPANTS_RESPONSE = "notifyMeetupParticipants_response";
 
-    @Override
-    public CompletableFuture<CommandResult> executeAsync(CommandContext commandContext) {
-        List<Object> parameters = commandContext.getParameters().getParameters();
-        Long meetupId = (Long) parameters.get(0);
-        Meetup meetup = meetupManagementServiceBean.getMeetup(meetupId, commandContext.getGuild().getIdLong());
-        if(!meetup.getOrganizer().getUserReference().getId().equals(commandContext.getAuthor().getIdLong())) {
-            throw new NotMeetupOrganizerException();
-        }
-        String notificationMessage = (String) parameters.get(1);
-        return meetupServiceBean.notifyMeetupParticipants(meetup, notificationMessage, null)
-                .thenApply(unused -> CommandResult.fromSuccess());
-    }
-
     @Override
     public CompletableFuture<CommandResult> executeSlash(SlashCommandInteractionEvent event) {
         Long meetupId = slashCommandParameterService.getCommandOption(MEETUP_ID_PARAMETER, event, Integer.class).longValue();
@@ -68,12 +57,15 @@ public class NotifyMeetupParticipants extends AbstractConditionableCommand {
         if(!meetup.getOrganizer().getUserReference().getId().equals(event.getMember().getIdLong())) {
             throw new NotMeetupOrganizerException();
         }
-        MeetupDecision toNotify = null;
-        if(slashCommandParameterService.hasCommandOption(NOTIFICATION_MEETUP_DECISION, event)) {
-            toNotify = MeetupDecision.valueOf(slashCommandParameterService.getCommandOption(NOTIFICATION_MEETUP_DECISION, event, String.class));
+        List<MeetupDecision> decisionsToNotify = new ArrayList<>();
+        for (int i = 0; i < MeetupDecision.values().length; i++) {
+            if(slashCommandParameterService.hasCommandOption(NOTIFICATION_MEETUP_DECISION + "_" + i, event)) {
+                String choice = slashCommandParameterService.getCommandOption(NOTIFICATION_MEETUP_DECISION + "_" + i, event, String.class);
+                decisionsToNotify.add(MeetupDecision.valueOf(choice));
+            }
         }
         String notificationMessage = slashCommandParameterService.getCommandOption(NOTIFICATION_MESSAGE_PARAMETER, event, String.class);
-        return meetupServiceBean.notifyMeetupParticipants(meetup, notificationMessage, toNotify)
+        return meetupServiceBean.notifyMeetupParticipants(meetup, notificationMessage, decisionsToNotify)
                 .thenCompose(unused -> interactionService.replyEmbed(NOTIFY_MEETUP_PARTICIPANTS_RESPONSE, event))
                 .thenApply(unused -> CommandResult.fromSuccess());
     }
@@ -105,6 +97,8 @@ public class NotifyMeetupParticipants extends AbstractConditionableCommand {
                 .templated(true)
                 .name(NOTIFICATION_MEETUP_DECISION)
                 .type(String.class)
+                .listSize(MeetupDecision.values().length)
+                .isListParam(true)
                 .optional(true)
                 .choices(meetupDecisions)
                 .slashCommandOnly(true)
@@ -120,6 +114,7 @@ public class NotifyMeetupParticipants extends AbstractConditionableCommand {
                 .builder()
                 .enabled(true)
                 .rootCommandName(MeetupSlashCommandNames.MEETUP)
+                .defaultPrivilege(SlashCommandPrivilegeLevels.ADMIN)
                 .commandName("notify")
                 .build();
 
@@ -129,6 +124,7 @@ public class NotifyMeetupParticipants extends AbstractConditionableCommand {
                 .templated(true)
                 .slashCommandConfig(slashCommandConfig)
                 .async(true)
+                .slashCommandOnly(true)
                 .supportsEmbedException(true)
                 .causesReaction(true)
                 .parameters(parameters)

application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/listener/MeetupDecisionListener.java

@@ -60,7 +60,7 @@ public class MeetupDecisionListener implements ButtonClickedListener {
         MeetupMessageModel meetupMessageModel = meetupServiceBean.getMeetupMessageModel(meetup);
         addParticipationToModel(meetupMessageModel, userInAServer, payload.getMeetupDecision());
         MessageToSend messageToSend = meetupServiceBean.getMeetupMessage(meetupMessageModel, model.getServerId());
-        channelService.editEmbedMessageInAChannel(messageToSend.getEmbeds().get(0), model.getEvent().getChannel(), meetup.getMessageId())
+        channelService.editMessageInAChannelFuture(messageToSend, model.getEvent().getChannel(), meetup.getMessageId())
                 .thenAccept(message -> log.info("Updated message of meetup {} in channel {} in server {}.", meetup.getId().getId(), meetup.getMeetupChannel().getId(), meetup.getServer().getId()))
                 .exceptionally(throwable -> {
                     log.info("Failed to update message of meetup {} in channel {} in server {}.", meetup.getId().getId(), meetup.getMeetupChannel().getId(), meetup.getServer().getId(), throwable);

application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/service/MeetupServiceBean.java

@@ -293,8 +293,8 @@ public class MeetupServiceBean {
         }
     }
 
-    public CompletableFuture<Void> notifyMeetupParticipants(Meetup meetup, String message, MeetupDecision toNotify) {
-        List<MeetupDecision> decisionsToBeNotified = toNotify == null ? Arrays.asList(MeetupDecision.MAYBE, MeetupDecision.YES) : Arrays.asList(toNotify);
+    public CompletableFuture<Void> notifyMeetupParticipants(Meetup meetup, String message, List<MeetupDecision> toNotify) {
+        List<MeetupDecision> decisionsToBeNotified = toNotify == null || toNotify.isEmpty() ? Arrays.asList(MeetupDecision.MAYBE, MeetupDecision.YES) : toNotify;
         List<MemberDisplay> participants = meetup
                 .getParticipants()
                 .stream()
@@ -372,7 +372,7 @@ public class MeetupServiceBean {
         List<Long> userIdsToNotify = participants
                 .stream()
                 .map(meetupParticipator -> meetupParticipator.getParticipator().getUserReference().getId())
-                .collect(Collectors.toList());
+                .toList();
 
         Long serverId = meetup.getServer().getId();
 
@@ -415,7 +415,7 @@ public class MeetupServiceBean {
         List<Long> userInServerIds = participants
                 .stream()
                 .map(meetupParticipant -> meetupParticipant.getParticipator().getUserInServerId())
-                .collect(Collectors.toList());
+                .toList();
         meetup
                 .getParticipants().removeIf(meetupParticipant -> userInServerIds.contains(meetupParticipant.getParticipator().getUserInServerId()));
         MeetupMessageModel meetupMessageModel = getMeetupMessageModel(meetup);

application/sissi-modules/miepscord/pom.xml

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

application/sissi-modules/miepscord/src/main/java/dev/sheldan/sissi/module/miepscord/weeklytext/commands/AddTextItem.java

@@ -9,6 +9,7 @@ import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.interaction.InteractionService;
 import dev.sheldan.abstracto.core.interaction.slash.SlashCommandConfig;
+import dev.sheldan.abstracto.core.interaction.slash.SlashCommandPrivilegeLevels;
 import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandParameterService;
 import dev.sheldan.sissi.module.miepscord.MiepscordFeatureDefinition;
 import dev.sheldan.sissi.module.miepscord.MiepscordSlashCommandNames;
@@ -65,6 +66,7 @@ public class AddTextItem extends AbstractConditionableCommand {
                 .builder()
                 .enabled(true)
                 .rootCommandName(MiepscordSlashCommandNames.MIEPSCORD_ROOT_NAME_CONFIG)
+                .defaultPrivilege(SlashCommandPrivilegeLevels.INVITER)
                 .groupName("weeklytexts")
                 .commandName("add")
                 .build();

application/sissi-modules/miepscord/src/main/java/dev/sheldan/sissi/module/miepscord/weeklytext/commands/RemoveTextItem.java

@@ -9,6 +9,7 @@ import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.interaction.InteractionService;
 import dev.sheldan.abstracto.core.interaction.slash.SlashCommandConfig;
+import dev.sheldan.abstracto.core.interaction.slash.SlashCommandPrivilegeLevels;
 import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandParameterService;
 import dev.sheldan.sissi.module.miepscord.MiepscordFeatureDefinition;
 import dev.sheldan.sissi.module.miepscord.MiepscordSlashCommandNames;
@@ -66,6 +67,7 @@ public class RemoveTextItem extends AbstractConditionableCommand {
                 .builder()
                 .enabled(true)
                 .rootCommandName(MiepscordSlashCommandNames.MIEPSCORD_ROOT_NAME_CONFIG)
+                .defaultPrivilege(SlashCommandPrivilegeLevels.INVITER)
                 .groupName("weeklytexts")
                 .commandName("remove")
                 .build();

application/sissi-modules/pom.xml

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

application/sissi-modules/quotes/pom.xml

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

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

@@ -9,6 +9,7 @@ import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.interaction.InteractionService;
 import dev.sheldan.abstracto.core.interaction.slash.SlashCommandConfig;
+import dev.sheldan.abstracto.core.interaction.slash.SlashCommandPrivilegeLevels;
 import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandParameterService;
 import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.service.management.ServerManagementService;
@@ -79,6 +80,7 @@ public class QuoteDelete extends AbstractConditionableCommand {
                 .builder()
                 .enabled(true)
                 .rootCommandName(QuoteSlashCommandNames.QUOTE_INTERNAL)
+                .defaultPrivilege(SlashCommandPrivilegeLevels.INVITER)
                 .commandName("delete")
                 .build();
 

application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/model/command/QuoteResponseModel.java

@@ -1,6 +1,8 @@
 package dev.sheldan.sissi.module.quotes.model.command;
 
 import dev.sheldan.abstracto.core.models.ServerChannelMessage;
+import dev.sheldan.abstracto.core.models.template.display.MemberDisplay;
+import dev.sheldan.abstracto.core.models.template.display.UserDisplay;
 import lombok.Builder;
 import lombok.Getter;
 
@@ -11,14 +13,14 @@ import java.util.List;
 @Builder
 public class QuoteResponseModel {
     private Long quoteId;
-    private String authorAvatarURL;
-    private String authorName;
+    private UserDisplay authorUserDisplay;
+    private MemberDisplay authorMemberDisplay;
     private ServerChannelMessage quotedMessage;
     private String quoteContent;
-    private List<String> imageAttachmentURLs;
+    private List<String> mediaAttachmentURLs;
     private List<String> fileAttachmentURLs;
-    private String adderAvatarURL;
-    private String adderName;
+    private UserDisplay adderUserDisplay;
+    private MemberDisplay adderMemberDisplay;
     private Instant creationDate;
     private String sourceChannelName;
 }

application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/model/database/QuoteAttachment.java

@@ -41,8 +41,8 @@ public class QuoteAttachment {
 
     @Getter
     @Setter
-    @Column(name = "is_image", nullable = false)
+    @Column(name = "is_media", nullable = false)
     @Builder.Default
-    private Boolean isImage = false;
+    private Boolean isMedia = false;
 
 }

application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/service/QuoteServiceBean.java

@@ -4,6 +4,8 @@ import dev.sheldan.abstracto.core.models.ServerChannelMessage;
 import dev.sheldan.abstracto.core.models.ServerUser;
 import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
+import dev.sheldan.abstracto.core.models.template.display.MemberDisplay;
+import dev.sheldan.abstracto.core.models.template.display.UserDisplay;
 import dev.sheldan.abstracto.core.service.ChannelService;
 import dev.sheldan.abstracto.core.service.MemberService;
 import dev.sheldan.abstracto.core.service.UserService;
@@ -103,21 +105,21 @@ public class QuoteServiceBean {
         List<String> imageAttachments = quote
                 .getAttachments()
                 .stream()
-                .filter(QuoteAttachment::getIsImage)
+                .filter(QuoteAttachment::getIsMedia)
                 .map(QuoteAttachment::getUrl)
                 .collect(Collectors.toList());
 
         List<String> fileAttachments = quote
                 .getAttachments()
                 .stream()
-                .filter(quoteAttachment -> !quoteAttachment.getIsImage())
+                .filter(quoteAttachment -> !quoteAttachment.getIsMedia())
                 .map(QuoteAttachment::getUrl)
                 .collect(Collectors.toList());
 
         QuoteResponseModel.QuoteResponseModelBuilder modelBuilder = QuoteResponseModel
                 .builder()
                 .quoteContent(quote.getText())
-                .imageAttachmentURLs(imageAttachments)
+                .mediaAttachmentURLs(imageAttachments)
                 .quoteId(quote.getId())
                 .fileAttachmentURLs(fileAttachments)
                 .creationDate(quote.getCreated())
@@ -166,42 +168,14 @@ public class QuoteServiceBean {
                             .filter(user -> user.getIdLong() == quoteAdderUserId)
                             .findFirst()
                             .orElse(null);
-                    String adderAvatar = Optional
-                            .ofNullable(adderMember)
-                            .map(member -> member.getUser().getAvatarUrl())
-                            .orElse(Optional
-                                    .ofNullable(adderUser)
-                                    .map(User::getAvatarUrl)
-                                    .orElse(null));
-                    String authorAvatar = Optional
-                            .ofNullable(authorMember)
-                            .map(member -> member.getUser().getAvatarUrl())
-                            .orElse(Optional
-                                    .ofNullable(authorUser)
-                                    .map(User::getAvatarUrl)
-                                    .orElse(null));
-                    String adderName = Optional
-                            .ofNullable(adderMember)
-                            .map(Member::getEffectiveName)
-                            .orElse(Optional
-                                    .ofNullable(adderUser)
-                                    .map(User::getName)
-                                    .orElse(null));
-                    String authorName = Optional
-                            .ofNullable(authorMember)
-                            .map(Member::getEffectiveName)
-                            .orElse(Optional
-                                    .ofNullable(authorUser)
-                                    .map(User::getName)
-                                    .orElse(null));
                     String channelName = sourceChannel
                             .map(Channel::getName)
                             .orElse(null);
                     QuoteResponseModel model = modelBuilder
-                            .adderAvatarURL(adderAvatar)
-                            .authorAvatarURL(authorAvatar)
-                            .adderName(adderName)
-                            .authorName(authorName)
+                            .authorMemberDisplay(authorMember != null ? MemberDisplay.fromMember(authorMember) : null)
+                            .authorUserDisplay(authorUser != null ? UserDisplay.fromUser(authorUser) : UserDisplay.fromServerUser(ServerUser.fromId(serverId, quotedUserId)))
+                            .adderMemberDisplay(adderMember != null ?  MemberDisplay.fromMember(adderMember) : null)
+                            .adderUserDisplay(adderUser != null ? UserDisplay.fromUser(adderUser) : UserDisplay.fromServerUser(ServerUser.fromId(serverId, quoteAdderUserId)))
                             .sourceChannelName(channelName)
                             .build();
                     return templateService.renderEmbedTemplate(QUOTE_RESPONSE_TEMPLATE_KEY, model, serverId);
@@ -260,7 +234,7 @@ public class QuoteServiceBean {
         List<Pair<String, Boolean>> attachments = quoteMessage
                 .getAttachments()
                 .stream()
-                .map(attachment -> Pair.of(attachment.getProxyUrl(), attachment.isImage()))
+                .map(attachment -> Pair.of(attachment.getProxyUrl(), attachment.isImage() || attachment.isVideo()))
                 .toList();
         return quoteManagementService.createQuote(author, adder, quoteMessage.getContentDisplay(), ServerChannelMessage.fromMessage(quoteMessage), attachments);
     }

application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/service/management/QuoteManagementService.java

@@ -45,7 +45,7 @@ public class QuoteManagementService {
                         .url(stringBooleanPair.getLeft())
                         .quote(quote)
                         .server(adder.getServerReference())
-                        .isImage(stringBooleanPair.getRight())
+                        .isMedia(stringBooleanPair.getRight())
                         .build())
                 .toList();
 

application/sissi-modules/quotes/src/main/resources/migrations/1.5.6/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="tables/tables.xml" relativeToChangelogFile="true"/>
+</databaseChangeLog>

application/sissi-modules/quotes/src/main/resources/migrations/1.5.6/tables/quote_attachment.xml

@@ -0,0 +1,12 @@
+<?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"  >
+    <changeSet author="Sheldan" id="quote_attachment-rename-media-column">
+        <renameColumn
+                tableName="quote_attachment"
+                newColumnName="is_media"
+                oldColumnName="is_image" />
+    </changeSet>
+
+</databaseChangeLog>

application/sissi-modules/quotes/src/main/resources/migrations/1.5.6/tables/tables.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="quote_attachment.xml" relativeToChangelogFile="true"/>
+</databaseChangeLog>

application/sissi-modules/quotes/src/main/resources/migrations/quotes-changeLog.xml

@@ -5,4 +5,5 @@
     <include file="1.0.2/collection.xml" relativeToChangelogFile="true"/>
     <include file="1.4.56/collection.xml" relativeToChangelogFile="true"/>
     <include file="1.4.57/collection.xml" relativeToChangelogFile="true"/>
+    <include file="1.5.6/collection.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>

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

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

application/sissi-modules/rss-news/src/main/java/dev/sheldan/sissi/module/rssnews/commands/CreateNewsCategory.java

@@ -9,6 +9,7 @@ import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.interaction.InteractionService;
 import dev.sheldan.abstracto.core.interaction.slash.SlashCommandConfig;
+import dev.sheldan.abstracto.core.interaction.slash.SlashCommandPrivilegeLevels;
 import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandParameterService;
 import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.service.management.ServerManagementService;
@@ -70,6 +71,7 @@ public class CreateNewsCategory extends AbstractConditionableCommand {
                 .builder()
                 .enabled(true)
                 .rootCommandName(RssNewsSlashCommandNames.RSS_NEWS)
+                .defaultPrivilege(SlashCommandPrivilegeLevels.INVITER)
                 .groupName("category")
                 .commandName("create")
                 .build();

application/sissi-modules/rss-news/src/main/java/dev/sheldan/sissi/module/rssnews/commands/CreateNewsCategoryChannelMapping.java

@@ -9,6 +9,7 @@ import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.interaction.InteractionService;
 import dev.sheldan.abstracto.core.interaction.slash.SlashCommandConfig;
+import dev.sheldan.abstracto.core.interaction.slash.SlashCommandPrivilegeLevels;
 import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandAutoCompleteService;
 import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandParameterService;
 import dev.sheldan.sissi.module.rssnews.config.RssNewsFeatureDefinition;
@@ -97,6 +98,7 @@ public class CreateNewsCategoryChannelMapping extends AbstractConditionableComma
                 .builder()
                 .enabled(true)
                 .rootCommandName(RssNewsSlashCommandNames.RSS_NEWS)
+                .defaultPrivilege(SlashCommandPrivilegeLevels.INVITER)
                 .groupName("categorychannelmapping")
                 .commandName("create")
                 .build();

application/sissi-modules/rss-news/src/main/java/dev/sheldan/sissi/module/rssnews/commands/CreateNewsCategorySubscription.java

@@ -9,6 +9,7 @@ import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.interaction.InteractionService;
 import dev.sheldan.abstracto.core.interaction.slash.SlashCommandConfig;
+import dev.sheldan.abstracto.core.interaction.slash.SlashCommandPrivilegeLevels;
 import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandAutoCompleteService;
 import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandParameterService;
 import dev.sheldan.sissi.module.rssnews.config.RssNewsFeatureDefinition;
@@ -127,6 +128,7 @@ public class CreateNewsCategorySubscription extends AbstractConditionableCommand
                 .builder()
                 .enabled(true)
                 .rootCommandName(RssNewsSlashCommandNames.RSS_NEWS)
+                .defaultPrivilege(SlashCommandPrivilegeLevels.INVITER)
                 .groupName("categorysubscription")
                 .commandName("create")
                 .build();

application/sissi-modules/rss-news/src/main/java/dev/sheldan/sissi/module/rssnews/commands/DeleteNewsCategory.java

@@ -9,6 +9,7 @@ import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.interaction.InteractionService;
 import dev.sheldan.abstracto.core.interaction.slash.SlashCommandConfig;
+import dev.sheldan.abstracto.core.interaction.slash.SlashCommandPrivilegeLevels;
 import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandParameterService;
 import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.service.management.ServerManagementService;
@@ -70,6 +71,7 @@ public class DeleteNewsCategory extends AbstractConditionableCommand {
                 .builder()
                 .enabled(true)
                 .rootCommandName(RssNewsSlashCommandNames.RSS_NEWS)
+                .defaultPrivilege(SlashCommandPrivilegeLevels.INVITER)
                 .groupName("category")
                 .commandName("delete")
                 .build();

application/sissi-modules/rss-news/src/main/java/dev/sheldan/sissi/module/rssnews/commands/DeleteNewsCategoryChannelMapping.java

@@ -9,6 +9,7 @@ import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.interaction.InteractionService;
 import dev.sheldan.abstracto.core.interaction.slash.SlashCommandConfig;
+import dev.sheldan.abstracto.core.interaction.slash.SlashCommandPrivilegeLevels;
 import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandAutoCompleteService;
 import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandParameterService;
 import dev.sheldan.sissi.module.rssnews.config.RssNewsFeatureDefinition;
@@ -96,6 +97,7 @@ public class DeleteNewsCategoryChannelMapping extends AbstractConditionableComma
                 .builder()
                 .enabled(true)
                 .rootCommandName(RssNewsSlashCommandNames.RSS_NEWS)
+                .defaultPrivilege(SlashCommandPrivilegeLevels.INVITER)
                 .groupName("categorychannelmapping")
                 .commandName("delete")
                 .build();

application/sissi-modules/rss-news/src/main/java/dev/sheldan/sissi/module/rssnews/commands/DeleteNewsCategorySubscription.java

@@ -9,6 +9,7 @@ import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.interaction.InteractionService;
 import dev.sheldan.abstracto.core.interaction.slash.SlashCommandConfig;
+import dev.sheldan.abstracto.core.interaction.slash.SlashCommandPrivilegeLevels;
 import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandAutoCompleteService;
 import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandParameterService;
 import dev.sheldan.sissi.module.rssnews.config.RssNewsFeatureDefinition;
@@ -127,6 +128,7 @@ public class DeleteNewsCategorySubscription extends AbstractConditionableCommand
                 .builder()
                 .enabled(true)
                 .rootCommandName(RssNewsSlashCommandNames.RSS_NEWS)
+                .defaultPrivilege(SlashCommandPrivilegeLevels.INVITER)
                 .groupName("categorysubscription")
                 .commandName("delete")
                 .build();

application/sissi-modules/rss-news/src/main/java/dev/sheldan/sissi/module/rssnews/commands/ShowNewsCategories.java

@@ -8,6 +8,7 @@ import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.interaction.InteractionService;
 import dev.sheldan.abstracto.core.interaction.slash.SlashCommandConfig;
+import dev.sheldan.abstracto.core.interaction.slash.SlashCommandPrivilegeLevels;
 import dev.sheldan.sissi.module.rssnews.config.RssNewsFeatureDefinition;
 import dev.sheldan.sissi.module.rssnews.config.RssNewsSlashCommandNames;
 import dev.sheldan.sissi.module.rssnews.model.template.NewsCategoryInfo;
@@ -54,6 +55,7 @@ public class ShowNewsCategories extends AbstractConditionableCommand {
                 .builder()
                 .enabled(true)
                 .rootCommandName(RssNewsSlashCommandNames.RSS_NEWS)
+                .defaultPrivilege(SlashCommandPrivilegeLevels.INVITER)
                 .groupName("category")
                 .commandName("show")
                 .build();

deployment/helm/sissi/Chart.yaml

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

deployment/helm/sissi/templates/api-keys.yaml

@@ -7,4 +7,5 @@ data:
   youtubeApiKey: {{ $.Values.apiKeys.youtube.apiKey | b64enc }}
   twitchClientId: {{ $.Values.apiKeys.twitch.clientId | b64enc }}
   twitchSecret: {{ $.Values.apiKeys.twitch.secret | b64enc }}
-  openWeatherMapApiKey: {{ $.Values.apiKeys.openWeatherMap.apiKey | b64enc }}
+  openWeatherMapApiKey: {{ $.Values.apiKeys.openWeatherMap.apiKey | b64enc }}
+  freeCurrencyApiApiKey: {{ $.Values.apiKeys.freeCurrencyApi.apiKey | b64enc }}

deployment/helm/sissi/templates/deployment.yaml

@@ -78,6 +78,11 @@ spec:
                 secretKeyRef:
                   name: api-keys
                   key: openWeatherMapApiKey
+            - name: FREE_CURRENCY_API_API_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: api-keys
+                  key: freeCurrencyApiApiKey
             - name: TWITCH_CLIENT_ID
               valueFrom:
                 secretKeyRef:

deployment/helm/sissi/values.yaml

@@ -3,7 +3,7 @@ bot:
   repository: harbor.sheldan.dev/sissi
   pullPolicy: Always
   image: sissi-bot
-  tag: 1.4.66
+  tag: 1.5.6
   livenessProbe:
     initialDelaySeconds: 60
     periodSeconds: 5
@@ -22,7 +22,7 @@ restApi:
   repository: harbor.sheldan.dev/sissi
   pullPolicy: Always
   image: sissi-rest-api
-  tag: 1.4.66
+  tag: 1.5.6
   podAnnotations: {}
   podSecurityContext: {}
   securityContext: {}
@@ -62,7 +62,7 @@ privateRestApi:
   repository: harbor.sheldan.dev/sissi
   pullPolicy: Always
   image: sissi-private-rest-api
-  tag: 1.4.66
+  tag: 1.5.6
   podAnnotations: {}
   podSecurityContext: {}
   securityContext: {}
@@ -93,23 +93,23 @@ templateDeployment:
   repository: harbor.sheldan.dev/abstracto
   pullPolicy: Always
   image: abstracto-template-deployment
-  tag: 1.5.54
+  tag: 1.6.10
 templateDeploymentData:
   repository: harbor.sheldan.dev/sissi
   pullPolicy: Always
   image: sissi-template-data
-  tag: 1.4.66
+  tag: 1.5.6
 dbConfigDeployment:
   enabled: true
   repository: harbor.sheldan.dev/abstracto
   pullPolicy: Always
   image: abstracto-db-deployment
-  tag: 1.5.54
+  tag: 1.6.10
 dbConfigDeploymentData:
   repository: harbor.sheldan.dev/sissi
   pullPolicy: Always
   image: sissi-db-data
-  tag: 1.4.66
+  tag: 1.5.6
 dbCredentials:
   host: null
   port: null
@@ -138,6 +138,8 @@ apiKeys:
   twitch:
     secret: null
     clientId: null
+  freeCurrencyApi:
+    apiKey: null
 imagePullSecrets: null
 nameOverride: ''
 fullnameOverride: ''

deployment/image-packaging/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi</groupId>
         <artifactId>deployment</artifactId>
-        <version>1.4.67</version>
+        <version>1.5.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -917,6 +917,16 @@
                                     <destFileName>logging-translation-overrides.zip</destFileName>
                                 </artifactItem>
 
+                                <artifactItem>
+                                    <groupId>dev.sheldan.sissi.templates.translations.overrides</groupId>
+                                    <artifactId>giveaway-translation-overrides</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>zip</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
+                                    <destFileName>giveaway-translation-overrides.zip</destFileName>
+                                </artifactItem>
+
                             </artifactItems>
                         </configuration>
                     </execution>

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

@@ -1,8 +1,32 @@
-FROM amazoncorretto:17.0.8-alpine3.18
-MAINTAINER Sheldan
-VOLUME /tmp
-ADD config/* /config/
-ADD wrapper/*.sh /
+# https://careers.wolt.com/en/blog/tech/how-to-reduce-jvm-docker-image-size
+FROM amazoncorretto:17.0.14-alpine3.20 AS corretto-jdk
+
+RUN apk add --no-cache binutils
+
+RUN $JAVA_HOME/bin/jlink \
+         --verbose \
+         --add-modules ALL-MODULE-PATH \
+         --strip-debug \
+         --no-man-pages \
+         --no-header-files \
+         --compress=2 \
+         --output /customjre
+
+FROM alpine:3.21
+
+ENV JAVA_HOME=/jre
+ENV PATH="${JAVA_HOME}/bin:${PATH}"
+
+COPY --from=corretto-jdk /customjre $JAVA_HOME
+
+ARG APPLICATION_USER=appuser
+
+RUN adduser --no-create-home -u 1000 -D $APPLICATION_USER
+
+RUN mkdir /app && chown -R $APPLICATION_USER /app
+
+COPY --chown=1000:1000 config/* /config/
+COPY --chown=1000:1000 wrapper/*.sh /
 RUN chmod +x /start.sh
-ADD bot/app.jar /app.jar
+COPY --chown=1000:1000 bot/app.jar /app.jar
 CMD ["/start.sh"]

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

@@ -14,7 +14,7 @@
     "image-generation",
     "quotes", "meetup", "debra", "rss-news", "miepscord",
     "moderation-custom",
-    "moderation-translation-overrides", "experience-translation-overrides", "logging-translation-overrides"
+    "moderation-translation-overrides", "experience-translation-overrides", "logging-translation-overrides", "giveaway-translation-overrides"
   ]
 }
 

deployment/pom.xml

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

pom.xml

@@ -13,13 +13,13 @@
     <groupId>dev.sheldan.sissi</groupId>
     <artifactId>sissi</artifactId>
     <name>Sissi</name>
-    <version>1.4.67</version>
+    <version>1.5.7</version>
 
     <properties>
         <maven.compiler.target>17</maven.compiler.target>
         <maven.compiler.source>17</maven.compiler.source>
-        <abstracto.version>1.5.54</abstracto.version>
-        <abstracto.templates.version>1.4.47</abstracto.templates.version>
+        <abstracto.version>1.6.10</abstracto.version>
+        <abstracto.templates.version>1.4.58</abstracto.templates.version>
         <apache-jena.version>4.9.0</apache-jena.version>
         <rssreader.version>3.5.0</rssreader.version>
     </properties>
@@ -73,7 +73,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.4.67</tag>
+        <tag>sissi-1.5.7</tag>
     </scm>
 
 </project>

templates/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi</groupId>
         <artifactId>sissi</artifactId>
-        <version>1.4.67</version>
+        <version>1.5.7</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.4.67</version>
+        <version>1.5.7</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.4.67</version>
+        <version>1.5.7</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.4.67</version>
+        <version>1.5.7</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.4.67</version>
+        <version>1.5.7</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.4.67</version>
+        <version>1.5.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-templates/module-templates/meetup-templates/src/main/resources/default/commands/createMeetup/createMeetup_confirmation_embed.ftl

@@ -1,33 +1,30 @@
 <#include "format_instant">
 {
-    "embeds": [
+    "components": [
         {
-            <#include "abstracto_color">,
-            "title": {
-                "title": "${topic?json_string}"
-            },
-            "description": "<@format_instant_long_date_time instant=meetupTime/>
-${description?json_string}"
-            <#if location?? && location != "%22%22">,
-            "fields": [
-                {
-                    "name": "<@safe_include "createMeetup_confirmation_location_field_title"/>",
-                    "value": "https://www.google.com/maps?q=${location?json_string}"
-                }
-            ]
-            </#if>
-        }
-    ],
-    "buttons": [
-        {
-            "label": "<@safe_include "createMeetup_confirm_button_label"/>",
-            "id": "${confirmationId}",
-            "buttonStyle": "success"
+            <#assign hasLocation=location?? && location != "%22%22">
+            "type": "textDisplay",
+            "content": "<#include "createMeetup_meetup_information">"
         },
         {
-            "label": "<@safe_include "createMeetup_cancel_button_label"/>",
-            "id": "${cancelId}",
-            "buttonStyle": "danger"
+            "type": "actionRow",
+            "actionRowItems": [
+                {
+                    "label": "<@safe_include "createMeetup_confirm_button_label"/>",
+                    "id": "${confirmationId}",
+                    "buttonStyle": "success",
+                    "type": "button"
+                },
+                {
+                    "label": "<@safe_include "createMeetup_cancel_button_label"/>",
+                    "id": "${cancelId}",
+                    "buttonStyle": "danger",
+                    "type": "button"
+                }
+            ]
         }
-    ]
+    ],
+    "messageConfig": {
+        "useComponentsV2": true
+    }
 }

templates/sissi-templates/module-templates/meetup-templates/src/main/resources/default/commands/listMeetups/listMeetups_response_embed.ftl

@@ -1,10 +1,36 @@
 <#include "format_instant">
 {
-    "embeds": [
+    "components": [
+<#list meetups as meetup>
+    <#assign meetup=meetup>
+    <#assign topic=meetup.topic>
+    <#assign time><@format_instant_long_date_time instant=meetup.meetupTime/>
+    </#assign><#assign timeRelative><@format_instant_relative instant=meetup.meetupTime/></#assign>
+    <#assign link=meetup.meetupMessage.jumpUrl>
         {
-            <#include "abstracto_color">,
-            "description": "<#list meetups as meetup><#assign meetup=meetup><#assign topic=meetup.topic><#assign time><@format_instant_long_date_time instant=meetup.meetupTime/></#assign><#assign timeRelative><@format_instant_relative instant=meetup.meetupTime/></#assign><#assign link=meetup.meetupMessage.jumpUrl><#include "meetup_list_meetup_display">
-<#else><#include "meetup_list_no_meetups"></#list>"
+            "type": "section",
+            "components": [
+                {
+                    "type": "textDisplay",
+                    "content": "<#include "meetup_list_meetup_display">"
+                }
+            ]
+            ,"accessory": {
+                "type": "button",
+                "label": "<#include "meetup_list_jump_button_label"/>",
+                "url": "${link}",
+                "buttonStyle": "link"
+            }
         }
-    ]
+    <#sep>,</#sep>
+<#else>
+    {
+        "type": "textDisplay",
+        "content": "<#include "meetup_list_no_meetups">"
+    }
+</#list>
+    ],
+    "messageConfig": {
+        "useComponentsV2": true
+    }
 }

templates/sissi-templates/module-templates/meetup-templates/src/main/resources/default/general/meetup_display_embed.ftl

@@ -1,63 +1,74 @@
 <#include "format_instant">
 {
-    <#assign roleMention="<@&371419588619141121>"/>
-    "additionalMessage": "${roleMention?json_string}",
-    "embeds": [
+    "components": [
+        {
+            "type": "textDisplay",
+            <#assign roleMention="<@&371419588619141121>"/>
+            "content": "<#if cancelled>~~</#if>${roleMention?json_string} ${topic?json_string} - <@safe_include "meetup_message_id_display"/><#if cancelled>~~</#if>"
+        },
+        <#if description?has_content>
+        {
+            <#assign descriptionText>${description?json_string}</#assign>
+            <#assign organizerText>${organizer.memberMention}</#assign>
+            "type": "textDisplay",
+            "content": "<#if cancelled>~~</#if><@safe_include "meetup_description_component"/><#if cancelled>~~</#if>"
+        },
+        </#if>
         {
-            <#include "abstracto_color">,
-            "title": {
-                "title": "${topic?json_string} - <@safe_include "meetup_message_id_display"/>"
-            },
             <#assign time><@format_instant_long_date_time instant=meetupTime/></#assign>
             <#assign timeRelative><@format_instant_relative instant=meetupTime/></#assign>
-            <#assign organizerText>${organizer.memberMention}</#assign>
-            <#assign meetupId=meetupId/>
-            <#assign descriptionText>${description?json_string}</#assign>
-            <#assign participantsText> (${participants?size}) <#list participants as member>${member.memberMention}<#sep>, </#sep><#else><#include "meetup_message_no_member"></#list></#assign>
-            <#assign maybeParticipantsText> (${maybeParticipants?size}) <#list maybeParticipants as member>${member.memberMention}<#sep>, </#sep><#else><#include "meetup_message_no_member"></#list></#assign>
-            <#assign noTimeParticipantsText> (${noTimeParticipants?size}) <#list noTimeParticipants as member>${member.memberMention}<#sep>, </#sep><#else><#include "meetup_message_no_member"></#list></#assign>
-            <#assign declinedParticipantsText> (${declinedParticipants?size}) <#list declinedParticipants as member>${member.memberMention}<#sep>, </#sep><#else><#include "meetup_message_no_member"></#list></#assign>
-            "description": "<#if cancelled>~~</#if><@safe_include "meetup_display_description"/><#if cancelled>~~</#if>"
-        }
-    ],
-    "buttons": [
-        {
-            "label": "<@safe_include "meetup_message_yes_button_label"/>",
-            "id": "${yesId}",
-            "buttonStyle": "success"
-        },
-        {
-            "label": "<@safe_include "meetup_message_maybe_button_label"/>",
-            "id": "${maybeId}",
-            "buttonStyle": "secondary"
-        },
-        {
-            "label": "<@safe_include "meetup_message_no_time_button_label"/>",
-            "id": "${noTimeId}",
-            "buttonStyle": "danger"
-        },
-        {
-            "label": "<@safe_include "meetup_message_no_button_label"/>",
-            "id": "${noId}",
-            "buttonStyle": "danger"
-        }
-        <#if location?? && location != "%22%22">,
-        {
-            "label": "<@safe_include "meetup_message_location_button_label"/>",
-            "url": "https://www.google.com/maps?q=${location?json_string}",
-            "buttonStyle": "link"
+            "type": "section",
+            "components": [
+                {
+                    "type": "textDisplay",
+                    "content": "<@safe_include "meetup_display_time_component"/>"
+                }
+            ]
+            <#if location?? && location != "%22%22">
+            ,"accessory": {
+                "type": "button",
+                "label": "<@safe_include "meetup_message_location_button_label"/>",
+                "url": "https://www.google.com/maps?q=${location?json_string}",
+                "buttonStyle": "link"
+            }
+            </#if>
         }
+        <#macro decision_component button_id button_style label_template content_template user>
+            {
+                "type": "section",
+                "components": [
+                    {
+                        "type": "textDisplay",
+                        "content": "<@safe_include content_template/>"
+                    }
+                ]
+                ,"accessory": {
+                    "type": "button",
+                    "id": "${button_id}",
+                    "label": "<@safe_include label_template/>",
+                    "buttonStyle": "${button_style}"
+                }
+            }
+        </#macro>
+        <#assign participantsText> (${participants?size}) <#list participants as member>${member.memberMention}<#sep>, </#sep><#else><#include "meetup_message_no_member"></#list></#assign>
+        <#assign maybeParticipantsText> (${maybeParticipants?size}) <#list maybeParticipants as member>${member.memberMention}<#sep>, </#sep><#else><#include "meetup_message_no_member"></#list></#assign>
+        <#assign noTimeParticipantsText> (${noTimeParticipants?size}) <#list noTimeParticipants as member>${member.memberMention}<#sep>, </#sep><#else><#include "meetup_message_no_member"></#list></#assign>
+        <#assign declinedParticipantsText> (${declinedParticipants?size}) <#list declinedParticipants as member>${member.memberMention}<#sep>, </#sep><#else><#include "meetup_message_no_member"></#list></#assign>
+        ,<@decision_component yesId "success" "meetup_message_yes_button_label" "meetup_user_display_participants" participantsText/>
+        ,<@decision_component maybeId "secondary" "meetup_message_maybe_button_label" "meetup_user_display_maybe_participants" maybeParticipantsText/>
+        ,<@decision_component noId "danger" "meetup_message_no_button_label" "meetup_user_display_declined_participants" declinedParticipantsText/>
+        ,<@decision_component noTimeId "danger" "meetup_message_no_time_button_label" "meetup_user_display_no_time_participants" noTimeParticipantsText/>
+        <#if meetupIcsModel.attachIcsFile>
+            ,{
+                "type": "fileDisplay",
+                "fileName": "<@safe_include "meetup_ics_file_name"/>.ics",
+                "fileContent": "<@safe_include "meetup_ice_file_download"/>"
+            }
         </#if>
     ],
-    <#if meetupIcsModel.attachIcsFile>
-    "files": [
-        {
-            "fileName": "<@safe_include "meetup_ics_file_name"/>.ics",
-            "fileContent": "<@safe_include "meetup_ice_file_download"/>"
-        }
-    ],
-    </#if>
     "messageConfig": {
-        "allowsRoleMention": true
+        "allowsRoleMention": true,
+        "allowsUserMention": false,
+        "useComponentsV2": true
     }
 }

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.4.67</version>
+        <version>1.5.7</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.4.67</version>
+        <version>1.5.7</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.4.67</version>
+        <version>1.5.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -1,26 +1,66 @@
+<#include "format_instant">
 {
-    "embeds": [
+    "components": [
         {
-            <#include "abstracto_color">,
-            "author": {
-                <#assign authorName><@default_template_if_null authorName "quote_response_default_author_name"/></#assign>
-                <#assign channelName><@default_template_if_null sourceChannelName "quote_response_default_channel_name"/></#assign>
-                "name": "<@safe_include "quote_response_header_author_name"/>"
-                <#if authorAvatarURL??>,"avatar": "${authorAvatarURL}"</#if>
-            },
-            <#assign quoteId=quoteId>
-            <#assign quoteDescription=quoteContent>
+            <#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 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"/>"
+        },
+        {
+            "type": "section",
+            "components": [
+                {
+                    <#assign quoteId=quoteId>
+                    "type": "textDisplay",
+                    "content": "<@safe_include "quote_response_title"/>"
+                }
+            ],
             <#assign quoteJumpUrl=quotedMessage.jumpUrl>
-            "description": "<@safe_include "quote_response_description"/>",
-            "footer": {
-                <#assign adderUserName><@default_template_if_null adderName "quote_response_default_adder_name"/></#assign>
-                "text": "<@safe_include "quote_response_footer_adder_name" />"
-                <#if adderAvatarURL??>,"icon": "${adderAvatarURL}"</#if>
-            },
-            <#if imageAttachmentURLs?size = 1>
-                "imageUrl": "${imageAttachmentURLs[0]}",
+            "accessory": {
+                "type": "button",
+                "label": "<@safe_include "quote_response_jump_label"/>",
+                "url": "${quoteJumpUrl}",
+                "buttonStyle": "link"
+            }
+        },
+        {
+            "type": "container",
+            "components": [
+            <#assign hasContent=false>
+            <#if quoteContent?has_content>
+                <#assign hasContent=true>
+                {
+                    "type": "textDisplay",
+                    <#assign quoteDescription=quoteContent>
+                    "content": "${quoteDescription}"
+                }
             </#if>
-            "timeStamp": "${creationDate}"
+            <#if mediaAttachmentURLs?size gt 0>
+                <#assign hasContent=true>
+                ,{
+                    "type": "mediaGallery",
+                    "images": [
+                <#list mediaAttachmentURLs as image>
+                        {
+                            "url": "${image}"
+                        }<#sep>,</#list>
+                    ]
+                }
+            </#if>
+            <#if hasContent==false>
+                {
+                    "type": "textDisplay",
+                    "content": "<@safe_include "quote_response_no_content"/>"
+                }
+            </#if>
+            ]
         }
-    ]
+    ],
+    "messageConfig": {
+        "allowsUserMention": false,
+        "useComponentsV2": true
+    }
 }

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.4.67</version>
+        <version>1.5.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/default/orf/job/orf_news_post_embed.ftl

@@ -6,7 +6,9 @@
                 "name": "<@safe_include "orf_news_post_author"/>"
             },
             "title": {
+                <#if title?has_content>
                 "title": "${title?json_string}",
+                </#if>
                 "url": "${url}"
             },
             "description": "${url?json_string}<#if description?has_content>\n${description?json_string}</#if>",

templates/sissi-templates/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates</groupId>
         <artifactId>templates</artifactId>
-        <version>1.4.67</version>
+        <version>1.5.7</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.4.67</version>
+        <version>1.5.7</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.4.67</version>
+        <version>1.5.7</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.4.67</version>
+        <version>1.5.7</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.4.67</version>
+        <version>1.5.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.4.67</version>
+        <version>1.5.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.4.67</version>
+        <version>1.5.7</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.4.67</version>
+        <version>1.5.7</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.4.67</version>
+        <version>1.5.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/createMeetup/createMeetup_meetup_information.ftl

@@ -0,0 +1,5 @@
+${topic?json_string} - <@format_instant_long_date_time instant=meetupTime/>
+
+${description?json_string}
+
+<#if hasLocation>https://www.google.com/maps?q=${location?json_string}</#if>

templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/listMeetups/meetup_list_jump_button_label.ftl

@@ -0,0 +1 @@
+Go to meetup

templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/listMeetups/meetup_list_meetup_display.ftl

@@ -1,3 +1,2 @@
 Time: ${time} ${timeRelative}
-Link: [here](${link})
 Meetup Topic: `${topic?json_string}`

templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/general/meetup_description_component.ftl

@@ -0,0 +1,3 @@
+Description: ${descriptionText}
+
+Organized by: ${organizerText}

templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/general/meetup_display_description.ftl

@@ -1,11 +0,0 @@
-Time: ${time} ${timeRelative}
-<#if descriptionText?hasContent>Description: ${descriptionText}</#if>
-Organized by: ${organizerText}
-
-Participants: ${participantsText}
-
-Maybe: ${maybeParticipantsText}
-
-Declined: ${declinedParticipantsText}
-
-No time: ${noTimeParticipantsText}

templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/general/meetup_display_time_component.ftl

@@ -0,0 +1 @@
+Time: ${time} ${timeRelative}

templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/general/meetup_user_display_declined_participants.ftl

@@ -0,0 +1 @@
+Declined: ${declinedParticipantsText}

templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/general/meetup_user_display_maybe_participants.ftl

@@ -0,0 +1 @@
+Maybe: ${maybeParticipantsText}

templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/general/meetup_user_display_no_time_participants.ftl

@@ -0,0 +1 @@
+No time: ${noTimeParticipantsText}

templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/general/meetup_user_display_participants.ftl

@@ -0,0 +1 @@
+Participants: ${participantsText}

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.4.67</version>
+        <version>1.5.7</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.4.67</version>
+        <version>1.5.7</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.4.67</version>
+        <version>1.5.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quote/quote_response_description.ftl

@@ -1,2 +0,0 @@
-[**Quote #${quoteId?c}**](${quoteJumpUrl})
-${quoteDescription}

templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quote/quote_response_footer_adder_name.ftl

@@ -1 +0,0 @@
-Added by ${adderUserName}

templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quote/quote_response_header_author_name.ftl

@@ -1 +1 @@
-${authorName} in ${channelName}
+${authorName} in ${channelName} added by ${adderUserName} at ${creationDate}

templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quote/quote_response_jump_label.ftl

@@ -0,0 +1 @@
+Go to quote

templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quote/quote_response_no_content.ftl

@@ -0,0 +1 @@
+No content found.

templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quote/quote_response_title.ftl

@@ -0,0 +1 @@
+## Quote #${quoteId}

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.4.67</version>
+        <version>1.5.7</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.4.67</version>
+        <version>1.5.7</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.4.67</version>
+        <version>1.5.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -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.sissi.templates.translations.overrides</groupId>
+        <artifactId>translation-overrides</artifactId>
+        <version>1.5.7</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>giveaway-translation-overrides</artifactId>
+    <packaging>pom</packaging>
+
+    <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>giveaway-translation-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-translations/translation-overrides/giveaway-translation-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-translations/translation-overrides/giveaway-translation-overrides/src/main/resources/de_DE/general/giveaway_winner_modmail_notification_description.ftl

@@ -0,0 +1,5 @@
+Der key ist `${key}`.
+Bitte antworte auf diese Nachricht um zu bestätigen, dass du den Key erhalten hast.
+<#if description?has_content>Mehr details: ${description}. </#if>
+
+<#if benefactor?has_content>Der Key wurde gesponsert von: ${benefactor}</#if>