[SIS-xxx] updating abstracto version to 1.5.51

adjusting template names to not use a locale

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

@@ -61,7 +61,7 @@ public class OrangeSunDogeCommandAlternative implements CommandAlternative {
         List<String> parameters = Arrays.asList(contentStripped.split(" "));
         String inputText = commandRegistry.getCommandName(parameters.get(0), message.getGuild().getIdLong());
         File triggeredGifFile = imageGenerationService.getOrangeSunDogeImage(inputText);
-        MessageToSend messageToSend = templateService.renderEmbedTemplate(DOGE_ORANGE_SUN_RESPONSE_TEMPLATE_KEY, new Object());
+        MessageToSend messageToSend = templateService.renderEmbedTemplate(DOGE_ORANGE_SUN_RESPONSE_TEMPLATE_KEY, new Object(), message.getGuildIdLong());
         // template support does not support binary files
         AttachedFile file = AttachedFile
                 .builder()

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

@@ -124,7 +124,7 @@ public class Donations extends AbstractConditionableCommand {
         } else {
             donationModel.setDonations(new ArrayList<>());
         }
-        return templateService.renderEmbedTemplate(DONATIONS_RESPONSE_TEMPLATE_KEY, donationModel);
+        return templateService.renderEmbedTemplate(DONATIONS_RESPONSE_TEMPLATE_KEY, donationModel, serverId);
     }
 
     @Override

application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/service/DonationService.java

@@ -182,7 +182,7 @@ public class DonationService {
                 .donation(donation)
                 .totalDonationAmount(donationInfoModel.getTotalAmount())
                 .build();
-        MessageToSend messageToSend = templateService.renderEmbedTemplate(DEBRA_DONATION_NOTIFICATION_TEMPLATE_KEY, model);
+        MessageToSend messageToSend = templateService.renderEmbedTemplate(DEBRA_DONATION_NOTIFICATION_TEMPLATE_KEY, model, targetServerId);
         List<CompletableFuture<Message>> firstMessage = postTargetService.sendEmbedInPostTarget(messageToSend, DebraPostTarget.DEBRA_DONATION_NOTIFICATION, targetServerId);
         List<CompletableFuture<Message>> secondMessage = postTargetService.sendEmbedInPostTarget(messageToSend, DebraPostTarget.DEBRA_DONATION_NOTIFICATION2, targetServerId);
         firstMessage.addAll(secondMessage);

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

@@ -115,7 +115,7 @@ public class MeetupConfirmationListener implements ButtonClickedListener {
         messageModel.setCancelled(false);
         Long meetupId = payload.getMeetupId();
         Long serverId = payload.getGuildId();
-        MessageToSend messageToSend = meetupServiceBean.getMeetupMessage(messageModel);
+        MessageToSend messageToSend = meetupServiceBean.getMeetupMessage(messageModel, model.getServerId());
         List<CompletableFuture<Message>> messageFutures = channelService.sendMessageToSendToChannel(messageToSend, model.getEvent().getMessageChannel());
         FutureUtils.toSingleFutureGeneric(messageFutures).thenAccept(unused -> {
             messageService.deleteMessage(model.getEvent().getMessage());

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

@@ -59,7 +59,7 @@ public class MeetupDecisionListener implements ButtonClickedListener {
         }
         MeetupMessageModel meetupMessageModel = meetupServiceBean.getMeetupMessageModel(meetup);
         addParticipationToModel(meetupMessageModel, userInAServer, payload.getMeetupDecision());
-        MessageToSend messageToSend = meetupServiceBean.getMeetupMessage(meetupMessageModel);
+        MessageToSend messageToSend = meetupServiceBean.getMeetupMessage(meetupMessageModel, model.getServerId());
         channelService.editEmbedMessageInAChannel(messageToSend.getEmbeds().get(0), 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 -> {

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

@@ -206,8 +206,8 @@ public class MeetupServiceBean {
                 .collect(Collectors.toList());
     }
 
-    public MessageToSend getMeetupMessage(MeetupMessageModel model) {
+    public MessageToSend getMeetupMessage(MeetupMessageModel model, Long serverId) {
-        return templateService.renderEmbedTemplate(MEETUP_DISPLAY_TEMPLATE, model);
+        return templateService.renderEmbedTemplate(MEETUP_DISPLAY_TEMPLATE, model, serverId);
     }
 
     public CompletableFuture<Void> cancelMeetup(Meetup meetup) {
@@ -221,7 +221,7 @@ public class MeetupServiceBean {
                 .map(meetupComponent -> meetupComponent.getId().getComponentId())
                 .collect(Collectors.toList());
         model.setCancelled(true);
-        MessageToSend meetupMessage = getMeetupMessage(model);
+        MessageToSend meetupMessage = getMeetupMessage(model, serverId);
         return messageService.editMessageInChannel(channel, meetupMessage, meetup.getMessageId())
                 .thenAccept(unused -> self.notifyParticipants(meetupId, serverId))
                 .thenAccept(unused -> self.cleanupMeetup(meetupId, serverId, componentPayloads));
@@ -231,7 +231,7 @@ public class MeetupServiceBean {
     public void notifyParticipants(Long meetupId, Long serverId) {
         Meetup meetup = meetupManagementServiceBean.getMeetup(meetupId, serverId);
         MeetupMessageModel model = getMeetupMessageModel(meetup);
-        MessageToSend messageToSend = templateService.renderEmbedTemplate(MEETUP_CANCELLATION_TEMPLATE, model);
+        MessageToSend messageToSend = templateService.renderEmbedTemplate(MEETUP_CANCELLATION_TEMPLATE, model, serverId);
         meetup
                 .getParticipants()
                 .stream()
@@ -319,7 +319,7 @@ public class MeetupServiceBean {
     public void remindParticipants(Long meetupId, Long serverId) {
         Meetup meetup = meetupManagementServiceBean.getMeetup(meetupId, serverId);
         MeetupMessageModel model = getMeetupMessageModel(meetup);
-        MessageToSend messageToSend = templateService.renderEmbedTemplate(MEETUP_REMINDER_TEMPLATE, model);
+        MessageToSend messageToSend = templateService.renderEmbedTemplate(MEETUP_REMINDER_TEMPLATE, model, serverId);
         meetup
                 .getParticipants()
                 .stream()
@@ -423,7 +423,7 @@ public class MeetupServiceBean {
         meetupMessageModel.setMaybeParticipants(new ArrayList<>());
         meetupMessageModel.setNoTimeParticipants(new ArrayList<>());
 
-        MessageToSend updatedMeetupMessage = getMeetupMessage(meetupMessageModel);
+        MessageToSend updatedMeetupMessage = getMeetupMessage(meetupMessageModel, serverId);
         GuildMessageChannel meetupChannel = channelService.getMessageChannelFromServer(serverId, meetup.getMeetupChannel().getId());
         return channelService.editMessageInAChannelFuture(updatedMeetupMessage, meetupChannel, meetup.getMessageId())
                 .thenAccept(message -> log.info("Updated message of meetup {} in channel {} in server {}.", meetupId, meetup.getMeetupChannel().getId(), serverId))
@@ -457,7 +457,7 @@ public class MeetupServiceBean {
         Long meetupId = meetup.getId().getId();
         Long serverId = meetup.getId().getServerId();
         MeetupMessageModel meetupMessageModel = getMeetupMessageModel(meetup);
-        MessageToSend updatedMeetupMessage = getMeetupMessage(meetupMessageModel);
+        MessageToSend updatedMeetupMessage = getMeetupMessage(meetupMessageModel, serverId);
         GuildMessageChannel meetupChannel = channelService.getMessageChannelFromServer(serverId, meetup.getMeetupChannel().getId());
         return channelService.editMessageInAChannelFuture(updatedMeetupMessage, meetupChannel, meetup.getMessageId())
                 .thenAccept(message -> log.info("Updated message of meetup {} in channel {} in server {}.", meetupId, meetup.getMeetupChannel().getId(), serverId))

pom.xml

@@ -18,8 +18,8 @@
     <properties>
         <maven.compiler.target>17</maven.compiler.target>
         <maven.compiler.source>17</maven.compiler.source>
-        <abstracto.version>1.5.50</abstracto.version>
+        <abstracto.version>1.5.51</abstracto.version>
-        <abstracto.templates.version>1.4.45</abstracto.templates.version>
+        <abstracto.templates.version>1.4.46</abstracto.templates.version>
         <apache-jena.version>4.9.0</apache-jena.version>
         <rssreader.version>3.5.0</rssreader.version>
     </properties>

templates/sissi-templates/module-templates/debra-templates/src/main/resources/default/commands/debraInfoButton/debraInfoButton_embed.ftl

@@ -1,5 +1,4 @@
 {
-    <#setting locale="de_DE">
     "additionalMessage": "<@safe_include "debraInfoButton_text"/>",
     "buttons": [
         {

templates/sissi-templates/module-templates/debra-templates/src/main/resources/default/commands/donations/donations_response_embed.ftl

@@ -1,6 +1,5 @@
 {
     <#assign donationAmount=totalAmount>
-    <#setting locale="de_DE">
     "additionalMessage": "<#include "donations_response_description">",
     "embeds": [
         {

templates/sissi-templates/module-templates/debra-templates/src/main/resources/default/listener/debraInfoMessage_embed.ftl

@@ -1,4 +1,3 @@
 {
-    <#setting locale="de_DE">
     "additionalMessage": "<@safe_include "debraInfoMessage_text"/>"
 }

templates/sissi-templates/module-templates/debra-templates/src/main/resources/default/listener/debraInfoMessage_response_embed.ftl

@@ -1,5 +1,4 @@
 {
-    <#setting locale="de_DE">
     "additionalMessage": "<@safe_include "debraInfoMessage_response_text"/>",
     "messageConfig": {
         "ephemeral": true

templates/sissi-templates/module-templates/debra-templates/src/main/resources/default/listener/debra_donation_notification_embed.ftl

@@ -2,7 +2,6 @@
     "embeds": [
         {
             "title": {
-                <#setting locale="de_DE">
                 <#assign donatorName=donation.donatorName>
                 <#assign donationAmount=donation.amount>
                 "title": "<@safe_include "debra_donation_notification_embed_title"/>"

templates/sissi-templates/template-overrides/experience-template-overrides/src/main/resources/default/listener/experienceTrackerListener/experience_level_up_notification_embed.ftl

@@ -2,6 +2,5 @@
     <#assign userMention=memberDisplay.memberMention>
     <#assign pastLevel=oldLevel>
     <#assign currentLevel=newLevel>
-    <#setting locale="de_DE">
     "additionalMessage": "<@safe_include "experience_level_up_notification_text"/>"
 }

templates/sissi-templates/template-overrides/logging-template-overrides/src/main/resources/default/listener/user_joined/user_join_embed.ftl

@@ -1,6 +1,5 @@
 {
         <#assign userMention>${member.asMention}</#assign>
         <#assign user>${member.user.name} (${member.asMention}: ${member.id})</#assign>
-        <#setting locale="de_DE">
         "additionalMessage": "<@safe_include "user_joined_text"/>"
 }

templates/sissi-templates/template-overrides/logging-template-overrides/src/main/resources/default/listener/user_left/user_leave_embed.ftl

@@ -1,6 +1,5 @@
 {
     <#include "user_detail">
     <#assign user><@user_detail user=user/></#assign>
-    <#setting locale="de_DE">
     "additionalMessage": "<@safe_include "user_left_text"/>"
 }