mirror/DisCal-Discord-Bot
1
0
Fork 0
mirror of https://github.com/DreamExposure/DisCal-Discord-Bot.git synced 2026-01-27 06:18:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

All the debugging!

Browse Source
This commit is contained in:
NovaFox161
2021-06-30 13:10:45 -05:00
parent b21e60d5aa
commit ff93db0584
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,6 +5,7 @@ import discord4j.core.event.domain.message.MessageCreateEvent;
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;
@@ -78,16 +79,21 @@ public class AnnouncementCreator {
if (!this.hasAnnouncement(settings.getGuildID())) {
return DatabaseManager.INSTANCE.getAnnouncement(UUID.fromString(announcementId), settings.getGuildID())
.flatMap(edit -> {
LogFeed.log(LogObject.forDebug("a1"));
final Announcement a = Announcement.Companion.copy(edit, true);
a.setEditing(true);
this.announcements.add(a);
return AnnouncementMessageFormatter.getFormatAnnouncementEmbed(a, settings)
.doOnNext(n -> LogFeed.log(LogObject.forDebug("a2")))
.flatMap(em ->
Messages.sendMessage(Messages.getMessage("Creator.Announcement.Edit.Init", settings), em, e))
.doOnNext(n -> LogFeed.log(LogObject.forDebug("a3")))
.doOnNext(a::setCreatorMessage)
.then(Messages.deleteMessage(e))
.doOnNext(n -> LogFeed.log(LogObject.forDebug("a4")))
.thenReturn(a)
.doOnNext(n -> LogFeed.log(LogObject.forDebug("a5")))
.doOnError(err -> LogObject.forException("Failed to init editor", err, this.getClass()))
.onErrorResume(err -> Mono.empty());
});

3
client/src/main/java/org/dreamexposure/discal/client/message/Messages.java
View File

@@ -179,7 +179,8 @@ public class Messages {
//Message deleting
public static Mono<Void> deleteMessage(Message message) {
return Mono.justOrEmpty(message).flatMap(Message::delete)
return Mono.justOrEmpty(message)
.flatMap(Message::delete)
.onErrorResume(e -> Mono.empty());
}