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

Handle 403 on message update

Browse Source
This commit is contained in:
NovaFox161
2021-12-03 21:56:28 -06:00
parent 67fcbe8543
commit 0486df5e02
2 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/main/kotlin/org/dreamexposure/discal/client/commands/DisplayCalendarCommand.kt
+17 -13
View File
@@ -7,6 +7,7 @@ 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 discord4j.rest.http.client.ClientException
import org.dreamexposure.discal.client.message.embed.CalendarEmbed
import org.dreamexposure.discal.core.`object`.GuildSettings
import org.dreamexposure.discal.core.`object`.StaticMessage
@@ -96,20 +97,23 @@ class DisplayCalendarCommand : SlashCommand {
DatabaseManager.getStaticMessage(settings.guildID, messageId)
.filter { it.type == StaticMessage.Type.CALENDAR_OVERVIEW }
.flatMap { static ->
event.client.getMessageById(static.channelId, static.messageId).flatMap { msg ->
val gMono = event.interaction.guild.cache()
val cMono = gMono.flatMap { it.getCalendar(static.calendarNumber) }
event.client.getMessageById(static.channelId, static.messageId)
.onErrorResume(ClientException.isStatusCode(403, 404)) {
Mono.empty()
}.flatMap { msg ->
val gMono = event.interaction.guild.cache()
val cMono = gMono.flatMap { it.getCalendar(static.calendarNumber) }
Mono.zip(gMono, cMono).flatMap(TupleUtils.function { guild, calendar ->
CalendarEmbed.overview(guild, settings, calendar, true)
.flatMap { msg.edit().withEmbedsOrNull(listOf(it)) }
.flatMap {
DatabaseManager.updateStaticMessage(
static.copy(lastUpdate = Instant.now())
)
}.then(event.followupEphemeral(getCommonMsg("success.generic", settings)))
})
}.switchIfEmpty(event.followupEphemeral(getCommonMsg("error.notFound.message", settings)))
Mono.zip(gMono, cMono).flatMap(TupleUtils.function { guild, calendar ->
CalendarEmbed.overview(guild, settings, calendar, true)
.flatMap { msg.edit().withEmbedsOrNull(listOf(it)) }
.flatMap {
DatabaseManager.updateStaticMessage(
static.copy(lastUpdate = Instant.now())
)
}.then(event.followupEphemeral(getCommonMsg("success.generic", settings)))
})
}.switchIfEmpty(event.followupEphemeral(getCommonMsg("error.notFound.message", settings)))
}.switchIfEmpty(event.followupEphemeral(getCommonMsg("error.notFound.staticMessage", settings)))
}.switchIfEmpty(event.followupEphemeral(getCommonMsg("error.perms.elevated", settings)))
}.onErrorResume(NumberFormatException::class.java) {
client/src/main/kotlin/org/dreamexposure/discal/client/service/StaticMessageService.kt
+4 -4
View File
@@ -69,8 +69,8 @@ class StaticMessageService : ApplicationRunner {
})
}
}
}.onErrorResume(ClientException.isStatusCode(404)) {
//Message or channel was deleted, delete from database
}.onErrorResume(ClientException.isStatusCode(403, 404)) {
//Message or channel was deleted OR access was revoked, delete from database
DatabaseManager.deleteStaticMessage(data.guildId, data.messageId)
}
}.doOnError {
@@ -97,8 +97,8 @@ class StaticMessageService : ApplicationRunner {
.embedsOrNull(listOf(it))
.build()
).then(DatabaseManager.updateStaticMessage(msg.copy(lastUpdate = Instant.now())))
}.onErrorResume(ClientException.isStatusCode(404)) {
//Message or channel was deleted, delete from database
}.onErrorResume(ClientException.isStatusCode(403, 404)) {
//Message or channel was deleted OR access was revoked, delete from database
DatabaseManager.deleteStaticMessage(msg.guildId, msg.messageId)
}
}