mirror of
https://github.com/Sheldan/abstracto.git
synced 2026-04-14 03:45:57 +00:00
[AB-xxx] adding reminder display to reminders command to add a link to the existing reminder
This commit is contained in:
@@ -8,12 +8,14 @@ import dev.sheldan.abstracto.core.command.execution.CommandContext;
|
|||||||
import dev.sheldan.abstracto.core.command.execution.CommandResult;
|
import dev.sheldan.abstracto.core.command.execution.CommandResult;
|
||||||
import dev.sheldan.abstracto.core.command.execution.ContextConverter;
|
import dev.sheldan.abstracto.core.command.execution.ContextConverter;
|
||||||
import dev.sheldan.abstracto.core.config.FeatureDefinition;
|
import dev.sheldan.abstracto.core.config.FeatureDefinition;
|
||||||
|
import dev.sheldan.abstracto.core.models.ServerChannelMessage;
|
||||||
import dev.sheldan.abstracto.core.models.database.AUserInAServer;
|
import dev.sheldan.abstracto.core.models.database.AUserInAServer;
|
||||||
import dev.sheldan.abstracto.core.service.ChannelService;
|
import dev.sheldan.abstracto.core.service.ChannelService;
|
||||||
import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
|
import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
|
||||||
import dev.sheldan.abstracto.core.utils.FutureUtils;
|
import dev.sheldan.abstracto.core.utils.FutureUtils;
|
||||||
import dev.sheldan.abstracto.remind.config.RemindFeatureDefinition;
|
import dev.sheldan.abstracto.remind.config.RemindFeatureDefinition;
|
||||||
import dev.sheldan.abstracto.remind.model.database.Reminder;
|
import dev.sheldan.abstracto.remind.model.database.Reminder;
|
||||||
|
import dev.sheldan.abstracto.remind.model.template.commands.ReminderDisplay;
|
||||||
import dev.sheldan.abstracto.remind.model.template.commands.RemindersModel;
|
import dev.sheldan.abstracto.remind.model.template.commands.RemindersModel;
|
||||||
import dev.sheldan.abstracto.remind.service.management.ReminderManagementService;
|
import dev.sheldan.abstracto.remind.service.management.ReminderManagementService;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
@@ -42,7 +44,20 @@ public class Reminders extends AbstractConditionableCommand {
|
|||||||
AUserInAServer aUserInAServer = userInServerManagementService.loadOrCreateUser(commandContext.getAuthor());
|
AUserInAServer aUserInAServer = userInServerManagementService.loadOrCreateUser(commandContext.getAuthor());
|
||||||
List<Reminder> activeReminders = reminderManagementService.getActiveRemindersForUser(aUserInAServer);
|
List<Reminder> activeReminders = reminderManagementService.getActiveRemindersForUser(aUserInAServer);
|
||||||
RemindersModel model = (RemindersModel) ContextConverter.fromCommandContext(commandContext, RemindersModel.class);
|
RemindersModel model = (RemindersModel) ContextConverter.fromCommandContext(commandContext, RemindersModel.class);
|
||||||
model.setReminders(activeReminders);
|
activeReminders.forEach(reminder -> {
|
||||||
|
ServerChannelMessage originMessage = ServerChannelMessage
|
||||||
|
.builder()
|
||||||
|
.messageId(reminder.getMessageId())
|
||||||
|
.channelId(reminder.getChannel().getId())
|
||||||
|
.serverId(commandContext.getGuild().getIdLong())
|
||||||
|
.build();
|
||||||
|
ReminderDisplay display = ReminderDisplay
|
||||||
|
.builder()
|
||||||
|
.reminder(reminder)
|
||||||
|
.message(originMessage)
|
||||||
|
.build();
|
||||||
|
model.getReminders().add(display);
|
||||||
|
});
|
||||||
log.info("Showing {} reminders for user {} in server {}.", activeReminders.size(), commandContext.getAuthor().getId(), commandContext.getGuild().getId());
|
log.info("Showing {} reminders for user {} in server {}.", activeReminders.size(), commandContext.getAuthor().getId(), commandContext.getGuild().getId());
|
||||||
return FutureUtils.toSingleFutureGeneric(channelService.sendEmbedTemplateInTextChannelList(REMINDERS_RESPONSE_TEMPLATE, model, commandContext.getChannel()))
|
return FutureUtils.toSingleFutureGeneric(channelService.sendEmbedTemplateInTextChannelList(REMINDERS_RESPONSE_TEMPLATE, model, commandContext.getChannel()))
|
||||||
.thenApply(aVoid -> CommandResult.fromIgnored());
|
.thenApply(aVoid -> CommandResult.fromIgnored());
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
package dev.sheldan.abstracto.remind.model.template.commands;
|
||||||
|
|
||||||
|
import dev.sheldan.abstracto.core.models.ServerChannelMessage;
|
||||||
|
import dev.sheldan.abstracto.remind.model.database.Reminder;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.Setter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
@Builder
|
||||||
|
public class ReminderDisplay {
|
||||||
|
private Reminder reminder;
|
||||||
|
private ServerChannelMessage message;
|
||||||
|
}
|
||||||
@@ -1,16 +1,18 @@
|
|||||||
package dev.sheldan.abstracto.remind.model.template.commands;
|
package dev.sheldan.abstracto.remind.model.template.commands;
|
||||||
|
|
||||||
import dev.sheldan.abstracto.core.models.context.UserInitiatedServerContext;
|
import dev.sheldan.abstracto.core.models.context.UserInitiatedServerContext;
|
||||||
import dev.sheldan.abstracto.remind.model.database.Reminder;
|
import lombok.Builder;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import lombok.Setter;
|
import lombok.Setter;
|
||||||
import lombok.experimental.SuperBuilder;
|
import lombok.experimental.SuperBuilder;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
@Setter
|
@Setter
|
||||||
@SuperBuilder
|
@SuperBuilder
|
||||||
public class RemindersModel extends UserInitiatedServerContext {
|
public class RemindersModel extends UserInitiatedServerContext {
|
||||||
private List<Reminder> reminders;
|
@Builder.Default
|
||||||
|
private List<ReminderDisplay> reminders = new ArrayList<>();
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user