Sheldan/Sissi
1
0
Fork 0
mirror of https://github.com/Sheldan/Sissi.git synced 2026-01-26 03:11:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SIS-xxx] updating abstracto version to get capability to use multiple channels for a post target

Browse Source 
updating donation notification to use two templates for the post target
removing separate donation notification post target in favor of multiple channels
removing attribution as the code was refactored and reworked
This commit is contained in:
Sheldan
2025-12-18 00:05:39 +01:00
parent abcd8e5c67
commit a2db56853b
10 changed files with 51 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/config/DebraFeatureConfig.java
View File

@@ -21,7 +21,7 @@ public class DebraFeatureConfig implements FeatureConfig {
@Override
public List<PostTargetEnum> getRequiredPostTargets() {
return Arrays.asList(DebraPostTarget.DEBRA_DONATION_NOTIFICATION, DebraPostTarget.DEBRA_DONATION_NOTIFICATION2);
return Arrays.asList(DebraPostTarget.DEBRA_DONATION_NOTIFICATION);
}
@Override

2
application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/config/DebraPostTarget.java
View File

@@ -5,7 +5,7 @@ import lombok.Getter;
@Getter
public enum DebraPostTarget implements PostTargetEnum {
DEBRA_DONATION_NOTIFICATION("debraDonationNotification"), DEBRA_DONATION_NOTIFICATION2("debraDonationNotification2");
DEBRA_DONATION_NOTIFICATION("debraDonationNotification");
private String key;

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

@@ -87,6 +87,7 @@ public class DonationService {
private DonationService self;
private static final String DEBRA_DONATION_NOTIFICATION_TEMPLATE_KEY = "debra_donation_notification";
private static final String DEBRA_DONATION_PING_NOTIFICATION_TEMPLATE_KEY = "debra_donation_notification_ping_notification";
private static final String DEBRA_INFO_BUTTON_MESSAGE_TEMPLATE_KEY = "debraInfoButton";
public static final String DEBRA_INFO_BUTTON_ORIGIN = "DEBRA_INFO_BUTTON";
@@ -286,10 +287,9 @@ public class DonationService {
.totalDonationAmount(donationInfoModel.getTotalAmount())
.build();
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);
return FutureUtils.toSingleFutureGeneric(firstMessage);
MessageToSend pingMessageToSend = templateService.renderEmbedTemplate(DEBRA_DONATION_PING_NOTIFICATION_TEMPLATE_KEY, model, targetServerId);
return FutureUtils.toSingleFutureGenericList(postTargetService.sendEmbedInPostTarget(List.of(pingMessageToSend, messageToSend),
DebraPostTarget.DEBRA_DONATION_NOTIFICATION, targetServerId));
}
public CompletableFuture<Void> sendDebraInfoButtonMessage(GuildMessageChannel guildMessageChannel) {

1
application/sissi-modules/debra/src/main/resources/debra.properties
View File

@@ -2,7 +2,6 @@ abstracto.featureFlags.debra.featureName=debra
abstracto.featureFlags.debra.enabled=false
abstracto.postTargets.debraDonationNotification.name=debraDonationNotification
abstracto.postTargets.debraDonationNotification2.name=debraDonationNotification2
sissi.debra.donationPageUrl=https://secure.sicherhelfen.org/campaigns/07a3baf6-5cdc-4300-854b-ea2b36b0b218/show