mirror/DisCal-Discord-Bot
1
0
Fork 0
mirror of https://github.com/DreamExposure/DisCal-Discord-Bot.git synced 2026-02-09 04:49:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix creator messages and make sure to delete initial command message

Browse Source
This commit is contained in:
NovaFox161
2020-05-09 14:47:26 -05:00
parent 2c42260e97
commit d1a32e5b87
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/src/main/java/org/dreamexposure/discal/client/announcement/AnnouncementCreator.java
View File

@@ -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()));

5
client/src/main/java/org/dreamexposure/discal/client/calendar/CalendarCreator.java
View File

@@ -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));
})
);

6
client/src/main/java/org/dreamexposure/discal/client/event/EventCreator.java
View File

@@ -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);
}));
}