refactored the naming in channel service

added initial version of closing and logging the thread
This commit is contained in:
Sheldan
2020-05-06 18:32:08 +02:00
parent 54327c3e58
commit ad1cbb54fd
37 changed files with 392 additions and 64 deletions

View File

@@ -38,7 +38,7 @@ public class StarStats extends AbstractConditionableCommand {
public CommandResult execute(CommandContext commandContext) {
StarStatsModel result = starboardService.retrieveStarStats(commandContext.getGuild().getIdLong());
MessageToSend messageToSend = templateService.renderEmbedTemplate(STARSTATS_RESPONSE_TEMPLATE, result);
channelService.sendMessageToEndInTextChannel(messageToSend, commandContext.getChannel());
channelService.sendMessageToSendToChannel(messageToSend, commandContext.getChannel());
return CommandResult.fromSuccess();
}

View File

@@ -38,7 +38,7 @@ public class Reminders extends AbstractConditionableCommand {
RemindersModel model = (RemindersModel) ContextConverter.fromCommandContext(commandContext, RemindersModel.class);
model.setReminders(activeReminders);
MessageToSend messageToSend = templateService.renderEmbedTemplate("reminders_response", model);
channelService.sendMessageToEndInTextChannel(messageToSend, commandContext.getChannel());
channelService.sendMessageToSendToChannel(messageToSend, commandContext.getChannel());
return CommandResult.fromSuccess();
}

View File

@@ -113,7 +113,7 @@ public class MessageEmbedServiceBean implements MessageEmbedService {
public void embedLink(CachedMessage cachedMessage, TextChannel target, AUserInAServer cause, Message embeddingMessage) {
MessageEmbeddedModel messageEmbeddedModel = buildTemplateParameter(embeddingMessage, cachedMessage);
MessageToSend embed = templateService.renderEmbedTemplate(MESSAGE_EMBED_TEMPLATE, messageEmbeddedModel);
List<CompletableFuture<Message>> completableFutures = channelService.sendMessageToEndInTextChannel(embed, target);
List<CompletableFuture<Message>> completableFutures = channelService.sendMessageToSendToChannel(embed, target);
log.trace("Embedding message {} from channel {} from server {}, because of user {}", cachedMessage.getMessageId(),
cachedMessage.getChannelId(), cachedMessage.getServerId(), cause.getUserReference().getId());
CompletableFuture.allOf(completableFutures.toArray(new CompletableFuture[0])).thenAccept(aVoid -> {

View File

@@ -71,7 +71,7 @@ public class RemindServiceBean implements ReminderService {
Reminder reminder = reminderManagementService.createReminder(aServerAChannelAUser, remindText, remindAt, reminderModel.getMessage().getIdLong());
reminderModel.setReminder(reminder);
MessageToSend message = templateService.renderEmbedTemplate(REMINDER_EMBED_KEY, reminderModel);
channelService.sendMessageToEndInAChannel(message, reminderModel.getChannel());
channelService.sendMessageToSendToAChannel(message, reminderModel.getChannel());
log.info("Creating reminder for user {} in guild {} due at {}.",
user.getUserReference().getId(), user.getServerReference().getId(), remindAt);
@@ -120,7 +120,7 @@ public class RemindServiceBean implements ReminderService {
.duration(Duration.between(reminderToRemindFor.getReminderDate(), reminderToRemindFor.getTargetDate()))
.build();
MessageToSend messageToSend = templateService.renderEmbedTemplate("remind_reminder", build);
channelService.sendMessageToEndInTextChannel(messageToSend, channelToAnswerIn.get());
channelService.sendMessageToSendToChannel(messageToSend, channelToAnswerIn.get());
} else {
log.warn("Channel {} in server {} to remind user did not exist anymore. Ignoring reminder {}", channel.getId(), server.getId(), reminderId);
}