Add error handling for expired sessions or unknown guilds

WinG4merBR · WinG4merBR · commit ba183519ad47 · 2026-02-19T01:12:44.000-03:00
diff --git a/common/src/commonMain/kotlin/net/cakeyfox/common/Constants.kt b/common/src/commonMain/kotlin/net/cakeyfox/common/Constants.kt
@@ -53,6 +53,10 @@ object Constants {
         return "💫 $activity"
     }
 
+    fun getServerInviteLink(serverId: String): String {
+        return "https://discord.com/oauth2/authorize?client_id=1006520438865801296&scope=bot+applications.commands&permissions=269872255&guild_id=$serverId"
+    }
+
     // Website utils
     const val DISCORD_AVATAR = "https://cdn.discordapp.com/embed/avatars/0.png"
 
diff --git a/foxy/src/main/kotlin/net/cakeyfox/foxy/listeners/MessageListener.kt b/foxy/src/main/kotlin/net/cakeyfox/foxy/listeners/MessageListener.kt
@@ -14,7 +14,6 @@ import net.cakeyfox.common.FoxyLocale
 import net.cakeyfox.foxy.interactions.pretty
 import net.cakeyfox.foxy.modules.ServerLogModule
 import net.cakeyfox.foxy.utils.PremiumUtils
-import net.cakeyfox.foxy.utils.discord.NitroUtils
 import net.cakeyfox.foxy.utils.music.AudioLoader
 import net.cakeyfox.foxy.utils.music.getOrCreateMusicManager
 import net.cakeyfox.foxy.utils.music.joinInAVoiceChannel
@@ -67,9 +66,6 @@ class MessageListener(val foxy: FoxyInstance) : ListenerAdapter() {
 
             processCommandOrMention(event)
             processDjFoxyMessage(event)
-            if (event.member?.isBoosting == true) {
-                processNitroBoost(event)
-            }
         }
     }
 
@@ -101,20 +97,6 @@ class MessageListener(val foxy: FoxyInstance) : ListenerAdapter() {
         link.loadItem(processQuery(raw)).subscribe(AudioLoader(context, manager))
     }
 
-    private suspend fun processNitroBoost(event: MessageReceivedEvent) {
-        val member = event.member ?: return
-        val guildAsFoxyverseGuild = foxy.database.guild.getFoxyverseGuildOrNull(event.guild.id) ?: return
-
-        guildAsFoxyverseGuild.serverBenefits?.givePremiumIfBoosted?.let { benefit ->
-            val redeemChannel = benefit.textChannelToRedeem
-            if (benefit.isEnabled == true && redeemChannel != null && redeemChannel != event.message.channelId) {
-                return
-            }
-        }
-
-        NitroUtils.onBoostActivation(foxy, member)
-    }
-
     private suspend fun processCommandOrMention(event: MessageReceivedEvent) {
         val guild = foxy.database.guild.getGuild(event.guild.id)
         val localeKey = DiscordLocale.from(guild.guildSettings.language)
diff --git a/foxy/src/main/kotlin/net/cakeyfox/foxy/utils/discord/NitroUtils.kt b/foxy/src/main/kotlin/net/cakeyfox/foxy/utils/discord/NitroUtils.kt
diff --git a/foxy/src/main/kotlin/net/cakeyfox/foxy/website/FoxyWebsite.kt b/foxy/src/main/kotlin/net/cakeyfox/foxy/website/FoxyWebsite.kt
@@ -8,13 +8,17 @@ import io.ktor.server.application.install
 import io.ktor.server.engine.embeddedServer
 import io.ktor.server.netty.Netty
 import io.ktor.server.plugins.contentnegotiation.ContentNegotiation
+import io.ktor.server.plugins.statuspages.StatusPages
+import io.ktor.server.response.respondRedirect
 import io.ktor.server.sessions.SameSite
 import io.ktor.server.sessions.Sessions
 import io.ktor.server.sessions.cookie
 import io.ktor.server.sessions.sameSite
 import kotlinx.serialization.json.Json
 import mu.KotlinLogging
+import net.cakeyfox.common.Constants
 import net.cakeyfox.foxy.FoxyInstance
+import net.cakeyfox.foxy.website.utils.DiscordAPIException
 import net.cakeyfox.foxy.website.utils.registerAllRoutes
 import net.cakeyfox.serializable.data.utils.FoxyConfig
 import net.cakeyfox.serializable.data.website.DiscordRole
diff --git a/foxy/src/main/kotlin/net/cakeyfox/foxy/website/routes/api/v1/dashboard/guild/PostAutoRoleSettingsRoute.kt b/foxy/src/main/kotlin/net/cakeyfox/foxy/website/routes/api/v1/dashboard/guild/PostAutoRoleSettingsRoute.kt
@@ -24,7 +24,7 @@ class PostAutoRoleSettingsRoute(val server: FoxyWebsite) : BaseRoute("/api/v1/se
             ?: return htmxRedirect(context.call, Constants.INVITE_LINK)
 
         try {
-            checkPermissions(server, context, locale) ?: return
+            checkPermissions(server, context, locale, context.call) ?: return
             fun Parameters.getBoolean(name: String) = this[name] == "on"
 
             val params = context.call.receiveParameters()
diff --git a/foxy/src/main/kotlin/net/cakeyfox/foxy/website/routes/api/v1/dashboard/guild/PostGeneralSettingsRoute.kt b/foxy/src/main/kotlin/net/cakeyfox/foxy/website/routes/api/v1/dashboard/guild/PostGeneralSettingsRoute.kt
@@ -26,7 +26,7 @@ class PostGeneralSettingsRoute(val server: FoxyWebsite) :
             ?: return htmxRedirect(context.call, Constants.INVITE_LINK)
 
         try {
-            checkPermissions(server, context, locale) ?: return
+            checkPermissions(server, context, locale, context.call) ?: return
 
             val params = context.call.receiveParameters()
             fun Parameters.getBoolean(name: String) = this[name] == "on"
diff --git a/foxy/src/main/kotlin/net/cakeyfox/foxy/website/routes/api/v1/dashboard/guild/PostSaveYouTubeSettings.kt b/foxy/src/main/kotlin/net/cakeyfox/foxy/website/routes/api/v1/dashboard/guild/PostSaveYouTubeSettings.kt
@@ -33,7 +33,7 @@ class PostSaveYouTubeSettings(val server: FoxyWebsite) : BaseRoute("/api/v1/serv
         }
 
         try {
-            checkPermissions(server, context, locale) ?: return
+            checkPermissions(server, context, locale, context.call) ?: return
 
             val params = context.call.receiveParameters()
 
diff --git a/foxy/src/main/kotlin/net/cakeyfox/foxy/website/routes/api/v1/dashboard/guild/PostServerLogsSettingsRoute.kt b/foxy/src/main/kotlin/net/cakeyfox/foxy/website/routes/api/v1/dashboard/guild/PostServerLogsSettingsRoute.kt
@@ -23,7 +23,7 @@ class PostServerLogsSettingsRoute(val server: FoxyWebsite) : BaseRoute("/api/v1/
             ?: return htmxRedirect(context.call, Constants.INVITE_LINK)
 
         try {
-            checkPermissions(server, context, locale) ?: return
+            checkPermissions(server, context, locale, context.call) ?: return
 
             val params = context.call.receiveParameters()
             fun Parameters.getBoolean(name: String) = this[name] == "on"
diff --git a/foxy/src/main/kotlin/net/cakeyfox/foxy/website/routes/api/v1/dashboard/guild/PostWelcomerRoute.kt b/foxy/src/main/kotlin/net/cakeyfox/foxy/website/routes/api/v1/dashboard/guild/PostWelcomerRoute.kt
@@ -23,7 +23,7 @@ class PostWelcomerRoute(val server: FoxyWebsite) :
         val guildId = context.call.parameters["guildId"] ?: return
 
         try {
-            checkPermissions(server, context, locale) ?: return
+            checkPermissions(server, context, locale, context.call) ?: return
 
             val params = context.call.receiveParameters()
             fun Parameters.getBoolean(name: String) = this[name] == "on"
diff --git a/foxy/src/main/kotlin/net/cakeyfox/foxy/website/routes/api/v1/dashboard/guild/PostWelcomerTestRoute.kt b/foxy/src/main/kotlin/net/cakeyfox/foxy/website/routes/api/v1/dashboard/guild/PostWelcomerTestRoute.kt
@@ -37,7 +37,7 @@ class PostWelcomerTestRoute(val server: FoxyWebsite) :
             return context.call.respondRedirect(Constants.INVITE_LINK)
         }
 
-        val (user, guild, session, guildInfo) = checkPermissions(server, context, locale) ?: return
+        val (user, guild, session, guildInfo) = checkPermissions(server, context, locale, context.call) ?: return
 
         val bodyAsDiscordMessage = Json.encodeToString(
             DiscordMessageBody(
diff --git a/foxy/src/main/kotlin/net/cakeyfox/foxy/website/routes/api/v1/dashboard/guild/PostYouTubeAddChannelRoute.kt b/foxy/src/main/kotlin/net/cakeyfox/foxy/website/routes/api/v1/dashboard/guild/PostYouTubeAddChannelRoute.kt
@@ -23,7 +23,7 @@ class PostYouTubeAddChannelRoute(val server: FoxyWebsite) :
         val channelQuery = context.call.receive<String>()
         if (guildData == null) return
 
-        checkPermissions(server, context, locale) ?: return
+        checkPermissions(server, context, locale, context.call) ?: return
         val channelInfo = server.foxy.youtubeManager.getChannelInfo(channelQuery)
             ?.items?.get(0) ?: return
 
diff --git a/foxy/src/main/kotlin/net/cakeyfox/foxy/website/routes/api/v1/dashboard/guild/PostYouTubeRemoveChannelRoute.kt b/foxy/src/main/kotlin/net/cakeyfox/foxy/website/routes/api/v1/dashboard/guild/PostYouTubeRemoveChannelRoute.kt
@@ -17,7 +17,7 @@ class PostYouTubeRemoveChannelRoute(val server: FoxyWebsite) :
 
         if (guildData == null) return
 
-        checkPermissions(server, context, locale) ?: return
+        checkPermissions(server, context, locale, context.call) ?: return
 
         val followedChannel = guildData.followedYouTubeChannels.find { it.channelId == channelId }
 
diff --git a/foxy/src/main/kotlin/net/cakeyfox/foxy/website/routes/api/v1/dashboard/guild/PostYouTubeTestRoute.kt b/foxy/src/main/kotlin/net/cakeyfox/foxy/website/routes/api/v1/dashboard/guild/PostYouTubeTestRoute.kt
@@ -37,7 +37,7 @@ class PostYouTubeTestRoute(val server: FoxyWebsite) :
             return context.call.respondRedirect(Constants.INVITE_LINK)
         }
 
-        val (user, guild, session, guildInfo) = checkPermissions(server, context, locale) ?: return
+        val (user, guild, session, guildInfo) = checkPermissions(server, context, locale, context.call) ?: return
 
         val bodyAsDiscordMessage = Json.encodeToString(
             DiscordMessageBody(
diff --git a/foxy/src/main/kotlin/net/cakeyfox/foxy/website/utils/DiscordAPIException.kt b/foxy/src/main/kotlin/net/cakeyfox/foxy/website/utils/DiscordAPIException.kt
@@ -0,0 +1,7 @@
+package net.cakeyfox.foxy.website.utils
+
+class DiscordAPIException(
+    val code: Int,
+    message: String,
+    cause: Throwable? = null
+) : Exception(message, cause)
diff --git a/foxy/src/main/kotlin/net/cakeyfox/foxy/website/utils/OAuthManager.kt b/foxy/src/main/kotlin/net/cakeyfox/foxy/website/utils/OAuthManager.kt
@@ -19,13 +19,15 @@ import io.ktor.server.sessions.clear
 import io.ktor.server.sessions.get
 import io.ktor.server.sessions.sessions
 import io.ktor.server.sessions.set
+import kotlinx.coroutines.delay
 import kotlinx.serialization.json.Json
 import mu.KotlinLogging
 import net.cakeyfox.common.Constants
 import net.cakeyfox.foxy.website.FoxyWebsite
 import net.cakeyfox.serializable.data.website.DiscordUser
 import net.cakeyfox.serializable.data.website.TokenResponse
 import net.cakeyfox.serializable.data.website.UserSession
+import kotlin.time.Duration.Companion.seconds
 
 class OAuthManager(val server: FoxyWebsite) {
     val redirectUri = "${server.config.website.url.removeSuffix("/")}/login/callback"
@@ -35,7 +37,8 @@ class OAuthManager(val server: FoxyWebsite) {
 
     fun Route.oauthRoutes() {
         get("/login") {
-            val scope = listOf("identify", "email").joinToString(" ")
+            call.sessions.clear<UserSession>()
+            val scope = listOf("identify", "email", "guilds").joinToString(" ")
             val url = URLBuilder(Constants.AUTHORIZATION_ENDPOINT).apply {
                 parameters.append("client_id", clientId)
                 parameters.append("redirect_uri", redirectUri)
@@ -105,6 +108,7 @@ class OAuthManager(val server: FoxyWebsite) {
             )
 
             logger.info { "${discordUser.username} (${discordUser.id}) is logged" }
+            delay(1.seconds)
             call.respondRedirect("/br/dashboard")
         }
 
diff --git a/foxy/src/main/kotlin/net/cakeyfox/foxy/website/utils/RouteManager.kt b/foxy/src/main/kotlin/net/cakeyfox/foxy/website/utils/RouteManager.kt
@@ -28,12 +28,12 @@ import net.cakeyfox.foxy.website.routes.pages.GetPremiumPage
 import net.cakeyfox.foxy.website.routes.pages.GetSupportPage
 import net.cakeyfox.foxy.website.routes.pages.GetTermsOfServiceRoute
 import net.cakeyfox.foxy.website.routes.partials.GetServerAutoRoleSettingsRoute
-import net.cakeyfox.foxy.website.routes.partials.GetServerGeneralSettingsPartial
-import net.cakeyfox.foxy.website.routes.partials.GetServerListPartial
-import net.cakeyfox.foxy.website.routes.partials.GetServerLogsSettingsRoute
-import net.cakeyfox.foxy.website.routes.partials.GetServerWelcomerSettingsPartial
-import net.cakeyfox.foxy.website.routes.partials.GetYouTubeChannelPartial
 import net.cakeyfox.foxy.website.routes.partials.GetYouTubePartial
+import net.cakeyfox.foxy.website.routes.partials.dashboard.guild.GetServerGeneralSettingsPartial
+import net.cakeyfox.foxy.website.routes.partials.dashboard.guild.GetServerListPartial
+import net.cakeyfox.foxy.website.routes.partials.dashboard.guild.GetServerLogsSettingsRoute
+import net.cakeyfox.foxy.website.routes.partials.dashboard.guild.GetServerWelcomerSettingsPartial
+import net.cakeyfox.foxy.website.routes.partials.dashboard.guild.GetYouTubeChannelPartial
 import net.cakeyfox.foxy.website.routes.partials.dashboard.user.GetGenericUserInventoryRoute
 
 fun Application.registerAllRoutes(server: FoxyWebsite) {
diff --git a/foxy/src/main/kotlin/net/cakeyfox/foxy/website/utils/RouteUtils.kt b/foxy/src/main/kotlin/net/cakeyfox/foxy/website/utils/RouteUtils.kt
diff --git a/serializable-commons/src/commonMain/kotlin/net/cakeyfox/serializable/data/utils/FoxyConfig.kt b/serializable-commons/src/commonMain/kotlin/net/cakeyfox/serializable/data/utils/FoxyConfig.kt
diff --git a/serializable-commons/src/commonMain/kotlin/net/cakeyfox/serializable/data/website/DiscordAPIError.kt b/serializable-commons/src/commonMain/kotlin/net/cakeyfox/serializable/data/website/DiscordAPIError.kt
diff --git a/settings.gradle.kts b/settings.gradle.kts

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,10 @@ object Constants {`
`53`	`53`	`return "💫 $activity"`
`54`	`54`	`}`
`55`	`55`
	`56`	`+ fun getServerInviteLink(serverId: String): String {`
	`57`	`+ return "https://discord.com/oauth2/authorize?client_id=1006520438865801296&scope=bot+applications.commands&permissions=269872255&guild_id=$serverId"`
	`58`	`+ }`
	`59`	`+`
`56`	`60`	`// Website utils`
`57`	`61`	`const val DISCORD_AVATAR = "https://cdn.discordapp.com/embed/avatars/0.png"`
`58`	`62`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ class PostSaveYouTubeSettings(val server: FoxyWebsite) : BaseRoute("/api/v1/serv`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`try {`
`36`		`- checkPermissions(server, context, locale) ?: return`
	`36`	`+ checkPermissions(server, context, locale, context.call) ?: return`
`37`	`37`
`38`	`38`	`val params = context.call.receiveParameters()`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ class PostWelcomerTestRoute(val server: FoxyWebsite) :`
`37`	`37`	`return context.call.respondRedirect(Constants.INVITE_LINK)`
`38`	`38`	`}`
`39`	`39`
`40`		`- val (user, guild, session, guildInfo) = checkPermissions(server, context, locale) ?: return`
	`40`	`+ val (user, guild, session, guildInfo) = checkPermissions(server, context, locale, context.call) ?: return`
`41`	`41`
`42`	`42`	`val bodyAsDiscordMessage = Json.encodeToString(`
`43`	`43`	`DiscordMessageBody(`