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 #92 from dalbodeule/develop

Browse Source 
apiDiscordRoutes fix. (14x)
This commit is contained in:
JinU Choi 2024-08-15 10:53:53 +09:00 committed by GitHub
commit 8903b7660d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -129,11 +129,6 @@ val server = embeddedServer(Netty, port = 8080, ) {
it.owner it.owner
}.map { it.id } }.map { it.id }
)) ))
DiscordGuildCache.addGuild(guilds.associate {
println("${it.id} ${it.name}")
it.id to Guild(it.id, it.name, it.icon, it.banner, it.roles ?: emptyList(), emptyList())
})
redirects[principal.state]?.let { redirect -> redirects[principal.state]?.let { redirect ->
call.respondRedirect(redirect) call.respondRedirect(redirect)

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

@ -33,10 +33,10 @@ object DiscordGuildCache {
try { try {
if(guild == null) { return null } if(guild == null) { return null }
if (guild!!.guild.roles.isEmpty()) { if (guild!!.guild.roles.isEmpty()) {
guild!!.guild.roles = fetchGuildRoles(guildId) guild!!.guild.roles.addAll(fetchGuildRoles(guildId))
} }
if (guild!!.guild.channel.isEmpty()) { if (guild!!.guild.channel.isEmpty()) {
guild!!.guild.channel = fetchGuildChannels(guildId) guild!!.guild.channel.addAll(fetchGuildChannels(guildId))
} }
} catch(e: Exception) { } catch(e: Exception) {
logger.info("guild fetch is failed. ${e.stackTraceToString()}") logger.info("guild fetch is failed. ${e.stackTraceToString()}")
@ -74,7 +74,7 @@ object DiscordGuildCache {
return result.body<List<DiscordGuildListAPI>>() return result.body<List<DiscordGuildListAPI>>()
} }
private suspend fun fetchGuildRoles(guildId: String): List<GuildRole> { private suspend fun fetchGuildRoles(guildId: String): MutableList<GuildRole> {
if(DiscordRatelimits.isLimited()) { if(DiscordRatelimits.isLimited()) {
delay(DiscordRatelimits.getRateReset()) delay(DiscordRatelimits.getRateReset())
} }
@ -93,21 +93,22 @@ object DiscordGuildCache {
if (result.status != HttpStatusCode.OK) { if (result.status != HttpStatusCode.OK) {
logger.error("Failed to fetch data from Discord API. Status: ${result.status} ${result.bodyAsText()}") logger.error("Failed to fetch data from Discord API. Status: ${result.status} ${result.bodyAsText()}")
return emptyList() return mutableListOf()
} }
val parsed = result.body<List<GuildRole>>() val parsed = result.body<MutableList<GuildRole>>()
println(result.bodyAsText())
parsed.forEach { println("${it.name} - ${it.id}") } parsed.forEach { println("${it.name} - ${it.id}") }
return parsed return parsed
} catch(e: Exception) { } catch(e: Exception) {
logger.info("fetchGuildRoles error: ${e.stackTraceToString()}") logger.info("fetchGuildRoles error: ${e.stackTraceToString()}")
return emptyList() return mutableListOf()
} }
} }
private suspend fun fetchGuildChannels(guildId: String): List<GuildChannel> { private suspend fun fetchGuildChannels(guildId: String): MutableList<GuildChannel> {
if(DiscordRatelimits.isLimited()) { if(DiscordRatelimits.isLimited()) {
delay(DiscordRatelimits.getRateReset()) delay(DiscordRatelimits.getRateReset())
} }
@ -126,17 +127,18 @@ object DiscordGuildCache {
if (result.status != HttpStatusCode.OK) { if (result.status != HttpStatusCode.OK) {
logger.error("Failed to fetch data from Discord API. Status: ${result.status} ${result.bodyAsText()}") logger.error("Failed to fetch data from Discord API. Status: ${result.status} ${result.bodyAsText()}")
return emptyList() return mutableListOf()
} }
val parsed = result.body<List<GuildChannel>>().filter { it.type == ChannelType.GUILD_TEXT } val parsed = result.body<List<GuildChannel>>().filter { it.type == ChannelType.GUILD_TEXT }.toMutableList()
println(result.bodyAsText())
parsed.forEach { println("${it.name} - ${it.id}") } parsed.forEach { println("${it.name} - ${it.id}") }
return parsed return parsed
} catch(e: Exception) { } catch(e: Exception) {
logger.info("fetchGuildRoles error: ${e.stackTraceToString()}") logger.info("fetchGuildRoles error: ${e.stackTraceToString()}")
return emptyList() return mutableListOf()
} }
} }
@ -151,7 +153,7 @@ object DiscordGuildCache {
guilds.forEach { guilds.forEach {
cache[it.id] = CachedGuilds( cache[it.id] = CachedGuilds(
Guild(it.id, it.name, it.icon, it.banner, it.roles ?: emptyList(), emptyList()), Guild(it.id, it.name, it.icon, it.banner, it.roles?.toMutableList() ?: mutableListOf(), mutableListOf()),
Instant.now().plusSeconds(EXP_SECONDS), Instant.now().plusSeconds(EXP_SECONDS),
true true
) )
@ -184,6 +186,6 @@ data class Guild(
val name: String, val name: String,
val icon: String?, val icon: String?,
val banner: String?, val banner: String?,
var roles: List<GuildRole>, var roles: MutableList<GuildRole>,
var channel: List<GuildChannel> var channel: MutableList<GuildChannel>
) )