Skip to content

Commit a2a5f2b

Browse files
committed
chore: optimize imports
1 parent 3bdf980 commit a2a5f2b

20 files changed

Lines changed: 51 additions & 86 deletions

File tree

saltify-core/src/commonMain/kotlin/org/ntqqrev/saltify/SaltifyApplication.kt

Lines changed: 18 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,33 @@
11
package org.ntqqrev.saltify
22

3-
import io.ktor.client.HttpClient
4-
import io.ktor.client.call.body
5-
import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
6-
import io.ktor.client.plugins.defaultRequest
7-
import io.ktor.client.plugins.sse.SSE
8-
import io.ktor.client.plugins.timeout
9-
import io.ktor.client.plugins.websocket.WebSockets
10-
import io.ktor.client.request.header
11-
import io.ktor.client.request.post
12-
import io.ktor.client.request.setBody
13-
import io.ktor.http.ContentType
14-
import io.ktor.http.HttpHeaders
15-
import io.ktor.http.contentType
16-
import io.ktor.serialization.kotlinx.KotlinxWebsocketSerializationConverter
17-
import io.ktor.serialization.kotlinx.json.json
18-
import io.ktor.util.logging.KtorSimpleLogger
19-
import kotlinx.coroutines.CoroutineScope
20-
import kotlinx.coroutines.SupervisorJob
21-
import kotlinx.coroutines.cancel
22-
import kotlinx.coroutines.flow.MutableSharedFlow
23-
import kotlinx.coroutines.flow.MutableStateFlow
24-
import kotlinx.coroutines.flow.SharedFlow
25-
import kotlinx.coroutines.flow.StateFlow
26-
import kotlinx.coroutines.flow.asSharedFlow
27-
import kotlinx.coroutines.flow.asStateFlow
28-
import kotlinx.coroutines.job
29-
import kotlinx.coroutines.joinAll
30-
import kotlinx.coroutines.launch
3+
import io.ktor.client.*
4+
import io.ktor.client.call.*
5+
import io.ktor.client.plugins.*
6+
import io.ktor.client.plugins.contentnegotiation.*
7+
import io.ktor.client.plugins.sse.*
8+
import io.ktor.client.plugins.websocket.*
9+
import io.ktor.client.request.*
10+
import io.ktor.http.*
11+
import io.ktor.serialization.kotlinx.*
12+
import io.ktor.serialization.kotlinx.json.*
13+
import io.ktor.util.logging.*
14+
import kotlinx.coroutines.*
15+
import kotlinx.coroutines.flow.*
3116
import kotlinx.serialization.json.decodeFromJsonElement
32-
import org.ntqqrev.milky.ApiEmptyStruct
33-
import org.ntqqrev.milky.ApiEndpoint
34-
import org.ntqqrev.milky.ApiGeneralResponse
35-
import org.ntqqrev.milky.Event
36-
import org.ntqqrev.milky.milkyJsonModule
17+
import org.ntqqrev.milky.*
3718
import org.ntqqrev.saltify.annotation.WithApiExtension
3819
import org.ntqqrev.saltify.dsl.PluginBuilder
3920
import org.ntqqrev.saltify.dsl.config.ApplicationConfig
40-
import org.ntqqrev.saltify.internal.util.InstalledPlugin
41-
import org.ntqqrev.saltify.runtime.SaltifyComponent
42-
import org.ntqqrev.saltify.internal.util.ExceptionHandlerProvider
43-
import org.ntqqrev.saltify.runtime.command.RegisteredCommand
4421
import org.ntqqrev.saltify.exception.ApiCallException
4522
import org.ntqqrev.saltify.internal.app.SaltifyApplicationSSE
4623
import org.ntqqrev.saltify.internal.app.SaltifyApplicationWebSocket
24+
import org.ntqqrev.saltify.internal.util.ExceptionHandlerProvider
25+
import org.ntqqrev.saltify.internal.util.InstalledPlugin
4726
import org.ntqqrev.saltify.model.SaltifyComponentType
4827
import org.ntqqrev.saltify.model.event.EventConnectionState
4928
import org.ntqqrev.saltify.model.event.EventConnectionType
29+
import org.ntqqrev.saltify.runtime.SaltifyComponent
30+
import org.ntqqrev.saltify.runtime.command.RegisteredCommand
5031
import kotlin.coroutines.CoroutineContext
5132
import kotlin.time.Clock
5233

saltify-core/src/commonMain/kotlin/org/ntqqrev/saltify/builtin/plugin/CommandHelp.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package org.ntqqrev.saltify.builtin.plugin
22

33
import org.ntqqrev.saltify.dsl.SaltifyPlugin
4-
import org.ntqqrev.saltify.runtime.command.RegisteredCommand
5-
import org.ntqqrev.saltify.runtime.command.RegisteredSubCommand
64
import org.ntqqrev.saltify.extension.command
75
import org.ntqqrev.saltify.extension.respond
86
import org.ntqqrev.saltify.forward
97
import org.ntqqrev.saltify.node
8+
import org.ntqqrev.saltify.runtime.command.RegisteredCommand
9+
import org.ntqqrev.saltify.runtime.command.RegisteredSubCommand
1010
import org.ntqqrev.saltify.text
1111

1212
/**

saltify-core/src/commonMain/kotlin/org/ntqqrev/saltify/builtin/plugin/DefaultLogging.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import org.ntqqrev.milky.IncomingMessage
77
import org.ntqqrev.saltify.dsl.SaltifyPlugin
88
import org.ntqqrev.saltify.extension.on
99
import org.ntqqrev.saltify.extension.plainText
10-
import org.ntqqrev.saltify.model.event.EventConnectionState
1110
import org.ntqqrev.saltify.model.SaltifyComponentType
11+
import org.ntqqrev.saltify.model.event.EventConnectionState
1212
import org.ntqqrev.saltify.runtime.saltifyComponent
1313

1414
/**

saltify-core/src/commonMain/kotlin/org/ntqqrev/saltify/dsl/CommandBuilder.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package org.ntqqrev.saltify.dsl
22

33
import org.ntqqrev.saltify.annotation.SaltifyDsl
4-
import org.ntqqrev.saltify.runtime.command.CommandRequirementMatch
5-
import org.ntqqrev.saltify.runtime.command.CommandParameter
6-
import org.ntqqrev.saltify.runtime.context.CommandExecutionContext
74
import org.ntqqrev.saltify.model.command.CommandError
85
import org.ntqqrev.saltify.model.command.CommandRequirement
6+
import org.ntqqrev.saltify.runtime.command.CommandParameter
7+
import org.ntqqrev.saltify.runtime.command.CommandRequirementMatch
8+
import org.ntqqrev.saltify.runtime.context.CommandExecutionContext
99

1010
@SaltifyDsl
1111
public class CommandBuilder internal constructor() {

saltify-core/src/commonMain/kotlin/org/ntqqrev/saltify/dsl/PluginBuilder.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package org.ntqqrev.saltify.dsl
22

33
import io.ktor.util.logging.*
44
import kotlinx.coroutines.CoroutineScope
5-
import org.ntqqrev.saltify.annotation.SaltifyDsl
65
import org.ntqqrev.saltify.SaltifyApplication
6+
import org.ntqqrev.saltify.annotation.SaltifyDsl
77
import org.ntqqrev.saltify.runtime.context.ApplicationContext
88

99
@SaltifyDsl

saltify-core/src/commonMain/kotlin/org/ntqqrev/saltify/dsl/config/ApplicationConfig.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package org.ntqqrev.saltify.dsl.config
22

33
import org.ntqqrev.saltify.annotation.SaltifyDsl
4-
import org.ntqqrev.saltify.dsl.SaltifyPlugin
54
import org.ntqqrev.saltify.dsl.PluginBuilder
5+
import org.ntqqrev.saltify.dsl.SaltifyPlugin
66
import org.ntqqrev.saltify.internal.util.InstalledPlugin
77

88
@SaltifyDsl

saltify-core/src/commonMain/kotlin/org/ntqqrev/saltify/extension/ApplicationExtension.kt

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
11
package org.ntqqrev.saltify.extension
22

3-
import kotlinx.coroutines.CancellationException
4-
import kotlinx.coroutines.CoroutineScope
5-
import kotlinx.coroutines.Job
6-
import kotlinx.coroutines.currentCoroutineContext
3+
import kotlinx.coroutines.*
74
import kotlinx.coroutines.flow.filterIsInstance
8-
import kotlinx.coroutines.launch
95
import org.ntqqrev.milky.Event
106
import org.ntqqrev.milky.IncomingSegment
117
import org.ntqqrev.saltify.dsl.CommandBuilder
128
import org.ntqqrev.saltify.internal.engine.CommandEngine
9+
import org.ntqqrev.saltify.model.SaltifyComponentType
1310
import org.ntqqrev.saltify.runtime.command.RegisteredCommand
1411
import org.ntqqrev.saltify.runtime.command.RegisteredSubCommand
1512
import org.ntqqrev.saltify.runtime.context.ApplicationContext
1613
import org.ntqqrev.saltify.runtime.context.EventContext
17-
import org.ntqqrev.saltify.model.SaltifyComponentType
1814
import org.ntqqrev.saltify.runtime.saltifyComponent
1915

2016
/**

saltify-core/src/commonMain/kotlin/org/ntqqrev/saltify/extension/CommandContextExtension.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package org.ntqqrev.saltify.extension
22

3-
import org.ntqqrev.saltify.runtime.context.CommandExecutionContext
43
import org.ntqqrev.saltify.dsl.SaltifyParameterBuilder
54
import org.ntqqrev.saltify.runtime.command.CommandParameter
5+
import org.ntqqrev.saltify.runtime.context.CommandExecutionContext
66

77
/**
88
* 定义一个指令参数。请搭配 [CommandExecutionContext.value] 使用。

saltify-core/src/commonMain/kotlin/org/ntqqrev/saltify/extension/EventExtension.kt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,9 @@ import kotlinx.coroutines.withTimeoutOrNull
77
import org.ntqqrev.milky.Event
88
import org.ntqqrev.milky.IncomingMessage
99
import org.ntqqrev.milky.OutgoingSegment
10+
import org.ntqqrev.saltify.*
1011
import org.ntqqrev.saltify.runtime.context.EventContext
1112
import org.ntqqrev.saltify.runtime.milky.SendMessageOutput
12-
import org.ntqqrev.saltify.recallGroupMessage
13-
import org.ntqqrev.saltify.recallPrivateMessage
14-
import org.ntqqrev.saltify.sendGroupMessage
15-
import org.ntqqrev.saltify.sendPrivateMessage
16-
import org.ntqqrev.saltify.text
1713
import kotlin.time.Duration
1814
import kotlin.time.Duration.Companion.seconds
1915

saltify-core/src/commonMain/kotlin/org/ntqqrev/saltify/extension/PermissionLevelExtension.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.ntqqrev.saltify.extension
22

3-
import org.ntqqrev.saltify.runtime.context.ApplicationContext
43
import org.ntqqrev.saltify.model.PermissionLevel
4+
import org.ntqqrev.saltify.runtime.context.ApplicationContext
55

66
/**
77
* 获取用户的权限等级。

0 commit comments

Comments
 (0)