Sheldan/abstracto
1
0
Fork 0
mirror of https://github.com/Sheldan/abstracto.git synced 2026-04-14 03:45:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

[AB-174] fixing being unable to snooze unreminded reminders

Browse Source 
changing new line handling for command parameters
This commit is contained in:
Sheldan
2021-05-02 23:01:33 +02:00
parent a05393eb96
commit 3b2216201d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
abstracto-application/abstracto-modules/remind/remind-impl/src/main/java/dev/sheldan/abstracto/remind/service/RemindServiceBean.java
View File

@@ -174,7 +174,7 @@ public class RemindServiceBean implements ReminderService {
@Override @Override
public void snoozeReminder(Long reminderId, AUserInAServer user, Duration newDuration) { public void snoozeReminder(Long reminderId, AUserInAServer user, Duration newDuration) {
Reminder reminder = reminderManagementService.getReminderByAndByUser(user, reminderId).orElseThrow(() -> new ReminderNotFoundException(reminderId)); 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(); throw new NotPossibleToSnoozeException();
} }
log.info("Snoozing reminder {} to be executed in {}.", reminderId, newDuration); log.info("Snoozing reminder {} to be executed in {}.", reminderId, newDuration);

2
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/command/execution/UnParsedCommandParameter.java
View File

@@ -11,7 +11,7 @@ import java.util.regex.Pattern;
@Getter @Getter
public class UnParsedCommandParameter { 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) { public UnParsedCommandParameter(String parameters, Message message) {
this.parameters = new ArrayList<>(); this.parameters = new ArrayList<>();