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

Fix specific type announcements not posting

Browse Source 
I think I was accidentally deleting them because
I am a dumb
This commit is contained in:
NovaFox161
2020-08-25 12:34:09 -05:00
parent 3f9b4e6d81
commit 3d3d413f7b
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
client/src/main/java/org/dreamexposure/discal/client/module/announcement/AnnouncementThread.java
View File

@@ -2,7 +2,9 @@ package org.dreamexposure.discal.client.module.announcement;
import com.google.api.services.calendar.Calendar;
import com.google.api.services.calendar.model.Event;
import discord4j.common.util.Snowflake;
import discord4j.core.GatewayDiscordClient;
import discord4j.core.object.entity.Guild;
import org.dreamexposure.discal.client.message.AnnouncementMessageFormatter;
import org.dreamexposure.discal.core.calendar.CalendarAuth;
import org.dreamexposure.discal.core.database.DatabaseManager;
@@ -14,18 +16,14 @@ import org.dreamexposure.discal.core.object.announcement.Announcement;
import org.dreamexposure.discal.core.object.calendar.CalendarData;
import org.dreamexposure.discal.core.utils.GlobalConst;
import org.dreamexposure.discal.core.wrapper.google.EventWrapper;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import discord4j.common.util.Snowflake;
import discord4j.core.GatewayDiscordClient;
import discord4j.core.object.entity.Guild;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import static org.dreamexposure.discal.core.enums.announcement.AnnouncementType.SPECIFIC;
import static reactor.function.TupleUtils.function;
@@ -86,12 +84,14 @@ public class AnnouncementThread {
}
//Modifier handling
private Mono<Void> handleBeforeModifier(final Guild guild, final Announcement a, final GuildSettings settings, final CalendarData calData,
final Calendar service) {
private Mono<Void> handleBeforeModifier(final Guild guild, final Announcement a, final GuildSettings settings,
final CalendarData calData, final Calendar service) {
switch (a.getAnnouncementType()) {
case SPECIFIC:
return EventWrapper.getEvent(calData, settings, a.getEventId())
.flatMap(e -> this.inRangeSpecific(a, e)
.switchIfEmpty(DatabaseManager.deleteAnnouncement(a.getAnnouncementId().toString())
.then(Mono.empty())
).flatMap(e -> this.inRangeSpecific(a, e)
.flatMap(inRange -> {
if (inRange) {
return AnnouncementMessageFormatter
@@ -103,8 +103,6 @@ public class AnnouncementThread {
return Mono.empty(); //Not in range, but still valid.
}
}))
.switchIfEmpty(DatabaseManager
.deleteAnnouncement(a.getAnnouncementId().toString()))
.then();
case UNIVERSAL:
return this.getEvents(settings, calData, service)