From d1a32e5b874b380a3ea6af28eb0f95e2f61e8a18 Mon Sep 17 00:00:00 2001 From: NovaFox161 Date: Sat, 9 May 2020 14:47:26 -0500 Subject: [PATCH] Fix creator messages and make sure to delete initial command message --- .../discal/client/announcement/AnnouncementCreator.java | 3 +++ .../discal/client/calendar/CalendarCreator.java | 5 ++++- .../org/dreamexposure/discal/client/event/EventCreator.java | 6 +++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/client/src/main/java/org/dreamexposure/discal/client/announcement/AnnouncementCreator.java b/client/src/main/java/org/dreamexposure/discal/client/announcement/AnnouncementCreator.java index be9868fd..d9b86605 100644 --- a/client/src/main/java/org/dreamexposure/discal/client/announcement/AnnouncementCreator.java +++ b/client/src/main/java/org/dreamexposure/discal/client/announcement/AnnouncementCreator.java @@ -48,6 +48,7 @@ public class AnnouncementCreator { .flatMap(em -> Messages.sendMessage(Messages.getMessage("Creator.Announcement.Create.Init", settings), em, e)) .doOnNext(a::setCreatorMessage) + .then(Messages.deleteMessage(e)) .thenReturn(a); }); } @@ -65,6 +66,7 @@ public class AnnouncementCreator { .flatMap(em -> Messages.sendMessage(Messages.getMessage("Creator.Announcement.Copy.Success", settings), em, e)) .doOnNext(a::setCreatorMessage) + .then(Messages.deleteMessage(e)) .thenReturn(a); }).defaultIfEmpty(getAnnouncement(settings.getGuildID())); } @@ -83,6 +85,7 @@ public class AnnouncementCreator { .flatMap(em -> Messages.sendMessage(Messages.getMessage("Creator.Announcement.Edit.Init", settings), em, e)) .doOnNext(a::setCreatorMessage) + .then(Messages.deleteMessage(e)) .thenReturn(a) .onErrorResume(err -> { LogFeed.log(LogObject.forException("Failed to init editor", err, this.getClass())); diff --git a/client/src/main/java/org/dreamexposure/discal/client/calendar/CalendarCreator.java b/client/src/main/java/org/dreamexposure/discal/client/calendar/CalendarCreator.java index 3b9dc12f..87388586 100644 --- a/client/src/main/java/org/dreamexposure/discal/client/calendar/CalendarCreator.java +++ b/client/src/main/java/org/dreamexposure/discal/client/calendar/CalendarCreator.java @@ -48,9 +48,10 @@ public class CalendarCreator { return CalendarMessageFormatter.getPreCalendarEmbed(calendar, settings) .flatMap(embed -> Messages.sendMessage( - Messages.getMessage("Creator.Calendar.Edit.Init", settings), + Messages.getMessage("Creator.Calendar.Create.Init", settings), embed, e) .doOnNext(calendar::setCreatorMessage) + .then(Messages.deleteMessage(e)) .thenReturn(calendar)); } ); @@ -75,6 +76,7 @@ public class CalendarCreator { Messages.getMessage("Creator.Calendar.Edit.Init", settings), embed, event) .doOnNext(preCalendar::setCreatorMessage) + .then(Messages.deleteMessage(event)) .thenReturn(preCalendar)); }) ); @@ -98,6 +100,7 @@ public class CalendarCreator { Messages.getMessage("Creator.Calendar.Edit.Init", settings), embed, event) .doOnNext(preCalendar::setCreatorMessage) + .then(Messages.deleteMessage(event)) .thenReturn(preCalendar)); }) ); diff --git a/client/src/main/java/org/dreamexposure/discal/client/event/EventCreator.java b/client/src/main/java/org/dreamexposure/discal/client/event/EventCreator.java index 8211c2c1..7ea7a087 100644 --- a/client/src/main/java/org/dreamexposure/discal/client/event/EventCreator.java +++ b/client/src/main/java/org/dreamexposure/discal/client/event/EventCreator.java @@ -53,8 +53,9 @@ public class EventCreator { .doOnNext(c -> event.setTimeZone(c.getTimeZone())) .flatMap(c -> EventMessageFormatter.getPreEventEmbed(event, settings)) .flatMap(embed -> Messages.sendMessage( - Messages.getMessage("Creator.Event.Copy.Init", settings), embed, e)) + Messages.getMessage("Creator.Event.Create.Init", settings), embed, e)) .doOnNext(event::setCreatorMessage) + .then(Messages.deleteMessage(e)) .thenReturn(event); }); } @@ -76,6 +77,7 @@ public class EventCreator { .flatMap(embed -> Messages.sendMessage( Messages.getMessage("Creator.Event.Create.Init", settings), embed, e)) .doOnNext(event::setCreatorMessage) + .then(Messages.deleteMessage(e)) .thenReturn(event); }); } @@ -98,6 +100,7 @@ public class EventCreator { .flatMap(embed -> Messages.sendMessage( Messages.getMessage("Creator.Event.Copy.Init", settings), embed, e)) .doOnNext(event::setCreatorMessage) + .then(Messages.deleteMessage(e)) .thenReturn(event); })); } @@ -120,6 +123,7 @@ public class EventCreator { .flatMap(embed -> Messages.sendMessage( Messages.getMessage("Creator.Event.Edit.Init", settings), embed, e)) .doOnNext(event::setCreatorMessage) + .then(Messages.deleteMessage(e)) .thenReturn(event); })); }