diff --git a/abstracto-application/abstracto-modules/remind/remind-impl/src/main/java/dev/sheldan/abstracto/remind/service/RemindServiceBean.java b/abstracto-application/abstracto-modules/remind/remind-impl/src/main/java/dev/sheldan/abstracto/remind/service/RemindServiceBean.java index 2679c9178..1a901c763 100644 --- a/abstracto-application/abstracto-modules/remind/remind-impl/src/main/java/dev/sheldan/abstracto/remind/service/RemindServiceBean.java +++ b/abstracto-application/abstracto-modules/remind/remind-impl/src/main/java/dev/sheldan/abstracto/remind/service/RemindServiceBean.java @@ -174,7 +174,7 @@ public class RemindServiceBean implements ReminderService { @Override public void snoozeReminder(Long reminderId, AUserInAServer user, Duration newDuration) { Reminder reminder = reminderManagementService.getReminderByAndByUser(user, reminderId).orElseThrow(() -> new ReminderNotFoundException(reminderId)); - if(reminder.getTargetDate().isAfter(Instant.now())) { + if(reminder.getTargetDate().isAfter(Instant.now()) && !reminder.isReminded()) { throw new NotPossibleToSnoozeException(); } log.info("Snoozing reminder {} to be executed in {}.", reminderId, newDuration); diff --git a/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/command/execution/UnParsedCommandParameter.java b/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/command/execution/UnParsedCommandParameter.java index f3b0b044c..c3bb400af 100644 --- a/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/command/execution/UnParsedCommandParameter.java +++ b/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/command/execution/UnParsedCommandParameter.java @@ -11,7 +11,7 @@ import java.util.regex.Pattern; @Getter public class UnParsedCommandParameter { - private static Pattern SPLIT_REGEX = Pattern.compile("\"([^\"]*)\"|(\\S+\\n*)"); + private static Pattern SPLIT_REGEX = Pattern.compile("\"([^\"]*)\"|([\\S\\n]+)"); public UnParsedCommandParameter(String parameters, Message message) { this.parameters = new ArrayList<>();