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

Event confirmations are no longer ephemeral

Browse Source
This commit is contained in:
NovaFox161
2021-12-06 12:49:27 -06:00
parent 87632c5baa
commit d5b1577a0b
2 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/main/kotlin/org/dreamexposure/discal/client/commands/EventCommand.kt
+21 -8
View File
@@ -5,6 +5,7 @@ import discord4j.core.`object`.command.ApplicationCommandInteractionOptionValue
import discord4j.core.`object`.entity.Member
import discord4j.core.`object`.entity.Message
import discord4j.core.event.domain.interaction.ChatInputInteractionEvent
import discord4j.core.spec.MessageCreateSpec
import org.dreamexposure.discal.client.message.embed.EventEmbed
import org.dreamexposure.discal.client.service.StaticMessageService
import org.dreamexposure.discal.core.`object`.GuildSettings
@@ -422,11 +423,17 @@ class EventCommand(val wizard: Wizard<PreEvent>, val staticMessageSrv: StaticMes
calEvent.calendar,
settings
)
val embedMono = event.interaction.channel.flatMap {
val spec = MessageCreateSpec.builder()
.content(getMessage("confirm.success.new", settings))
.addEmbed(EventEmbed.getFull(guild, settings, calEvent))
.build()
event.followupEphemeral(
getMessage("confirm.success.create", settings),
EventEmbed.getFull(guild, settings, calEvent)
).flatMap { updateMessages.thenReturn(it) }
it.createMessage(spec)
}
val followupMono = event.followupEphemeral(getCommonMsg("success.generic", settings))
embedMono.then(followupMono).flatMap { updateMessages.thenReturn(it) }
}.doOnError {
LOGGER.error("Create event with command failure", it)
}.onErrorResume {
@@ -443,11 +450,17 @@ class EventCommand(val wizard: Wizard<PreEvent>, val staticMessageSrv: StaticMes
uer.new!!.calendar,
settings
)
val embedMono = event.interaction.channel.flatMap {
val spec = MessageCreateSpec.builder()
.content(getMessage("confirm.success.new", settings))
.addEmbed(EventEmbed.getFull(guild, settings, uer.new!!))
.build()
event.followupEphemeral(
getMessage("confirm.success.edit", settings),
EventEmbed.getFull(guild, settings, uer.new!!)
).flatMap { updateMessages.thenReturn(it) }
it.createMessage(spec)
}
val followupMono = event.followupEphemeral(getCommonMsg("success.generic", settings))
embedMono.then(followupMono).flatMap { updateMessages.thenReturn(it) }
}
.switchIfEmpty(event.followupEphemeral(getMessage("confirm.failure.edit", settings)))
}
client/src/main/kotlin/org/dreamexposure/discal/client/message/embed/EventEmbed.kt
+1 -4
View File
@@ -147,10 +147,7 @@ object EventEmbed : EmbedMaker {
val warnings = event.generateWarnings(settings)
if (warnings.isNotEmpty()) {
val warnText = """```fix
${warnings.joinToString("\n")}
```""".trimMargin()
val warnText = "```fix\n${warnings.joinToString("\n")}\n```"
builder.addField(getMessage("event", "wizard.field.warnings", settings), warnText, false)
}