From 45a81b49d75230d66a8b28da4bb39ad1d1289feb Mon Sep 17 00:00:00 2001 From: cssxsh Date: Fri, 14 Jul 2023 10:36:39 +0800 Subject: [PATCH] fix: prompts --- .../kotlin/xyz/cssxsh/mirai/openai/MiraiOpenAiListener.kt | 6 +++--- .../xyz/cssxsh/mirai/openai/data/MiraiOpenAiPrompts.kt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/xyz/cssxsh/mirai/openai/MiraiOpenAiListener.kt b/src/main/kotlin/xyz/cssxsh/mirai/openai/MiraiOpenAiListener.kt index 4535f9f..afd4515 100644 --- a/src/main/kotlin/xyz/cssxsh/mirai/openai/MiraiOpenAiListener.kt +++ b/src/main/kotlin/xyz/cssxsh/mirai/openai/MiraiOpenAiListener.kt @@ -503,12 +503,12 @@ internal object MiraiOpenAiListener : SimpleListenerHost() { val content = message.contentToString() if (content.startsWith(MiraiOpenAiConfig.prompts).not()) return val index = """\d+""".toRegex().find(content)?.value?.toInt() ?: 1 - val page = MiraiOpenAiPrompts.keys().chunked(MiraiOpenAiConfig.page) - .getOrNull(index - 1).orEmpty() + val files = MiraiOpenAiPrompts.files() + val page = files.chunked(MiraiOpenAiConfig.page).getOrNull(index - 1).orEmpty() launch { subject.sendMessage(buildMessageChain { - appendLine("第 $page 页") + appendLine("共 ${files.size} 个, 第 $index 页 ") appendLine() page.forEach { name -> appendLine(name) diff --git a/src/main/kotlin/xyz/cssxsh/mirai/openai/data/MiraiOpenAiPrompts.kt b/src/main/kotlin/xyz/cssxsh/mirai/openai/data/MiraiOpenAiPrompts.kt index 87f3734..edef451 100644 --- a/src/main/kotlin/xyz/cssxsh/mirai/openai/data/MiraiOpenAiPrompts.kt +++ b/src/main/kotlin/xyz/cssxsh/mirai/openai/data/MiraiOpenAiPrompts.kt @@ -57,7 +57,7 @@ public object MiraiOpenAiPrompts : AutoSavePluginData("prompts") { return bind.remove(id) } - public fun keys(): List { + public fun files(): List { return folder.list { _, name -> name.endsWith(".txt") } ?.asList().orEmpty() }