Merge branch 'master' of https://github.com/diyigemt/arona-reborn

Author: diyigemt

arona/arona-core/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
   id("io.ktor.plugin") version "2.3.7"
   id("org.jetbrains.kotlin.plugin.serialization") version "1.9.10"
 }
-version = "1.1.15"
+version = "1.1.16"
 application {
   mainClass.set("com.diyigemt.arona.ApplicationKt")
 

arona/arona-plugin/arona/src/main/kotlin/com/diyigemt/arona/arona/config/BaseConfig.kt arona/arona-core/src/main/kotlin/com/diyigemt/arona/command/BaseConfig.kt

@@ -1,16 +1,16 @@
-package com.diyigemt.arona.arona.config
-
-import com.diyigemt.arona.webui.pluginconfig.PluginWebuiConfig
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class BaseConfig(
-  val markdown: MarkdownCompatiblyConfig = MarkdownCompatiblyConfig()
-) : PluginWebuiConfig() {
-  override fun check() {}
-}
-
-@Serializable
-data class MarkdownCompatiblyConfig(
-  val enable: Boolean = false // 是否启用md
-)
+package com.diyigemt.arona.command
+
+import com.diyigemt.arona.webui.pluginconfig.PluginWebuiConfig
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class BaseConfig(
+  val markdown: MarkdownCompatiblyConfig = MarkdownCompatiblyConfig()
+) : PluginWebuiConfig() {
+  override fun check() {}
+}
+
+@Serializable
+data class MarkdownCompatiblyConfig(
+  val enable: Boolean = false // 是否启用md
+)

arona/arona-core/src/main/kotlin/com/diyigemt/arona/command/BuiltInCommands.kt

@@ -14,6 +14,7 @@ import com.diyigemt.arona.database.permission.ContactRole.Companion.DEFAULT_MEMB
 import com.diyigemt.arona.database.permission.UserDocument
 import com.diyigemt.arona.database.permission.UserDocument.Companion.findUserDocumentByIdOrNull
 import com.diyigemt.arona.permission.PermissionService
+import com.diyigemt.arona.webui.pluginconfig.PluginWebuiConfigRecorder
 import com.github.ajalt.clikt.parameters.arguments.argument
 
 object BuiltInCommands {
@@ -44,6 +45,7 @@ object BuiltInCommands {
     BuiltInCommands::class.nestedClasses.forEach {
       (it.objectInstance as? Command)?.register()
     }
+    PluginWebuiConfigRecorder.register(BuildInCommandOwner, BaseConfig.serializer())
   }
 
   object LoginCommand : AbstractCommand(

arona/arona-core/src/main/kotlin/com/diyigemt/arona/webui/pluginconfig/PluginWebuiConfig.kt

@@ -1,5 +1,6 @@
 package com.diyigemt.arona.webui.pluginconfig
 
+import com.diyigemt.arona.command.CommandOwner
 import com.diyigemt.arona.database.permission.toMongodbKey
 import com.diyigemt.arona.plugins.AronaPlugin
 import com.diyigemt.arona.utils.JsonIgnoreUnknownKeys
@@ -28,6 +29,15 @@ object PluginWebuiConfigRecorder {
     }
   }
   @OptIn(ExperimentalSerializationApi::class)
+  fun register(owner: CommandOwner, serializer: KSerializer<*>) {
+    val key = serializer.descriptor.serialName.split(".").last()
+    map.getOrPut(owner.permission.id.nameSpace.toMongodbKey()) {
+      mutableMapOf(key to serializer)
+    }.also {
+      it[key] = serializer
+    }
+  }
+  @OptIn(ExperimentalSerializationApi::class)
   @Suppress("UNCHECKED_CAST")
   fun checkDataSafety(obj: PluginPreferenceResp): String? {
     val serializer = getSerializer(obj.id, obj.key) ?: return null

arona/arona-plugin/arona/build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 }
 
 val projectMainClass = "com.diyigemt.arona.arona.Arona"
-version = "1.1.0"
+version = "1.1.1"
 dependencies {
   compileOnly(project(":arona-core"))
   compileOnly("io.ktor:ktor-server-core-jvm")

arona/arona-plugin/arona/src/main/kotlin/com/diyigemt/arona/arona/Main.kt

@@ -17,7 +17,7 @@ object Arona : AronaPlugin(
     id = "com.diyigemt.arona",
     name = "arona",
     author = "diyigemt",
-    version = "1.1.0",
+    version = "1.1.1",
     description = "hello world"
   )
 ) {

arona/arona-plugin/arona/src/main/kotlin/com/diyigemt/arona/arona/command/TrainerCommand.kt

@@ -1,7 +1,6 @@
 package com.diyigemt.arona.arona.command
 
 import com.diyigemt.arona.arona.Arona
-import com.diyigemt.arona.arona.config.BaseConfig
 import com.diyigemt.arona.arona.database.DatabaseProvider.dbQuery
 import com.diyigemt.arona.arona.database.image.ImageCacheSchema.Companion.findImage
 import com.diyigemt.arona.arona.database.image.contactType
@@ -10,6 +9,8 @@ import com.diyigemt.arona.arona.tools.BackendEndpoint
 import com.diyigemt.arona.arona.tools.NetworkTool
 import com.diyigemt.arona.arona.tools.ServerResponse
 import com.diyigemt.arona.command.AbstractCommand
+import com.diyigemt.arona.command.BaseConfig
+import com.diyigemt.arona.command.BuildInCommandOwner
 import com.diyigemt.arona.command.nextMessage
 import com.diyigemt.arona.communication.command.UserCommandSender
 import com.diyigemt.arona.communication.command.UserCommandSender.Companion.readPluginConfigOrDefault
@@ -129,7 +130,7 @@ object TrainerCommand : AbstractCommand(
     getImage(match).run {
       data?.run r1@{
         if (code != 200) {
-          val mdConfig = readUserPluginConfigOrDefault(Arona, default = BaseConfig()).markdown
+          val mdConfig = readUserPluginConfigOrDefault(BuildInCommandOwner, default = BaseConfig()).markdown
           if (mdConfig.enable) {
             val md = TencentTemplateMarkdown("102057194_1702305572") {
               append("search_target", match)

arona/arona-plugin/custom-menu/src/main/kotlin/com/diyigemt/arona/custom/menu/Main.kt

@@ -3,7 +3,10 @@
 package com.diyigemt.arona.custom.menu
 
 import com.diyigemt.arona.command.AbstractCommand
+import com.diyigemt.arona.command.BaseConfig
+import com.diyigemt.arona.command.BuildInCommandOwner
 import com.diyigemt.arona.communication.command.UserCommandSender
+import com.diyigemt.arona.communication.command.UserCommandSender.Companion.readUserPluginConfigOrDefault
 import com.diyigemt.arona.communication.command.UserCommandSender.Companion.readUserPluginConfigOrNull
 import com.diyigemt.arona.communication.message.*
 import com.diyigemt.arona.plugins.AronaPlugin
@@ -105,14 +108,24 @@ object CustomMenuCommand : AbstractCommand(
   PluginMain, "菜单", description = "提供快捷菜单, 或者默认菜单"
 ) {
   suspend fun UserCommandSender.menu() {
+    val mdConfig = readUserPluginConfigOrDefault(BuildInCommandOwner, default = BaseConfig()).markdown
+    if (!mdConfig.enable) {
+      sendMessage(MessageChainBuilder()
+        .append("请先在webui开启markdown支持")
+        .append("需要NTQQ或QQ8.9.85以上版本才能显示")
+        .append("文档: https://doc.arona.diyigemt.com/v2/manual/webui")
+        .append("webui仅支持桌面端,未对移动端适配")
+        .build()
+      )
+      return
+    }
     val menu = readUserPluginConfigOrNull<CustomMenuConfig>(PluginMain)
     val md = TencentTemplateMarkdown("102057194_1708227032") {
       append("title", if (menu == null) "默认菜单" else "快捷菜单")
       append("content", " ")
       append("footer", " ")
     }
-    val kb = TencentTempleKeyboard("102057194_1708226882")
-//    val kb = (menu ?: CustomMenuConfig.DefaultMenu).toCustomKeyboard()
+    val kb = (menu ?: CustomMenuConfig.DefaultMenu).toCustomKeyboard()
     sendMessage(MessageChainBuilder().append(md).append(kb).build())
   }
 }

arona/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 
 allprojects {
   group = "com.diyigemt.arona"
-  version = "0.1.12"
+  version = "1.2.0"
 //  gradle.taskGraph.whenReady {
 //    tasks.forEach { task ->
 //      if (task.name.contains("test")) {