refactor: rename entity package to model

Aliorpse · Aliorpse · commit 7e895224a53c · 2026-02-21T05:12:13.000+08:00
diff --git a/saltify-core/src/commonMain/kotlin/org/ntqqrev/saltify/core/SaltifyApplication.kt b/saltify-core/src/commonMain/kotlin/org/ntqqrev/saltify/core/SaltifyApplication.kt
@@ -18,9 +18,9 @@ import kotlinx.serialization.json.decodeFromJsonElement
 import org.ntqqrev.milky.*
 import org.ntqqrev.saltify.annotation.WithApiExtension
 import org.ntqqrev.saltify.dsl.SaltifyConfig
-import org.ntqqrev.saltify.dsl.SaltifyPluginBuilder
-import org.ntqqrev.saltify.entity.EventConnectionType
-import org.ntqqrev.saltify.entity.SaltifyComponentType
+import org.ntqqrev.saltify.dsl.SaltifyPluginContext
+import org.ntqqrev.saltify.model.EventConnectionType
+import org.ntqqrev.saltify.model.SaltifyComponentType
 import org.ntqqrev.saltify.exception.ApiCallException
 import org.ntqqrev.saltify.util.coroutine.SaltifyComponent
 import org.ntqqrev.saltify.util.coroutine.SaltifyExceptionHandlerProvider
@@ -84,7 +84,7 @@ public sealed class SaltifyApplication(private val config: SaltifyConfig) : Auto
      */
     public val eventFlow: SharedFlow<Event> = events.asSharedFlow()
 
-    private val activePlugins = mutableListOf<SaltifyPluginBuilder>()
+    private val activePlugins = mutableListOf<SaltifyPluginContext>()
 
     @PublishedApi
     internal val httpClient: HttpClient = HttpClient {
@@ -114,7 +114,7 @@ public sealed class SaltifyApplication(private val config: SaltifyConfig) : Auto
                     SaltifyComponent(SaltifyComponentType.Plugin, plugin.name)
             )
 
-            val context = SaltifyPluginBuilder(this, pluginScope)
+            val context = SaltifyPluginContext(this, pluginScope)
             plugin.setup(context)
 
             activePlugins.add(context)
diff --git a/saltify-core/src/commonMain/kotlin/org/ntqqrev/saltify/dsl/SaltifyConfig.kt b/saltify-core/src/commonMain/kotlin/org/ntqqrev/saltify/dsl/SaltifyConfig.kt
@@ -1,7 +1,7 @@
 package org.ntqqrev.saltify.dsl
 
 import org.ntqqrev.saltify.annotation.SaltifyDsl
-import org.ntqqrev.saltify.entity.EventConnectionType
+import org.ntqqrev.saltify.model.EventConnectionType
 
 @SaltifyDsl
 public class SaltifyConfig {
@@ -28,7 +28,7 @@ public class SaltifyConfig {
     /**
      * 定义并安装插件，用法与 [createSaltifyPlugin] 相同。
      */
-    public fun plugin(name: String = "unspecified", block: SaltifyPluginBuilder.() -> Unit) {
+    public fun plugin(name: String = "unspecified", block: SaltifyPluginContext.() -> Unit) {
         install(createSaltifyPlugin(name, block))
     }
 }
diff --git a/saltify-core/src/commonMain/kotlin/org/ntqqrev/saltify/extension/ApplicationExtension.kt b/saltify-core/src/commonMain/kotlin/org/ntqqrev/saltify/extension/ApplicationExtension.kt
@@ -12,7 +12,7 @@ import org.ntqqrev.saltify.dsl.ParameterParseResult
 import org.ntqqrev.saltify.dsl.SaltifyCommandContext
 import org.ntqqrev.saltify.dsl.SaltifyCommandExecutionContext
 import org.ntqqrev.saltify.dsl.SaltifyCommandParamDef
-import org.ntqqrev.saltify.entity.CommandError
+import org.ntqqrev.saltify.model.CommandError
 import kotlin.reflect.KClass
 
 /**
diff --git a/saltify-core/src/commonMain/kotlin/org/ntqqrev/saltify/extension/CommandContextExtension.kt b/saltify-core/src/commonMain/kotlin/org/ntqqrev/saltify/extension/CommandContextExtension.kt
@@ -0,0 +1,13 @@
+package org.ntqqrev.saltify.extension
+
+import org.ntqqrev.saltify.dsl.SaltifyCommandContext
+import org.ntqqrev.saltify.dsl.SaltifyCommandExecutionContext
+import org.ntqqrev.saltify.dsl.SaltifyCommandParamDef
+
+/**
+ * 定义一个命令参数。请搭配 [SaltifyCommandExecutionContext.capture] 使用。
+ */
+public inline fun <reified T : Any> SaltifyCommandContext.parameter(
+    name: String,
+    description: String = ""
+): SaltifyCommandParamDef<T> = parameter(T::class, name, description)
diff --git a/saltify-core/src/commonMain/kotlin/org/ntqqrev/saltify/extension/EventExtension.kt b/saltify-core/src/commonMain/kotlin/org/ntqqrev/saltify/extension/EventExtension.kt
@@ -6,15 +6,22 @@ import org.ntqqrev.milky.OutgoingSegment
 import org.ntqqrev.saltify.core.SaltifyApplication
 import org.ntqqrev.saltify.core.sendGroupMessage
 import org.ntqqrev.saltify.core.sendPrivateMessage
-import org.ntqqrev.saltify.dsl.SaltifyPluginBuilder
+import org.ntqqrev.saltify.dsl.SaltifyPluginContext
+import org.ntqqrev.saltify.model.milky.SendMessageOutput
 
 /**
- * 响应事件。鉴于 Context Parameter 尚未完善，这里需要手动传 client。建议使用 [SaltifyPluginBuilder.respond]。
+ * 响应事件。鉴于 Context Parameter 尚未完善，这里需要手动传 client。建议使用 [SaltifyPluginContext.respond]。
  */
 public suspend fun Event.MessageReceive.respond(
     client: SaltifyApplication,
     block: MutableList<OutgoingSegment>.() -> Unit
-): Any = when (val data = this.data) {
-    is IncomingMessage.Group -> client.sendGroupMessage(data.peerId, block)
-    else -> client.sendPrivateMessage(data.peerId, block)
+): SendMessageOutput = when (val data = this.data) {
+    is IncomingMessage.Group -> {
+        val output = client.sendGroupMessage(data.peerId, block)
+        SendMessageOutput(output.messageSeq, output.time)
+    }
+    else -> {
+        val output = client.sendPrivateMessage(data.peerId, block)
+        SendMessageOutput(output.messageSeq, output.time)
+    }
 }
diff --git a/saltify-core/src/commonMain/kotlin/org/ntqqrev/saltify/extension/PluginContextExtension.kt b/saltify-core/src/commonMain/kotlin/org/ntqqrev/saltify/extension/PluginContextExtension.kt
@@ -0,0 +1 @@
+package org.ntqqrev.saltify.extension
diff --git a/saltify-core/src/commonMain/kotlin/org/ntqqrev/saltify/model/CommandError.kt b/saltify-core/src/commonMain/kotlin/org/ntqqrev/saltify/model/CommandError.kt
@@ -1,4 +1,4 @@
-package org.ntqqrev.saltify.entity
+package org.ntqqrev.saltify.model
 
 import org.ntqqrev.saltify.dsl.SaltifyCommandParamDef
 
diff --git a/saltify-core/src/commonMain/kotlin/org/ntqqrev/saltify/model/EventConnectionType.kt b/saltify-core/src/commonMain/kotlin/org/ntqqrev/saltify/model/EventConnectionType.kt
@@ -1,4 +1,4 @@
-package org.ntqqrev.saltify.entity
+package org.ntqqrev.saltify.model
 
 /**
  * 事件服务的协议类型
diff --git a/saltify-core/src/commonMain/kotlin/org/ntqqrev/saltify/model/SaltifyComponentType.kt b/saltify-core/src/commonMain/kotlin/org/ntqqrev/saltify/model/SaltifyComponentType.kt
@@ -1,4 +1,4 @@
-package org.ntqqrev.saltify.entity
+package org.ntqqrev.saltify.model
 
 /**
  * Saltify 的协程组件类型
diff --git a/saltify-core/src/commonMain/kotlin/org/ntqqrev/saltify/util/coroutine/SaltifyComponent.kt b/saltify-core/src/commonMain/kotlin/org/ntqqrev/saltify/util/coroutine/SaltifyComponent.kt
@@ -1,6 +1,6 @@
 package org.ntqqrev.saltify.util.coroutine
 
-import org.ntqqrev.saltify.entity.SaltifyComponentType
+import org.ntqqrev.saltify.model.SaltifyComponentType
 import kotlin.coroutines.AbstractCoroutineContextElement
 import kotlin.coroutines.CoroutineContext
 
diff --git a/saltify-core/src/jvmTest/kotlin/org/ntqqrev/saltify/PluginTest.kt b/saltify-core/src/jvmTest/kotlin/org/ntqqrev/saltify/PluginTest.kt
@@ -10,9 +10,8 @@ import org.ntqqrev.saltify.core.SaltifyApplication
 import org.ntqqrev.saltify.core.getLoginInfo
 import org.ntqqrev.saltify.core.text
 import org.ntqqrev.saltify.dsl.createSaltifyPlugin
-import org.ntqqrev.saltify.dsl.parameter
-import org.ntqqrev.saltify.entity.EventConnectionType
-import org.ntqqrev.saltify.entity.SaltifyComponentType
+import org.ntqqrev.saltify.model.EventConnectionType
+import org.ntqqrev.saltify.model.SaltifyComponentType
 import org.ntqqrev.saltify.util.coroutine.saltifyComponent
 import kotlin.test.Test
 
diff --git a/saltify-processor/src/main/kotlin/org/ntqqrev/saltify/ksp/ApiExtensionProcessor.kt b/saltify-processor/src/main/kotlin/org/ntqqrev/saltify/ksp/ApiExtensionProcessor.kt
@@ -88,7 +88,7 @@ class ApiExtensionProcessor(
                 it.appendLine()
                 if (pkg != "org.ntqqrev.milky") {
                     it.appendLine("import org.ntqqrev.milky.*")
-                    it.appendLine("import org.ntqqrev.saltify.entity.*")
+                    it.appendLine("import org.ntqqrev.saltify.model.*")
                     it.appendLine()
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.ntqqrev.saltify.entity`
	`1`	`+package org.ntqqrev.saltify.model`
`2`	`2`
`3`	`3`	`import org.ntqqrev.saltify.dsl.SaltifyCommandParamDef`
`4`	`4`