PK: No more webhook perms required!

Also, clear ID from reply cache when awaited event is cleared
Kord-Extensions · Mar 17, 2024 · a484ff4 · a484ff4
1 parent 6fd7139
commit a484ff4
Showing 1 changed file with 7 additions and 90 deletions.
diff --git a/.../src/main/kotlin/com/kotlindiscord/kord/extensions/modules/extra/pluralkit/PKExtension.kt b/.../src/main/kotlin/com/kotlindiscord/kord/extensions/modules/extra/pluralkit/PKExtension.kt
@@ -15,7 +15,6 @@ package com.kotlindiscord.kord.extensions.modules.extra.pluralkit
 
 import com.kotlindiscord.kord.extensions.checks.anyGuild
 import com.kotlindiscord.kord.extensions.checks.hasPermission
-import com.kotlindiscord.kord.extensions.checks.topChannelFor
 import com.kotlindiscord.kord.extensions.commands.Arguments
 import com.kotlindiscord.kord.extensions.commands.application.slash.ephemeralSubCommand
 import com.kotlindiscord.kord.extensions.commands.converters.impl.optionalBoolean
@@ -40,15 +39,12 @@ import dev.kord.core.behavior.GuildBehavior
 import dev.kord.core.behavior.channel.asChannelOfOrNull
 import dev.kord.core.entity.Message
 import dev.kord.core.entity.channel.GuildChannel
-import dev.kord.core.entity.channel.TopGuildMessageChannel
 import dev.kord.core.event.message.MessageCreateEvent
 import dev.kord.core.event.message.MessageDeleteEvent
 import dev.kord.core.event.message.MessageUpdateEvent
 import dev.kord.rest.builder.message.embed
-import dev.kord.rest.request.KtorRequestException
 import io.github.oshai.kotlinlogging.KotlinLogging
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
@@ -101,6 +97,7 @@ class PKExtension : Extension() {
 					.filterKeys { it.timestamp < target }
 					.forEach { (key, value) ->
 						awaitingEvents.remove(key)
+						replyCache.remove(key)
 
 						kord.launch {
 							bot.send(value.unproxied())
@@ -132,9 +129,9 @@ class PKExtension : Extension() {
 				}
 
 				val message = event.message
-				val webhookId = message.data.webhookId.value
+				val applicationId = message.data.applicationId.value
 
-				if (webhookId == null) {
+				if (applicationId != config.botId) {
 					eventLock.withLock {
 						awaitingEvents[message.id] = event
 					}
@@ -148,30 +145,6 @@ class PKExtension : Extension() {
 					return@action
 				}
 
-				// This is to work around Kord's lack of support for forum channels. This can go once they're supported.
-				val channel = try {
-					topChannelFor(event)?.asChannelOfOrNull<TopGuildMessageChannel>()
-				} catch (e: ClassCastException) {
-					logger.warn(e) { "Failed to cast channel to TopGuildMessageChannel" }
-
-					null
-				}
-
-				val webhook = try {
-					channel
-						?.asChannelOfOrNull<TopGuildMessageChannel>()
-						?.webhooks
-						?.firstOrNull { it.id == webhookId }
-				} catch (e: KtorRequestException) {
-					logger.warn(e) { "Failed to retrieve webhooks for channel: ${channel?.id}" }
-
-					null
-				}
-
-				if (webhook == null || webhook.creatorId != config.botId) {
-					return@action
-				}
-
 				delay(2.seconds)
 
 				val pkMessage = config.api().getMessageOrNull(message.id)
@@ -216,13 +189,13 @@ class PKExtension : Extension() {
 				}
 
 				val message = event.message
-				val webhookId = message?.data?.webhookId?.value
+				val applicationId = message?.data?.applicationId?.value
 
 				eventLock.withLock {
 					awaitingEvents.remove(message?.id)
 				}
 
-				if (webhookId == null) {
+				if (applicationId != config.botId) {
 					val pkMessage = guild.config().api().getMessageOrNull(event.messageId)
 
 					if (pkMessage != null) {
@@ -236,34 +209,6 @@ class PKExtension : Extension() {
 					return@action
 				}
 
-				// This is to work around Kord's lack of support for forum channels. This can go once they're supported.
-				val channel = try {
-					topChannelFor(event)?.asChannelOfOrNull<TopGuildMessageChannel>()
-				} catch (e: ClassCastException) {
-					logger.warn(e) { "Failed to cast channel to TopGuildMessageChannel" }
-
-					null
-				}
-
-				val webhook = try {
-					channel
-						?.asChannelOfOrNull<TopGuildMessageChannel>()
-						?.webhooks
-						?.firstOrNull { it.id == webhookId }
-				} catch (e: KtorRequestException) {
-					logger.warn(e) { "Failed to retrieve webhooks for channel: ${channel?.id}" }
-
-					null
-				}
-
-				if (webhook == null || webhook.creatorId != config.botId) {
-					kord.launch {
-						bot.send(event.unproxied())
-					}
-
-					return@action
-				}
-
 				delay(2.seconds)
 
 				val pkMessage = config.api().getMessageOrNull(message.id)
@@ -300,37 +245,9 @@ class PKExtension : Extension() {
 				}
 
 				val message = event.message
-				val webhookId = message.asMessageOrNull()?.data?.webhookId?.value
-
-				if (webhookId == null) {
-					kord.launch {
-						bot.send(event.unproxied())
-					}
-
-					return@action
-				}
-
-				// This is to work around Kord's lack of support for forum channels. This can go once they're supported.
-				val channel = try {
-					topChannelFor(event)?.asChannelOfOrNull<TopGuildMessageChannel>()
-				} catch (e: ClassCastException) {
-					logger.warn(e) { "Failed to cast channel to TopGuildMessageChannel" }
-
-					null
-				}
-
-				val webhook = try {
-					channel
-						?.asChannelOfOrNull<TopGuildMessageChannel>()
-						?.webhooks
-						?.firstOrNull { it.id == webhookId }
-				} catch (e: KtorRequestException) {
-					logger.warn(e) { "Failed to retrieve webhooks for channel: ${channel?.id}" }
-
-					null
-				}
+				val applicationId = message.asMessageOrNull()?.data?.applicationId?.value
 
-				if (webhook == null || webhook.creatorId != config.botId) {
+				if (applicationId != config.botId) {
 					kord.launch {
 						bot.send(event.unproxied())
 					}