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

[OPB-xxx] updating abstracto version to 1.5.51

Browse Source 
adapting templates to use the default locale
This commit is contained in:
Sheldan
2024-11-22 23:12:07 +01:00
parent 42a94359bb
commit a39124e208
140 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
application/oneplus-bot-modules/faq/src/main/java/dev/sheldan/oneplus/bot/modules/faq/command/FAQ.java
View File

@@ -66,14 +66,14 @@ public class FAQ extends AbstractConditionableCommand {
.forEach(faqResponseMessageModel ->
messageFutures.add(FutureUtils.
toSingleFutureGeneric(channelService.
sendEmbedTemplateInTextChannelList(FAQ_RESPONSE_TEMPLATE_KEY,
sendEmbedTemplateInMessageChannel(FAQ_RESPONSE_TEMPLATE_KEY,
faqResponseMessageModel, commandContext.getChannel()))));
return FutureUtils.toSingleFutureGeneric(messageFutures);
} else {
return FutureUtils
.toSingleFutureGeneric(
channelService.
sendEmbedTemplateInTextChannelList(FAQ_RESPONSE_NO_COMMAND_FOUND_TEMPLATE_KEY,
sendEmbedTemplateInMessageChannel(FAQ_RESPONSE_NO_COMMAND_FOUND_TEMPLATE_KEY,
faqResponseModel, commandContext.getChannel()));
}
})
@@ -85,7 +85,7 @@ public class FAQ extends AbstractConditionableCommand {
return FutureUtils
.toSingleFutureGeneric(
channelService.
sendEmbedTemplateInTextChannelList(FAQ_RESPONSE_NO_COMMAND_FOUND_TEMPLATE_KEY,
sendEmbedTemplateInMessageChannel(FAQ_RESPONSE_NO_COMMAND_FOUND_TEMPLATE_KEY,
model, commandContext.getChannel()))
.thenApply(unused -> CommandResult.fromSuccess());
}

2
application/oneplus-bot-modules/faq/src/main/java/dev/sheldan/oneplus/bot/modules/faq/command/FAQUsage.java
View File

@@ -52,7 +52,7 @@ public class FAQUsage extends AbstractConditionableCommand {
model = faqUsageServiceBean.getFAQUsageModel(server, commandName);
}
return FutureUtils.toSingleFutureGeneric(channelService.sendEmbedTemplateInTextChannelList(FAQ_USAGE_RESPONSE_TEMPLATE_KEY, model, commandContext.getChannel()))
return FutureUtils.toSingleFutureGeneric(channelService.sendEmbedTemplateInMessageChannel(FAQ_USAGE_RESPONSE_TEMPLATE_KEY, model, commandContext.getChannel()))
.thenApply(unused -> CommandResult.fromSuccess());
}

2
application/oneplus-bot-modules/faq/src/main/java/dev/sheldan/oneplus/bot/modules/faq/command/ListFAQCommands.java
View File

@@ -39,7 +39,7 @@ public class ListFAQCommands extends AbstractConditionableCommand {
public CompletableFuture<CommandResult> executeAsync(CommandContext commandContext) {
AServer server = serverManagementService.loadServer(commandContext.getGuild());
ListFAQCommandsModel model = faqServiceBean.getCommandListingForServer(server);
return FutureUtils.toSingleFutureGeneric(channelService.sendEmbedTemplateInTextChannelList(LIST_FAQ_COMMANDS_RESPONSE_TEMPLATE_KEY, model, commandContext.getChannel()))
return FutureUtils.toSingleFutureGeneric(channelService.sendEmbedTemplateInMessageChannel(LIST_FAQ_COMMANDS_RESPONSE_TEMPLATE_KEY, model, commandContext.getChannel()))
.thenApply(unused -> CommandResult.fromSuccess());
}

4
application/oneplus-bot-modules/referral/src/main/java/dev/sheldan/oneplus/bot/modules/referral/listener/ReferralListener.java
View File

@@ -119,7 +119,7 @@ public class ReferralListener implements AsyncMessageReceivedListener {
.build();
ServerUser serverUser = ServerUser.fromMember(message.getMember());
CompletableFutureList<Message> sendFutures = new CompletableFutureList<>(channelService
.sendEmbedTemplateInMessageChannelList(REFERRAL_POST_EMBED_TEMPLATE_KEY, postModel, message.getChannel()));
.sendEmbedTemplateInMessageChannel(REFERRAL_POST_EMBED_TEMPLATE_KEY, postModel, message.getChannel()));
CompletableFuture<Void> deletionFuture = messageService.deleteMessage(message);
CompletableFuture.allOf(sendFutures.getMainFuture(), deletionFuture)
.thenAccept(unused -> self.updateReferralStateInDatabase(serverUser))
@@ -139,7 +139,7 @@ public class ReferralListener implements AsyncMessageReceivedListener {
private void deleteAndNotify(Message message, String usedTemplate, Object usedModel) {
CompletableFutureList<Message> futures = new CompletableFutureList<>(channelService
.sendEmbedTemplateInMessageChannelList(usedTemplate, usedModel, message.getChannel()));
.sendEmbedTemplateInMessageChannel(usedTemplate, usedModel, message.getChannel()));
futures.getMainFuture().thenAccept(unused ->
scheduledExecutorService.schedule(() ->
futures.getObjects().forEach(createdMessage -> messageService.deleteMessage(createdMessage)),