diff --git a/application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/config/DebraFeatureConfig.java b/application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/config/DebraFeatureConfig.java index 4a31fa76..af5ef210 100644 --- a/application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/config/DebraFeatureConfig.java +++ b/application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/config/DebraFeatureConfig.java @@ -17,6 +17,6 @@ public class DebraFeatureConfig implements FeatureConfig { @Override public List getRequiredPostTargets() { - return Arrays.asList(DebraPostTarget.DEBRA_DONATION_NOTIFICATION); + return Arrays.asList(DebraPostTarget.DEBRA_DONATION_NOTIFICATION, DebraPostTarget.DEBRA_DONATION_NOTIFICATION2); } } diff --git a/application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/config/DebraPostTarget.java b/application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/config/DebraPostTarget.java index d6aebbd4..53b9721c 100644 --- a/application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/config/DebraPostTarget.java +++ b/application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/config/DebraPostTarget.java @@ -5,7 +5,7 @@ import lombok.Getter; @Getter public enum DebraPostTarget implements PostTargetEnum { - DEBRA_DONATION_NOTIFICATION("debraDonationNotification"); + DEBRA_DONATION_NOTIFICATION("debraDonationNotification"), DEBRA_DONATION_NOTIFICATION2("debraDonationNotification2"); private String key; diff --git a/application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/service/DonationService.java b/application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/service/DonationService.java index 9e60d39f..f251f759 100644 --- a/application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/service/DonationService.java +++ b/application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/service/DonationService.java @@ -10,6 +10,7 @@ import dev.sheldan.sissi.module.debra.config.DebraProperties; import dev.sheldan.sissi.module.debra.model.Donation; import dev.sheldan.sissi.module.debra.model.listener.DonationNotificationModel; import lombok.extern.slf4j.Slf4j; +import net.dv8tion.jda.api.entities.Message; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -19,6 +20,7 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.math.BigDecimal; import java.net.URL; +import java.util.List; import java.util.Optional; import java.util.concurrent.CompletableFuture; import java.util.regex.Matcher; @@ -86,6 +88,9 @@ public class DonationService { .build(); MessageToSend messageToSend = templateService.renderEmbedTemplate(DONATION_NOTIFICATION_TEMPLATE_KEY, model); Long targetServerId = Long.parseLong(System.getenv("DEBRA_DONATION_NOTIFICATION_SERVER_ID")); - return FutureUtils.toSingleFutureGeneric(postTargetService.sendEmbedInPostTarget(messageToSend, DebraPostTarget.DEBRA_DONATION_NOTIFICATION, targetServerId)); + List> firstMessage = postTargetService.sendEmbedInPostTarget(messageToSend, DebraPostTarget.DEBRA_DONATION_NOTIFICATION, targetServerId); + List> secondMessage = postTargetService.sendEmbedInPostTarget(messageToSend, DebraPostTarget.DEBRA_DONATION_NOTIFICATION2, targetServerId); + firstMessage.addAll(secondMessage); + return FutureUtils.toSingleFutureGeneric(firstMessage); } } diff --git a/application/sissi-modules/debra/src/main/resources/debra.properties b/application/sissi-modules/debra/src/main/resources/debra.properties index 66e097c4..feeccf76 100644 --- a/application/sissi-modules/debra/src/main/resources/debra.properties +++ b/application/sissi-modules/debra/src/main/resources/debra.properties @@ -2,6 +2,7 @@ abstracto.featureFlags.debra.featureName=debra abstracto.featureFlags.debra.enabled=false abstracto.postTargets.debraDonationNotification.name=debraDonationNotification +abstracto.postTargets.debraDonationNotification2.name=debraDonationNotification2 sissi.debra.websocketURL=ws://spenden.baba.fm:8765/ -sissi.debra.donationsPageURL=https://em.altruja.de/discord-und-r-austria-2021 +sissi.debra.donationsPageURL=https://em.altruja.de/discord-fuer-debra-2022 diff --git a/templates/sissi-translations/module-translations/debra-translations/src/main/resources/de_DE/commands/donations/donations_response_description_de_DE.ftl b/templates/sissi-translations/module-translations/debra-translations/src/main/resources/de_DE/commands/donations/donations_response_description_de_DE.ftl index f59ede69..98f1b924 100644 --- a/templates/sissi-translations/module-translations/debra-translations/src/main/resources/de_DE/commands/donations/donations_response_description_de_DE.ftl +++ b/templates/sissi-translations/module-translations/debra-translations/src/main/resources/de_DE/commands/donations/donations_response_description_de_DE.ftl @@ -1 +1 @@ -Aktuell wurden **${donationAmount} Euro** für Debra Austria gespendet. Spende auch du unter https://tiny.cc/schmetterling2021. \ No newline at end of file +Aktuell wurden **${donationAmount} Euro** für Debra Austria gespendet. Spende auch du unter https://tiny.cc/schmetterling2022. \ No newline at end of file diff --git a/templates/sissi-translations/module-translations/debra-translations/src/main/resources/de_DE/listener/debra_donation_notification_embed_footer_de_DE.ftl b/templates/sissi-translations/module-translations/debra-translations/src/main/resources/de_DE/listener/debra_donation_notification_embed_footer_de_DE.ftl index c59a863d..09077fee 100644 --- a/templates/sissi-translations/module-translations/debra-translations/src/main/resources/de_DE/listener/debra_donation_notification_embed_footer_de_DE.ftl +++ b/templates/sissi-translations/module-translations/debra-translations/src/main/resources/de_DE/listener/debra_donation_notification_embed_footer_de_DE.ftl @@ -1 +1 @@ -Spende auch du für Debra Austria unter http://tiny.cc/schmetterling2021. \ No newline at end of file +Spende auch du für Debra Austria unter http://tiny.cc/schmetterling2022. \ No newline at end of file diff --git a/templates/sissi-translations/module-translations/debra-translations/src/main/resources/en_US/listener/debra_donation_notification_embed_footer_en_US.ftl b/templates/sissi-translations/module-translations/debra-translations/src/main/resources/en_US/listener/debra_donation_notification_embed_footer_en_US.ftl index aa1e8642..1c0a67db 100644 --- a/templates/sissi-translations/module-translations/debra-translations/src/main/resources/en_US/listener/debra_donation_notification_embed_footer_en_US.ftl +++ b/templates/sissi-translations/module-translations/debra-translations/src/main/resources/en_US/listener/debra_donation_notification_embed_footer_en_US.ftl @@ -1 +1 @@ -Also donate for Debra austria via http://tiny.cc/schmetterling2021. \ No newline at end of file +Also donate for Debra austria via http://tiny.cc/schmetterling2022. \ No newline at end of file