dalbodeule/chibot-chzzk-bot
1
0
Fork 0
mirror of https://github.com/dalbodeule/chibot-chzzk-bot.git synced 2025-06-09 07:18:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #77 from dalbodeule/develop

Browse Source 
Discord guild related bug fix, improve
This commit is contained in:
JinU Choi 2024-08-15 06:15:25 +09:00 committed by GitHub
commit 62449959a5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 41 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/Main.kt
View File

@ -24,7 +24,6 @@ import kotlinx.serialization.Serializable
import kotlinx.serialization.json.Json
import space.mori.chzzk_bot.common.services.UserService
import space.mori.chzzk_bot.webserver.routes.*
import space.mori.chzzk_bot.webserver.utils.CachedGuilds
import space.mori.chzzk_bot.webserver.utils.DiscordGuildCache
import space.mori.chzzk_bot.webserver.utils.DiscordRatelimits
import space.mori.chzzk_bot.webserver.utils.Guild
@ -133,7 +132,7 @@ val server = embeddedServer(Netty, port = 8080, ) {
DiscordGuildCache.addGuild(guilds.associate {
println("${it.id} ${it.name}")
it.id to Guild(it.id, it.name, it.icon, it.banner)
it.id to Guild(it.id, it.name, it.icon, it.banner, it.roles)
})
redirects[principal.state]?.let { redirect ->
@ -285,7 +284,16 @@ data class DiscordGuildListAPI(
val banner: String?,
val owner: Boolean,
val permissions: Int,
val features: List<String>
val features: List<String>,
val roles: List<GuildRole>
)
@Serializable
data class GuildRole(
val id: String,
val name: String,
val color: String,
val mentionable: Boolean,
)
suspend fun getDiscordUser(accessToken: String): DiscordMeAPI? {

23
webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/ApiDiscordRoutes.kt
View File

@ -40,7 +40,7 @@ fun Route.apiDiscordRoutes() {
call.respond(HttpStatusCode.OK, guild)
return@get
}
get {
get("/guild/{gid}") {
val session = call.sessions.get<UserSession>()
if(session == null) {
call.respond(HttpStatusCode.BadRequest, "Session is required")
@ -52,7 +52,26 @@ fun Route.apiDiscordRoutes() {
return@get
}
call.respond(HttpStatusCode.OK, DiscordGuildCache.getCachedGuilds(session.discordGuildList))
}
get {
val uid = call.parameters["gid"]
val session = call.sessions.get<UserSession>()
if(uid == null) {
call.respond(HttpStatusCode.BadRequest, "GID is required")
return@get
}
if(session == null) {
call.respond(HttpStatusCode.BadRequest, "Session is required")
return@get
}
val user = UserService.getUserWithNaverId(session.id)
if(user == null) {
call.respond(HttpStatusCode.BadRequest, "User does not exist")
return@get
}
return@get
}
}

13
webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/utils/DiscordGuildCache.kt
View File

@ -10,6 +10,7 @@ import kotlinx.coroutines.sync.withLock
import kotlinx.serialization.Serializable
import space.mori.chzzk_bot.common.utils.logger
import space.mori.chzzk_bot.webserver.DiscordGuildListAPI
import space.mori.chzzk_bot.webserver.GuildRole
import space.mori.chzzk_bot.webserver.dotenv
import java.time.Instant
import java.util.concurrent.ConcurrentHashMap
@ -21,10 +22,11 @@ object DiscordGuildCache {
suspend fun getCachedGuilds(guildId: String): Guild? {
val now = Instant.now()
val guild = cache[guildId]
if(cache.isEmpty() || !cache.containsKey(guildId) || cache[guildId]!!.timestamp.plusSeconds(EXP_SECONDS).isBefore(now)) {
if(guild == null || guild.timestamp.plusSeconds(EXP_SECONDS).isBefore(now) || !guild.isBotAvailable) {
mutex.withLock {
if(cache.isEmpty() || !cache.containsKey(guildId) || cache[guildId]!!.timestamp.plusSeconds(EXP_SECONDS).isBefore(now)) {
if(guild == null || guild.timestamp.plusSeconds(EXP_SECONDS).isBefore(now) || !guild.isBotAvailable) {
fetchAllGuilds()
}
}
@ -70,8 +72,9 @@ object DiscordGuildCache {
guilds.forEach {
cache[it.id] = CachedGuilds(
Guild(it.id, it.name, it.icon, it.banner),
Guild(it.id, it.name, it.icon, it.banner, it.roles),
Instant.now().plusSeconds(EXP_SECONDS),
true
)
}
lastGuildId = guilds.last().id
@ -92,7 +95,8 @@ object DiscordGuildCache {
data class CachedGuilds(
val guild: Guild,
val timestamp: Instant = Instant.now()
val timestamp: Instant = Instant.now(),
val isBotAvailable: Boolean = false,
)
@Serializable
@ -101,4 +105,5 @@ data class Guild(
val name: String,
val icon: String?,
val banner: String?,
val roles: List<GuildRole>,
)