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

Get events command fully working without emitting no cal message

Browse Source
This commit is contained in:
NovaFox161
2020-05-05 17:53:19 -05:00
parent 32f2d037b8
commit c36db9aeff
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/main/java/org/dreamexposure/discal/client/module/command/EventListCommand.java
+3 -2
View File
@@ -126,7 +126,7 @@ public class EventListCommand implements Command {
.flatMap(e -> EventMessageFormatter.getCondensedEventEmbed(e, .flatMap(e -> EventMessageFormatter.getCondensedEventEmbed(e,
data.getCalendarNumber(), settings).flatMap(embed -> data.getCalendarNumber(), settings).flatMap(embed ->
Messages.sendMessage(embed, event))) Messages.sendMessage(embed, event)))
.then()); .then()).thenReturn(GlobalConst.NOT_EMPTY);
} }
}) })
).switchIfEmpty(Messages.sendMessage(Messages.getMessage("Creator.Calendar.NoCalendar", settings), event)); ).switchIfEmpty(Messages.sendMessage(Messages.getMessage("Creator.Calendar.NoCalendar", settings), event));
@@ -163,7 +163,8 @@ public class EventListCommand implements Command {
return Messages.sendMessage(Messages.getMessage("Event.List.Found.Many", "%amount%", return Messages.sendMessage(Messages.getMessage("Event.List.Found.Many", "%amount%",
events.size() + "", settings), event).then(Flux.fromIterable(events).flatMap(e -> events.size() + "", settings), event).then(Flux.fromIterable(events).flatMap(e ->
EventMessageFormatter.getCondensedEventEmbed(e, data.getCalendarNumber(), settings) EventMessageFormatter.getCondensedEventEmbed(e, data.getCalendarNumber(), settings)
.flatMap(embed -> Messages.sendMessage(embed, event))).then()); .flatMap(embed -> Messages.sendMessage(embed, event))).then())
.thenReturn(GlobalConst.NOT_EMPTY);
} }
}); });
}).switchIfEmpty(Messages.sendMessage(Messages.getMessage("Creator.Calendar.NoCalendar", settings), event)); }).switchIfEmpty(Messages.sendMessage(Messages.getMessage("Creator.Calendar.NoCalendar", settings), event));
core/src/main/java/org/dreamexposure/discal/core/utils/GlobalConst.java
+2
View File
@@ -52,4 +52,6 @@ public class GlobalConst {
public static final long oneDayMs = 86400000; public static final long oneDayMs = 86400000;
public static final MediaType JSON = MediaType.parse("application/json; charset=utf-8"); public static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
public static final String NOT_EMPTY = "Not empty"; //Used for returning in mono's that we don't want to be empty.
} }