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

Event view will now no longer be ephemeral

Browse Source
This commit is contained in:
NovaFox161
2021-10-15 16:48:20 -05:00
parent ea43f825c9
commit 5ac25ade51
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
client/src/main/kotlin/org/dreamexposure/discal/client/commands/EventCommand.kt
View File

@@ -14,7 +14,6 @@ import org.dreamexposure.discal.core.entities.Event
import org.dreamexposure.discal.core.entities.response.UpdateEventResponse
import org.dreamexposure.discal.core.enums.event.EventColor
import org.dreamexposure.discal.core.enums.event.EventFrequency
import org.dreamexposure.discal.core.extensions.discord4j.followup
import org.dreamexposure.discal.core.extensions.discord4j.followupEphemeral
import org.dreamexposure.discal.core.extensions.discord4j.getCalendar
import org.dreamexposure.discal.core.extensions.discord4j.hasControlRole
@@ -195,7 +194,7 @@ class EventCommand(private val wizard: Wizard<PreEvent>) : SlashCommand {
// Event end cannot be before event start
event.interaction.guild
.map { EventEmbed.pre(it, settings, pre) }
.flatMap { event.followupEphemeral(getMessage("start.failure.afterEnd", settings), it)}
.flatMap { event.followupEphemeral(getMessage("start.failure.afterEnd", settings), it) }
}
}
} else {
@@ -275,7 +274,7 @@ class EventCommand(private val wizard: Wizard<PreEvent>) : SlashCommand {
// Event start cannot be after event end
event.interaction.guild
.map { EventEmbed.pre(it, settings, pre) }
.flatMap { event.followupEphemeral(getMessage("end.failure.beforeStart", settings), it)}
.flatMap { event.followupEphemeral(getMessage("end.failure.beforeStart", settings), it) }
}
}
} else {
@@ -529,7 +528,12 @@ class EventCommand(private val wizard: Wizard<PreEvent>) : SlashCommand {
return event.interaction.guild.flatMap { guild ->
guild.getCalendar(calendarNumber).flatMap { calendar ->
calendar.getEvent(eventId).flatMap { calEvent ->
event.followup(EventEmbed.getFull(guild, settings, calEvent))
event.interaction.channel.flatMap {
// Create message instead of followup
event.interactionResponse.deleteInitialResponse().then(
it.createMessage(EventEmbed.getFull(guild, settings, calEvent))
)
}
}.switchIfEmpty(event.followupEphemeral(getCommonMsg("error.notFound.calendar", settings)))
}.switchIfEmpty(event.followupEphemeral(getCommonMsg("error.notFound.calendar", settings)))
}