From b92222f56c0f805dd0e2b75ee9b4fb3f4684e5f6 Mon Sep 17 00:00:00 2001 From: cssxsh Date: Sat, 18 Mar 2023 03:13:04 +0800 Subject: [PATCH] feat: has_economy config --- CHANGELOG.md | 2 ++ README.md | 1 + .../xyz/cssxsh/mirai/openai/config/MiraiOpenAiConfig.kt | 4 ++++ .../xyz/cssxsh/mirai/openai/data/MiraiOpenAiTokensData.kt | 3 ++- 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 973d870..8734b55 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ ## 1.3.2 (23/03/17) 1. fix: depends on mirai-economy-core +2. fix: MiraiOpenAiTokens register +3. feat: has_economy config ## 1.3.1 (23/03/16) diff --git a/README.md b/README.md index 4cf7a7f..6fe4416 100644 --- a/README.md +++ b/README.md @@ -63,6 +63,7 @@ OpenAI 目前对注册有一定要求,请先阅读 [注册](#注册), 然后 * `has_permission` 权限检查, 为 `true` 时开启 * `at_once` 立刻开始聊天/问答(即不会发送 `聊天/问答将开始`, 而是直接接着指令开始聊天) 默认 `false` * `keep_prefix_check` 保持前缀检查(即一定要附带前缀/`@`才会触发对话),默认 `false` +* `has_economy` 经济系统, 为 `true` 时开启 @see `completion.yml` 自定义模型详细配置 diff --git a/src/main/kotlin/xyz/cssxsh/mirai/openai/config/MiraiOpenAiConfig.kt b/src/main/kotlin/xyz/cssxsh/mirai/openai/config/MiraiOpenAiConfig.kt index fa8ad18..93bf835 100644 --- a/src/main/kotlin/xyz/cssxsh/mirai/openai/config/MiraiOpenAiConfig.kt +++ b/src/main/kotlin/xyz/cssxsh/mirai/openai/config/MiraiOpenAiConfig.kt @@ -89,4 +89,8 @@ internal object MiraiOpenAiConfig : ReadOnlyPluginConfig("openai"), OpenAiClient @ValueName("has_permission") @ValueDescription("权限检查") val permission: Boolean by value(false) + + @ValueName("has_economy") + @ValueDescription("接入经济系统") + val economy: Boolean by value(true) } \ No newline at end of file diff --git a/src/main/kotlin/xyz/cssxsh/mirai/openai/data/MiraiOpenAiTokensData.kt b/src/main/kotlin/xyz/cssxsh/mirai/openai/data/MiraiOpenAiTokensData.kt index 706134c..ddfe85f 100644 --- a/src/main/kotlin/xyz/cssxsh/mirai/openai/data/MiraiOpenAiTokensData.kt +++ b/src/main/kotlin/xyz/cssxsh/mirai/openai/data/MiraiOpenAiTokensData.kt @@ -3,12 +3,13 @@ package xyz.cssxsh.mirai.openai.data import net.mamoe.mirai.contact.* import xyz.cssxsh.mirai.economy.* import xyz.cssxsh.mirai.openai.* +import xyz.cssxsh.mirai.openai.config.* public object MiraiOpenAiTokensData { @PublishedApi internal val economy: Boolean by lazy { - try { + MiraiOpenAiConfig.economy && try { EconomyService.register(MiraiOpenAiTokens) true } catch (_: Throwable) {