Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions .idea/codeStyles/Project.xml

This file was deleted.

5 changes: 0 additions & 5 deletions .idea/codeStyles/codeStyleConfig.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/copilot.data.migration.agent.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/copilot.data.migration.ask.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/copilot.data.migration.ask2agent.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/copilot.data.migration.edit.xml

This file was deleted.

7 changes: 0 additions & 7 deletions .idea/inspectionProfiles/Project_Default.xml

This file was deleted.

2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
kotlin.code.style=official
kotlin.stdlib.default.dependency=false
org.gradle.parallel=true
version=4.5.0
version=4.5.1
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ interface PreChatProcessor {
val order: Int

fun process(context: MessageContext): MessageContext
suspend fun processAsync(context: MessageContext): MessageContext = process(context)
Comment on lines 8 to +9
}
Original file line number Diff line number Diff line change
Expand Up @@ -212,13 +212,13 @@ object DirectMessageAccess {
}
}

private fun runPreProcessors(
private suspend fun runPreProcessors(
original: MessageContext
): MessageContext {
var context = original

chatProcessorRegistry.preChatProcessors.sortedBy { it.order }.forEach { processor ->
context = processor.process(context)
context = processor.processAsync(context)

if (context.isCancelled) {
return context
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import dev.slne.surf.chat.paper.util.cancel
import dev.slne.surf.chat.paper.util.uuidOrNull
import dev.slne.surf.core.api.common.SurfCoreApi
import io.papermc.paper.event.player.AsyncChatEvent
import kotlinx.coroutines.runBlocking
import org.bukkit.event.EventHandler
import org.bukkit.event.Listener
import java.time.OffsetDateTime
Expand All @@ -36,15 +37,17 @@ object AsyncChatListener : Listener {
MessageType.GLOBAL
)

val result = runPreProcessors(MessageContext(data, event.isCancelled, event.viewers()))
data = result.messageData
runBlocking {
val result = runPreProcessors(MessageContext(data, event.isCancelled, event.viewers()))
data = result.messageData

if (result.isCancelled) {
event.cancel()
}
if (result.isCancelled) {
event.cancel()
}

event.renderer { _, _, _, viewer ->
viewer.uuidOrNull()?.let { result.render(it, viewer) } ?: event.message()
event.renderer { _, _, _, viewer ->
viewer.uuidOrNull()?.let { result.render(it, viewer) } ?: event.message()
}
}

plugin.launch {
Expand All @@ -56,13 +59,13 @@ object AsyncChatListener : Listener {
}
}

private fun runPreProcessors(
private suspend fun runPreProcessors(
original: MessageContext
): MessageContext {
var context = original

chatProcessorRegistry.preChatProcessors.sortedBy { it.order }.forEach { processor ->
context = processor.process(context)
context = processor.processAsync(context)

if (context.isCancelled) {
return context
Expand Down