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

Trying to track down some errors with announcement editing

Browse Source
This commit is contained in:
NovaFox161
2020-05-05 22:17:53 -05:00
parent 341041a972
commit b97585407a
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,6 +3,8 @@ package org.dreamexposure.discal.client.announcement;
import org.dreamexposure.discal.client.message.AnnouncementMessageFormatter;
import org.dreamexposure.discal.client.message.Messages;
import org.dreamexposure.discal.core.database.DatabaseManager;
import org.dreamexposure.discal.core.logger.LogFeed;
import org.dreamexposure.discal.core.logger.object.LogObject;
import org.dreamexposure.discal.core.object.GuildSettings;
import org.dreamexposure.discal.core.object.announcement.Announcement;
import org.dreamexposure.discal.core.object.announcement.AnnouncementCreatorResponse;
@@ -81,8 +83,13 @@ public class AnnouncementCreator {
.flatMap(em ->
Messages.sendMessage(Messages.getMessage("Creator.Announcement.Edit.Init", settings), em, e))
.doOnNext(a::setCreatorMessage)
.thenReturn(a);
}).defaultIfEmpty(getAnnouncement(settings.getGuildID()));
.thenReturn(a)
.onErrorResume(err -> {
LogFeed.log(LogObject.forException("Failed to init editor", err, this.getClass()));
return Mono.empty();
});
});
} else {
return Mono.justOrEmpty(getAnnouncement(settings.getGuildID()));
}

5
client/src/main/java/org/dreamexposure/discal/client/module/command/AnnouncementCommand.java
View File

@@ -250,7 +250,10 @@ public class AnnouncementCommand implements Command {
return AnnouncementUtils.announcementExists(args[1], settings.getGuildID())
.flatMap(exists -> {
if (exists) {
return AnnouncementCreator.getCreator().edit(event, args[1], settings);
return AnnouncementCreator.getCreator().edit(event, args[1], settings)
.switchIfEmpty(Messages.sendMessage(
Messages.getMessage("Notification.Error.Unknown", settings), event)
.then(Mono.empty()));
} else {
return Messages.sendMessage(
Messages.getMessage("Creator.Announcement.CannotFind.Announcement", settings), event);