diff --git a/.gitignore b/.gitignore index 96a088b..bc19509 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,5 @@ bin/ ### Mac OS ### .DS_Store /logs/ +/config/ +/rcon_playerlist_state.json diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml new file mode 100644 index 0000000..875bfab --- /dev/null +++ b/.idea/dataSources.xml @@ -0,0 +1,17 @@ + + + + + mysql.8 + true + com.mysql.cj.jdbc.Driver + jdbc:mysql://47.116.125.76:3308 + + + + + + $ProjectFileDir$ + + + \ No newline at end of file diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml new file mode 100644 index 0000000..29a0deb --- /dev/null +++ b/.idea/sqldialects.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/README.MD b/README.MD index 0dcd141..502cf9f 100644 --- a/README.MD +++ b/README.MD @@ -1 +1,7 @@ -# 基于NapCat Websocket Server 框架开发 +# 基于NapCat Http/Websocket Server API开发 +## 目标1：实现白名单申请通过后加群自动通过 +### 拆分目标： +轮询 +1. 获取指定加群请求 +2. 对比数据库中的以通过QQ号 +3. 批量通过/拒绝请求 diff --git a/build.gradle.kts b/build.gradle.kts index a46f0f8..1082a92 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,15 +1,19 @@ +import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar + plugins { kotlin("jvm") version "1.9.23" kotlin("plugin.serialization") version "1.9.23" // 添加序列化插件 application + id("com.github.johnrengelman.shadow") version "8.0.0" // fat jar } -group = "top.r3944realms.ltdmanager" -version = "1.0-SNAPSHOT" +group = project.property("project_group") as String +version = project.property("project_version") as String repositories { repositories { + gradlePluginPortal() mavenLocal() maven { url = uri("https://maven.aliyun.com/repository/public/") @@ -42,7 +46,8 @@ repositories { implementation("org.apache.logging.log4j:log4j-api:2.20.0") // 配置管理 - implementation("org.yaml:snakeyaml:2.2") + implementation("org.yaml:snakeyaml:2.4") + implementation("org.snakeyaml:snakeyaml-engine:2.10") implementation("com.typesafe:config:1.4.2") // 类型安全的配置库 // 协程 @@ -60,6 +65,21 @@ repositories { jvmToolchain(17) } application { - mainClass.set("top.r3944realms.ltdmanager.main") // 设置主类 + mainClass.set("top.r3944realms.ltdmanager.MainKt") // 设置主类 + } +} +tasks { + // ShadowJar 配置 + named("shadowJar") { + archiveClassifier.set("") // 去掉 -all 后缀 + mergeServiceFiles() + manifest { + attributes["Main-Class"] = "top.r3944realms.ltdmanager.MainKt" + } + } + + // build 依赖 shadowJar + build { + dependsOn("shadowJar") } } \ No newline at end of file diff --git a/doc/README.MD b/doc/README.MD index ef30471..2aa1423 100644 --- a/doc/README.MD +++ b/doc/README.MD @@ -1,19 +1,3 @@ # NapCat 将回应抽象为event模型 -将请求抽象为request模型 - -优先级发送流程 -sequenceDiagram -participant Client -participant PriorityQueue -participant PendingResponses -participant Server - - Client->>PriorityQueue: sendRequest(高优先级) - Client->>PriorityQueue: sendRequest(低优先级) - PriorityQueue->>Server: 先发送高优先级请求 - Server->>PendingResponses: 返回响应1 - PendingResponses->>Client: 解除高优先级请求的await - PriorityQueue->>Server: 发送低优先级请求 - Server->>PendingResponses: 返回响应2 - PendingResponses->>Client: 解除低优先级请求的await \ No newline at end of file +将请求抽象为request模型 \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index d3e6509..33b6d4d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,6 @@ kotlin.code.style=official org.gradle.downloadSources=false org.gradle.parallel=true -org.gradle.degree_of_parallelism=16 \ No newline at end of file +org.gradle.degree_of_parallelism=16 +project_group=top.r3944realms.ltdmanager +project_version=1.2-SNAPSHOT diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/GlobalManager.kt b/src/main/kotlin/top/r3944realms/ltdmanager/GlobalManager.kt new file mode 100644 index 0000000..f5afe5c --- /dev/null +++ b/src/main/kotlin/top/r3944realms/ltdmanager/GlobalManager.kt @@ -0,0 +1,55 @@ +package top.r3944realms.ltdmanager + +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.SupervisorJob +import top.r3944realms.ltdmanager.core.mysql.MysqlHikariConnectPool +import top.r3944realms.ltdmanager.module.ModuleManager +import top.r3944realms.ltdmanager.napcat.NapCatClient +import top.r3944realms.ltdmanager.utils.LoggerUtil +import java.sql.Connection + +object GlobalManager { + // 单例作用域，可在模块中使用协程 + val scope = CoroutineScope(Dispatchers.IO + SupervisorJob()) + + // Hikari 数据源 + private val dataSource: MysqlHikariConnectPool by lazy { + MysqlHikariConnectPool() + } + + // NapCat 客户端 + val napCatClient: NapCatClient by lazy { + NapCatClient.create() + } + + val moduleManager: ModuleManager by lazy { ModuleManager() } + + /** + * 获取数据库连接 + * 使用 try-with-resources 时会自动关闭 + */ + fun getConnection(): Connection { + return dataSource.getConnection() + } + + /** + * 关闭全局资源 + * 例如在应用退出时调用 + */ + fun shutdown() { + try { + LoggerUtil.logger.info("关闭 NapCatClient") + napCatClient.close() + } catch (e: Exception) { + LoggerUtil.logger.warn("关闭 NapCatClient 失败", e) + } + + try { + LoggerUtil.logger.info("关闭 Hikari 数据源") + dataSource.close() + } catch (e: Exception) { + LoggerUtil.logger.warn("关闭 Hikari 数据源失败", e) + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/core/config/DatabaseConfig.kt b/src/main/kotlin/top/r3944realms/ltdmanager/core/config/DatabaseConfig.kt index d07ded7..f42d0f0 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/core/config/DatabaseConfig.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/core/config/DatabaseConfig.kt @@ -2,7 +2,6 @@ package top.r3944realms.ltdmanager.core.config import top.r3944realms.ltdmanager.utils.CryptoUtil import top.r3944realms.ltdmanager.utils.YamlUpdater -import java.util.* data class DatabaseConfig( var url: String? = null, @@ -37,12 +36,8 @@ data class DatabaseConfig( } try { encryptedPassword = "ENC(${CryptoUtil.encrypt(encryptedPassword!!)})" - YamlUpdater.updateYamlValue( - Objects.requireNonNull( - YamlConfigLoader::class.java - .classLoader - .getResource("application.yaml") - ).path, + YamlUpdater.updateYaml( + YamlConfigLoader.configFilePath.toString(), "database.encrypted-password", this.encryptedPassword!! ) @@ -54,7 +49,7 @@ data class DatabaseConfig( /** * 检查密码是否已加密 */ - fun isEncrypted(): Boolean { + private fun isEncrypted(): Boolean { return encryptedPassword != null && encryptedPassword!!.startsWith("ENC(") && encryptedPassword!!.endsWith(")") diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/core/config/HttpConfig.kt b/src/main/kotlin/top/r3944realms/ltdmanager/core/config/HttpConfig.kt new file mode 100644 index 0000000..7da0152 --- /dev/null +++ b/src/main/kotlin/top/r3944realms/ltdmanager/core/config/HttpConfig.kt @@ -0,0 +1,59 @@ +package top.r3944realms.ltdmanager.core.config + +import top.r3944realms.ltdmanager.utils.CryptoUtil +import top.r3944realms.ltdmanager.utils.YamlUpdater + +data class HttpConfig( + var url: String? = null, + var encryptedToken: String? = null +) { + /** + * 获取解密后的token（如果未加密，返回原值） + */ + val decryptedToken: String? + get() { + if (encryptedToken == null) { + return null + } + if (!isEncrypted()) { + return encryptedToken + } + try { + val cipherText = encryptedToken!!.substring(4, encryptedToken!!.length - 1) + return CryptoUtil.decrypt(cipherText) + } catch (e: Exception) { + throw IllegalStateException("token解密失败", e) + } + } + + /** + * 加密密码（如果未加密），并返回是否成功加密 + */ + fun encryptToken() { + if (encryptedToken == null || isEncrypted()) { + return + } + try { + encryptedToken = "ENC(${CryptoUtil.encrypt(encryptedToken!!)})" + YamlUpdater.updateYaml( + YamlConfigLoader.configFilePath.toString(), + "http.encrypted-token", + this.encryptedToken!! + ) + } catch (e: Exception) { + throw IllegalStateException("密码加密失败", e) + } + } + + /** + * 检查Token是否已加密 + */ + private fun isEncrypted(): Boolean { + return encryptedToken != null && + encryptedToken!!.startsWith("ENC(") && + encryptedToken!!.endsWith(")") + } + override fun toString(): String { + return "HttpConfig(Url=$url, token=***)" + } +} \ No newline at end of file diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/core/config/ModeConfig.kt b/src/main/kotlin/top/r3944realms/ltdmanager/core/config/ModeConfig.kt new file mode 100644 index 0000000..b6cf1f4 --- /dev/null +++ b/src/main/kotlin/top/r3944realms/ltdmanager/core/config/ModeConfig.kt @@ -0,0 +1,13 @@ +package top.r3944realms.ltdmanager.core.config + +import top.r3944realms.ltdmanager.utils.ApiType +import top.r3944realms.ltdmanager.utils.Environment + +data class ModeConfig( + var botApiType: ApiType? = null, + var environment: Environment? = null, +) { + override fun toString(): String { + return "ModeConfig(botApiType=$botApiType, environment=$environment)" + } +} \ No newline at end of file diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/core/config/ToolConfig.kt b/src/main/kotlin/top/r3944realms/ltdmanager/core/config/ToolConfig.kt new file mode 100644 index 0000000..2b9c027 --- /dev/null +++ b/src/main/kotlin/top/r3944realms/ltdmanager/core/config/ToolConfig.kt @@ -0,0 +1,61 @@ +package top.r3944realms.ltdmanager.core.config + +import top.r3944realms.ltdmanager.utils.CryptoUtil +import top.r3944realms.ltdmanager.utils.YamlUpdater + +data class ToolConfig( + var rcon: RconConfig = RconConfig() +) { + data class RconConfig( + var mcRconToolPath: String? = null, + var mcRconToolConfigPath: String? = null, + var serverUrl: String? = null, + var rconPassword: String? = null + ) { + /** + * 获取解密后的 rcon 密码（如果未加密，返回原值） + */ + val decryptedPassword: String? + get() { + if (rconPassword == null) return null + if (!isEncrypted()) return rconPassword + return try { + val cipherText = rconPassword!!.substring(4, rconPassword!!.length - 1) + CryptoUtil.decrypt(cipherText) + } catch (e: Exception) { + throw IllegalStateException("RCON 密码解密失败", e) + } + } + + /** + * 加密 rcon 密码（如果未加密） + */ + fun encryptPassword(configFilePath: String) { + if (rconPassword == null || isEncrypted()) return + try { + rconPassword = "ENC(${CryptoUtil.encrypt(rconPassword!!)})" + YamlUpdater.updateYaml( + configFilePath, + "tools.rcon.rcon-password", + rconPassword!! + ) + } catch (e: Exception) { + throw IllegalStateException("RCON 密码加密失败", e) + } + } + + private fun isEncrypted(): Boolean { + return rconPassword != null && + rconPassword!!.startsWith("ENC(") && + rconPassword!!.endsWith(")") + } + + override fun toString(): String { + return "RconConfig(path=$mcRconToolPath, configPath=$mcRconToolConfigPath, url=$serverUrl, password=***)" + } + } + + override fun toString(): String { + return "ToolConfig(rcon=$rcon)" + } +} \ No newline at end of file diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/core/config/WebsocketConfig.kt b/src/main/kotlin/top/r3944realms/ltdmanager/core/config/WebsocketConfig.kt index 08b9905..00224d2 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/core/config/WebsocketConfig.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/core/config/WebsocketConfig.kt @@ -1,10 +1,59 @@ package top.r3944realms.ltdmanager.core.config +import top.r3944realms.ltdmanager.utils.CryptoUtil +import top.r3944realms.ltdmanager.utils.YamlUpdater + data class WebsocketConfig( var url: String? = null, - var token: String? = null + var encryptedToken: String? = null ) { + /** + * 获取解密后的token（如果未加密，返回原值） + */ + val decryptedToken: String? + get() { + if (encryptedToken == null) { + return null + } + if (!isEncrypted()) { + return encryptedToken + } + try { + val cipherText = encryptedToken!!.substring(4, encryptedToken!!.length - 1) + return CryptoUtil.decrypt(cipherText) + } catch (e: Exception) { + throw IllegalStateException("token解密失败", e) + } + } + + /** + * 加密密码（如果未加密），并返回是否成功加密 + */ + fun encryptToken() { + if (encryptedToken == null || isEncrypted()) { + return + } + try { + encryptedToken = "ENC(${CryptoUtil.encrypt(encryptedToken!!)})" + YamlUpdater.updateYaml( + YamlConfigLoader.configFilePath.toString(), + "websocket.encrypted-token", + this.encryptedToken!! + ) + } catch (e: Exception) { + throw IllegalStateException("密码加密失败", e) + } + } + + /** + * 检查Token是否已加密 + */ + private fun isEncrypted(): Boolean { + return encryptedToken != null && + encryptedToken!!.startsWith("ENC(") && + encryptedToken!!.endsWith(")") + } override fun toString(): String { - return "WebsocketConfig(Url=$url, token=$token)" + return "WebsocketConfig(Url=$url, token=***)" } } diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/core/config/YamlConfigLoader.kt b/src/main/kotlin/top/r3944realms/ltdmanager/core/config/YamlConfigLoader.kt index 646da55..28c06e7 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/core/config/YamlConfigLoader.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/core/config/YamlConfigLoader.kt @@ -5,22 +5,50 @@ import org.yaml.snakeyaml.Yaml import org.yaml.snakeyaml.constructor.Constructor import org.yaml.snakeyaml.introspector.Property import org.yaml.snakeyaml.introspector.PropertyUtils +import top.r3944realms.ltdmanager.utils.ConfigInitializer import top.r3944realms.ltdmanager.utils.NamingConventionUtil +import java.nio.file.Files +import java.nio.file.Paths object YamlConfigLoader { - private val config: ConfigWrapper = loadConfig().also { - ensureConfigEncrypted(it) // 初始化后立即加密 + val configFilePath = Paths.get("config/application.yaml") // 配置文件路径 + private val _config by lazy { loadConfig() } // 延迟初始化 + val config: ConfigWrapper get() = _config + + init { + // 第一次启动确保配置文件存在 + ConfigInitializer.initConfig("application.yaml", "config") + + // 初始化后加密（确保只执行一次） + runCatching { + _config.database.encryptPassword() + _config.websocket.encryptToken() + _config.http.encryptToken() + }.onFailure { e -> + println("初始化加密失败: ${e.message}") + e.printStackTrace() + } } private fun ensureConfigEncrypted(config: ConfigWrapper?) { config?.database?.encryptPassword() + config?.websocket?.encryptToken() + config?.http?.encryptToken() } private fun loadConfig(): ConfigWrapper { - YamlConfigLoader::class.java.classLoader.getResourceAsStream("application.yaml").use { inputStream -> - if (inputStream == null) { - throw RuntimeException("配置文件 application.yaml 未找到！") - } - return Yaml(getConstructor()).load(inputStream) + if (!Files.exists(configFilePath)) { + throw RuntimeException("配置文件未找到: $configFilePath") } + + try { + val yamlContent = Files.readString(configFilePath) + + return Yaml(getConstructor()).load(yamlContent) + ?: throw RuntimeException("YAML解析返回null") + + } catch (e: Exception) { + throw RuntimeException("YAML解析失败: ${e.message}", e) + } + } private fun getConstructor(): Constructor { val propertyUtils = object : PropertyUtils() { @@ -38,12 +66,20 @@ object YamlConfigLoader { setPropertyUtils(propertyUtils) } } + fun loadDatabaseConfig(): DatabaseConfig = config.database fun loadCryptoConfig(): CryptoConfig = config.crypto fun loadWebsocketConfig(): WebsocketConfig = config.websocket + fun loadHttpConfig(): HttpConfig = config.http + fun loadModeConfig(): ModeConfig = config.mode + fun loadToolConfig(): ToolConfig = config.tools data class ConfigWrapper( - var database :DatabaseConfig, - var crypto :CryptoConfig, - var websocket :WebsocketConfig + var database: DatabaseConfig = DatabaseConfig(), + var crypto: CryptoConfig = CryptoConfig(), + var mode: ModeConfig = ModeConfig(), + var websocket: WebsocketConfig = WebsocketConfig(), + var http: HttpConfig = HttpConfig(), + var tools: ToolConfig = ToolConfig(), + ) } \ No newline at end of file diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/main.kt b/src/main/kotlin/top/r3944realms/ltdmanager/main.kt index 16973ee..55f4249 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/main.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/main.kt @@ -1,28 +1,60 @@ package top.r3944realms.ltdmanager -import org.slf4j.LoggerFactory -import top.r3944realms.ltdmanager.napcat.events.NapCatEvent -import top.r3944realms.ltdmanager.napcat.events.group.SetGroupPortraitEvent -import top.r3944realms.ltdmanager.napcat.events.group.SetGroupSearchEvent -import top.r3944realms.ltdmanager.napcat.events.personal.CanSendImageEvent +import kotlinx.coroutines.delay +import kotlinx.coroutines.runBlocking +import top.r3944realms.ltdmanager.module.GroupRequestHandlerModule +import top.r3944realms.ltdmanager.module.RconPlayerListModule +import top.r3944realms.ltdmanager.utils.LoggerUtil +import java.util.concurrent.atomic.AtomicBoolean -fun main() { - val logger = LoggerFactory.getLogger("log") - logger.info("Start") - val toJSON = SetOnlineStatusRequest.ONLINE.toJSON() - logger.info("S:{}",toJSON) - val str: String = """ - { - "status": "ok", - "retcode": 0, - "data": null, - "message": "string", - "wording": "string", - "echo": "string" + +fun main() = runBlocking { + // 标记程序是否运行 + val isRunning = AtomicBoolean(true) + + // 创建模块实例 + val groupModule = GroupRequestHandlerModule( + client = GlobalManager.napCatClient, + targetGroupId = 538751386 + ) + val rconModule = RconPlayerListModule( + pollIntervalMillis = 3_000L, + timeout = 2_000L, + cooldownMillis = 10_000L, + targetGroupId = 538751386, + selfId = 3327379836, + selfNickName = "闲趣老土豆", + keywords = setOf( + //形容 + "土豆", "马铃薯", "Potato", "potato", "POTATO", + "Potatoes", "potatoes", "POTATOES", "🥔", + //正经 + "列表","服务器状态", "TPS", "tps", "list", "List" + ) + ); + + // 注册模块到全局模块管理器 + GlobalManager.moduleManager.registerModule(groupModule) + GlobalManager.moduleManager.registerModule(rconModule) + + // 加载模块 + GlobalManager.moduleManager.loadModule(groupModule.name) + GlobalManager.moduleManager.loadModule(rconModule.name) + + + // 捕获 JVM 关闭信号，优雅退出 + Runtime.getRuntime().addShutdownHook(Thread { + runBlocking { + LoggerUtil.logger.info("\n收到退出信号，正在停止所有模块...") + GlobalManager.moduleManager.stopAllModules() // 批量 stop + LoggerUtil.logger.info("模块卸载完成，程序退出。") + GlobalManager.shutdown() } - """.trimIndent() - val decodeEvent = NapCatEvent.decodeEvent(str, "group/set_group_search") - if (decodeEvent is SetGroupSearchEvent) { - logger.info("data:{}",decodeEvent.data) + isRunning.set(false) + }) + + // 持续挂起，保持主线程运行 + while (isRunning.get()) { + delay(1000L) } } \ No newline at end of file diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/module/BaseModule.kt b/src/main/kotlin/top/r3944realms/ltdmanager/module/BaseModule.kt new file mode 100644 index 0000000..3fa4c89 --- /dev/null +++ b/src/main/kotlin/top/r3944realms/ltdmanager/module/BaseModule.kt @@ -0,0 +1,70 @@ +package top.r3944realms.ltdmanager.module + +import top.r3944realms.ltdmanager.GlobalManager + +/** + * 模块抽象基类 + * 所有功能模块都继承该类 + */ +abstract class BaseModule { + + /** + * 模块名称 + */ + abstract val name: String + + /** + * 模块是否加载 + */ + @Volatile + var loaded: Boolean = false + private set + + /** + * 模块加载 + * 可以在这里初始化协程、监听器、定时任务等 + */ + open fun load() { + if (!loaded) { + loaded = true + onLoad() + } + } + + /** + * 模块卸载 + * 清理资源，取消协程、关闭监听器等 + */ + open fun unload() { + if (loaded) { + loaded = false + onUnload() + } + } + + /** + * 模块加载时的实际逻辑，由子类实现 + */ + protected abstract fun onLoad() + + /** + * 模块卸载时的实际逻辑，由子类实现 + */ + protected abstract fun onUnload() + /** + * 可选的停止方法，模块内部协程等后台任务在这里被取消 + */ + open suspend fun stop() { + unload() // 默认实现直接卸载 + } + /** + * 提供访问全局 NapCatClient 的快捷方式 + */ + protected val napCatClient get() = GlobalManager.napCatClient + + /** + * 获取数据库连接 + * 使用 try-with-resources 时会自动关闭 + */ + protected fun getConnection() = GlobalManager.getConnection() +} \ No newline at end of file diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/module/GroupRequestHandlerModule.kt b/src/main/kotlin/top/r3944realms/ltdmanager/module/GroupRequestHandlerModule.kt new file mode 100644 index 0000000..f0b083e --- /dev/null +++ b/src/main/kotlin/top/r3944realms/ltdmanager/module/GroupRequestHandlerModule.kt @@ -0,0 +1,192 @@ +package top.r3944realms.ltdmanager.module + +import kotlinx.coroutines.* +import top.r3944realms.ltdmanager.napcat.NapCatClient +import top.r3944realms.ltdmanager.napcat.event.NapCatEvent +import top.r3944realms.ltdmanager.napcat.event.group.GetGroupIgnoredNotifiesEvent +import top.r3944realms.ltdmanager.napcat.event.group.GetGroupSystemMsgEvent +import top.r3944realms.ltdmanager.napcat.request.group.GetGroupIgnoredNotifiesRequest +import top.r3944realms.ltdmanager.napcat.request.group.GetGroupSystemMsgRequest +import top.r3944realms.ltdmanager.napcat.request.group.SetGroupAddRequestRequest +import top.r3944realms.ltdmanager.utils.LoggerUtil + +class GroupRequestHandlerModule( + private val client: NapCatClient, + private val targetGroupId: Long, + private val pollIntervalMillis: Long = 30_000L, +) : BaseModule() { + + override val name: String = "GroupRequestHandlerModule" + + private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob()) + + private val stopSignal = CompletableDeferred() + + override fun onLoad() { + LoggerUtil.logger.info("模块[$name]已装载，目标群组: $targetGroupId，轮询间隔: ${pollIntervalMillis}ms") + + // 启动轮询协程 + scope.launch { + LoggerUtil.logger.info("[$name] 轮询协程启动") + try { + while (isActive) { + try { + LoggerUtil.logger.debug("[$name] 开始轮询群组请求...") + + // 获取正常请求 + LoggerUtil.logger.debug("[$name] 获取正常群系统消息...") + val systemEvent: GetGroupSystemMsgEvent = + client.send(GetGroupSystemMsgRequest()) + LoggerUtil.logger.debug("[$name] 获取到 ${systemEvent.data.invitedRequest.size} 个邀请请求和 ${systemEvent.data.joinRequests.size} 个加群请求") + + handleEvent(systemEvent) + + // 获取被过滤的请求 + LoggerUtil.logger.debug("[$name] 获取被过滤的群系统消息...") + val ignoredEvent: GetGroupIgnoredNotifiesEvent = + client.send(GetGroupIgnoredNotifiesRequest()) + LoggerUtil.logger.debug("[$name] 获取到 ${ignoredEvent.data.invitedRequest.size} 个被过滤的邀请请求和 ${ignoredEvent.data.joinRequests.size} 个被过滤的加群请求") + + handleEvent(ignoredEvent) + + LoggerUtil.logger.debug("[$name] 本轮轮询完成，等待 ${pollIntervalMillis}ms 后继续") + } catch (e: Exception) { + LoggerUtil.logger.error("[$name] 轮询执行异常", e) + } + delay(pollIntervalMillis) + } + } catch (e: CancellationException) { + LoggerUtil.logger.info("[$name] 轮询协程收到取消信号") + } finally { + LoggerUtil.logger.info("[$name] 轮询协程退出，完成 stopSignal") + stopSignal.complete(Unit) + } + } + } + + override suspend fun stop() { + LoggerUtil.logger.info("[$name] 收到停止命令，开始关闭协程...") + scope.cancel() + LoggerUtil.logger.info("[$name] 等待协程退出...") + stopSignal.await() + LoggerUtil.logger.info("[$name] 协程已退出，卸载模块资源") + onUnload() + } + + public override fun onUnload() { + LoggerUtil.logger.info("[$name] 已卸载") + } + + private suspend fun handleEvent(event: Any) { + LoggerUtil.logger.debug("[$name] 处理群请求事件: ${event.javaClass.simpleName}") + + val provider: GroupRequestProvider? = when (event) { + is GetGroupSystemMsgEvent -> { + LoggerUtil.logger.debug("[$name] 识别为正常群系统消息事件") + event.asProvider() + } + is GetGroupIgnoredNotifiesEvent -> { + LoggerUtil.logger.debug("[$name] 识别为被过滤群系统消息事件") + event.asProvider() + } + else -> { + LoggerUtil.logger.warn("[$name] 未知的事件类型: ${event.javaClass}") + null + } + } + + provider?.getAllRequests()?.forEach { request -> + if (!request.checked) { + LoggerUtil.logger.info("[$name] 处理群请求: requestId=${request.requestId}, groupId=${request.groupId}, actor=${request.actor}, type=${request.javaClass}") + if (request.groupId == targetGroupId) { + LoggerUtil.logger.info("[$name] 请求匹配目标群组 $targetGroupId，查询玩家状态...") + val status = queryPlayerStatus(request.invitorUin) + LoggerUtil.logger.info("[$name] 玩家 ${request.invitorUin} 状态查询结果: $status") + + when (status) { + 1 -> { + LoggerUtil.logger.info("[$name] 允许加群: groupId=${request.groupId}, invitorUin=${request.invitorUin}, requestId=${request.requestId}") + val setGroupAddRequestRequest = SetGroupAddRequestRequest( + true, + request.requestId.toString() + ) + client.send(setGroupAddRequestRequest) + LoggerUtil.logger.info("[$name] 已发送同意加群请求") + } + + 2, 3 -> { + val reason = if (status == 2) "审核未通过" else "待审核" + LoggerUtil.logger.info("[$name] 拒绝加群: groupId=${request.groupId}, invitorUin=${request.invitorUin}, status=$status, reason=$reason, requestId=${request.requestId}") + val request1 = SetGroupAddRequestRequest( + false, + request.requestId.toString(), + reason + ) + client.send(request1) + LoggerUtil.logger.info("[$name] 已发送拒绝加群请求") + } + + else -> { + LoggerUtil.logger.warn("[$name] 未知玩家状态($status)，拒绝请求: invitorUin=${request.invitorUin}, requestId=${request.requestId}") + val request1 = SetGroupAddRequestRequest( + false, + request.requestId.toString(), + "未知状态" + ) + client.send(request1) + LoggerUtil.logger.info("[$name] 已发送拒绝加群请求（未知状态）") + } + } + } else { + LoggerUtil.logger.debug("[$name] 请求群组 ${request.groupId} 不匹配目标群组 $targetGroupId，跳过处理") + } + } + } + + LoggerUtil.logger.debug("[$name] 事件处理完成") + } + + private fun queryPlayerStatus(actor: Long): Int { + LoggerUtil.logger.debug("[$name] 查询玩家状态: qq=$actor") + try { + getConnection().use { conn -> + val stmt = conn.prepareStatement( + "SELECT status FROM minecraft_manager_ltd.players WHERE qq=?" + ) + stmt.setLong(1, actor) + val rs = stmt.executeQuery() + val status = if (rs.next()) rs.getInt("status") else 0 + LoggerUtil.logger.debug("[$name] 数据库查询结果: qq=$actor, status=$status") + return status + } + } catch (e: Exception) { + LoggerUtil.logger.error("[$name] 查询玩家状态失败: qq=$actor", e) + return 0 + } + } + + /** + * 所有群系统请求的统一访问接口 + */ + interface GroupRequestProvider { + fun getAllRequests(): List + } + + /** + * 正常请求事件实现 + */ + private fun GetGroupSystemMsgEvent.asProvider(): GroupRequestProvider = object : GroupRequestProvider { + override fun getAllRequests(): List { + return data.invitedRequest + data.joinRequests + } + } + + /** + * 被过滤请求事件实现 + */ + private fun GetGroupIgnoredNotifiesEvent.asProvider(): GroupRequestProvider = object : GroupRequestProvider { + override fun getAllRequests(): List { + return data.invitedRequest + data.joinRequests + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/module/ModuleManager.kt b/src/main/kotlin/top/r3944realms/ltdmanager/module/ModuleManager.kt new file mode 100644 index 0000000..639bfb7 --- /dev/null +++ b/src/main/kotlin/top/r3944realms/ltdmanager/module/ModuleManager.kt @@ -0,0 +1,113 @@ +package top.r3944realms.ltdmanager.module + +import top.r3944realms.ltdmanager.utils.LoggerUtil + +class ModuleManager { + + private val modules = mutableMapOf() + + /** + * 注册模块到管理器 + */ + fun registerModule(module: BaseModule) { + if (modules.containsKey(module.name)) { + LoggerUtil.logger.warn("模块已注册: ${module.name}") + return + } + modules[module.name] = module + LoggerUtil.logger.info("模块注册: ${module.name}") + } + + /** + * 加载指定模块 + */ + fun loadModule(name: String) { + val module = modules[name] + if (module == null) { + LoggerUtil.logger.warn("尝试加载不存在的模块: $name") + return + } + if (module.loaded) { + LoggerUtil.logger.info("模块已加载: $name") + return + } + try { + module.load() + LoggerUtil.logger.info("模块加载: $name") + } catch (e: Exception) { + LoggerUtil.logger.error("加载模块 $name 失败", e) + } + } + + /** + * 卸载指定模块 + */ + fun unloadModule(name: String) { + val module = modules[name] + if (module == null) { + LoggerUtil.logger.warn("尝试卸载不存在的模块: $name") + return + } + if (!module.loaded) { + LoggerUtil.logger.info("模块未加载: $name") + return + } + try { + module.unload() + LoggerUtil.logger.info("模块卸载: $name") + } catch (e: Exception) { + LoggerUtil.logger.warn("卸载模块 $name 失败", e) + } + } + + /** + * 卸载所有模块 + */ + fun unloadAll() { + modules.values.forEach { module -> + try { + if (module.loaded) { + module.unload() + LoggerUtil.logger.info("模块卸载: ${module.name}") + } + } catch (e: Exception) { + LoggerUtil.logger.warn("卸载模块 ${module.name} 失败", e) + } + } + } + + /** + * 获取所有模块名称 + */ + fun getModuleNames(): List = modules.keys.toList() + + /** + * 检查模块是否已加载 + */ + fun isModuleLoaded(name: String): Boolean { + return modules[name]?.loaded ?: false + } + /** + * 扩展方法：批量加载模块 + */ + fun ModuleManager.loadModules(vararg names: String) { + names.forEach { loadModule(it) } + } + + /** + * 扩展方法：批量卸载模块 + */ + fun ModuleManager.unloadModules(vararg names: String) { + names.forEach { unloadModule(it) } + } + /** + * 关闭所有模块 + */ + suspend fun stopAllModules() { + modules.values.forEach { module -> + if (module.loaded) { + module.stop() + } + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/module/RconPlayerListModule.kt b/src/main/kotlin/top/r3944realms/ltdmanager/module/RconPlayerListModule.kt new file mode 100644 index 0000000..01678a5 --- /dev/null +++ b/src/main/kotlin/top/r3944realms/ltdmanager/module/RconPlayerListModule.kt @@ -0,0 +1,501 @@ +package top.r3944realms.ltdmanager.module + +import kotlinx.coroutines.* +import kotlinx.serialization.Serializable +import kotlinx.serialization.encodeToString +import kotlinx.serialization.json.Json +import top.r3944realms.ltdmanager.core.config.YamlConfigLoader +import top.r3944realms.ltdmanager.napcat.NapCatClient +import top.r3944realms.ltdmanager.napcat.data.ID +import top.r3944realms.ltdmanager.napcat.data.MessageElement +import top.r3944realms.ltdmanager.napcat.data.MessageType +import top.r3944realms.ltdmanager.napcat.event.message.GetGroupMsgHistoryEvent +import top.r3944realms.ltdmanager.napcat.request.message.GetGroupMsgHistoryRequest +import top.r3944realms.ltdmanager.napcat.request.message.SendForwardMsgRequest +import top.r3944realms.ltdmanager.napcat.request.other.SendGroupMsgRequest +import top.r3944realms.ltdmanager.utils.CmdUtil +import top.r3944realms.ltdmanager.utils.LoggerUtil +import java.io.File +import java.util.concurrent.TimeoutException + +class RconPlayerListModule( + private val pollIntervalMillis: Long = 30_000L, + private val timeout: Long = 2_000L, + private val cooldownMillis: Long = 30_000L, // 默认 30 秒 + private var lastSuccessTime: Long = 0L, + private var msgHistoryCheck: Int = 5, + private val targetGroupId: Long, + private val selfId: Long, + private val selfNickName: String, + private val keywords: Set = setOf("查看玩家列表", "玩家列表", "在线玩家") +) : BaseModule() { + + private val stopSignal = CompletableDeferred() // 用于等待协程退出 + override val name: String = "RconPlayerListModule" + private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob()) + + // 持久化文件路径 + private val stateFile = File("rcon_playerlist_state.json") + + // 保存最新触发过的消息 realId 和 time + private var moduleState: ModuleState = loadState() + + private val rconPath: String + get() = YamlConfigLoader.loadToolConfig().rcon.mcRconToolPath + ?: throw IllegalStateException("RCON 工具路径未配置") + + private val rconConfigPath: String + get() = YamlConfigLoader.loadToolConfig().rcon.mcRconToolConfigPath + ?: throw IllegalStateException("Rcon配置路径未配置") + + override fun onLoad() { + LoggerUtil.logger.info("[$name] 模块已装载，目标群组: $targetGroupId，轮询间隔: ${pollIntervalMillis}ms") + LoggerUtil.logger.info("[$name] 上次触发状态: realId=${moduleState.lastTriggeredRealId}, time=${moduleState.lastTriggerTime}") + LoggerUtil.logger.info("[$name] 关键词列表: $keywords") + + scope.launch { + LoggerUtil.logger.info("[$name] 轮询协程启动") + try { + while (isActive) { + LoggerUtil.logger.debug("[$name] 开始轮询群消息历史...") + try { + val historyEvent = napCatClient.send( + GetGroupMsgHistoryRequest( + count = msgHistoryCheck, + groupId = ID.long(targetGroupId) + ) + ) as? GetGroupMsgHistoryEvent + + val messages = historyEvent?.data?.messages ?: emptyList() + LoggerUtil.logger.debug("[$name] 获取到 ${messages.size} 条最近消息") + + // 找到比 lastTriggeredRealId 更新的触发消息 + val triggerMessages = messages.filter { msg -> + ((msg.time > moduleState.lastTriggerTime || + (msg.time == moduleState.lastTriggerTime && msg.realId > moduleState.lastTriggeredRealId)) && msg.userId != selfId) && + msg.message.any { seg -> + seg.type == MessageType.Text && + seg.data.text?.let { text -> + keywords.any { keyword -> + text == keyword + } + } == true + } + } + + LoggerUtil.logger.debug("[$name] 找到 ${triggerMessages.size} 条符合条件的触发消息") + + if (triggerMessages.isNotEmpty()) { + val triggerMsg = triggerMessages.maxBy { it.time } + LoggerUtil.logger.info("[$name] 找到触发消息 realId=${triggerMsg.realId}, time=${triggerMsg.time}, userId=${triggerMsg.userId}") + + val now = System.currentTimeMillis() + + // ✅ 首次触发允许直接执行 + val canTrigger = (lastSuccessTime == 0L) || (now - lastSuccessTime >= cooldownMillis) + + if (!canTrigger) { + val remaining = ((cooldownMillis - (now - lastSuccessTime)) / 1000).coerceAtLeast(1) + LoggerUtil.logger.info("[$name] 冷却中，拒绝执行，剩余 $remaining 秒") + sendCooldownMessage(napCatClient, triggerMsg.realId, triggerMsg.time) + continue + } + + // 执行 RCON + val commands = listOf("forge tps","list") + LoggerUtil.logger.info("[$name] 执行 RCON 命令: $commands") + + + runCatching { + val tpsOutput = runCatching { + CmdUtil.runExeCommand(rconPath, "-c", rconConfigPath, "-T", (timeout / 1000).toString() + "s", "forge tps") + }.getOrElse { ex -> + LoggerUtil.logger.warn("[$name] 执行 forge tps 失败: ${ex.message}") + "" + } + + val listOutput = runCatching { + CmdUtil.runExeCommand(rconPath, "-c", rconConfigPath, "-T", (timeout / 1000).toString() + "s", "list") + }.getOrElse { ex -> + LoggerUtil.logger.warn("[$name] 执行 list 失败: ${ex.message}") + "" + } + + // 合并输出，再解析 + buildString { + appendLine(tpsOutput.trim()) + appendLine("--------") + appendLine(listOutput.trim()) + } + } .onFailure { ex -> + if (ex is TimeoutException) { + LoggerUtil.logger.warn("[$name] RCON 连接超时: ${ex.message}") + sendFailedMessage(napCatClient, triggerMsg.realId, triggerMsg.time) + } else { + LoggerUtil.logger.error("[$name] RCON 命令执行失败", ex) + sendFailedMessage( + napCatClient, + triggerMsg.realId, + triggerMsg.time, + "系统内部错误请联系管理员：${ex.message}" + ) + throw ex + } + } .onSuccess { output -> + lastSuccessTime = now // ✅ 成功后记录冷却开始时间 + LoggerUtil.logger.info("[$name] RCON 命令执行成功，输出长度: ${output.length}") + LoggerUtil.logger.debug("[$name] RCON 输出内容: $output") + val tpsInfo = parseTPS(output) + val playerListInfo = parsePlayerList(output) + LoggerUtil.logger.info("[$name] 解析成功: TPS=${tpsInfo.overall.meanTPS}, 在线 ${playerListInfo.onlineCount} 人") + // 发送转发消息 + sendForwardMessage(napCatClient, tpsInfo, playerListInfo, triggerMsg.realId, triggerMsg.time) + } + } else { + LoggerUtil.logger.debug("[$name] 未找到新的触发消息") + } + } catch (e: Exception) { + LoggerUtil.logger.error("[$name] 轮询玩家列表或发送转发消息失败", e) + } + LoggerUtil.logger.debug("[$name] 本轮轮询完成，等待 ${pollIntervalMillis}ms") + delay(pollIntervalMillis) + } + } catch (e: CancellationException) { + LoggerUtil.logger.info("[$name] 轮询协程收到取消信号") + } finally { + LoggerUtil.logger.info("[$name] 轮询协程退出，完成 stopSignal") + stopSignal.complete(Unit) + } + } + } + + public override fun onUnload() { + LoggerUtil.logger.info("[$name] 模块已卸载") + saveState(moduleState.lastTriggeredRealId, moduleState.lastTriggerTime) // 卸载时保存 + } + + override suspend fun stop() { + LoggerUtil.logger.info("[$name] 收到停止命令，开始关闭协程...") + scope.cancel() // 取消协程 + LoggerUtil.logger.info("[$name] 等待协程退出...") + stopSignal.await() // 等待协程完成 + LoggerUtil.logger.info("[$name] 协程已退出，卸载模块资源") + onUnload() // 卸载模块资源，保存状态 + } + private suspend fun sendCooldownMessage(client: NapCatClient, realId: Long, time: Long) { + val now = System.currentTimeMillis() + val remaining = ((cooldownMillis - (now - lastSuccessTime)) / 1000).coerceAtLeast(1) // 至少显示 1 秒 + val msg = "⏳ 查询过于频繁，请稍后再试（剩余 $remaining 秒）" + + LoggerUtil.logger.info("[$name] 发送冷却提示: $msg") + + val request = SendGroupMsgRequest( + MessageElement.reply(ID.long(realId), msg), + ID.long(targetGroupId) + ) + client.sendUnit(request) + + // 更新触发状态，但不更新 lastSuccessTime（避免延长冷却） + moduleState.lastTriggeredRealId = realId + moduleState.lastTriggerTime = time + saveState(realId, time) + } + + private val failedMessages = listOf( + "💥 土豆服务器炸了，请稍后再试", + "🥔 土豆过热，正在冷却中……", + "🐌 RCON 响应太慢，像蜗牛一样", + "🛠️ 系统开小差了，请联系管理员", + "⚠️ 服务器没理我，可能在打盹", + "🔥 电路冒烟了！查询失败" + ) + private suspend fun sendFailedMessage( + client: NapCatClient, + realId: Long, + time: Long, + text: String? = null + ) { + // 如果调用时传了 text，就用 text，否则随机选择一条 + val finalText = text ?: failedMessages.random() + + LoggerUtil.logger.info("[$name] 发送失败消息: realId=$realId, text=$finalText") + + val request = SendGroupMsgRequest( + MessageElement.reply(ID.long(realId), finalText), + ID.long(targetGroupId) + ) + client.sendUnit(request) + LoggerUtil.logger.info("[$name] 已发送 RCON 失败消息") + + // 更新触发的最大 realId + moduleState.lastTriggeredRealId = realId + moduleState.lastTriggerTime = time + saveState(realId, time) // 保存到文件 + } + private suspend fun sendForwardMessage(client: NapCatClient, tps: TPSInfo, info: PlayerListInfo, realId: Long, time: Long) { + LoggerUtil.logger.info("[$name] 发送转发消息: realId=$realId, TPS=${tps.overall.meanTPS}, 在线玩家数=${info.onlineCount}") + + val messages = mutableListOf() + + // ① 服务器TPS状态 + val tpsMessage = SendForwardMsgRequest.Message( + data = SendForwardMsgRequest.PurpleData( + text = buildString { + appendLine("⚡ 服务器性能状态 ${getStatusEmoji(tps.status)}") + appendLine("═".repeat(25)) + appendLine("整体TPS: ${"%.3f".format(tps.overall.meanTPS)} （${getStatusDescription(tps.status)}）") + appendLine("平均Tick耗时: ${"%.3f".format(tps.overall.meanTickTime)} ms") + appendLine() + appendLine("📌 各维度详情:") + tps.dimensions.forEach { + appendLine("- ${it.name}: ${"%.3f".format(it.meanTPS)} TPS, ${"%.3f".format(it.meanTickTime)} ms") + } + } + ), + type = MessageType.Text + ) + messages.add(tpsMessage) + + // ② 玩家列表 + if (info.players.isNotEmpty()) { + val playerListMessage = SendForwardMsgRequest.Message( + data = SendForwardMsgRequest.PurpleData( + text = buildString { + appendLine("👥 玩家列表") + appendLine("─".repeat(20)) + appendLine("在线人数: ${info.onlineCount}") + info.players.forEachIndexed { index, player -> + appendLine("${index + 1}. 🧑‍💻 $player") + } + } + ), + type = MessageType.Text + ) + messages.add(playerListMessage) + } else { + messages.add( + SendForwardMsgRequest.Message( + data = SendForwardMsgRequest.PurpleData("😴 当前没有玩家在线"), + type = MessageType.Text + ) + ) + } + + // ③ 摘要消息 + val summaryMessage = SendForwardMsgRequest.Message( + data = SendForwardMsgRequest.PurpleData( + text = buildString { + appendLine("📊 查询摘要") + appendLine("─".repeat(15)) + appendLine("TPS: ${"%.3f".format(tps.overall.meanTPS)} - ${getStatusDescription(tps.status)}") + appendLine("在线玩家: ${info.onlineCount} 人") + appendLine("🕐 ${getCurrentTime()}") + appendLine("🤖 由 $selfNickName 提供") + } + ), + type = MessageType.Text + ) + messages.add(summaryMessage) + + val topMessage = SendForwardMsgRequest.TopForwardMsg( + data = SendForwardMsgRequest.MessageData( + content = messages, + nickname = selfNickName, + userId = ID.long(selfId), + ), + type = MessageType.Node + ) + + val request = SendForwardMsgRequest( + groupId = ID.long(targetGroupId), + messages = listOf(topMessage), + news = listOf( + SendForwardMsgRequest.ForwardModelNews("点击查看服务器状态与玩家列表"), + SendForwardMsgRequest.ForwardModelNews("TPS: ${"%.1f".format(tps.overall.meanTPS)} 在线 ${info.onlineCount} 人"), + SendForwardMsgRequest.ForwardModelNews("更新时间: ${getCurrentTime()}") + ), + prompt = "TPS + 玩家列表查询结果", + source = "🎮 服务器状态", + summary = "TPS ${"%.1f".format(tps.overall.meanTPS)}, 在线玩家: ${info.onlineCount}人", + ) + + client.sendUnit(request) + LoggerUtil.logger.info("[$name] 已发送 TPS+玩家列表 转发消息") + moduleState.lastTriggeredRealId = realId + moduleState.lastTriggerTime = time + saveState(realId, time) + } + + // 添加时间格式化函数 + private fun getCurrentTime(): String { + return java.time.LocalDateTime.now().format( + java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss") + ) + } +// 在类内部添加以下数据类和函数 + + @Serializable + data class TPSInfo( + val dimensions: List, + val overall: OverallTPS, + val status: ServerStatus + ) { + @Serializable + data class DimensionTPS( + val name: String, + val meanTickTime: Double, + val meanTPS: Double + ) + @Serializable + data class OverallTPS( + val meanTickTime: Double, + val meanTPS: Double + ) + + enum class ServerStatus { + EXCELLENT, // TPS = 20.0 + GOOD, // TPS >= 18.0 + FAIR, // TPS >= 15.0 + POOR, // TPS >= 10.0 + CRITICAL // TPS < 10.0 + } + } + + // 修改 parsePlayerList 函数来处理组合输出 + private fun parsePlayerList(output: String): PlayerListInfo { + LoggerUtil.logger.debug("[$name] 解析玩家列表输出: ${output.take(100)}...") + + // 检查是否是连接超时错误 + if (output.contains("dial tcp") && output.contains("i/o timeout")) { + LoggerUtil.logger.warn("[$name] 检测到连接超时错误") + throw TimeoutException("服务器不可达") + } + + // 分割输出，获取玩家列表部分 + val parts = output.split("--------") + val playerListOutput = if (parts.size > 1) parts[1].trim() else output + + val regex = Regex("""There are (\d+) of a max of \d+ players online:\s*(.*)""") + val match = regex.find(playerListOutput) + + if (match == null) { + LoggerUtil.logger.warn("[$name] 无法解析玩家列表输出，返回空列表") + return PlayerListInfo(0, emptyList()) + } + + val onlineCount = match.groupValues[1].toInt() + val playersString = match.groupValues[2] + + val players = playersString.split(",").map { it.trim() }.filter { it.isNotEmpty() } + + LoggerUtil.logger.debug("[{}] 解析完成: 在线 {} 人，玩家列表: {}", name, onlineCount, players) + return PlayerListInfo(onlineCount, players) + } + + // 修改 parseTPS 函数来处理组合输出 + private fun parseTPS(output: String): TPSInfo { + LoggerUtil.logger.debug("[$name] 解析TPS输出: ${output.take(100)}...") + + // 分割输出，获取TPS部分 + val parts = output.split("--------") + val tpsOutput = parts[0].trim() + + val dimensionRegex = Regex("""Dim (.+?): Mean tick time: (\d+\.\d+) ms\. Mean TPS: (\d+\.\d+)""") + val overallRegex = Regex("""Overall: Mean tick time: (\d+\.\d+) ms\. Mean TPS: (\d+\.\d+)""") + + val dimensions = mutableListOf() + var overall: TPSInfo.OverallTPS? = null + + tpsOutput.lineSequence().forEach { line -> + // 解析维度TPS + dimensionRegex.find(line)?.let { match -> + val name = match.groupValues[1] + val meanTickTime = match.groupValues[2].toDouble() + val meanTPS = match.groupValues[3].toDouble() + + dimensions.add(TPSInfo.DimensionTPS(name, meanTickTime, meanTPS)) + } + + // 解析总体TPS + overallRegex.find(line)?.let { match -> + val meanTickTime = match.groupValues[1].toDouble() + val meanTPS = match.groupValues[2].toDouble() + + overall = TPSInfo.OverallTPS(meanTickTime, meanTPS) + } + } + + if (overall == null) { + throw IllegalArgumentException("无法解析TPS输出: $output") + } + + // 确定服务器状态 + val status = when (overall!!.meanTPS) { + 20.0 -> TPSInfo.ServerStatus.EXCELLENT + in 18.0..19.99 -> TPSInfo.ServerStatus.GOOD + in 15.0..17.99 -> TPSInfo.ServerStatus.FAIR + in 10.0..14.99 -> TPSInfo.ServerStatus.POOR + else -> TPSInfo.ServerStatus.CRITICAL + } + + return TPSInfo(dimensions, overall!!, status) + } + + // 获取服务器状态表情符号 + private fun getStatusEmoji(status: TPSInfo.ServerStatus): String { + return when (status) { + TPSInfo.ServerStatus.EXCELLENT -> "💚" // 绿色心形，优秀 + TPSInfo.ServerStatus.GOOD -> "💛" // 黄色心形，良好 + TPSInfo.ServerStatus.FAIR -> "🟡" // 黄色圆形，一般 + TPSInfo.ServerStatus.POOR -> "🟠" // 橙色圆形，较差 + TPSInfo.ServerStatus.CRITICAL -> "🔴" // 红色圆形，严重 + } + } + + // 获取服务器状态描述 + private fun getStatusDescription(status: TPSInfo.ServerStatus): String { + return when (status) { + TPSInfo.ServerStatus.EXCELLENT -> "优秀" + TPSInfo.ServerStatus.GOOD -> "良好" + TPSInfo.ServerStatus.FAIR -> "一般" + TPSInfo.ServerStatus.POOR -> "较差" + TPSInfo.ServerStatus.CRITICAL -> "严重" + } + } + data class PlayerListInfo( + val onlineCount: Int, + val players: List + ) + + + + // ---------------- 持久化部分 ---------------- + + @Serializable + data class ModuleState(var lastTriggeredRealId: Long, var lastTriggerTime: Long) + + private fun saveState(realId: Long, time: Long) { + try { + val state = ModuleState(realId, time) + stateFile.writeText(Json.encodeToString(state)) + LoggerUtil.logger.info("[$name] 已保存状态: lastTriggeredRealId=$realId, lastTriggerTime=$time") + } catch (e: Exception) { + LoggerUtil.logger.error("[$name] 保存状态失败", e) + } + } + + private fun loadState(): ModuleState { + return try { + if (!stateFile.exists()) { + LoggerUtil.logger.info("[$name] 状态文件不存在，使用默认值") + return ModuleState(-1L, 0L) + } + val state = Json.decodeFromString(stateFile.readText()) + LoggerUtil.logger.info("[$name] 成功加载状态: lastTriggeredRealId=${state.lastTriggeredRealId}, lastTriggerTime=${state.lastTriggerTime}") + state + } catch (e: Exception) { + LoggerUtil.logger.warn("[$name] 读取状态失败，使用默认值", e) + ModuleState(-1L, 0L) + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/Developing.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/Developing.kt index 21d04ae..a0e9228 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/Developing.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/Developing.kt @@ -1,4 +1,4 @@ package top.r3944realms.ltdmanager.napcat @Target(AnnotationTarget.CLASS) -annotation class Developing() +annotation class Developing \ No newline at end of file diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/NapCatClient.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/NapCatClient.kt index c7cb62e..95f2d2c 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/NapCatClient.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/NapCatClient.kt @@ -1,134 +1,200 @@ package top.r3944realms.ltdmanager.napcat import io.ktor.client.* +import io.ktor.client.call.* import io.ktor.client.engine.cio.* -import io.ktor.client.plugins.websocket.* -import io.ktor.websocket.* +import io.ktor.client.request.* +import io.ktor.http.* +import io.ktor.utils.io.core.* import kotlinx.coroutines.* -import kotlinx.coroutines.channels.Channel -import kotlinx.coroutines.channels.ReceiveChannel -import kotlinx.coroutines.flow.MutableStateFlow -import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.sync.Mutex +import kotlinx.coroutines.sync.Semaphore import kotlinx.coroutines.sync.withLock -import kotlinx.serialization.encodeToString -import kotlinx.serialization.json.Json -import org.slf4j.LoggerFactory -import top.r3944realms.ltdmanager.napcat.events.NapCatEvent -import top.r3944realms.ltdmanager.napcat.requests.NapCatRequest -import top.r3944realms.ltdmanager.napcat.requests.PrioritizedRequest -import top.r3944realms.ltdmanager.napcat.requests.PriorityMessageQueue -import kotlin.coroutines.coroutineContext +import kotlinx.coroutines.sync.withPermit +import top.r3944realms.ltdmanager.core.config.YamlConfigLoader +import top.r3944realms.ltdmanager.napcat.event.NapCatEvent +import top.r3944realms.ltdmanager.napcat.request.NapCatRequest +import top.r3944realms.ltdmanager.utils.Environment +import top.r3944realms.ltdmanager.utils.LoggerUtil +import java.util.* +import kotlin.collections.ArrayDeque +import kotlin.collections.isNotEmpty +import kotlin.time.Duration.Companion.seconds + +class NapCatClient private constructor() : Closeable { + private val client = HttpClient(CIO) + private val httpConfig = YamlConfigLoader.loadHttpConfig() + private val token = httpConfig.decryptedToken + + // 限流 (同时最多 3 个请求) + private val semaphore = Semaphore(3) + + // 普通优先级队列 + private val requestQueue = PriorityQueue(compareBy { it.priority }) + private val queueMutex = Mutex() + + // 紧急队列 (先进先出，最多 10 个) + private val urgentQueue = ArrayDeque(10) -class NapCatClient(private val wsUrl: String, private val token: String) { - private val client = HttpClient(CIO) { install(WebSockets) } private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob()) - private val logger = LoggerFactory.getLogger(NapCatClient::class.java) - // 请求-响应匹配队列（FIFO） - private val pendingResponses = Channel>(capacity = Channel.UNLIMITED) - private val mutex = Mutex() - - // 事件通道（用于非请求响应的消息） - // 优先级队列（按优先级发送请求） - private val priorityQueue = PriorityMessageQueue() - private val eventChannel = Channel(capacity = Channel.UNLIMITED) - private val _connectionState = MutableStateFlow(false) - val connectionState = _connectionState.asStateFlow() - - // 子协程引用 - private var receiverJob: Job? = null - private var senderJob: Job? = null - - suspend fun start() { - receiverJob = scope.launch { launchReceiver() } - senderJob = scope.launch { launchSender() } - } - - @OptIn(ExperimentalCoroutinesApi::class) - private suspend fun launchReceiver() { - try { - client.wss( - host = wsUrl.removePrefix("ws://").substringBefore(':'), - port = wsUrl.substringAfterLast(':').toInt(), - path = "/" - ) { - send(Frame.Text("""{"token":"$token"}""")) - _connectionState.value = true - - while (true) { - when (val frame = incoming.receive()) { - is Frame.Text -> { - val event = Json.decodeFromString(frame.readText()) - // 尝试匹配最近的请求 - if (!pendingResponses.isEmpty) { - pendingResponses.tryReceive().getOrNull()?.complete(event) - } else { - eventChannel.send(event) // 非请求响应的消息 - } - } - is Frame.Close -> break - else -> {} + init { + scope.launch { + while (isActive) { + val item = queueMutex.withLock { + when { + urgentQueue.isNotEmpty() -> urgentQueue.removeFirst() + requestQueue.isNotEmpty() -> requestQueue.poll() + else -> null } } - } - } finally { - _connectionState.value = false - pendingResponses.close() - eventChannel.close() - priorityQueue.close() - } - } - private suspend fun launchSender() { - while (coroutineContext.isActive) { - try { - // 从优先级队列取出请求（自动按优先级排序） - val prioritized = priorityQueue.dequeue() - val request = prioritized.request - // 发送前注册响应监听器 - val deferred = CompletableDeferred() - mutex.withLock { - pendingResponses.send(deferred) + if (item == null) { + // 队列空 -> 挂起一小段时间等待新任务 + delay(20) + continue } - // 发送请求 - client.webSocketSession(wsUrl).send(Frame.Text(Json.encodeToString(request))) - - // 等待响应（超时由外层 sendRequest 控制） - deferred.await() - } catch (e: Exception) { - logger.error("发送请求失败", e) - delay(1000) // 错误时暂停1秒 + processRequest(item) } } } + /** + * 普通发送 (带优先级) 无返回事件版本 + * 适用于只需要发送请求，不关心返回结果的情况，例如 SetGroupAddRequestRequest + */ + suspend fun sendUnit( + request: NapCatRequest, + retries: Int = 3, + priority: Int = 5 + ) { + checkRequest(request) + val deferred = CompletableDeferred() + queueMutex.withLock { + requestQueue.add(QueueItem(request, deferred, retries, priority, expectsEvent = false)) + } + deferred.await() + } /** - * 发送带优先级的请求 - * @param priority 优先级（HIGH_PRIORITY/DEFAULT_PRIORITY/LOW_PRIORITY） - * @param timeout 超时时间（毫秒） + * 紧急发送 (先进先出, 最多 10 个) 无返回事件版本 */ - suspend fun sendRequest( + @Throws(IllegalStateException::class) + suspend fun sendUrgentUnit( request: NapCatRequest, - priority: Int = PrioritizedRequest.DEFAULT_PRIORITY, - timeout: Long = 5000 - ): NapCatEvent = withTimeout(timeout) { - val deferred = CompletableDeferred() - // 将请求加入优先级队列 - priorityQueue.enqueue(PrioritizedRequest(request, priority)) - deferred.await() // 等待响应（由 launchSender 和 launchReceiver 协作完成） + retries: Int = 3 + ) { + checkRequest(request) + val deferred = CompletableDeferred() + queueMutex.withLock { + if (urgentQueue.size >= 10) { + throw IllegalStateException("紧急任务队列已满 (最多 10 个)") + } + urgentQueue.addLast(QueueItem(request, deferred, retries, priority = Int.MIN_VALUE, expectsEvent = false)) + } + deferred.await() } - val incomingEvents: ReceiveChannel = eventChannel - private fun cleanup() { - _connectionState.value = false - pendingResponses.close() - eventChannel.close() - priorityQueue.close() + /** + * 普通发送 (带优先级) + */ + suspend fun send( + request: NapCatRequest, + retries: Int = 3, + priority: Int = 5 + ): T { + checkRequest(request) + val deferred = CompletableDeferred() + queueMutex.withLock { + requestQueue.add(QueueItem(request, deferred, retries, priority, expectsEvent = true)) + } + return deferred.await() } - fun close() { - scope.cancel("NapCatClient closed") - cleanup() + + /** + * 紧急发送 (先进先出, 最多 10 个) + */ + @Throws(IllegalStateException::class) + suspend fun sendUrgent( + request: NapCatRequest, + retries: Int = 3 + ): T { + checkRequest(request) + val deferred = CompletableDeferred() + queueMutex.withLock { + if (urgentQueue.size >= 10) { + throw IllegalStateException("紧急任务队列已满 (最多 10 个)") + } + urgentQueue.addLast(QueueItem(request, deferred, retries, priority = Int.MIN_VALUE, expectsEvent = true)) + } + return deferred.await() } -} \ No newline at end of file + private fun checkRequest(request: NapCatRequest) { + // 如果请求类标记为 @Developing，则抛出异常 + if (request::class.annotations.any { it.annotationClass == Developing::class }) { + throw UnsupportedOperationException( + "请求类 ${request::class.simpleName} 标记为 @Developing，不支持发送" + ) + } + + } + + private suspend fun processRequest(item: QueueItem) { + semaphore.withPermit { + val (request, deferred, retries, _, expectsEvent) = item + var attempt = 0 + var lastError: Throwable? = null + + while (attempt < retries) { + try { + val apiUrl = URLBuilder(httpConfig.url.toString()).apply { + encodedPath += request.path() + }.build() + + if(!Environment.isProduction()) LoggerUtil.logger.debug("发送请求: ${request.toJSON()}") + + val response = client.post(apiUrl) { + contentType(ContentType.Application.Json) + header("Authorization", "Bearer $token") + setBody(request.toJSON()) + } + + if (!response.status.isSuccess()) { + throw IllegalStateException("请求失败: HTTP ${response.status}") + } + if (response.contentType()?.match(ContentType.Application.Json) != true && expectsEvent) { + throw IllegalStateException("请求失败: 响应类型不是 JSON (${response.contentType()})") + } + + val jsonText: String = response.body() + if(!Environment.isProduction()) LoggerUtil.logger.debug("响应: $jsonText") + if (expectsEvent) { + val event = NapCatEvent.decodeEvent(jsonText, request.type()) + @Suppress("UNCHECKED_CAST") + (deferred as CompletableDeferred).complete(event) + } else { + @Suppress("UNCHECKED_CAST") + (deferred as CompletableDeferred).complete(Unit) + } + return + } catch (e: Exception) { + lastError = e + LoggerUtil.logger.warn("请求失败, 第 ${attempt + 1} 次: ${e.message}") + delay(((attempt + 1) * 2L).seconds) // 指数退避 + } + attempt++ + } + + deferred.completeExceptionally(lastError ?: RuntimeException("未知错误")) + } + } + + override fun close() { + scope.cancel() + runBlocking { client.close() } + } + + companion object { + fun create(): NapCatClient = NapCatClient() + } +} diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/QueueItem.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/QueueItem.kt new file mode 100644 index 0000000..b38a4e6 --- /dev/null +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/QueueItem.kt @@ -0,0 +1,14 @@ +package top.r3944realms.ltdmanager.napcat + +import kotlinx.coroutines.CompletableDeferred +import top.r3944realms.ltdmanager.napcat.request.NapCatRequest + +data class QueueItem( + val request: NapCatRequest, + val deferred: CompletableDeferred<*>, + var retries: Int, + val priority: Int, + val expectsEvent: Boolean // true 表示返回 NapCatEvent, false 表示 Unit +) : Comparable { + override fun compareTo(other: QueueItem): Int = priority.compareTo(other.priority) +} diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/data/Author.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/data/Author.kt index b15c805..ce1f42d 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/data/Author.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/data/Author.kt @@ -6,15 +6,15 @@ import kotlinx.serialization.Serializable @Serializable data class Author ( @SerialName("groupId") - val groupID: String, + val groupId: String, val groupName: String, @SerialName("numId") - val numID: String, + val numId: String, @SerialName("strId") - val strID: String, + val strId: String, val type: Double, val uid: String diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/data/CollectionItemList.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/data/CollectionItemList.kt index 14030cb..22d8495 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/data/CollectionItemList.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/data/CollectionItemList.kt @@ -6,14 +6,14 @@ import kotlinx.serialization.Serializable @Serializable data class CollectionItemList ( val author: Author, - val bid: Double, - val category: Double, + val bid: Long, + val category: Long, val cid: String, val collectTime: String, val createTime: String, @SerialName("customGroupId") - val customGroupID: Double, + val customGroupId: Double, val modifyTime: String, val securityBeat: Boolean, diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/data/FriendInfo.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/data/FriendInfo.kt index a85c3dd..01f15dd 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/data/FriendInfo.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/data/FriendInfo.kt @@ -1,13 +1,15 @@ package top.r3944realms.ltdmanager.napcat.data +import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable +import kotlinx.serialization.json.JsonNames /** * 好友信息 */ @Serializable -data class FriendInfo( +data class FriendInfo @OptIn(ExperimentalSerializationApi::class) constructor( @SerialName("birthday_year") val birthdayYear: Int, @SerialName("birthday_month") @@ -15,15 +17,15 @@ data class FriendInfo( @SerialName("birthday_day") val birthdayDay: Int, @SerialName("user_id") - val userId: Long, + val userId: Int, val age: Int, - @SerialName("phone_number") + @JsonNames("phone_number", "phone_num") val phoneNum: String, val email: String, @SerialName("category_id") val categoryId: Int, val nickname: String, val remark: String, - val sex: String, + val sex: SexV2, val level: Int ) \ No newline at end of file diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/data/ID.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/data/ID.kt index 2a50dec..b89025a 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/data/ID.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/data/ID.kt @@ -1,12 +1,19 @@ package top.r3944realms.ltdmanager.napcat.data import kotlinx.serialization.Serializable +import top.r3944realms.ltdmanager.napcat.serializer.IDSerializer /** * ID */ -@Serializable +@Serializable(with = IDSerializer::class) sealed class ID { - class DoubleValue(val value: Double) : ID() + @Serializable + class LongValue(val value: Long) : ID() + @Serializable class StringValue(val value: String) : ID() + companion object { + fun long(value: Long) = LongValue(value) + fun str(value: String) = StringValue(value) + } } \ No newline at end of file diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/data/MessageElement.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/data/MessageElement.kt index a03cea6..e8f77da 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/data/MessageElement.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/data/MessageElement.kt @@ -4,7 +4,7 @@ import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable @Serializable -class MessageElement( +class MessageElement private constructor ( val type: MessageType, val data: Message? = null ) { @@ -13,7 +13,7 @@ class MessageElement( fun at(qq: ID, name: String?): MessageElement = MessageElement(MessageType.At, AtMessage(qq, name)) fun image(file: String, summary: String?): MessageElement = MessageElement(MessageType.Image, ImageMessage(file, summary)) fun json(json: String): MessageElement = MessageElement(MessageType.JSON, JSONMessage(json)) - fun face(id: Int): MessageElement = MessageElement(MessageType.Face, FaceMessage(id)) + fun face(id: Long): MessageElement = MessageElement(MessageType.Face, FaceMessage(id)) fun record(file: String): MessageElement = MessageElement(MessageType.Record, RecordMessage(file)) fun markdown(text: String): MessageElement = MessageElement(MessageType.Record, RecordMessage(text)) fun video(video: String): MessageElement = MessageElement(MessageType.Video, VideoMessage(video)) @@ -29,7 +29,7 @@ class MessageElement( } @Serializable - abstract class Message + sealed class Message /** * 文本 @@ -91,7 +91,7 @@ class MessageElement( */ @Serializable data class FaceMessage( - val id: Int + val id: Long ) : Message() /** diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/data/QQ.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/data/QQ.kt deleted file mode 100644 index a65806e..0000000 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/data/QQ.kt +++ /dev/null @@ -1,9 +0,0 @@ -package top.r3944realms.ltdmanager.napcat.data - -import kotlinx.serialization.Serializable - -@Serializable -sealed class QQ { - class DoubleValue(val value: Double) : QQ() - class StringValue(val value: String) : QQ() -} \ No newline at end of file diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/data/Sender.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/data/Sender.kt index 5204587..730ed1a 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/data/Sender.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/data/Sender.kt @@ -15,5 +15,5 @@ data class Sender ( val sex: SexV2? = null, @SerialName("user_id") - val userID: Double + val userId: Long ) \ No newline at end of file diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/FailedRequestEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/FailedRequestEvent.kt new file mode 100644 index 0000000..250fba4 --- /dev/null +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/FailedRequestEvent.kt @@ -0,0 +1,33 @@ +package top.r3944realms.ltdmanager.napcat.event + +import kotlinx.serialization.Serializable +import kotlinx.serialization.json.Json +import kotlinx.serialization.json.JsonElement + +@Serializable +data class FailedRequestEvent( + val status: Status = Status.Failed, + val retcode: Int, + val data: JsonElement?= null, + val message: String, + val wording: String, + val echo: String? = null +): NapCatEvent() { + override fun type(): String { + return "FailedRequestEvent" + } + + override fun subtype(): String { + return "FailedRequestEvent" + } + + override fun isOk(): Boolean = false + + companion object { + internal val json: Json by lazy { + Json { + ignoreUnknownKeys = true + } + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/NapCatEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/NapCatEvent.kt new file mode 100644 index 0000000..96e6ecc --- /dev/null +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/NapCatEvent.kt @@ -0,0 +1,78 @@ +package top.r3944realms.ltdmanager.napcat.event + +import io.ktor.http.* +import kotlinx.serialization.* +import kotlinx.serialization.json.Json +import top.r3944realms.ltdmanager.napcat.event.account.AbstractAccountEvent +import top.r3944realms.ltdmanager.napcat.event.file.AbstractFileEvent +import top.r3944realms.ltdmanager.napcat.event.group.AbstractGroupEvent +import top.r3944realms.ltdmanager.napcat.event.message.AbstractMessageEvent +import top.r3944realms.ltdmanager.napcat.event.other.AbstractOtherEvent +import top.r3944realms.ltdmanager.napcat.event.passkey.AbstractPassKeyEvent +import top.r3944realms.ltdmanager.napcat.event.personal.AbstractPersonalEvent +import top.r3944realms.ltdmanager.napcat.event.system.AbstractSystemEvent + + +/** + * 基础NapCat事件类 + * @property httpStatusCode HTTP状态码 + * @property createTime 创建时间戳 + */ +@Serializable +abstract class NapCatEvent( + @Transient + open val httpStatusCode: HttpStatusCode = HttpStatusCode.OK, + @Transient + open val createTime: Long = System.currentTimeMillis() +) { + abstract fun type() :String + abstract fun subtype(): String + companion object { + private val eventTypeMap by lazy { + mutableMapOf>().apply { + putAll(AbstractAccountEvent.eventTypeMap) + putAll(AbstractFileEvent.eventTypeMap) + putAll(AbstractOtherEvent.eventTypeMap) + putAll(AbstractPersonalEvent.eventTypeMap) + putAll(AbstractPassKeyEvent.eventTypeMap) + putAll(AbstractGroupEvent.eventTypeMap) + putAll(AbstractSystemEvent.eventTypeMap) + putAll(AbstractMessageEvent.eventTypeMap) + } + } + + private fun failedDecode(jsonString: String): FailedRequestEvent { + return FailedRequestEvent.json.decodeFromString(jsonString) + } + fun decodeEvent(jsonString: String, type: String): NapCatEvent { + return try { + eventTypeMap[type]?.let { serializer -> + val json = when { + type.startsWith("account/") -> AbstractAccountEvent.json + type.startsWith("file/") -> AbstractFileEvent.json + type.startsWith("group/") -> AbstractGroupEvent.json + type.startsWith("message/") -> AbstractMessageEvent.json + type.startsWith("passkey/") -> AbstractPassKeyEvent.json + type.startsWith("personal/") -> AbstractPersonalEvent.json + type.startsWith("system/") -> AbstractSystemEvent.json + type.startsWith("other/") -> AbstractOtherEvent.json + else -> Json { ignoreUnknownKeys = true } + } + json.decodeFromString(serializer, jsonString) + } ?: failedDecode(jsonString) // 找不到类型，直接 fallback + } catch (e: Exception) { + // 解码失败，fallback + failedDecode(jsonString) + } + } + } + open fun isOk():Boolean = true + @Serializable + enum class Status(val value: String) { + @SerialName("ok") Ok("ok"), + @SerialName("failed") Failed("failed"),; + companion object { + fun isOk(value: Status): Boolean = value == Ok + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/AbstractAccountEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/AbstractAccountEvent.kt similarity index 98% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/AbstractAccountEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/AbstractAccountEvent.kt index c1faa16..34c4321 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/AbstractAccountEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/AbstractAccountEvent.kt @@ -1,4 +1,4 @@ -package top.r3944realms.ltdmanager.napcat.events.account +package top.r3944realms.ltdmanager.napcat.event.account import kotlinx.serialization.KSerializer import kotlinx.serialization.Serializable @@ -6,7 +6,7 @@ import kotlinx.serialization.json.Json import kotlinx.serialization.modules.SerializersModule import kotlinx.serialization.modules.polymorphic import kotlinx.serialization.modules.subclass -import top.r3944realms.ltdmanager.napcat.events.NapCatEvent +import top.r3944realms.ltdmanager.napcat.event.NapCatEvent /** * QQ 账户相关响应抽象 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/ArkShareGroupEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/ArkShareGroupEvent.kt similarity index 91% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/ArkShareGroupEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/ArkShareGroupEvent.kt index defdb8f..0795c57 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/ArkShareGroupEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/ArkShareGroupEvent.kt @@ -1,4 +1,4 @@ -package top.r3944realms.ltdmanager.napcat.events.account +package top.r3944realms.ltdmanager.napcat.event.account import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/ArkSharePeerEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/ArkSharePeerEvent.kt similarity index 93% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/ArkSharePeerEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/ArkSharePeerEvent.kt index df02634..5bf133f 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/ArkSharePeerEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/ArkSharePeerEvent.kt @@ -1,4 +1,4 @@ -package top.r3944realms.ltdmanager.napcat.events.account +package top.r3944realms.ltdmanager.napcat.event.account import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/CreateCollectionEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/CreateCollectionEvent.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/CreateCollectionEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/CreateCollectionEvent.kt index cb99b69..cdf3b11 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/CreateCollectionEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/CreateCollectionEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.account +package top.r3944realms.ltdmanager.napcat.event.account import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/DeleteFriendEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/DeleteFriendEvent.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/DeleteFriendEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/DeleteFriendEvent.kt index 3611c43..5b7878a 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/DeleteFriendEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/DeleteFriendEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.account +package top.r3944realms.ltdmanager.napcat.event.account import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/FetchCustomFaceEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/FetchCustomFaceEvent.kt similarity index 82% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/FetchCustomFaceEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/FetchCustomFaceEvent.kt index 2e4e4ac..f5768e7 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/FetchCustomFaceEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/FetchCustomFaceEvent.kt @@ -1,9 +1,8 @@ -package top.r3944realms.ltdmanager.napcat.events.account +package top.r3944realms.ltdmanager.napcat.event.account import kotlinx.serialization.Serializable import kotlinx.serialization.Transient -import kotlinx.serialization.json.JsonArray /** * FetchCustomFace事件 @@ -22,7 +21,7 @@ data class FetchCustomFaceEvent( @Transient val echo0: String? = null, - val data: JsonArray + val data: List ) : AbstractAccountEvent(status0, retcode0, message0, wording0, echo0) { override fun subtype(): String { diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/GetDoubtFriendsAddRequestEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/GetDoubtFriendsAddRequestEvent.kt similarity index 94% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/GetDoubtFriendsAddRequestEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/GetDoubtFriendsAddRequestEvent.kt index b7f7400..3e2bc5b 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/GetDoubtFriendsAddRequestEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/GetDoubtFriendsAddRequestEvent.kt @@ -1,4 +1,4 @@ -package top.r3944realms.ltdmanager.napcat.events.account +package top.r3944realms.ltdmanager.napcat.event.account import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/GetFriendListEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/GetFriendListEvent.kt similarity index 80% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/GetFriendListEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/GetFriendListEvent.kt index 51d2813..cb1a506 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/GetFriendListEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/GetFriendListEvent.kt @@ -1,9 +1,9 @@ -package top.r3944realms.ltdmanager.napcat.events.account +package top.r3944realms.ltdmanager.napcat.event.account import kotlinx.serialization.Serializable import kotlinx.serialization.Transient -import kotlinx.serialization.json.JsonArray +import top.r3944realms.ltdmanager.napcat.data.FriendInfo /** * GetFriendList事件 @@ -22,7 +22,7 @@ data class GetFriendListEvent( @Transient val echo0: String? = null, - val data: JsonArray + val data: List ) : AbstractAccountEvent(status0, retcode0, message0, wording0, echo0) { override fun subtype(): String { diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/GetFriendsWithCategoryEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/GetFriendsWithCategoryEvent.kt similarity index 95% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/GetFriendsWithCategoryEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/GetFriendsWithCategoryEvent.kt index 8932fae..52f8d66 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/GetFriendsWithCategoryEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/GetFriendsWithCategoryEvent.kt @@ -1,4 +1,4 @@ -package top.r3944realms.ltdmanager.napcat.events.account +package top.r3944realms.ltdmanager.napcat.event.account import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/GetLoginInfoEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/GetLoginInfoEvent.kt similarity index 93% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/GetLoginInfoEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/GetLoginInfoEvent.kt index ffac2b1..2443601 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/GetLoginInfoEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/GetLoginInfoEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.account +package top.r3944realms.ltdmanager.napcat.event.account import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/GetMiniAppArkEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/GetMiniAppArkEvent.kt similarity index 98% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/GetMiniAppArkEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/GetMiniAppArkEvent.kt index e10b9ce..2e13f52 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/GetMiniAppArkEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/GetMiniAppArkEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.account +package top.r3944realms.ltdmanager.napcat.event.account import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/GetModelShowEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/GetModelShowEvent.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/GetModelShowEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/GetModelShowEvent.kt index 09ab071..6ebee26 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/GetModelShowEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/GetModelShowEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.account +package top.r3944realms.ltdmanager.napcat.event.account import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/GetOnlineClientsEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/GetOnlineClientsEvent.kt similarity index 91% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/GetOnlineClientsEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/GetOnlineClientsEvent.kt index e72ccc0..b0f6e86 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/GetOnlineClientsEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/GetOnlineClientsEvent.kt @@ -1,4 +1,4 @@ -package top.r3944realms.ltdmanager.napcat.events.account +package top.r3944realms.ltdmanager.napcat.event.account import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/GetProfileLikeEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/GetProfileLikeEvent.kt similarity index 97% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/GetProfileLikeEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/GetProfileLikeEvent.kt index 672d4ce..b7b8886 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/GetProfileLikeEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/GetProfileLikeEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.account +package top.r3944realms.ltdmanager.napcat.event.account import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/GetRecentContactEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/GetRecentContactEvent.kt similarity index 91% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/GetRecentContactEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/GetRecentContactEvent.kt index 4f49b2a..5f60d21 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/GetRecentContactEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/GetRecentContactEvent.kt @@ -1,11 +1,11 @@ -package top.r3944realms.ltdmanager.napcat.events.account +package top.r3944realms.ltdmanager.napcat.event.account import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.Transient +import top.r3944realms.ltdmanager.napcat.data.ID import top.r3944realms.ltdmanager.napcat.data.MessageType -import top.r3944realms.ltdmanager.napcat.data.QQ import top.r3944realms.ltdmanager.napcat.data.Sender /** @@ -72,7 +72,7 @@ data class GetRecentContactEvent( val font: Double, @SerialName("group_id") - val groupID: Double? = null, + val groupId: Double? = null, val message: List, @@ -92,7 +92,7 @@ data class GetRecentContactEvent( val realSeq: String, @SerialName("self_id") - val selfID: Double, + val selfId: Double, val sender: Sender, @@ -102,7 +102,7 @@ data class GetRecentContactEvent( val time: Double, @SerialName("user_id") - val userID: Double + val userId: Double ) /** @@ -113,7 +113,7 @@ data class GetRecentContactEvent( val font: Double, @SerialName("group_id") - val groupID: Double? = null, + val groupId: Double? = null, val message: List, @@ -136,13 +136,13 @@ data class GetRecentContactEvent( val rawMessage: String, @SerialName("real_id") - val realID: Double, + val realId: Double, @SerialName("real_seq") val realSeq: String, @SerialName("self_id") - val selfID: Double, + val selfId: Double, val sender: Sender, @@ -152,7 +152,7 @@ data class GetRecentContactEvent( val time: Double, @SerialName("user_id") - val userID: Double + val userId: Double ) @Serializable @@ -165,8 +165,8 @@ data class GetRecentContactEvent( data class Data ( val text: String? = null, val name: String? = null, - val qq: QQ? = null, - val id: QQ? = null, + val qq: ID? = null, + val id: ID? = null, val file: String? = null, /** diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/GetStatusEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/GetStatusEvent.kt similarity index 93% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/GetStatusEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/GetStatusEvent.kt index 6f59dd1..a6194b4 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/GetStatusEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/GetStatusEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.account +package top.r3944realms.ltdmanager.napcat.event.account import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/GetStrangerInfoEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/GetStrangerInfoEvent.kt similarity index 95% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/GetStrangerInfoEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/GetStrangerInfoEvent.kt index 4a2f116..27d8ba4 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/GetStrangerInfoEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/GetStrangerInfoEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.account +package top.r3944realms.ltdmanager.napcat.event.account import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable @@ -88,7 +88,7 @@ data class GetStrangerInfoEvent( val uin: String, @SerialName("user_id") - val userID: Double, + val userId: Double, /** * 会员等级 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/GetUnidirectionalFriendListEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/GetUnidirectionalFriendListEvent.kt similarity index 94% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/GetUnidirectionalFriendListEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/GetUnidirectionalFriendListEvent.kt index b8c8743..29b277c 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/GetUnidirectionalFriendListEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/GetUnidirectionalFriendListEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.account +package top.r3944realms.ltdmanager.napcat.event.account import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/MarkAllAsReadEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/MarkAllAsReadEvent.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/MarkAllAsReadEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/MarkAllAsReadEvent.kt index 5e78b54..bd91d48 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/MarkAllAsReadEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/MarkAllAsReadEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.account +package top.r3944realms.ltdmanager.napcat.event.account import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/MarkGroupMsgAsReadEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/MarkGroupMsgAsReadEvent.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/MarkGroupMsgAsReadEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/MarkGroupMsgAsReadEvent.kt index 0e4adcd..77474ba 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/MarkGroupMsgAsReadEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/MarkGroupMsgAsReadEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.account +package top.r3944realms.ltdmanager.napcat.event.account import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/MarkMsgAsReadEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/MarkMsgAsReadEvent.kt similarity index 90% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/MarkMsgAsReadEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/MarkMsgAsReadEvent.kt index 317bd38..079c3e6 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/MarkMsgAsReadEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/MarkMsgAsReadEvent.kt @@ -1,4 +1,4 @@ -package top.r3944realms.ltdmanager.napcat.events.account +package top.r3944realms.ltdmanager.napcat.event.account import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/MarkPrivateMsgAsReadEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/MarkPrivateMsgAsReadEvent.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/MarkPrivateMsgAsReadEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/MarkPrivateMsgAsReadEvent.kt index d94ffa0..85b64b2 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/MarkPrivateMsgAsReadEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/MarkPrivateMsgAsReadEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.account +package top.r3944realms.ltdmanager.napcat.event.account import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/NcGetUserStatusEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/NcGetUserStatusEvent.kt similarity index 93% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/NcGetUserStatusEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/NcGetUserStatusEvent.kt index ff7cd86..e16deb8 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/NcGetUserStatusEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/NcGetUserStatusEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.account +package top.r3944realms.ltdmanager.napcat.event.account import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/SendLikeEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/SendLikeEvent.kt similarity index 91% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/SendLikeEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/SendLikeEvent.kt index 1fc9962..114392d 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/SendLikeEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/SendLikeEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.account +package top.r3944realms.ltdmanager.napcat.event.account import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/SetDiyOnlineStatusEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/SetDiyOnlineStatusEvent.kt similarity index 91% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/SetDiyOnlineStatusEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/SetDiyOnlineStatusEvent.kt index ee2b90a..7be3545 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/SetDiyOnlineStatusEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/SetDiyOnlineStatusEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.account +package top.r3944realms.ltdmanager.napcat.event.account import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/SetDoubtFriendsAddRequestEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/SetDoubtFriendsAddRequestEvent.kt similarity index 91% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/SetDoubtFriendsAddRequestEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/SetDoubtFriendsAddRequestEvent.kt index b2c4510..4d9ac6b 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/SetDoubtFriendsAddRequestEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/SetDoubtFriendsAddRequestEvent.kt @@ -1,4 +1,4 @@ -package top.r3944realms.ltdmanager.napcat.events.account +package top.r3944realms.ltdmanager.napcat.event.account import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/SetFriendAddRequestEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/SetFriendAddRequestEvent.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/SetFriendAddRequestEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/SetFriendAddRequestEvent.kt index 9f6d3cf..e00a915 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/SetFriendAddRequestEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/SetFriendAddRequestEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.account +package top.r3944realms.ltdmanager.napcat.event.account import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/SetFriendRemarkEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/SetFriendRemarkEvent.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/SetFriendRemarkEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/SetFriendRemarkEvent.kt index ec94659..8353991 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/SetFriendRemarkEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/SetFriendRemarkEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.account +package top.r3944realms.ltdmanager.napcat.event.account import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/SetModelShowEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/SetModelShowEvent.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/SetModelShowEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/SetModelShowEvent.kt index 467200b..96e41f8 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/SetModelShowEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/SetModelShowEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.account +package top.r3944realms.ltdmanager.napcat.event.account import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/SetOnlineStatusEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/SetOnlineStatusEvent.kt similarity index 91% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/SetOnlineStatusEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/SetOnlineStatusEvent.kt index 66f7bb1..7cce45e 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/SetOnlineStatusEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/SetOnlineStatusEvent.kt @@ -1,4 +1,4 @@ -package top.r3944realms.ltdmanager.napcat.events.account +package top.r3944realms.ltdmanager.napcat.event.account import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/SetQQProfileEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/SetQQProfileEvent.kt similarity index 95% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/SetQQProfileEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/SetQQProfileEvent.kt index eee8cb8..f419357 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/SetQQProfileEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/SetQQProfileEvent.kt @@ -1,4 +1,4 @@ -package top.r3944realms.ltdmanager.napcat.events.account +package top.r3944realms.ltdmanager.napcat.event.account import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/SetQqAvatarEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/SetQqAvatarEvent.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/SetQqAvatarEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/SetQqAvatarEvent.kt index 0ef556d..dff5c47 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/SetQqAvatarEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/SetQqAvatarEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.account +package top.r3944realms.ltdmanager.napcat.event.account import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/SetSelfLongnickEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/SetSelfLongnickEvent.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/SetSelfLongnickEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/SetSelfLongnickEvent.kt index 2883ca9..3de0c94 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/account/SetSelfLongnickEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/account/SetSelfLongnickEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.account +package top.r3944realms.ltdmanager.napcat.event.account import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/AbstractFileEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/AbstractFileEvent.kt similarity index 96% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/AbstractFileEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/AbstractFileEvent.kt index 2ca90dc..e8283af 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/AbstractFileEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/AbstractFileEvent.kt @@ -1,4 +1,4 @@ -package top.r3944realms.ltdmanager.napcat.events.file +package top.r3944realms.ltdmanager.napcat.event.file import kotlinx.serialization.KSerializer import kotlinx.serialization.SerialName @@ -7,7 +7,7 @@ import kotlinx.serialization.json.Json import kotlinx.serialization.modules.SerializersModule import kotlinx.serialization.modules.polymorphic import kotlinx.serialization.modules.subclass -import top.r3944realms.ltdmanager.napcat.events.NapCatEvent +import top.r3944realms.ltdmanager.napcat.event.NapCatEvent /** * QQ 文件相关响应抽象 @@ -62,7 +62,7 @@ abstract class AbstractFileEvent( val downloadTimes: Double, @SerialName("file_id") - val fileID: String, + val fileId: String, @SerialName("file_name") val fileName: String, @@ -71,7 +71,7 @@ abstract class AbstractFileEvent( val fileSize: Double, @SerialName("group_id") - val groupID: Double, + val groupId: Double, @SerialName("modify_time") val modifyTime: Double, @@ -121,7 +121,7 @@ abstract class AbstractFileEvent( val folderName: String, @SerialName("group_id") - val groupID: Double, + val groupId: Double, /** * 文件数量 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/CleanCacheEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/CleanCacheEvent.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/CleanCacheEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/CleanCacheEvent.kt index 775c97c..a2928fe 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/CleanCacheEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/CleanCacheEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.file +package top.r3944realms.ltdmanager.napcat.event.file import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/CreateGroupFileFolderEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/CreateGroupFileFolderEvent.kt similarity index 96% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/CreateGroupFileFolderEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/CreateGroupFileFolderEvent.kt index 19747f5..335f484 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/CreateGroupFileFolderEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/CreateGroupFileFolderEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.file +package top.r3944realms.ltdmanager.napcat.event.file import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/DeleteGroupFileEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/DeleteGroupFileEvent.kt similarity index 95% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/DeleteGroupFileEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/DeleteGroupFileEvent.kt index a265a0f..0d6415c 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/DeleteGroupFileEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/DeleteGroupFileEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.file +package top.r3944realms.ltdmanager.napcat.event.file import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/DeleteGroupFolderEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/DeleteGroupFolderEvent.kt similarity index 93% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/DeleteGroupFolderEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/DeleteGroupFolderEvent.kt index 665146b..992daaf 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/DeleteGroupFolderEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/DeleteGroupFolderEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.file +package top.r3944realms.ltdmanager.napcat.event.file import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/DownloadFileEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/DownloadFileEvent.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/DownloadFileEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/DownloadFileEvent.kt index 6e4683f..fd3eabd 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/DownloadFileEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/DownloadFileEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.file +package top.r3944realms.ltdmanager.napcat.event.file import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/GetFileEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/GetFileEvent.kt similarity index 95% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/GetFileEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/GetFileEvent.kt index ad76f13..b92c836 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/GetFileEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/GetFileEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.file +package top.r3944realms.ltdmanager.napcat.event.file import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/GetGroupFileSystemInfoEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/GetGroupFileSystemInfoEvent.kt similarity index 95% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/GetGroupFileSystemInfoEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/GetGroupFileSystemInfoEvent.kt index 9dca6d0..d974dcf 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/GetGroupFileSystemInfoEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/GetGroupFileSystemInfoEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.file +package top.r3944realms.ltdmanager.napcat.event.file import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/GetGroupFileUrlEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/GetGroupFileUrlEvent.kt similarity index 91% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/GetGroupFileUrlEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/GetGroupFileUrlEvent.kt index c8e3315..3ecfc47 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/GetGroupFileUrlEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/GetGroupFileUrlEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.file +package top.r3944realms.ltdmanager.napcat.event.file import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/GetGroupFilesByFolderEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/GetGroupFilesByFolderEvent.kt similarity index 81% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/GetGroupFilesByFolderEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/GetGroupFilesByFolderEvent.kt index 505e3fe..4970ec8 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/GetGroupFilesByFolderEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/GetGroupFilesByFolderEvent.kt @@ -1,9 +1,9 @@ -package top.r3944realms.ltdmanager.napcat.events.file +package top.r3944realms.ltdmanager.napcat.event.file import kotlinx.serialization.Serializable import kotlinx.serialization.Transient -import top.r3944realms.ltdmanager.napcat.events.file.GetGroupRootFilesEvent.FileData +import top.r3944realms.ltdmanager.napcat.event.file.GetGroupRootFilesEvent.FileData /** * GetGroupFilesByFolder事件 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/GetGroupRootFilesEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/GetGroupRootFilesEvent.kt similarity index 94% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/GetGroupRootFilesEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/GetGroupRootFilesEvent.kt index 4efc1df..9af8bdc 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/GetGroupRootFilesEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/GetGroupRootFilesEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.file +package top.r3944realms.ltdmanager.napcat.event.file import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/GetPrivateFileUrlEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/GetPrivateFileUrlEvent.kt similarity index 91% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/GetPrivateFileUrlEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/GetPrivateFileUrlEvent.kt index ae8812c..93ec888 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/GetPrivateFileUrlEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/GetPrivateFileUrlEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.file +package top.r3944realms.ltdmanager.napcat.event.file import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/MoveGroupFileEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/MoveGroupFileEvent.kt similarity index 91% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/MoveGroupFileEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/MoveGroupFileEvent.kt index 10952e7..1079616 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/MoveGroupFileEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/MoveGroupFileEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.file +package top.r3944realms.ltdmanager.napcat.event.file import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/RenameGroupFileEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/RenameGroupFileEvent.kt similarity index 91% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/RenameGroupFileEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/RenameGroupFileEvent.kt index bcd26fb..258b30e 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/RenameGroupFileEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/RenameGroupFileEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.file +package top.r3944realms.ltdmanager.napcat.event.file import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/TransGroupFileEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/TransGroupFileEvent.kt similarity index 91% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/TransGroupFileEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/TransGroupFileEvent.kt index 8be47ec..e911be4 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/TransGroupFileEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/TransGroupFileEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.file +package top.r3944realms.ltdmanager.napcat.event.file import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/UploadGroupFileEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/UploadGroupFileEvent.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/UploadGroupFileEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/UploadGroupFileEvent.kt index 85b26f9..46d8f1f 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/UploadGroupFileEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/UploadGroupFileEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.file +package top.r3944realms.ltdmanager.napcat.event.file import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/UploadPrivateFileEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/UploadPrivateFileEvent.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/UploadPrivateFileEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/UploadPrivateFileEvent.kt index 730563e..afebd53 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/file/UploadPrivateFileEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/file/UploadPrivateFileEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.file +package top.r3944realms.ltdmanager.napcat.event.file import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/AbstractGroupEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/AbstractGroupEvent.kt similarity index 98% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/AbstractGroupEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/AbstractGroupEvent.kt index 5f9c94b..41bb10e 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/AbstractGroupEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/AbstractGroupEvent.kt @@ -1,4 +1,4 @@ -package top.r3944realms.ltdmanager.napcat.events.group +package top.r3944realms.ltdmanager.napcat.event.group import kotlinx.serialization.KSerializer import kotlinx.serialization.Serializable @@ -6,7 +6,7 @@ import kotlinx.serialization.json.Json import kotlinx.serialization.modules.SerializersModule import kotlinx.serialization.modules.polymorphic import kotlinx.serialization.modules.subclass -import top.r3944realms.ltdmanager.napcat.events.NapCatEvent +import top.r3944realms.ltdmanager.napcat.event.NapCatEvent /** * QQ 群聊相关响应抽象 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/DelGroupNoticeEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/DelGroupNoticeEvent.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/DelGroupNoticeEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/DelGroupNoticeEvent.kt index 683ea9d..c10fc8c 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/DelGroupNoticeEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/DelGroupNoticeEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.group +package top.r3944realms.ltdmanager.napcat.event.group import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/DeleteEssenceMsgEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/DeleteEssenceMsgEvent.kt similarity index 91% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/DeleteEssenceMsgEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/DeleteEssenceMsgEvent.kt index 3ab70e1..9425fdf 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/DeleteEssenceMsgEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/DeleteEssenceMsgEvent.kt @@ -1,7 +1,6 @@ -package top.r3944realms.ltdmanager.napcat.events.group +package top.r3944realms.ltdmanager.napcat.event.group -import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.Transient import kotlinx.serialization.json.JsonObject diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/GetEssenceMsgListEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/GetEssenceMsgListEvent.kt similarity index 97% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/GetEssenceMsgListEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/GetEssenceMsgListEvent.kt index ddbebb6..052b189 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/GetEssenceMsgListEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/GetEssenceMsgListEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.group +package top.r3944realms.ltdmanager.napcat.event.group import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/GetGroupAtAllRemainEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/GetGroupAtAllRemainEvent.kt similarity index 94% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/GetGroupAtAllRemainEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/GetGroupAtAllRemainEvent.kt index b1902ea..9f2e9d9 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/GetGroupAtAllRemainEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/GetGroupAtAllRemainEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.group +package top.r3944realms.ltdmanager.napcat.event.group import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/GetGroupDetailInfoEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/GetGroupDetailInfoEvent.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/GetGroupDetailInfoEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/GetGroupDetailInfoEvent.kt index 2674a40..009c09a 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/GetGroupDetailInfoEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/GetGroupDetailInfoEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.group +package top.r3944realms.ltdmanager.napcat.event.group import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable @@ -30,7 +30,7 @@ data class GetGroupDetailInfoEvent( val groupAllShut: Double, @SerialName("group_id") - val groupID: Double, + val groupId: Double, @SerialName("group_name") val groupName: String, diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/GetGroupHonorInfoEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/GetGroupHonorInfoEvent.kt similarity index 93% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/GetGroupHonorInfoEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/GetGroupHonorInfoEvent.kt index 8ff26ac..167884e 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/GetGroupHonorInfoEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/GetGroupHonorInfoEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.group +package top.r3944realms.ltdmanager.napcat.event.group import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable @@ -39,7 +39,7 @@ data class GetGroupHonorInfoEvent( val emotionList: List, @SerialName("group_id") - val groupID: String, + val groupId: String, /** * 龙王 @@ -83,7 +83,7 @@ data class GetGroupHonorInfoEvent( val nickname: String? = null, @SerialName("user_id") - val userID: Double? = null + val userId: Double? = null ) override fun subtype(): String { return "get_group_honor_info" diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/GetGroupIgnoredNotifiesEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/GetGroupIgnoredNotifiesEvent.kt similarity index 74% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/GetGroupIgnoredNotifiesEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/GetGroupIgnoredNotifiesEvent.kt index da61e0e..f3aa6fa 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/GetGroupIgnoredNotifiesEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/GetGroupIgnoredNotifiesEvent.kt @@ -1,9 +1,10 @@ -package top.r3944realms.ltdmanager.napcat.events.group +package top.r3944realms.ltdmanager.napcat.event.group -import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.Transient +import top.r3944realms.ltdmanager.napcat.request.group.GetGroupIgnoredNotifiesRequest +import top.r3944realms.ltdmanager.napcat.request.group.GetGroupSystemMsgRequest /** * GetGroupIgnoredNotifies事件 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/GetGroupInfoEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/GetGroupInfoEvent.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/GetGroupInfoEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/GetGroupInfoEvent.kt index db3c017..ce2739a 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/GetGroupInfoEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/GetGroupInfoEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.group +package top.r3944realms.ltdmanager.napcat.event.group import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/GetGroupInfoExEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/GetGroupInfoExEvent.kt similarity index 98% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/GetGroupInfoExEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/GetGroupInfoExEvent.kt index 40a8da4..73d78ba 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/GetGroupInfoExEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/GetGroupInfoExEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.group +package top.r3944realms.ltdmanager.napcat.event.group import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/GetGroupListEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/GetGroupListEvent.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/GetGroupListEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/GetGroupListEvent.kt index f3f7d4d..b0c7ff4 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/GetGroupListEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/GetGroupListEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.group +package top.r3944realms.ltdmanager.napcat.event.group import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/GetGroupMemberInfoEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/GetGroupMemberInfoEvent.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/GetGroupMemberInfoEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/GetGroupMemberInfoEvent.kt index 9b6d548..acbf7a2 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/GetGroupMemberInfoEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/GetGroupMemberInfoEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.group +package top.r3944realms.ltdmanager.napcat.event.group import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/GetGroupMemberListEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/GetGroupMemberListEvent.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/GetGroupMemberListEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/GetGroupMemberListEvent.kt index f9e50ad..c32f1ea 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/GetGroupMemberListEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/GetGroupMemberListEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.group +package top.r3944realms.ltdmanager.napcat.event.group import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/GetGroupNoticeEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/GetGroupNoticeEvent.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/GetGroupNoticeEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/GetGroupNoticeEvent.kt index 806a452..1775c70 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/GetGroupNoticeEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/GetGroupNoticeEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.group +package top.r3944realms.ltdmanager.napcat.event.group import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/GetGroupShutListEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/GetGroupShutListEvent.kt similarity index 97% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/GetGroupShutListEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/GetGroupShutListEvent.kt index d86b26e..862332a 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/GetGroupShutListEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/GetGroupShutListEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.group +package top.r3944realms.ltdmanager.napcat.event.group import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/GetGroupSystemMsgEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/GetGroupSystemMsgEvent.kt similarity index 88% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/GetGroupSystemMsgEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/GetGroupSystemMsgEvent.kt index 423d21d..8eefaf6 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/GetGroupSystemMsgEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/GetGroupSystemMsgEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.group +package top.r3944realms.ltdmanager.napcat.event.group import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable @@ -38,11 +38,11 @@ data class GetGroupSystemMsgEvent( */ @Serializable data class SystemInfo ( - val actor: Double, + val actor: Long, val checked: Boolean, @SerialName("group_id") - val groupID: Double, + val groupId: Long, @SerialName("group_name") val groupName: String, @@ -51,12 +51,12 @@ data class GetGroupSystemMsgEvent( val invitorNick: String, @SerialName("invitor_uin") - val invitorUin: Double, + val invitorUin: Long, val message: String, @SerialName("request_id") - val requestID: Double, + val requestId: Long, @SerialName("requester_nick") val requesterNick: String diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SendGroupNoticeEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SendGroupNoticeEvent.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SendGroupNoticeEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SendGroupNoticeEvent.kt index 978ed5b..cee3417 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SendGroupNoticeEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SendGroupNoticeEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.group +package top.r3944realms.ltdmanager.napcat.event.group import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SendGroupSignEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SendGroupSignEvent.kt similarity index 58% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SendGroupSignEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SendGroupSignEvent.kt index f30f9fd..789add8 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SendGroupSignEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SendGroupSignEvent.kt @@ -1,10 +1,8 @@ -package top.r3944realms.ltdmanager.napcat.events.group +package top.r3944realms.ltdmanager.napcat.event.group import kotlinx.serialization.Serializable -import kotlinx.serialization.Transient -import kotlinx.serialization.json.JsonElement -import top.r3944realms.ltdmanager.napcat.events.NapCatEvent +import top.r3944realms.ltdmanager.napcat.event.NapCatEvent /** * SendGroupSign事件 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetEssenceMsgEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetEssenceMsgEvent.kt similarity index 95% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetEssenceMsgEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetEssenceMsgEvent.kt index 1cfa7d3..edbe195 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetEssenceMsgEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetEssenceMsgEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.group +package top.r3944realms.ltdmanager.napcat.event.group import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupAddOptionEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupAddOptionEvent.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupAddOptionEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupAddOptionEvent.kt index 7b762fc..3817170 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupAddOptionEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupAddOptionEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.group +package top.r3944realms.ltdmanager.napcat.event.group import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupAddRequestEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupAddRequestEvent.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupAddRequestEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupAddRequestEvent.kt index 848e916..1c3bc7e 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupAddRequestEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupAddRequestEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.group +package top.r3944realms.ltdmanager.napcat.event.group import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupAdminEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupAdminEvent.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupAdminEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupAdminEvent.kt index 7e17c7d..25463af 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupAdminEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupAdminEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.group +package top.r3944realms.ltdmanager.napcat.event.group import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupBanEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupBanEvent.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupBanEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupBanEvent.kt index 050dbd5..a8953f3 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupBanEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupBanEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.group +package top.r3944realms.ltdmanager.napcat.event.group import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupCardEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupCardEvent.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupCardEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupCardEvent.kt index 2a08494..9562c3d 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupCardEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupCardEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.group +package top.r3944realms.ltdmanager.napcat.event.group import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupKickEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupKickEvent.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupKickEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupKickEvent.kt index 475bf27..0f600bc 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupKickEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupKickEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.group +package top.r3944realms.ltdmanager.napcat.event.group import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupKickMembersEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupKickMembersEvent.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupKickMembersEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupKickMembersEvent.kt index d9ea2c9..a500087 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupKickMembersEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupKickMembersEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.group +package top.r3944realms.ltdmanager.napcat.event.group import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupLeaveEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupLeaveEvent.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupLeaveEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupLeaveEvent.kt index 095de87..014cd9d 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupLeaveEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupLeaveEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.group +package top.r3944realms.ltdmanager.napcat.event.group import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupNameEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupNameEvent.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupNameEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupNameEvent.kt index 0dd58af..8e9f1d5 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupNameEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupNameEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.group +package top.r3944realms.ltdmanager.napcat.event.group import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupPortraitEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupPortraitEvent.kt similarity index 93% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupPortraitEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupPortraitEvent.kt index f18ad97..724bbeb 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupPortraitEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupPortraitEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.group +package top.r3944realms.ltdmanager.napcat.event.group import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupRemarkEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupRemarkEvent.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupRemarkEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupRemarkEvent.kt index c85133c..67e938f 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupRemarkEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupRemarkEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.group +package top.r3944realms.ltdmanager.napcat.event.group import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupRobotAddOptionEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupRobotAddOptionEvent.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupRobotAddOptionEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupRobotAddOptionEvent.kt index f41f3ca..7990406 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupRobotAddOptionEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupRobotAddOptionEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.group +package top.r3944realms.ltdmanager.napcat.event.group import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupSearchEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupSearchEvent.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupSearchEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupSearchEvent.kt index 8c8d0f5..c10ee0f 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupSearchEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupSearchEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.group +package top.r3944realms.ltdmanager.napcat.event.group import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupSignEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupSignEvent.kt similarity index 71% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupSignEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupSignEvent.kt index 82fde77..f2407e0 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupSignEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupSignEvent.kt @@ -1,8 +1,8 @@ -package top.r3944realms.ltdmanager.napcat.events.group +package top.r3944realms.ltdmanager.napcat.event.group import kotlinx.serialization.Serializable -import top.r3944realms.ltdmanager.napcat.events.NapCatEvent +import top.r3944realms.ltdmanager.napcat.event.NapCatEvent /** * SetGroupSign事件 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupSpecialTitleEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupSpecialTitleEvent.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupSpecialTitleEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupSpecialTitleEvent.kt index 97c6dd4..a156c8d 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupSpecialTitleEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupSpecialTitleEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.group +package top.r3944realms.ltdmanager.napcat.event.group import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupWholeBanEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupWholeBanEvent.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupWholeBanEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupWholeBanEvent.kt index c67a423..7b1b963 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/group/SetGroupWholeBanEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/group/SetGroupWholeBanEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.group +package top.r3944realms.ltdmanager.napcat.event.group import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/AbstractMessageEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/AbstractMessageEvent.kt similarity index 84% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/AbstractMessageEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/AbstractMessageEvent.kt index d8a45de..d66434a 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/AbstractMessageEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/AbstractMessageEvent.kt @@ -1,4 +1,4 @@ -package top.r3944realms.ltdmanager.napcat.events.message +package top.r3944realms.ltdmanager.napcat.event.message import kotlinx.serialization.KSerializer import kotlinx.serialization.Serializable @@ -6,15 +6,15 @@ import kotlinx.serialization.json.Json import kotlinx.serialization.modules.SerializersModule import kotlinx.serialization.modules.polymorphic import kotlinx.serialization.modules.subclass -import top.r3944realms.ltdmanager.napcat.events.NapCatEvent -import top.r3944realms.ltdmanager.napcat.events.message.group.ForwardGroupSingleMsgEvent -import top.r3944realms.ltdmanager.napcat.events.message.group.GroupPokeEvent -import top.r3944realms.ltdmanager.napcat.events.message.group.SendGroupForwardMsgEvent -import top.r3944realms.ltdmanager.napcat.events.message.personal.ForwardFriendSingleMsgEvent -import top.r3944realms.ltdmanager.napcat.events.message.personal.FriendPokeEvent -import top.r3944realms.ltdmanager.napcat.events.message.personal.SendPrivateForwardMsgEvent -import top.r3944realms.ltdmanager.napcat.events.other.SendGroupMsgEvent -import top.r3944realms.ltdmanager.napcat.events.other.SendPrivateMsgEvent +import top.r3944realms.ltdmanager.napcat.event.NapCatEvent +import top.r3944realms.ltdmanager.napcat.event.message.group.ForwardGroupSingleMsgEvent +import top.r3944realms.ltdmanager.napcat.event.message.group.GroupPokeEvent +import top.r3944realms.ltdmanager.napcat.event.message.group.SendGroupForwardMsgEvent +import top.r3944realms.ltdmanager.napcat.event.message.personal.ForwardFriendSingleMsgEvent +import top.r3944realms.ltdmanager.napcat.event.message.personal.FriendPokeEvent +import top.r3944realms.ltdmanager.napcat.event.message.personal.SendPrivateForwardMsgEvent +import top.r3944realms.ltdmanager.napcat.event.other.SendGroupMsgEvent +import top.r3944realms.ltdmanager.napcat.event.other.SendPrivateMsgEvent /** * QQ 消息相关响应抽象 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/DeleteMsgEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/DeleteMsgEvent.kt similarity index 83% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/DeleteMsgEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/DeleteMsgEvent.kt index 6b3aa32..04c3c97 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/DeleteMsgEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/DeleteMsgEvent.kt @@ -1,10 +1,10 @@ -package top.r3944realms.ltdmanager.napcat.events.message +package top.r3944realms.ltdmanager.napcat.event.message import kotlinx.serialization.Serializable import kotlinx.serialization.Transient import kotlinx.serialization.json.JsonElement -import top.r3944realms.ltdmanager.napcat.events.group.AbstractGroupEvent +import top.r3944realms.ltdmanager.napcat.event.group.AbstractGroupEvent /** * DeleteMsg事件 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/FetchEmojiLikeEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/FetchEmojiLikeEvent.kt similarity index 84% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/FetchEmojiLikeEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/FetchEmojiLikeEvent.kt index fcf39db..5b9c134 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/FetchEmojiLikeEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/FetchEmojiLikeEvent.kt @@ -1,9 +1,9 @@ -package top.r3944realms.ltdmanager.napcat.events.message +package top.r3944realms.ltdmanager.napcat.event.message import kotlinx.serialization.Serializable import kotlinx.serialization.Transient -import top.r3944realms.ltdmanager.napcat.events.group.AbstractGroupEvent +import top.r3944realms.ltdmanager.napcat.event.group.AbstractGroupEvent /** * FetchEmojiLike事件 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/GetForwardMsgEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/GetForwardMsgEvent.kt similarity index 85% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/GetForwardMsgEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/GetForwardMsgEvent.kt index 558e1d8..3c0f45d 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/GetForwardMsgEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/GetForwardMsgEvent.kt @@ -1,13 +1,13 @@ -package top.r3944realms.ltdmanager.napcat.events.message +package top.r3944realms.ltdmanager.napcat.event.message import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.Transient +import top.r3944realms.ltdmanager.napcat.data.ID import top.r3944realms.ltdmanager.napcat.data.MessageType -import top.r3944realms.ltdmanager.napcat.data.QQ import top.r3944realms.ltdmanager.napcat.data.Sender -import top.r3944realms.ltdmanager.napcat.events.group.AbstractGroupEvent +import top.r3944realms.ltdmanager.napcat.event.group.AbstractGroupEvent /** * GetForwardMsg事件 @@ -40,7 +40,7 @@ data class GetForwardMsgEvent( val font: Double, @SerialName("group_id") - val groupID: Double? = null, + val groupId: Double? = null, val message: List, @@ -48,7 +48,7 @@ data class GetForwardMsgEvent( val messageFormat: String, @SerialName("message_id") - val messageID: Double, + val messageId: Double, @SerialName("message_seq") val messageSeq: Double, @@ -63,13 +63,13 @@ data class GetForwardMsgEvent( val rawMessage: String, @SerialName("real_id") - val realID: Double, + val realId: Double, @SerialName("real_seq") val realSeq: String, @SerialName("self_id") - val selfID: Double, + val selfId: Double, val sender: Sender, @@ -79,7 +79,7 @@ data class GetForwardMsgEvent( val time: Double, @SerialName("user_id") - val userID: Double + val userId: Double ) /** * 文本消息 @@ -109,7 +109,7 @@ data class GetForwardMsgEvent( val font: Double? = null, @SerialName("group_id") - val groupID: Double? = null, + val groupId: Double? = null, val message: List? = null, @@ -117,7 +117,7 @@ data class GetForwardMsgEvent( val messageFormat: String? = null, @SerialName("message_id") - val messageID: Double? = null, + val messageId: Double? = null, @SerialName("message_seq") val messageSeq: Double? = null, @@ -132,13 +132,13 @@ data class GetForwardMsgEvent( val rawMessage: String? = null, @SerialName("real_id") - val realID: Double? = null, + val realId: Double? = null, @SerialName("real_seq") val realSeq: String? = null, @SerialName("self_id") - val selfID: Double? = null, + val selfId: Double? = null, val sender: Sender? = null, @@ -148,14 +148,14 @@ data class GetForwardMsgEvent( val time: Double? = null, @SerialName("user_id") - val userID: Double? = null + val userId: Double? = null ) @Serializable data class MessageData ( val text: String? = null, val name: String? = null, - val qq: QQ? = null, - val id: QQ? = null, + val qq: ID? = null, + val id: ID? = null, val file: String? = null, /** diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/GetFriendMsgHistoryEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/GetFriendMsgHistoryEvent.kt similarity index 84% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/GetFriendMsgHistoryEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/GetFriendMsgHistoryEvent.kt index f0092c5..94d6090 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/GetFriendMsgHistoryEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/GetFriendMsgHistoryEvent.kt @@ -1,13 +1,13 @@ -package top.r3944realms.ltdmanager.napcat.events.message +package top.r3944realms.ltdmanager.napcat.event.message import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.Transient +import top.r3944realms.ltdmanager.napcat.data.ID import top.r3944realms.ltdmanager.napcat.data.MessageType -import top.r3944realms.ltdmanager.napcat.data.QQ import top.r3944realms.ltdmanager.napcat.data.Sender -import top.r3944realms.ltdmanager.napcat.events.group.AbstractGroupEvent +import top.r3944realms.ltdmanager.napcat.event.group.AbstractGroupEvent /** * GetFriendMsgHistory事件 @@ -41,8 +41,8 @@ data class GetFriendMsgHistoryEvent( data class MessageData ( val text: String? = null, val name: String? = null, - val qq: QQ? = null, - val id: QQ? = null, + val qq: ID? = null, + val id: ID? = null, val file: String? = null, /** @@ -86,10 +86,10 @@ data class GetFriendMsgHistoryEvent( */ @Serializable data class SpecificMsg ( - val font: Double, + val font: Long, @SerialName("group_id") - val groupID: Double? = null, + val groupId: Long? = null, val message: List, @@ -97,10 +97,10 @@ data class GetFriendMsgHistoryEvent( val messageFormat: String, @SerialName("message_id") - val messageID: Double, + val messageId: Long, @SerialName("message_seq") - val messageSeq: Double, + val messageSeq: Long, @SerialName("message_type") val messageType: String, @@ -112,23 +112,23 @@ data class GetFriendMsgHistoryEvent( val rawMessage: String, @SerialName("real_id") - val realID: Double, + val realId: Long, @SerialName("real_seq") val realSeq: String, @SerialName("self_id") - val selfID: Double, + val selfId: Long, val sender: Sender, @SerialName("sub_type") val subType: String, - val time: Double, + val time: Long, @SerialName("user_id") - val userID: Double + val userId: Long ) override fun subtype(): String { return "get_friend_msg_history" diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/GetGroupMsgHistoryEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/GetGroupMsgHistoryEvent.kt similarity index 83% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/GetGroupMsgHistoryEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/GetGroupMsgHistoryEvent.kt index f1c8526..a7d2411 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/GetGroupMsgHistoryEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/GetGroupMsgHistoryEvent.kt @@ -1,9 +1,9 @@ -package top.r3944realms.ltdmanager.napcat.events.message +package top.r3944realms.ltdmanager.napcat.event.message import kotlinx.serialization.Serializable import kotlinx.serialization.Transient -import top.r3944realms.ltdmanager.napcat.events.group.AbstractGroupEvent +import top.r3944realms.ltdmanager.napcat.event.group.AbstractGroupEvent /** * GetGroupMsgHistory事件 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/GetImageEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/GetImageEvent.kt similarity index 89% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/GetImageEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/GetImageEvent.kt index 62263a5..e8d2c61 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/GetImageEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/GetImageEvent.kt @@ -1,10 +1,10 @@ -package top.r3944realms.ltdmanager.napcat.events.message +package top.r3944realms.ltdmanager.napcat.event.message import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.Transient -import top.r3944realms.ltdmanager.napcat.events.group.AbstractGroupEvent +import top.r3944realms.ltdmanager.napcat.event.group.AbstractGroupEvent /** * GetImage事件 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/GetMsgEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/GetMsgEvent.kt similarity index 82% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/GetMsgEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/GetMsgEvent.kt index 7f0393f..e39de62 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/GetMsgEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/GetMsgEvent.kt @@ -1,10 +1,10 @@ -package top.r3944realms.ltdmanager.napcat.events.message +package top.r3944realms.ltdmanager.napcat.event.message import kotlinx.serialization.Serializable import kotlinx.serialization.Transient import kotlinx.serialization.json.JsonObject -import top.r3944realms.ltdmanager.napcat.events.group.AbstractGroupEvent +import top.r3944realms.ltdmanager.napcat.event.group.AbstractGroupEvent /** * GetMsg事件 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/GetRecordEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/GetRecordEvent.kt similarity index 82% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/GetRecordEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/GetRecordEvent.kt index 5bd07ee..9b9a29d 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/GetRecordEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/GetRecordEvent.kt @@ -1,9 +1,9 @@ -package top.r3944realms.ltdmanager.napcat.events.message +package top.r3944realms.ltdmanager.napcat.event.message import kotlinx.serialization.Serializable import kotlinx.serialization.Transient -import top.r3944realms.ltdmanager.napcat.events.group.AbstractGroupEvent +import top.r3944realms.ltdmanager.napcat.event.group.AbstractGroupEvent /** * GetRecord事件 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/SendForwardMsgEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/SendForwardMsgEvent.kt similarity index 83% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/SendForwardMsgEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/SendForwardMsgEvent.kt index b422454..eb16b48 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/SendForwardMsgEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/SendForwardMsgEvent.kt @@ -1,10 +1,10 @@ -package top.r3944realms.ltdmanager.napcat.events.message +package top.r3944realms.ltdmanager.napcat.event.message import kotlinx.serialization.Serializable import kotlinx.serialization.Transient import kotlinx.serialization.json.JsonObject -import top.r3944realms.ltdmanager.napcat.events.group.AbstractGroupEvent +import top.r3944realms.ltdmanager.napcat.event.group.AbstractGroupEvent /** * SendForwardMsg事件 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/SendGroupAiRecordEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/SendGroupAiRecordEvent.kt similarity index 85% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/SendGroupAiRecordEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/SendGroupAiRecordEvent.kt index 1368f50..3dfe484 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/SendGroupAiRecordEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/SendGroupAiRecordEvent.kt @@ -1,10 +1,10 @@ -package top.r3944realms.ltdmanager.napcat.events.message +package top.r3944realms.ltdmanager.napcat.event.message import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.Transient -import top.r3944realms.ltdmanager.napcat.events.group.AbstractGroupEvent +import top.r3944realms.ltdmanager.napcat.event.group.AbstractGroupEvent /** * SendGroupAiRecord事件 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/SendPokeEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/SendPokeEvent.kt similarity index 83% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/SendPokeEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/SendPokeEvent.kt index 1057271..4a9c447 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/SendPokeEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/SendPokeEvent.kt @@ -1,10 +1,10 @@ -package top.r3944realms.ltdmanager.napcat.events.message +package top.r3944realms.ltdmanager.napcat.event.message import kotlinx.serialization.Serializable import kotlinx.serialization.Transient import kotlinx.serialization.json.JsonElement -import top.r3944realms.ltdmanager.napcat.events.group.AbstractGroupEvent +import top.r3944realms.ltdmanager.napcat.event.group.AbstractGroupEvent /** * SendPoke事件 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/SetMsgEmojiLikeEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/SetMsgEmojiLikeEvent.kt similarity index 87% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/SetMsgEmojiLikeEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/SetMsgEmojiLikeEvent.kt index 84c53d2..fe123d9 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/SetMsgEmojiLikeEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/SetMsgEmojiLikeEvent.kt @@ -1,10 +1,10 @@ -package top.r3944realms.ltdmanager.napcat.events.message +package top.r3944realms.ltdmanager.napcat.event.message import kotlinx.serialization.Serializable import kotlinx.serialization.Transient import top.r3944realms.ltdmanager.napcat.data.EmojiLikesList -import top.r3944realms.ltdmanager.napcat.events.group.AbstractGroupEvent +import top.r3944realms.ltdmanager.napcat.event.group.AbstractGroupEvent /** * SetMsgEmojiLike事件 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/group/ForwardGroupSingleMsgEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/group/ForwardGroupSingleMsgEvent.kt similarity index 72% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/group/ForwardGroupSingleMsgEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/group/ForwardGroupSingleMsgEvent.kt index e6f35d3..e43ee67 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/group/ForwardGroupSingleMsgEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/group/ForwardGroupSingleMsgEvent.kt @@ -1,11 +1,11 @@ -package top.r3944realms.ltdmanager.napcat.events.message.group +package top.r3944realms.ltdmanager.napcat.event.message.group import kotlinx.serialization.Serializable import kotlinx.serialization.Transient import kotlinx.serialization.json.JsonElement -import top.r3944realms.ltdmanager.napcat.events.NapCatEvent -import top.r3944realms.ltdmanager.napcat.events.group.AbstractGroupEvent +import top.r3944realms.ltdmanager.napcat.event.NapCatEvent +import top.r3944realms.ltdmanager.napcat.event.group.AbstractGroupEvent /** * ForwardGroupSingleMsg事件 @@ -14,7 +14,7 @@ import top.r3944realms.ltdmanager.napcat.events.group.AbstractGroupEvent @Serializable data class ForwardGroupSingleMsgEvent( @Transient - val status0: NapCatEvent.Status = Status.Ok, + val status0: Status = Status.Ok, @Transient val retcode0: Double = 0.0, @Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/group/GroupPokeEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/group/GroupPokeEvent.kt similarity index 79% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/group/GroupPokeEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/group/GroupPokeEvent.kt index 6c03f27..8c051f0 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/group/GroupPokeEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/group/GroupPokeEvent.kt @@ -1,9 +1,9 @@ -package top.r3944realms.ltdmanager.napcat.events.message.group +package top.r3944realms.ltdmanager.napcat.event.message.group import kotlinx.serialization.Serializable import kotlinx.serialization.Transient -import top.r3944realms.ltdmanager.napcat.events.group.AbstractGroupEvent +import top.r3944realms.ltdmanager.napcat.event.group.AbstractGroupEvent /** * GroupPoke事件 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/group/SendGroupForwardMsgEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/group/SendGroupForwardMsgEvent.kt similarity index 76% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/group/SendGroupForwardMsgEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/group/SendGroupForwardMsgEvent.kt index 0b2aba6..09e8414 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/group/SendGroupForwardMsgEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/group/SendGroupForwardMsgEvent.kt @@ -1,11 +1,11 @@ -package top.r3944realms.ltdmanager.napcat.events.message.group +package top.r3944realms.ltdmanager.napcat.event.message.group import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.Transient -import top.r3944realms.ltdmanager.napcat.events.NapCatEvent -import top.r3944realms.ltdmanager.napcat.events.group.AbstractGroupEvent +import top.r3944realms.ltdmanager.napcat.event.NapCatEvent +import top.r3944realms.ltdmanager.napcat.event.group.AbstractGroupEvent /** * SendGroupForwardMsg事件 @@ -14,7 +14,7 @@ import top.r3944realms.ltdmanager.napcat.events.group.AbstractGroupEvent @Serializable data class SendGroupForwardMsgEvent( @Transient - val status0: NapCatEvent.Status = Status.Ok, + val status0: Status = Status.Ok, @Transient val retcode0: Double = 0.0, @Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/group/SendGroupMsgEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/group/SendGroupMsgEvent.kt similarity index 84% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/group/SendGroupMsgEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/group/SendGroupMsgEvent.kt index a83d31b..338ca08 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/group/SendGroupMsgEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/group/SendGroupMsgEvent.kt @@ -1,10 +1,10 @@ -package top.r3944realms.ltdmanager.napcat.events.message.group +package top.r3944realms.ltdmanager.napcat.event.message.group import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.Transient -import top.r3944realms.ltdmanager.napcat.events.group.AbstractGroupEvent +import top.r3944realms.ltdmanager.napcat.event.group.AbstractGroupEvent /** * SendGroupMsg事件 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/personal/ForwardFriendSingleMsgEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/personal/ForwardFriendSingleMsgEvent.kt similarity index 83% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/personal/ForwardFriendSingleMsgEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/personal/ForwardFriendSingleMsgEvent.kt index 0b289b0..43dfe5e 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/personal/ForwardFriendSingleMsgEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/personal/ForwardFriendSingleMsgEvent.kt @@ -1,10 +1,10 @@ -package top.r3944realms.ltdmanager.napcat.events.message.personal +package top.r3944realms.ltdmanager.napcat.event.message.personal import kotlinx.serialization.Serializable import kotlinx.serialization.Transient import kotlinx.serialization.json.JsonElement -import top.r3944realms.ltdmanager.napcat.events.group.AbstractGroupEvent +import top.r3944realms.ltdmanager.napcat.event.group.AbstractGroupEvent /** * ForwardFriendSingleMsg事件 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/personal/FriendPokeEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/personal/FriendPokeEvent.kt similarity index 79% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/personal/FriendPokeEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/personal/FriendPokeEvent.kt index 0123594..7eb7df0 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/personal/FriendPokeEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/personal/FriendPokeEvent.kt @@ -1,9 +1,9 @@ -package top.r3944realms.ltdmanager.napcat.events.message.personal +package top.r3944realms.ltdmanager.napcat.event.message.personal import kotlinx.serialization.Serializable import kotlinx.serialization.Transient -import top.r3944realms.ltdmanager.napcat.events.group.AbstractGroupEvent +import top.r3944realms.ltdmanager.napcat.event.group.AbstractGroupEvent /** * FriendPoke事件 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/personal/SendPrivateForwardMsgEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/personal/SendPrivateForwardMsgEvent.kt similarity index 83% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/personal/SendPrivateForwardMsgEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/personal/SendPrivateForwardMsgEvent.kt index fe1a2e4..207a515 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/personal/SendPrivateForwardMsgEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/personal/SendPrivateForwardMsgEvent.kt @@ -1,10 +1,10 @@ -package top.r3944realms.ltdmanager.napcat.events.message.personal +package top.r3944realms.ltdmanager.napcat.event.message.personal import kotlinx.serialization.Serializable import kotlinx.serialization.Transient import kotlinx.serialization.json.JsonElement -import top.r3944realms.ltdmanager.napcat.events.group.AbstractGroupEvent +import top.r3944realms.ltdmanager.napcat.event.group.AbstractGroupEvent /** * SendPrivateForwardMsg事件 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/personal/SendPrivateMsgEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/personal/SendPrivateMsgEvent.kt similarity index 84% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/personal/SendPrivateMsgEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/personal/SendPrivateMsgEvent.kt index d0422f1..cf67f9f 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/message/personal/SendPrivateMsgEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/message/personal/SendPrivateMsgEvent.kt @@ -1,10 +1,10 @@ -package top.r3944realms.ltdmanager.napcat.events.message.personal +package top.r3944realms.ltdmanager.napcat.event.message.personal import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.Transient -import top.r3944realms.ltdmanager.napcat.events.group.AbstractGroupEvent +import top.r3944realms.ltdmanager.napcat.event.group.AbstractGroupEvent /** * SendPrivateMsg事件 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/other/AbstractOtherEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/other/AbstractOtherEvent.kt similarity index 72% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/other/AbstractOtherEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/other/AbstractOtherEvent.kt index 05a686f..425ab79 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/other/AbstractOtherEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/other/AbstractOtherEvent.kt @@ -1,4 +1,4 @@ -package top.r3944realms.ltdmanager.napcat.events.other +package top.r3944realms.ltdmanager.napcat.event.other import kotlinx.serialization.KSerializer import kotlinx.serialization.Serializable @@ -6,7 +6,7 @@ import kotlinx.serialization.json.Json import kotlinx.serialization.modules.SerializersModule import kotlinx.serialization.modules.polymorphic import kotlinx.serialization.modules.subclass -import top.r3944realms.ltdmanager.napcat.events.NapCatEvent +import top.r3944realms.ltdmanager.napcat.event.NapCatEvent /** * QQ 其它相关响应抽象 * @property status 状态字符串 @@ -43,15 +43,15 @@ abstract class AbstractOtherEvent ( companion object { val eventTypeMap by lazy { mutableMapOf>().apply { - put("/send_private_msg",SendPrivateMsgEvent.serializer()) - put("/send_group_msg",SendGroupMsgEvent.serializer()) - put("/send_msg",SendMsgEvent.serializer()) - put("/unknown",UnknownEvent.serializer()) - put("/get_guild_list", GetGuildListEvent.serializer()) - put("/get_guild_service_profile", GetGuildServiceProfileEvent.serializer()) - put("/check_url_safely", CheckUrlSafelyEvent.serializer()) - put("/get_collection_list", GetCollectionListEvent.serializer()) - put("/get_group_ignore_add_request", GetGroupIgnoreAddRequestEvent.serializer()) + put("other/send_private_msg",SendPrivateMsgEvent.serializer()) + put("other/send_group_msg",SendGroupMsgEvent.serializer()) + put("other/send_msg",SendMsgEvent.serializer()) + put("other/unknown",UnknownEvent.serializer()) + put("other/get_guild_list", GetGuildListEvent.serializer()) + put("other/get_guild_service_profile", GetGuildServiceProfileEvent.serializer()) + put("other/check_url_safely", CheckUrlSafelyEvent.serializer()) + put("other/get_collection_list", GetCollectionListEvent.serializer()) + put("other/get_group_ignore_add_request", GetGroupIgnoreAddRequestEvent.serializer()) } } internal val json: Json by lazy { diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/other/CheckUrlSafelyEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/other/CheckUrlSafelyEvent.kt similarity index 62% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/other/CheckUrlSafelyEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/other/CheckUrlSafelyEvent.kt index 03ed4dc..888b539 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/other/CheckUrlSafelyEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/other/CheckUrlSafelyEvent.kt @@ -1,11 +1,9 @@ -package top.r3944realms.ltdmanager.napcat.events.other +package top.r3944realms.ltdmanager.napcat.event.other import kotlinx.serialization.Serializable -import kotlinx.serialization.Transient -import kotlinx.serialization.json.JsonElement import top.r3944realms.ltdmanager.napcat.Developing -import top.r3944realms.ltdmanager.napcat.events.NapCatEvent +import top.r3944realms.ltdmanager.napcat.event.NapCatEvent /** * CheckUrlSafely事件 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/other/GetCollectionListEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/other/GetCollectionListEvent.kt similarity index 94% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/other/GetCollectionListEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/other/GetCollectionListEvent.kt index 39eb3d1..5822915 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/other/GetCollectionListEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/other/GetCollectionListEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.other +package top.r3944realms.ltdmanager.napcat.event.other import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/other/GetGroupIgnoreAddRequestEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/other/GetGroupIgnoreAddRequestEvent.kt similarity index 91% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/other/GetGroupIgnoreAddRequestEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/other/GetGroupIgnoreAddRequestEvent.kt index 9991602..5acf7c4 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/other/GetGroupIgnoreAddRequestEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/other/GetGroupIgnoreAddRequestEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.other +package top.r3944realms.ltdmanager.napcat.event.other import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable @@ -32,7 +32,7 @@ data class GetGroupIgnoreAddRequestEvent( val checked: Boolean, @SerialName("group_id") - val groupID: Double? = null, + val groupId: Double? = null, @SerialName("group_name") val groupName: String? = null, @@ -46,7 +46,7 @@ data class GetGroupIgnoreAddRequestEvent( val message: String? = null, @SerialName("request_id") - val requestID: Double, + val requestId: Double, @SerialName("requester_nick") val requesterNick: String? = null diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/other/GetGuildListEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/other/GetGuildListEvent.kt similarity index 73% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/other/GetGuildListEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/other/GetGuildListEvent.kt index 378d64b..e69be48 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/other/GetGuildListEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/other/GetGuildListEvent.kt @@ -1,9 +1,9 @@ -package top.r3944realms.ltdmanager.napcat.events.other +package top.r3944realms.ltdmanager.napcat.event.other import kotlinx.serialization.Serializable import top.r3944realms.ltdmanager.napcat.Developing -import top.r3944realms.ltdmanager.napcat.events.NapCatEvent +import top.r3944realms.ltdmanager.napcat.event.NapCatEvent /** * GetGuildList事件 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/other/GetGuildServiceProfileEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/other/GetGuildServiceProfileEvent.kt similarity index 64% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/other/GetGuildServiceProfileEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/other/GetGuildServiceProfileEvent.kt index e964fe7..79ee6c9 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/other/GetGuildServiceProfileEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/other/GetGuildServiceProfileEvent.kt @@ -1,11 +1,9 @@ -package top.r3944realms.ltdmanager.napcat.events.other +package top.r3944realms.ltdmanager.napcat.event.other import kotlinx.serialization.Serializable -import kotlinx.serialization.Transient -import kotlinx.serialization.json.JsonElement import top.r3944realms.ltdmanager.napcat.Developing -import top.r3944realms.ltdmanager.napcat.events.NapCatEvent +import top.r3944realms.ltdmanager.napcat.event.NapCatEvent /** * GetGuildServiceProfile事件 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/other/SendGroupMsgEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/other/SendGroupMsgEvent.kt similarity index 91% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/other/SendGroupMsgEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/other/SendGroupMsgEvent.kt index 4e8d272..82c9bd0 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/other/SendGroupMsgEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/other/SendGroupMsgEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.other +package top.r3944realms.ltdmanager.napcat.event.other import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/other/SendMsgEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/other/SendMsgEvent.kt similarity index 93% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/other/SendMsgEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/other/SendMsgEvent.kt index 7b0cf89..f4d0d07 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/other/SendMsgEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/other/SendMsgEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.other +package top.r3944realms.ltdmanager.napcat.event.other import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/other/SendPrivateMsgEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/other/SendPrivateMsgEvent.kt similarity index 91% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/other/SendPrivateMsgEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/other/SendPrivateMsgEvent.kt index bea6b75..4047581 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/other/SendPrivateMsgEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/other/SendPrivateMsgEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.other +package top.r3944realms.ltdmanager.napcat.event.other import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/other/UnknownEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/other/UnknownEvent.kt similarity index 62% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/other/UnknownEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/other/UnknownEvent.kt index c97074a..93db44c 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/other/UnknownEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/other/UnknownEvent.kt @@ -1,11 +1,9 @@ -package top.r3944realms.ltdmanager.napcat.events.other +package top.r3944realms.ltdmanager.napcat.event.other import kotlinx.serialization.Serializable -import kotlinx.serialization.Transient -import kotlinx.serialization.json.JsonElement import top.r3944realms.ltdmanager.napcat.Developing -import top.r3944realms.ltdmanager.napcat.events.NapCatEvent +import top.r3944realms.ltdmanager.napcat.event.NapCatEvent /** * Unknown事件 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/passkey/AbstractPassKeyEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/passkey/AbstractPassKeyEvent.kt similarity index 95% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/passkey/AbstractPassKeyEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/passkey/AbstractPassKeyEvent.kt index 0096e56..5a50867 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/passkey/AbstractPassKeyEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/passkey/AbstractPassKeyEvent.kt @@ -1,4 +1,4 @@ -package top.r3944realms.ltdmanager.napcat.events.passkey +package top.r3944realms.ltdmanager.napcat.event.passkey import kotlinx.serialization.KSerializer import kotlinx.serialization.Serializable @@ -6,7 +6,7 @@ import kotlinx.serialization.json.Json import kotlinx.serialization.modules.SerializersModule import kotlinx.serialization.modules.polymorphic import kotlinx.serialization.modules.subclass -import top.r3944realms.ltdmanager.napcat.events.NapCatEvent +import top.r3944realms.ltdmanager.napcat.event.NapCatEvent /** * QQ 密钥相关响应抽象 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/passkey/GetClientkeyEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/passkey/GetClientkeyEvent.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/passkey/GetClientkeyEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/passkey/GetClientkeyEvent.kt index 207a583..61f2bef 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/passkey/GetClientkeyEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/passkey/GetClientkeyEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.passkey +package top.r3944realms.ltdmanager.napcat.event.passkey import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/passkey/GetCookiesEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/passkey/GetCookiesEvent.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/passkey/GetCookiesEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/passkey/GetCookiesEvent.kt index 9bca0c3..dc4a3ab 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/passkey/GetCookiesEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/passkey/GetCookiesEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.passkey +package top.r3944realms.ltdmanager.napcat.event.passkey import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/passkey/GetCredentialsEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/passkey/GetCredentialsEvent.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/passkey/GetCredentialsEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/passkey/GetCredentialsEvent.kt index 6b407ec..43239c4 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/passkey/GetCredentialsEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/passkey/GetCredentialsEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.passkey +package top.r3944realms.ltdmanager.napcat.event.passkey import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/passkey/GetCsrfTokenEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/passkey/GetCsrfTokenEvent.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/passkey/GetCsrfTokenEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/passkey/GetCsrfTokenEvent.kt index 2c45cc6..e005497 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/passkey/GetCsrfTokenEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/passkey/GetCsrfTokenEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.passkey +package top.r3944realms.ltdmanager.napcat.event.passkey import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/passkey/GetRkeyEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/passkey/GetRkeyEvent.kt similarity index 93% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/passkey/GetRkeyEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/passkey/GetRkeyEvent.kt index d14d967..cab14bf 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/passkey/GetRkeyEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/passkey/GetRkeyEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.passkey +package top.r3944realms.ltdmanager.napcat.event.passkey import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/passkey/GetRkeyServerEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/passkey/GetRkeyServerEvent.kt similarity index 94% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/passkey/GetRkeyServerEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/passkey/GetRkeyServerEvent.kt index b76c868..ba8f374 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/passkey/GetRkeyServerEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/passkey/GetRkeyServerEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.passkey +package top.r3944realms.ltdmanager.napcat.event.passkey import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/passkey/NcGetRkeyEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/passkey/NcGetRkeyEvent.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/passkey/NcGetRkeyEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/passkey/NcGetRkeyEvent.kt index 8cbac94..8c1dae3 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/passkey/NcGetRkeyEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/passkey/NcGetRkeyEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.passkey +package top.r3944realms.ltdmanager.napcat.event.passkey import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/personal/AbstractPersonalEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/personal/AbstractPersonalEvent.kt similarity index 95% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/personal/AbstractPersonalEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/personal/AbstractPersonalEvent.kt index c56d99d..f86255c 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/personal/AbstractPersonalEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/personal/AbstractPersonalEvent.kt @@ -1,4 +1,4 @@ -package top.r3944realms.ltdmanager.napcat.events.personal +package top.r3944realms.ltdmanager.napcat.event.personal import kotlinx.serialization.KSerializer import kotlinx.serialization.Serializable @@ -6,7 +6,7 @@ import kotlinx.serialization.json.Json import kotlinx.serialization.modules.SerializersModule import kotlinx.serialization.modules.polymorphic import kotlinx.serialization.modules.subclass -import top.r3944realms.ltdmanager.napcat.events.NapCatEvent +import top.r3944realms.ltdmanager.napcat.event.NapCatEvent /** * QQ 个人相关响应抽象 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/personal/CanSendImageEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/personal/CanSendImageEvent.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/personal/CanSendImageEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/personal/CanSendImageEvent.kt index d817dfc..3ed0380 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/personal/CanSendImageEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/personal/CanSendImageEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.personal +package top.r3944realms.ltdmanager.napcat.event.personal import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/personal/CanSendRecordEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/personal/CanSendRecordEvent.kt similarity index 91% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/personal/CanSendRecordEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/personal/CanSendRecordEvent.kt index d538e0a..e9981f1 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/personal/CanSendRecordEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/personal/CanSendRecordEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.personal +package top.r3944realms.ltdmanager.napcat.event.personal import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/personal/ClickInlineKeyboardButtonEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/personal/ClickInlineKeyboardButtonEvent.kt similarity index 93% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/personal/ClickInlineKeyboardButtonEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/personal/ClickInlineKeyboardButtonEvent.kt index de617df..9590703 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/personal/ClickInlineKeyboardButtonEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/personal/ClickInlineKeyboardButtonEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.personal +package top.r3944realms.ltdmanager.napcat.event.personal import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/personal/GetAiCharactersEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/personal/GetAiCharactersEvent.kt similarity index 93% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/personal/GetAiCharactersEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/personal/GetAiCharactersEvent.kt index 500bdee..6b17d43 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/personal/GetAiCharactersEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/personal/GetAiCharactersEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.personal +package top.r3944realms.ltdmanager.napcat.event.personal import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/personal/GetAiRecordEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/personal/GetAiRecordEvent.kt similarity index 91% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/personal/GetAiRecordEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/personal/GetAiRecordEvent.kt index b048522..ac69ddc 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/personal/GetAiRecordEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/personal/GetAiRecordEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.personal +package top.r3944realms.ltdmanager.napcat.event.personal import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/personal/OcrImageEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/personal/OcrImageEvent.kt similarity index 95% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/personal/OcrImageEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/personal/OcrImageEvent.kt index 35623ad..be3a21b 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/personal/OcrImageEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/personal/OcrImageEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.personal +package top.r3944realms.ltdmanager.napcat.event.personal import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/personal/PointHandleQuickOperationEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/personal/PointHandleQuickOperationEvent.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/personal/PointHandleQuickOperationEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/personal/PointHandleQuickOperationEvent.kt index e1ec1f5..dbf598a 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/personal/PointHandleQuickOperationEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/personal/PointHandleQuickOperationEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.personal +package top.r3944realms.ltdmanager.napcat.event.personal import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/personal/PointOcrImageEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/personal/PointOcrImageEvent.kt similarity index 91% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/personal/PointOcrImageEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/personal/PointOcrImageEvent.kt index b08823b..74b1a2f 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/personal/PointOcrImageEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/personal/PointOcrImageEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.personal +package top.r3944realms.ltdmanager.napcat.event.personal import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/personal/SetInputStatusEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/personal/SetInputStatusEvent.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/personal/SetInputStatusEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/personal/SetInputStatusEvent.kt index aabbaef..2f7d961 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/personal/SetInputStatusEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/personal/SetInputStatusEvent.kt @@ -1,4 +1,4 @@ -package top.r3944realms.ltdmanager.napcat.events.personal +package top.r3944realms.ltdmanager.napcat.event.personal import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/personal/TranslateEn2zhEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/personal/TranslateEn2zhEvent.kt similarity index 91% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/personal/TranslateEn2zhEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/personal/TranslateEn2zhEvent.kt index 8a457ac..0c7efb6 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/personal/TranslateEn2zhEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/personal/TranslateEn2zhEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.personal +package top.r3944realms.ltdmanager.napcat.event.personal import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/system/AbstractSystemEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/system/AbstractSystemEvent.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/system/AbstractSystemEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/system/AbstractSystemEvent.kt index 0ca55d9..937a9ba 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/system/AbstractSystemEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/system/AbstractSystemEvent.kt @@ -1,11 +1,11 @@ -package top.r3944realms.ltdmanager.napcat.events.system +package top.r3944realms.ltdmanager.napcat.event.system import kotlinx.serialization.KSerializer import kotlinx.serialization.json.Json import kotlinx.serialization.modules.SerializersModule import kotlinx.serialization.modules.polymorphic import kotlinx.serialization.modules.subclass -import top.r3944realms.ltdmanager.napcat.events.NapCatEvent +import top.r3944realms.ltdmanager.napcat.event.NapCatEvent abstract class AbstractSystemEvent : NapCatEvent() { diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/system/BotExitEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/system/BotExitEvent.kt similarity index 79% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/system/BotExitEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/system/BotExitEvent.kt index 681243c..35a0bc6 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/system/BotExitEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/system/BotExitEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.system +package top.r3944realms.ltdmanager.napcat.event.system import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/system/GetRobotUinRangeEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/system/GetRobotUinRangeEvent.kt similarity index 93% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/system/GetRobotUinRangeEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/system/GetRobotUinRangeEvent.kt index 762b218..09f699b 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/system/GetRobotUinRangeEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/system/GetRobotUinRangeEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.system +package top.r3944realms.ltdmanager.napcat.event.system import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/system/GetVersionInfoEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/system/GetVersionInfoEvent.kt similarity index 94% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/system/GetVersionInfoEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/system/GetVersionInfoEvent.kt index d518758..2a598ed 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/system/GetVersionInfoEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/system/GetVersionInfoEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.system +package top.r3944realms.ltdmanager.napcat.event.system import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/system/NcGetPacketStatusEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/system/NcGetPacketStatusEvent.kt similarity index 93% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/system/NcGetPacketStatusEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/system/NcGetPacketStatusEvent.kt index 13daf7d..ed74f94 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/system/NcGetPacketStatusEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/system/NcGetPacketStatusEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.system +package top.r3944realms.ltdmanager.napcat.event.system import kotlinx.serialization.Serializable import kotlinx.serialization.json.JsonElement diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/system/SendPacketEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/system/SendPacketEvent.kt similarity index 83% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/system/SendPacketEvent.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/system/SendPacketEvent.kt index 889fbf5..c7d5848 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/system/SendPacketEvent.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/event/system/SendPacketEvent.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.events.system +package top.r3944realms.ltdmanager.napcat.event.system import kotlinx.serialization.Serializable import top.r3944realms.ltdmanager.napcat.Developing diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/NapCatEvent.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/NapCatEvent.kt deleted file mode 100644 index b284c74..0000000 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/events/NapCatEvent.kt +++ /dev/null @@ -1,106 +0,0 @@ -package top.r3944realms.ltdmanager.napcat.events - -import kotlinx.serialization.* -import kotlinx.serialization.json.Json -import top.r3944realms.ltdmanager.napcat.events.account.AbstractAccountEvent -import top.r3944realms.ltdmanager.napcat.events.file.AbstractFileEvent -import top.r3944realms.ltdmanager.napcat.events.group.AbstractGroupEvent -import top.r3944realms.ltdmanager.napcat.events.message.AbstractMessageEvent -import top.r3944realms.ltdmanager.napcat.events.other.AbstractOtherEvent -import top.r3944realms.ltdmanager.napcat.events.passkey.AbstractPassKeyEvent -import top.r3944realms.ltdmanager.napcat.events.personal.AbstractPersonalEvent -import top.r3944realms.ltdmanager.napcat.events.system.AbstractSystemEvent - - -/** - * 基础NapCat事件类 - * @property httpStatusCode HTTP状态码 - * @property createTime 创建时间戳 - */ -@Serializable -abstract class NapCatEvent( - @Transient - open val httpStatusCode: HttpStatus = HttpStatus.OK, - @Transient - open val createTime: Long = System.currentTimeMillis() -) { - abstract fun type() :String - abstract fun subtype(): String - companion object { - private val eventTypeMap by lazy { - mutableMapOf>().apply { - putAll(AbstractAccountEvent.eventTypeMap) - putAll(AbstractFileEvent.eventTypeMap) - putAll(AbstractOtherEvent.eventTypeMap) - putAll(AbstractPersonalEvent.eventTypeMap) - putAll(AbstractPassKeyEvent.eventTypeMap) - putAll(AbstractGroupEvent.eventTypeMap) - putAll(AbstractSystemEvent.eventTypeMap) - putAll(AbstractMessageEvent.eventTypeMap) - } - } - - - fun decodeEvent(jsonString: String, type: String): NapCatEvent { - return eventTypeMap[type]?.let { serializer -> - // 如果是Account相关事件，使用AccountEvent的json配置 - if (type.startsWith("account/")) { - AbstractAccountEvent.json.decodeFromString(serializer, jsonString) - } else if (type.startsWith("file/")) { - AbstractFileEvent.json.decodeFromString(serializer, jsonString) - } else if (type.startsWith("group/")) { - AbstractGroupEvent.json.decodeFromString(serializer, jsonString) - } else if (type.startsWith("message/")) { - AbstractMessageEvent.json.decodeFromString(serializer, jsonString) - } else if (type.startsWith("passkey/")) { - AbstractPassKeyEvent.json.decodeFromString(serializer, jsonString) - } else if (type.startsWith("personal/")) { - AbstractPersonalEvent.json.decodeFromString(serializer, jsonString) - } else if (type.startsWith("system/")) { - AbstractSystemEvent.json.decodeFromString(serializer, jsonString) - } else if (type.startsWith("other/")) { - AbstractOtherEvent.json.decodeFromString(serializer, jsonString) - } else { - // 其他类型的事件可以使用默认的Json配置 - val json = Json { - ignoreUnknownKeys = true - } - json.decodeFromString(serializer, jsonString) - } - } ?: throw SerializationException("Unknown request type: $type") - } - } - @Serializable - enum class Status(val value: String) { - @SerialName("ok") Ok("ok"); - } - enum class HttpStatus( - val code: Int, - val message: String - ) { - // 1xx Informational - CONTINUE(100, "Continue"), - SWITCHING_PROTOCOLS(101, "Switching Protocols"), - - // 2xx Success - OK(200, "OK"), - CREATED(201, "Created"), - - // 3xx Redirection - MOVED_PERMANENTLY(301, "Moved Permanently"), - - // 4xx Client Error - BAD_REQUEST(400, "Bad Request"), - UNAUTHORIZED(401, "Unauthorized"), - FORBIDDEN(403, "Forbidden"), - NOT_FOUND(404, "Not Found"), - - // 5xx Server Error - INTERNAL_SERVER_ERROR(500, "Internal Server Error"), - SERVICE_UNAVAILABLE(503, "Service Unavailable"); - companion object { - private val values = entries.associateBy { it.code } - fun fromCode(code: Int) = values[code] ?: throw IllegalArgumentException("无效的HTTP状态码: $code") - } - } -} \ No newline at end of file diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/NapCatRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/NapCatRequest.kt similarity index 90% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/NapCatRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/NapCatRequest.kt index f2b8810..46e40ba 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/NapCatRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/NapCatRequest.kt @@ -1,4 +1,4 @@ -package top.r3944realms.ltdmanager.napcat.requests +package top.r3944realms.ltdmanager.napcat.request import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/AbstractAccountRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/AbstractAccountRequest.kt similarity index 60% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/AbstractAccountRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/AbstractAccountRequest.kt index 3fdf920..b3f541e 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/AbstractAccountRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/AbstractAccountRequest.kt @@ -1,7 +1,7 @@ -package top.r3944realms.ltdmanager.napcat.requests.account +package top.r3944realms.ltdmanager.napcat.request.account import kotlinx.serialization.Serializable -import top.r3944realms.ltdmanager.napcat.requests.NapCatRequest +import top.r3944realms.ltdmanager.napcat.request.NapCatRequest @Serializable abstract class AbstractAccountRequest diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/ArkShareGroupRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/ArkShareGroupRequest.kt similarity index 88% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/ArkShareGroupRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/ArkShareGroupRequest.kt index 81399ac..9c7737d 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/ArkShareGroupRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/ArkShareGroupRequest.kt @@ -1,4 +1,4 @@ -package top.r3944realms.ltdmanager.napcat.requests.account +package top.r3944realms.ltdmanager.napcat.request.account import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/ArkSharePeerRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/ArkSharePeerRequest.kt similarity index 79% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/ArkSharePeerRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/ArkSharePeerRequest.kt index c2d9939..c72cd11 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/ArkSharePeerRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/ArkSharePeerRequest.kt @@ -1,11 +1,10 @@ -package top.r3944realms.ltdmanager.napcat.requests.account +package top.r3944realms.ltdmanager.napcat.request.account import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import top.r3944realms.ltdmanager.napcat.data.ID -import top.r3944realms.ltdmanager.napcat.requests.NapCatRequest /** * 获取推荐好友/群聊卡片 @@ -16,7 +15,7 @@ data class ArkSharePeerRequest( * 和user_id二选一 */ @SerialName("group_id") - val groupID: ID? = null, + val groupId: ID? = null, /** * 对方手机号 @@ -27,7 +26,7 @@ data class ArkSharePeerRequest( * 和group_id二选一 */ @SerialName("user_id") - val userID: ID? = null + val userId: ID? = null ) : AbstractAccountRequest() { override fun toJSON(): String { return Json.encodeToString(this) diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/CreateCollectionRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/CreateCollectionRequest.kt similarity index 88% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/CreateCollectionRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/CreateCollectionRequest.kt index 7e30ddb..5971b54 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/CreateCollectionRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/CreateCollectionRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.account +package top.r3944realms.ltdmanager.napcat.request.account import kotlinx.serialization.Serializable import kotlinx.serialization.encodeToString diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/DeleteFriendRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/DeleteFriendRequest.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/DeleteFriendRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/DeleteFriendRequest.kt index f2cec3b..5a4c1df 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/DeleteFriendRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/DeleteFriendRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.account +package top.r3944realms.ltdmanager.napcat.request.account import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/FetchCustomFaceRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/FetchCustomFaceRequest.kt similarity index 86% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/FetchCustomFaceRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/FetchCustomFaceRequest.kt index d56bf04..d5baacf 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/FetchCustomFaceRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/FetchCustomFaceRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.account +package top.r3944realms.ltdmanager.napcat.request.account import kotlinx.serialization.Serializable import kotlinx.serialization.encodeToString diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/GetDoubtFriendsAddRequestRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/GetDoubtFriendsAddRequestRequest.kt similarity index 78% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/GetDoubtFriendsAddRequestRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/GetDoubtFriendsAddRequestRequest.kt index 91c8d87..32a298c 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/GetDoubtFriendsAddRequestRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/GetDoubtFriendsAddRequestRequest.kt @@ -1,9 +1,8 @@ -package top.r3944realms.ltdmanager.napcat.requests.account +package top.r3944realms.ltdmanager.napcat.request.account import kotlinx.serialization.Serializable import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json -import top.r3944realms.ltdmanager.napcat.requests.NapCatRequest /** * 获取被过滤好友请求 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/GetFriendListRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/GetFriendListRequest.kt similarity index 63% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/GetFriendListRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/GetFriendListRequest.kt index 4be2c2c..7b42431 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/GetFriendListRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/GetFriendListRequest.kt @@ -1,9 +1,7 @@ -package top.r3944realms.ltdmanager.napcat.requests.account +package top.r3944realms.ltdmanager.napcat.request.account import kotlinx.serialization.Serializable -import kotlinx.serialization.encodeToString -import kotlinx.serialization.json.Json /** * GetFriendList请求 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/GetFriendsWithCategoryRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/GetFriendsWithCategoryRequest.kt similarity index 65% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/GetFriendsWithCategoryRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/GetFriendsWithCategoryRequest.kt index 7aaf953..76a717a 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/GetFriendsWithCategoryRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/GetFriendsWithCategoryRequest.kt @@ -1,9 +1,7 @@ -package top.r3944realms.ltdmanager.napcat.requests.account +package top.r3944realms.ltdmanager.napcat.request.account import kotlinx.serialization.Serializable -import kotlinx.serialization.encodeToString -import kotlinx.serialization.json.Json /** * GetFriendsWithCategory请求 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/GetLoginInfoRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/GetLoginInfoRequest.kt similarity index 62% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/GetLoginInfoRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/GetLoginInfoRequest.kt index b8c27a6..897595c 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/GetLoginInfoRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/GetLoginInfoRequest.kt @@ -1,9 +1,7 @@ -package top.r3944realms.ltdmanager.napcat.requests.account +package top.r3944realms.ltdmanager.napcat.request.account import kotlinx.serialization.Serializable -import kotlinx.serialization.encodeToString -import kotlinx.serialization.json.Json /** * GetLoginInfo请求 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/GetMiniAppArkRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/GetMiniAppArkRequest.kt similarity index 97% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/GetMiniAppArkRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/GetMiniAppArkRequest.kt index 8c55f12..03ca03a 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/GetMiniAppArkRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/GetMiniAppArkRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.account +package top.r3944realms.ltdmanager.napcat.request.account import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/GetModelShowRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/GetModelShowRequest.kt similarity index 86% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/GetModelShowRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/GetModelShowRequest.kt index 5625bea..80d645c 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/GetModelShowRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/GetModelShowRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.account +package top.r3944realms.ltdmanager.napcat.request.account import kotlinx.serialization.Serializable import kotlinx.serialization.encodeToString diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/GetOnlineClientRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/GetOnlineClientRequest.kt similarity index 85% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/GetOnlineClientRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/GetOnlineClientRequest.kt index 1c251e8..9a9625f 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/GetOnlineClientRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/GetOnlineClientRequest.kt @@ -1,4 +1,4 @@ -package top.r3944realms.ltdmanager.napcat.requests.account +package top.r3944realms.ltdmanager.napcat.request.account import kotlinx.serialization.Serializable import top.r3944realms.ltdmanager.napcat.Developing diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/GetProfileLikeRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/GetProfileLikeRequest.kt similarity index 91% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/GetProfileLikeRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/GetProfileLikeRequest.kt index 165dfb6..ccb6209 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/GetProfileLikeRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/GetProfileLikeRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.account +package top.r3944realms.ltdmanager.napcat.request.account import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/GetRecentContactRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/GetRecentContactRequest.kt similarity index 87% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/GetRecentContactRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/GetRecentContactRequest.kt index fccb81b..d7b8fa3 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/GetRecentContactRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/GetRecentContactRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.account +package top.r3944realms.ltdmanager.napcat.request.account import kotlinx.serialization.Serializable import kotlinx.serialization.encodeToString diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/GetStatusRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/GetStatusRequest.kt similarity index 91% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/GetStatusRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/GetStatusRequest.kt index 43fa606..309697e 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/GetStatusRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/GetStatusRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.account +package top.r3944realms.ltdmanager.napcat.request.account import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/GetStrangerInfoRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/GetStrangerInfoRequest.kt similarity index 89% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/GetStrangerInfoRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/GetStrangerInfoRequest.kt index e98a01d..894c65e 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/GetStrangerInfoRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/GetStrangerInfoRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.account +package top.r3944realms.ltdmanager.napcat.request.account import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/GetUnidirectionalFriendListRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/GetUnidirectionalFriendListRequest.kt similarity index 71% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/GetUnidirectionalFriendListRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/GetUnidirectionalFriendListRequest.kt index 818a52b..95c8571 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/GetUnidirectionalFriendListRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/GetUnidirectionalFriendListRequest.kt @@ -1,9 +1,7 @@ -package top.r3944realms.ltdmanager.napcat.requests.account +package top.r3944realms.ltdmanager.napcat.request.account import kotlinx.serialization.Serializable -import kotlinx.serialization.encodeToString -import kotlinx.serialization.json.Json import top.r3944realms.ltdmanager.napcat.Developing /** diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/MarkAllAsReadRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/MarkAllAsReadRequest.kt similarity index 63% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/MarkAllAsReadRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/MarkAllAsReadRequest.kt index 957198b..2d4bca0 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/MarkAllAsReadRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/MarkAllAsReadRequest.kt @@ -1,9 +1,7 @@ -package top.r3944realms.ltdmanager.napcat.requests.account +package top.r3944realms.ltdmanager.napcat.request.account import kotlinx.serialization.Serializable -import kotlinx.serialization.encodeToString -import kotlinx.serialization.json.Json /** * MarkAllAsRead请求 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/MarkGroupMsgAsReadRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/MarkGroupMsgAsReadRequest.kt similarity index 89% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/MarkGroupMsgAsReadRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/MarkGroupMsgAsReadRequest.kt index 6922c71..d20d31d 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/MarkGroupMsgAsReadRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/MarkGroupMsgAsReadRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.account +package top.r3944realms.ltdmanager.napcat.request.account import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/MarkMsgAsReadRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/MarkMsgAsReadRequest.kt similarity index 88% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/MarkMsgAsReadRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/MarkMsgAsReadRequest.kt index 252df8e..436bb79 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/MarkMsgAsReadRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/MarkMsgAsReadRequest.kt @@ -1,4 +1,4 @@ -package top.r3944realms.ltdmanager.napcat.requests.account +package top.r3944realms.ltdmanager.napcat.request.account import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable @@ -21,7 +21,7 @@ data class MarkMsgAsReadRequest ( * 与group_id二选一 */ @SerialName("user_id") - val userID: ID? = null + val userId: ID? = null ) : AbstractAccountRequest() { override fun toJSON(): String { return Json.encodeToString(this) diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/MarkPrivateMsgAsReadRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/MarkPrivateMsgAsReadRequest.kt similarity index 89% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/MarkPrivateMsgAsReadRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/MarkPrivateMsgAsReadRequest.kt index ee312a0..1eaac58 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/MarkPrivateMsgAsReadRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/MarkPrivateMsgAsReadRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.account +package top.r3944realms.ltdmanager.napcat.request.account import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/NcGetUserStatusRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/NcGetUserStatusRequest.kt similarity index 89% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/NcGetUserStatusRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/NcGetUserStatusRequest.kt index 9c7c713..88b6a10 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/NcGetUserStatusRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/NcGetUserStatusRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.account +package top.r3944realms.ltdmanager.napcat.request.account import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/SendLikeRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/SendLikeRequest.kt similarity index 90% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/SendLikeRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/SendLikeRequest.kt index ba3235e..582c804 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/SendLikeRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/SendLikeRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.account +package top.r3944realms.ltdmanager.napcat.request.account import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/SetDiyOnlineStatusRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/SetDiyOnlineStatusRequest.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/SetDiyOnlineStatusRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/SetDiyOnlineStatusRequest.kt index 65d3599..08cf4a8 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/SetDiyOnlineStatusRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/SetDiyOnlineStatusRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.account +package top.r3944realms.ltdmanager.napcat.request.account import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/SetDoubtFriendsAddRequestRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/SetDoubtFriendsAddRequestRequest.kt similarity index 80% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/SetDoubtFriendsAddRequestRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/SetDoubtFriendsAddRequestRequest.kt index d7fd8a0..1b91e87 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/SetDoubtFriendsAddRequestRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/SetDoubtFriendsAddRequestRequest.kt @@ -1,9 +1,8 @@ -package top.r3944realms.ltdmanager.napcat.requests.account +package top.r3944realms.ltdmanager.napcat.request.account import kotlinx.serialization.Serializable import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json -import top.r3944realms.ltdmanager.napcat.requests.NapCatRequest /** * 处理被过滤好友请求 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/SetFriendAddRequestRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/SetFriendAddRequestRequest.kt similarity index 90% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/SetFriendAddRequestRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/SetFriendAddRequestRequest.kt index 1c066ca..12a89f6 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/SetFriendAddRequestRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/SetFriendAddRequestRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.account +package top.r3944realms.ltdmanager.napcat.request.account import kotlinx.serialization.Serializable import kotlinx.serialization.encodeToString diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/SetFriendRemarkRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/SetFriendRemarkRequest.kt similarity index 87% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/SetFriendRemarkRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/SetFriendRemarkRequest.kt index e0886bc..30f75ba 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/SetFriendRemarkRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/SetFriendRemarkRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.account +package top.r3944realms.ltdmanager.napcat.request.account import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable @@ -18,7 +18,7 @@ data class SetFriendRemarkRequest( val remark: String, @SerialName("user_id") - val userID: ID + val userId: ID ) : AbstractAccountRequest() { override fun toJSON(): String = Json.encodeToString(this) diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/SetModelShowRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/SetModelShowRequest.kt similarity index 87% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/SetModelShowRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/SetModelShowRequest.kt index c7bf2ca..7e1b1ff 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/SetModelShowRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/SetModelShowRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.account +package top.r3944realms.ltdmanager.napcat.request.account import kotlinx.serialization.Serializable import kotlinx.serialization.encodeToString diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/SetOnlineStatusRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/SetOnlineStatusRequest.kt similarity index 98% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/SetOnlineStatusRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/SetOnlineStatusRequest.kt index 9f48287..d049b42 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/SetOnlineStatusRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/SetOnlineStatusRequest.kt @@ -1,4 +1,4 @@ -package top.r3944realms.ltdmanager.napcat.requests.account +package top.r3944realms.ltdmanager.napcat.request.account import kotlinx.serialization.Serializable import kotlinx.serialization.encodeToString diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/SetQQAvatarRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/SetQQAvatarRequest.kt similarity index 86% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/SetQQAvatarRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/SetQQAvatarRequest.kt index 73ac5b1..69f4540 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/SetQQAvatarRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/SetQQAvatarRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.account +package top.r3944realms.ltdmanager.napcat.request.account import kotlinx.serialization.Serializable import kotlinx.serialization.encodeToString diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/SetQQProfileRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/SetQQProfileRequest.kt similarity index 86% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/SetQQProfileRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/SetQQProfileRequest.kt index 4d88c22..8d9dd2f 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/SetQQProfileRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/SetQQProfileRequest.kt @@ -1,11 +1,10 @@ -package top.r3944realms.ltdmanager.napcat.requests.account +package top.r3944realms.ltdmanager.napcat.request.account import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import top.r3944realms.ltdmanager.napcat.data.Sex -import top.r3944realms.ltdmanager.napcat.requests.NapCatRequest /** * QQ设置个人资料事件请求 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/SetSelfLongnickRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/SetSelfLongnickRequest.kt similarity index 87% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/SetSelfLongnickRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/SetSelfLongnickRequest.kt index d3f1da9..8b30fce 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/account/SetSelfLongnickRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/account/SetSelfLongnickRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.account +package top.r3944realms.ltdmanager.napcat.request.account import kotlinx.serialization.Serializable import kotlinx.serialization.encodeToString diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/AbstractFileRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/AbstractFileRequest.kt similarity index 59% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/AbstractFileRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/AbstractFileRequest.kt index 4c7ca67..8f4f3d3 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/AbstractFileRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/AbstractFileRequest.kt @@ -1,7 +1,7 @@ -package top.r3944realms.ltdmanager.napcat.requests.file +package top.r3944realms.ltdmanager.napcat.request.file import kotlinx.serialization.Serializable -import top.r3944realms.ltdmanager.napcat.requests.NapCatRequest +import top.r3944realms.ltdmanager.napcat.request.NapCatRequest @Serializable abstract class AbstractFileRequest diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/CleanCacheRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/CleanCacheRequest.kt similarity index 87% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/CleanCacheRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/CleanCacheRequest.kt index 08c341d..0f7b55a 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/CleanCacheRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/CleanCacheRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.file +package top.r3944realms.ltdmanager.napcat.request.file import kotlinx.serialization.Serializable import kotlinx.serialization.encodeToString diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/CreateGroupFileFolderRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/CreateGroupFileFolderRequest.kt similarity index 91% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/CreateGroupFileFolderRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/CreateGroupFileFolderRequest.kt index 55e81c7..a9f4f2a 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/CreateGroupFileFolderRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/CreateGroupFileFolderRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.file +package top.r3944realms.ltdmanager.napcat.request.file import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/DeleteGroupFileRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/DeleteGroupFileRequest.kt similarity index 90% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/DeleteGroupFileRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/DeleteGroupFileRequest.kt index e4923cb..194e63f 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/DeleteGroupFileRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/DeleteGroupFileRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.file +package top.r3944realms.ltdmanager.napcat.request.file import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/DeleteGroupFolderRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/DeleteGroupFolderRequest.kt similarity index 90% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/DeleteGroupFolderRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/DeleteGroupFolderRequest.kt index 0ced247..d8f6af9 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/DeleteGroupFolderRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/DeleteGroupFolderRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.file +package top.r3944realms.ltdmanager.napcat.request.file import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/DownloadFileRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/DownloadFileRequest.kt similarity index 93% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/DownloadFileRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/DownloadFileRequest.kt index 9c4ecec..7f19228 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/DownloadFileRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/DownloadFileRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.file +package top.r3944realms.ltdmanager.napcat.request.file import kotlinx.serialization.Serializable import kotlinx.serialization.encodeToString diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/GetFileRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/GetFileRequest.kt similarity index 90% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/GetFileRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/GetFileRequest.kt index f0722d4..7444d09 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/GetFileRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/GetFileRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.file +package top.r3944realms.ltdmanager.napcat.request.file import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/GetGroupFileSystemInfoRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/GetGroupFileSystemInfoRequest.kt similarity index 90% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/GetGroupFileSystemInfoRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/GetGroupFileSystemInfoRequest.kt index 182708a..14d9b5a 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/GetGroupFileSystemInfoRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/GetGroupFileSystemInfoRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.file +package top.r3944realms.ltdmanager.napcat.request.file import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/GetGroupFileUrlRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/GetGroupFileUrlRequest.kt similarity index 90% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/GetGroupFileUrlRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/GetGroupFileUrlRequest.kt index 01dc94d..9bf7319 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/GetGroupFileUrlRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/GetGroupFileUrlRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.file +package top.r3944realms.ltdmanager.napcat.request.file import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/GetGroupFilesByFolderRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/GetGroupFilesByFolderRequest.kt similarity index 93% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/GetGroupFilesByFolderRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/GetGroupFilesByFolderRequest.kt index 33a3df9..bf7928d 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/GetGroupFilesByFolderRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/GetGroupFilesByFolderRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.file +package top.r3944realms.ltdmanager.napcat.request.file import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/GetGroupRootFilesRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/GetGroupRootFilesRequest.kt similarity index 91% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/GetGroupRootFilesRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/GetGroupRootFilesRequest.kt index e2001e6..7dfb2a2 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/GetGroupRootFilesRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/GetGroupRootFilesRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.file +package top.r3944realms.ltdmanager.napcat.request.file import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/GetPrivateFileUrlRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/GetPrivateFileUrlRequest.kt similarity index 84% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/GetPrivateFileUrlRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/GetPrivateFileUrlRequest.kt index 52fd13a..39b80f2 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/GetPrivateFileUrlRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/GetPrivateFileUrlRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.file +package top.r3944realms.ltdmanager.napcat.request.file import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable @@ -12,7 +12,7 @@ import kotlinx.serialization.json.Json @Serializable data class GetPrivateFileUrlRequest( @SerialName("file_id") - val fileID: String + val fileId: String ) : AbstractFileRequest() { override fun toJSON(): String = Json.encodeToString(this) diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/MoveGroupFileRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/MoveGroupFileRequest.kt similarity index 93% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/MoveGroupFileRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/MoveGroupFileRequest.kt index bbbf3c9..c717a70 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/MoveGroupFileRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/MoveGroupFileRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.file +package top.r3944realms.ltdmanager.napcat.request.file import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/RenameGroupFileRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/RenameGroupFileRequest.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/RenameGroupFileRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/RenameGroupFileRequest.kt index a5d4534..875f311 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/RenameGroupFileRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/RenameGroupFileRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.file +package top.r3944realms.ltdmanager.napcat.request.file import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/TransGroupFileRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/TransGroupFileRequest.kt similarity index 86% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/TransGroupFileRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/TransGroupFileRequest.kt index 0f0bf00..e0ffaa1 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/TransGroupFileRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/TransGroupFileRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.file +package top.r3944realms.ltdmanager.napcat.request.file import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable @@ -13,7 +13,7 @@ import top.r3944realms.ltdmanager.napcat.data.ID @Serializable data class TransGroupFileRequest( @SerialName("file_id") - val fileID: String, + val fileId: String, @SerialName("group_id") val groupId: ID diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/UploadGroupFileRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/UploadGroupFileRequest.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/UploadGroupFileRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/UploadGroupFileRequest.kt index 0911e32..042a270 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/UploadGroupFileRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/UploadGroupFileRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.file +package top.r3944realms.ltdmanager.napcat.request.file import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/UploadPrivateFileRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/UploadPrivateFileRequest.kt similarity index 90% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/UploadPrivateFileRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/UploadPrivateFileRequest.kt index 9513415..9f59c16 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/file/UploadPrivateFileRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/file/UploadPrivateFileRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.file +package top.r3944realms.ltdmanager.napcat.request.file import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/AbstractGroupRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/AbstractGroupRequest.kt similarity index 60% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/AbstractGroupRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/AbstractGroupRequest.kt index 3d2d23a..dd99248 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/AbstractGroupRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/AbstractGroupRequest.kt @@ -1,7 +1,7 @@ -package top.r3944realms.ltdmanager.napcat.requests.group +package top.r3944realms.ltdmanager.napcat.request.group import kotlinx.serialization.Serializable -import top.r3944realms.ltdmanager.napcat.requests.NapCatRequest +import top.r3944realms.ltdmanager.napcat.request.NapCatRequest @Serializable abstract class AbstractGroupRequest diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/DelGroupNoticeRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/DelGroupNoticeRequest.kt similarity index 90% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/DelGroupNoticeRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/DelGroupNoticeRequest.kt index 99346b9..fa33aa4 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/DelGroupNoticeRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/DelGroupNoticeRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.group +package top.r3944realms.ltdmanager.napcat.request.group import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/DeleteEssenceMsgRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/DeleteEssenceMsgRequest.kt similarity index 89% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/DeleteEssenceMsgRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/DeleteEssenceMsgRequest.kt index 2bc18b3..dddc3a7 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/DeleteEssenceMsgRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/DeleteEssenceMsgRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.group +package top.r3944realms.ltdmanager.napcat.request.group import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/GetEssenceMsgListRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/GetEssenceMsgListRequest.kt similarity index 89% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/GetEssenceMsgListRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/GetEssenceMsgListRequest.kt index 5f2eb41..f598a43 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/GetEssenceMsgListRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/GetEssenceMsgListRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.group +package top.r3944realms.ltdmanager.napcat.request.group import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/GetGroupAtAllRemainRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/GetGroupAtAllRemainRequest.kt similarity index 89% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/GetGroupAtAllRemainRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/GetGroupAtAllRemainRequest.kt index ad55c29..24205cb 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/GetGroupAtAllRemainRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/GetGroupAtAllRemainRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.group +package top.r3944realms.ltdmanager.napcat.request.group import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/GetGroupDetailInfoRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/GetGroupDetailInfoRequest.kt similarity index 89% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/GetGroupDetailInfoRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/GetGroupDetailInfoRequest.kt index 8b26766..5ccfbf4 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/GetGroupDetailInfoRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/GetGroupDetailInfoRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.group +package top.r3944realms.ltdmanager.napcat.request.group import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/GetGroupHonorInfoRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/GetGroupHonorInfoRequest.kt similarity index 94% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/GetGroupHonorInfoRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/GetGroupHonorInfoRequest.kt index aa98df4..52aa37e 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/GetGroupHonorInfoRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/GetGroupHonorInfoRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.group +package top.r3944realms.ltdmanager.napcat.request.group import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable @@ -13,7 +13,7 @@ import top.r3944realms.ltdmanager.napcat.data.ID @Serializable data class GetGroupHonorInfoRequest( @SerialName("group_id") - val groupID: ID, + val groupId: ID, /** * 看详情 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/GetGroupIgnoredNotifiesRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/GetGroupIgnoredNotifiesRequest.kt similarity index 82% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/GetGroupIgnoredNotifiesRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/GetGroupIgnoredNotifiesRequest.kt index 9e4c09b..ef7c14d 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/GetGroupIgnoredNotifiesRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/GetGroupIgnoredNotifiesRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.group +package top.r3944realms.ltdmanager.napcat.request.group import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/GetGroupInfoExRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/GetGroupInfoExRequest.kt similarity index 89% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/GetGroupInfoExRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/GetGroupInfoExRequest.kt index bca3856..748fc5e 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/GetGroupInfoExRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/GetGroupInfoExRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.group +package top.r3944realms.ltdmanager.napcat.request.group import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/GetGroupInfoRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/GetGroupInfoRequest.kt similarity index 89% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/GetGroupInfoRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/GetGroupInfoRequest.kt index b3e46cf..5613b0b 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/GetGroupInfoRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/GetGroupInfoRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.group +package top.r3944realms.ltdmanager.napcat.request.group import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/GetGroupListRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/GetGroupListRequest.kt similarity index 88% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/GetGroupListRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/GetGroupListRequest.kt index 0a31344..ee22eae 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/GetGroupListRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/GetGroupListRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.group +package top.r3944realms.ltdmanager.napcat.request.group import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/GetGroupMemberInfoRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/GetGroupMemberInfoRequest.kt similarity index 91% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/GetGroupMemberInfoRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/GetGroupMemberInfoRequest.kt index 453f342..761d6fc 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/GetGroupMemberInfoRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/GetGroupMemberInfoRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.group +package top.r3944realms.ltdmanager.napcat.request.group import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/GetGroupMemberListRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/GetGroupMemberListRequest.kt similarity index 91% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/GetGroupMemberListRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/GetGroupMemberListRequest.kt index 01ea209..1d74431 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/GetGroupMemberListRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/GetGroupMemberListRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.group +package top.r3944realms.ltdmanager.napcat.request.group import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/GetGroupNoticeRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/GetGroupNoticeRequest.kt similarity index 89% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/GetGroupNoticeRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/GetGroupNoticeRequest.kt index 29eaae2..4ba4da0 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/GetGroupNoticeRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/GetGroupNoticeRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.group +package top.r3944realms.ltdmanager.napcat.request.group import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/GetGroupShutListRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/GetGroupShutListRequest.kt similarity index 89% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/GetGroupShutListRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/GetGroupShutListRequest.kt index 0f1aee5..39878f5 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/GetGroupShutListRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/GetGroupShutListRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.group +package top.r3944realms.ltdmanager.napcat.request.group import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/GetGroupSystemMsgRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/GetGroupSystemMsgRequest.kt similarity index 87% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/GetGroupSystemMsgRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/GetGroupSystemMsgRequest.kt index f4edb29..e4f7deb 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/GetGroupSystemMsgRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/GetGroupSystemMsgRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.group +package top.r3944realms.ltdmanager.napcat.request.group import kotlinx.serialization.Serializable import kotlinx.serialization.encodeToString diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SendGroupNoticeRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SendGroupNoticeRequest.kt similarity index 94% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SendGroupNoticeRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SendGroupNoticeRequest.kt index e4f882d..2a07357 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SendGroupNoticeRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SendGroupNoticeRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.group +package top.r3944realms.ltdmanager.napcat.request.group import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SendGroupSignRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SendGroupSignRequest.kt similarity index 89% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SendGroupSignRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SendGroupSignRequest.kt index 152b8d8..5c35104 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SendGroupSignRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SendGroupSignRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.group +package top.r3944realms.ltdmanager.napcat.request.group import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetEssenceMsgRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetEssenceMsgRequest.kt similarity index 89% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetEssenceMsgRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetEssenceMsgRequest.kt index 6446d4a..160bb65 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetEssenceMsgRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetEssenceMsgRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.group +package top.r3944realms.ltdmanager.napcat.request.group import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupAddOptionRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupAddOptionRequest.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupAddOptionRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupAddOptionRequest.kt index d6434dd..b4fbd5b 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupAddOptionRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupAddOptionRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.group +package top.r3944realms.ltdmanager.napcat.request.group import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupAddRequestRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupAddRequestRequest.kt similarity index 78% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupAddRequestRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupAddRequestRequest.kt index e9e99e6..a7dffdb 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupAddRequestRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupAddRequestRequest.kt @@ -1,11 +1,9 @@ -package top.r3944realms.ltdmanager.napcat.requests.group +package top.r3944realms.ltdmanager.napcat.request.group -import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json -import top.r3944realms.ltdmanager.napcat.data.ID /** * SetGroupAdd请求 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupAdminRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupAdminRequest.kt similarity index 84% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupAdminRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupAdminRequest.kt index b1bba42..28c13c3 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupAdminRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupAdminRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.group +package top.r3944realms.ltdmanager.napcat.request.group import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable @@ -15,10 +15,10 @@ data class SetGroupAdminRequest( val enable: Boolean, @SerialName("group_id") - val groupID: ID, + val groupId: ID, @SerialName("user_id") - val userID: ID + val userId: ID ) : AbstractGroupRequest() { override fun toJSON(): String = Json.encodeToString(this) diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupBanRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupBanRequest.kt similarity index 91% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupBanRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupBanRequest.kt index 7e696ce..9f31889 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupBanRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupBanRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.group +package top.r3944realms.ltdmanager.napcat.request.group import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupCardRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupCardRequest.kt similarity index 85% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupCardRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupCardRequest.kt index 2ab61cd..f0f2897 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupCardRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupCardRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.group +package top.r3944realms.ltdmanager.napcat.request.group import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable @@ -18,10 +18,10 @@ data class SetGroupCardRequest( val card: String? = null, @SerialName("group_id") - val groupID: ID, + val groupId: ID, @SerialName("user_id") - val userID: ID + val userId: ID ) : AbstractGroupRequest() { override fun toJSON(): String = Json.encodeToString(this) diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupKickMembersRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupKickMembersRequest.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupKickMembersRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupKickMembersRequest.kt index 958e2d7..8b36be7 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupKickMembersRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupKickMembersRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.group +package top.r3944realms.ltdmanager.napcat.request.group import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupKickRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupKickRequest.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupKickRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupKickRequest.kt index 3c04e93..60c1037 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupKickRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupKickRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.group +package top.r3944realms.ltdmanager.napcat.request.group import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupLeaveRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupLeaveRequest.kt similarity index 91% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupLeaveRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupLeaveRequest.kt index 4528ede..3a8ee8f 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupLeaveRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupLeaveRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.group +package top.r3944realms.ltdmanager.napcat.request.group import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupNameRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupNameRequest.kt similarity index 90% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupNameRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupNameRequest.kt index 08cc0a2..c982c84 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupNameRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupNameRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.group +package top.r3944realms.ltdmanager.napcat.request.group import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupPortraitRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupPortraitRequest.kt similarity index 90% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupPortraitRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupPortraitRequest.kt index 845b1aa..ee95869 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupPortraitRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupPortraitRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.group +package top.r3944realms.ltdmanager.napcat.request.group import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupRemarkRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupRemarkRequest.kt similarity index 89% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupRemarkRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupRemarkRequest.kt index 875fccf..73fd3e7 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupRemarkRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupRemarkRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.group +package top.r3944realms.ltdmanager.napcat.request.group import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupRobotAddOptionRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupRobotAddOptionRequest.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupRobotAddOptionRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupRobotAddOptionRequest.kt index d2559c6..459f158 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupRobotAddOptionRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupRobotAddOptionRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.group +package top.r3944realms.ltdmanager.napcat.request.group import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupSearchRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupSearchRequest.kt similarity index 91% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupSearchRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupSearchRequest.kt index 2372abf..0c58b6b 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupSearchRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupSearchRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.group +package top.r3944realms.ltdmanager.napcat.request.group import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupSignRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupSignRequest.kt similarity index 89% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupSignRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupSignRequest.kt index efb9aab..d6dd320 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupSignRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupSignRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.group +package top.r3944realms.ltdmanager.napcat.request.group import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupSpecialTitleRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupSpecialTitleRequest.kt similarity index 86% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupSpecialTitleRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupSpecialTitleRequest.kt index 648c6d9..899c387 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupSpecialTitleRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupSpecialTitleRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.group +package top.r3944realms.ltdmanager.napcat.request.group import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable @@ -13,7 +13,7 @@ import top.r3944realms.ltdmanager.napcat.data.ID @Serializable data class SetGroupSpecialTitleRequest( @SerialName("group_id") - val groupID: ID, + val groupId: ID, /** * 为空则取消头衔 @@ -22,7 +22,7 @@ data class SetGroupSpecialTitleRequest( val specialTitle: String? = null, @SerialName("user_id") - val userID: ID + val userId: ID ) : AbstractGroupRequest() { override fun toJSON(): String = Json.encodeToString(this) diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupWholeBanRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupWholeBanRequest.kt similarity index 90% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupWholeBanRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupWholeBanRequest.kt index 3b119fb..17ed116 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/group/SetGroupWholeBanRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/group/SetGroupWholeBanRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.group +package top.r3944realms.ltdmanager.napcat.request.group import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/AbstractMessageRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/AbstractMessageRequest.kt similarity index 60% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/AbstractMessageRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/AbstractMessageRequest.kt index 050a041..5a7da3d 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/AbstractMessageRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/AbstractMessageRequest.kt @@ -1,7 +1,7 @@ -package top.r3944realms.ltdmanager.napcat.requests.message +package top.r3944realms.ltdmanager.napcat.request.message import kotlinx.serialization.Serializable -import top.r3944realms.ltdmanager.napcat.requests.NapCatRequest +import top.r3944realms.ltdmanager.napcat.request.NapCatRequest @Serializable abstract class AbstractMessageRequest diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/DeleteMsgRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/DeleteMsgRequest.kt similarity index 88% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/DeleteMsgRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/DeleteMsgRequest.kt index 049d11b..f03d00d 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/DeleteMsgRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/DeleteMsgRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.message +package top.r3944realms.ltdmanager.napcat.request.message import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/FetchEmojiLikeRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/FetchEmojiLikeRequest.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/FetchEmojiLikeRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/FetchEmojiLikeRequest.kt index 7e47876..d357a4a 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/FetchEmojiLikeRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/FetchEmojiLikeRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.message +package top.r3944realms.ltdmanager.napcat.request.message import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/GetForwardMsgRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/GetForwardMsgRequest.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/GetForwardMsgRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/GetForwardMsgRequest.kt index fb20eb1..286fc7c 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/GetForwardMsgRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/GetForwardMsgRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.message +package top.r3944realms.ltdmanager.napcat.request.message import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/GetFriendMsgHistoryRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/GetFriendMsgHistoryRequest.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/GetFriendMsgHistoryRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/GetFriendMsgHistoryRequest.kt index 39ae589..f4729d4 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/GetFriendMsgHistoryRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/GetFriendMsgHistoryRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.message +package top.r3944realms.ltdmanager.napcat.request.message import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/GetGroupMsgHistoryRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/GetGroupMsgHistoryRequest.kt similarity index 88% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/GetGroupMsgHistoryRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/GetGroupMsgHistoryRequest.kt index 8af3583..3f69713 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/GetGroupMsgHistoryRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/GetGroupMsgHistoryRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.message +package top.r3944realms.ltdmanager.napcat.request.message import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable @@ -15,7 +15,7 @@ data class GetGroupMsgHistoryRequest( /** * 数量 */ - val count: Double? = null, + val count: Int? = null, @SerialName("group_id") val groupId: ID, diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/GetImageRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/GetImageRequest.kt similarity index 90% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/GetImageRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/GetImageRequest.kt index 7989be5..2edd0e7 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/GetImageRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/GetImageRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.message +package top.r3944realms.ltdmanager.napcat.request.message import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/GetMsgRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/GetMsgRequest.kt similarity index 88% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/GetMsgRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/GetMsgRequest.kt index 5021576..899fc6f 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/GetMsgRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/GetMsgRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.message +package top.r3944realms.ltdmanager.napcat.request.message import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/GetRecordRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/GetRecordRequest.kt similarity index 94% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/GetRecordRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/GetRecordRequest.kt index 21ee554..577846b 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/GetRecordRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/GetRecordRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.message +package top.r3944realms.ltdmanager.napcat.request.message import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/SendForwardMsgRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/SendForwardMsgRequest.kt similarity index 98% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/SendForwardMsgRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/SendForwardMsgRequest.kt index 617893a..b3a1813 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/SendForwardMsgRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/SendForwardMsgRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.message +package top.r3944realms.ltdmanager.napcat.request.message import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/SendGroupAiRecordRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/SendGroupAiRecordRequest.kt similarity index 91% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/SendGroupAiRecordRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/SendGroupAiRecordRequest.kt index 98037d6..e6bb29d 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/SendGroupAiRecordRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/SendGroupAiRecordRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.message +package top.r3944realms.ltdmanager.napcat.request.message import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/SendPokeRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/SendPokeRequest.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/SendPokeRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/SendPokeRequest.kt index 4775a26..cf6466a 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/SendPokeRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/SendPokeRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.message +package top.r3944realms.ltdmanager.napcat.request.message import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/SetMsgEmojiLikeRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/SetMsgEmojiLikeRequest.kt similarity index 91% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/SetMsgEmojiLikeRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/SetMsgEmojiLikeRequest.kt index bb17a95..91a5c7f 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/SetMsgEmojiLikeRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/SetMsgEmojiLikeRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.message +package top.r3944realms.ltdmanager.napcat.request.message import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/group/ForwardGroupSingleMsgRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/group/ForwardGroupSingleMsgRequest.kt similarity index 79% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/group/ForwardGroupSingleMsgRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/group/ForwardGroupSingleMsgRequest.kt index 925d844..be7b945 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/group/ForwardGroupSingleMsgRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/group/ForwardGroupSingleMsgRequest.kt @@ -1,12 +1,12 @@ -package top.r3944realms.ltdmanager.napcat.requests.message.group +package top.r3944realms.ltdmanager.napcat.request.message.group import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import top.r3944realms.ltdmanager.napcat.data.ID -import top.r3944realms.ltdmanager.napcat.requests.message.AbstractMessageRequest +import top.r3944realms.ltdmanager.napcat.request.message.AbstractMessageRequest /** * ForwardGroupSingleMsg请求 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/group/GroupPokeRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/group/GroupPokeRequest.kt similarity index 78% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/group/GroupPokeRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/group/GroupPokeRequest.kt index 56fd774..f5b90eb 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/group/GroupPokeRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/group/GroupPokeRequest.kt @@ -1,12 +1,12 @@ -package top.r3944realms.ltdmanager.napcat.requests.message.group +package top.r3944realms.ltdmanager.napcat.request.message.group import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import top.r3944realms.ltdmanager.napcat.data.ID -import top.r3944realms.ltdmanager.napcat.requests.message.AbstractMessageRequest +import top.r3944realms.ltdmanager.napcat.request.message.AbstractMessageRequest /** * GroupPoke请求 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/group/SendGroupForwardMsgRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/group/SendGroupForwardMsgRequest.kt similarity index 69% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/group/SendGroupForwardMsgRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/group/SendGroupForwardMsgRequest.kt index fa0e80b..a376646 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/group/SendGroupForwardMsgRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/group/SendGroupForwardMsgRequest.kt @@ -1,14 +1,14 @@ -package top.r3944realms.ltdmanager.napcat.requests.message.group +package top.r3944realms.ltdmanager.napcat.request.message.group import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import top.r3944realms.ltdmanager.napcat.data.ID -import top.r3944realms.ltdmanager.napcat.requests.message.AbstractMessageRequest -import top.r3944realms.ltdmanager.napcat.requests.message.SendForwardMsgRequest.ForwardModelNews -import top.r3944realms.ltdmanager.napcat.requests.message.SendForwardMsgRequest.TopForwardMsg +import top.r3944realms.ltdmanager.napcat.request.message.AbstractMessageRequest +import top.r3944realms.ltdmanager.napcat.request.message.SendForwardMsgRequest.ForwardModelNews +import top.r3944realms.ltdmanager.napcat.request.message.SendForwardMsgRequest.TopForwardMsg /** * SendGroupForwardMsg请求 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/group/SendGroupMsgRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/group/SendGroupMsgRequest.kt similarity index 80% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/group/SendGroupMsgRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/group/SendGroupMsgRequest.kt index 9acf390..a6bbdbf 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/group/SendGroupMsgRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/group/SendGroupMsgRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.message.group +package top.r3944realms.ltdmanager.napcat.request.message.group import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable @@ -7,7 +7,7 @@ import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import top.r3944realms.ltdmanager.napcat.data.ID import top.r3944realms.ltdmanager.napcat.data.MessageElement -import top.r3944realms.ltdmanager.napcat.requests.message.AbstractMessageRequest +import top.r3944realms.ltdmanager.napcat.request.message.AbstractMessageRequest /** * SendGroupMsg请求 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/personal/ForwardFriendSingleMsgRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/personal/ForwardFriendSingleMsgRequest.kt similarity index 79% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/personal/ForwardFriendSingleMsgRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/personal/ForwardFriendSingleMsgRequest.kt index f200964..273e3a7 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/personal/ForwardFriendSingleMsgRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/personal/ForwardFriendSingleMsgRequest.kt @@ -1,12 +1,12 @@ -package top.r3944realms.ltdmanager.napcat.requests.message.personal +package top.r3944realms.ltdmanager.napcat.request.message.personal import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import top.r3944realms.ltdmanager.napcat.data.ID -import top.r3944realms.ltdmanager.napcat.requests.message.AbstractMessageRequest +import top.r3944realms.ltdmanager.napcat.request.message.AbstractMessageRequest /** * ForwardFriendSingleMsg请求 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/personal/FriendPokeRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/personal/FriendPokeRequest.kt similarity index 74% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/personal/FriendPokeRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/personal/FriendPokeRequest.kt index 8f7f80a..68e5d77 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/personal/FriendPokeRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/personal/FriendPokeRequest.kt @@ -1,12 +1,12 @@ -package top.r3944realms.ltdmanager.napcat.requests.message.personal +package top.r3944realms.ltdmanager.napcat.request.message.personal import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import top.r3944realms.ltdmanager.napcat.data.ID -import top.r3944realms.ltdmanager.napcat.requests.message.AbstractMessageRequest +import top.r3944realms.ltdmanager.napcat.request.message.AbstractMessageRequest /** * FriendPoke请求 @@ -17,13 +17,13 @@ data class FriendPokeRequest( * 戳一戳对象，可不填 */ @SerialName("target_id") - val targetID: ID? = null, + val targetId: ID? = null, /** * 私聊对象 */ @SerialName("user_id") - val userID: ID + val userId: ID ) : AbstractMessageRequest() { override fun toJSON(): String = Json.encodeToString(this) diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/personal/SendPrivateForwardMsgRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/personal/SendPrivateForwardMsgRequest.kt similarity index 69% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/personal/SendPrivateForwardMsgRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/personal/SendPrivateForwardMsgRequest.kt index 9c5c767..44830fd 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/personal/SendPrivateForwardMsgRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/personal/SendPrivateForwardMsgRequest.kt @@ -1,14 +1,14 @@ -package top.r3944realms.ltdmanager.napcat.requests.message.personal +package top.r3944realms.ltdmanager.napcat.request.message.personal import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import top.r3944realms.ltdmanager.napcat.data.ID -import top.r3944realms.ltdmanager.napcat.requests.message.AbstractMessageRequest -import top.r3944realms.ltdmanager.napcat.requests.message.SendForwardMsgRequest.ForwardModelNews -import top.r3944realms.ltdmanager.napcat.requests.message.SendForwardMsgRequest.TopForwardMsg +import top.r3944realms.ltdmanager.napcat.request.message.AbstractMessageRequest +import top.r3944realms.ltdmanager.napcat.request.message.SendForwardMsgRequest.ForwardModelNews +import top.r3944realms.ltdmanager.napcat.request.message.SendForwardMsgRequest.TopForwardMsg /** * SendPrivateForwardMsg请求 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/personal/SendPrivateMsgRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/personal/SendPrivateMsgRequest.kt similarity index 79% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/personal/SendPrivateMsgRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/personal/SendPrivateMsgRequest.kt index 0d23a64..eb55fb7 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/message/personal/SendPrivateMsgRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/message/personal/SendPrivateMsgRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.message.personal +package top.r3944realms.ltdmanager.napcat.request.message.personal import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable @@ -7,7 +7,7 @@ import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import top.r3944realms.ltdmanager.napcat.data.ID import top.r3944realms.ltdmanager.napcat.data.MessageElement -import top.r3944realms.ltdmanager.napcat.requests.message.AbstractMessageRequest +import top.r3944realms.ltdmanager.napcat.request.message.AbstractMessageRequest /** * SendPrivateMsg请求 diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/other/AbstractOtherRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/other/AbstractOtherRequest.kt similarity index 60% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/other/AbstractOtherRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/other/AbstractOtherRequest.kt index 0aa7801..5dd9950 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/other/AbstractOtherRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/other/AbstractOtherRequest.kt @@ -1,7 +1,7 @@ -package top.r3944realms.ltdmanager.napcat.requests.other +package top.r3944realms.ltdmanager.napcat.request.other import kotlinx.serialization.Serializable -import top.r3944realms.ltdmanager.napcat.requests.NapCatRequest +import top.r3944realms.ltdmanager.napcat.request.NapCatRequest @Serializable abstract class AbstractOtherRequest diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/other/CheckUrlSafelyRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/other/CheckUrlSafelyRequest.kt similarity index 68% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/other/CheckUrlSafelyRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/other/CheckUrlSafelyRequest.kt index ff8e1d0..519399a 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/other/CheckUrlSafelyRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/other/CheckUrlSafelyRequest.kt @@ -1,9 +1,7 @@ -package top.r3944realms.ltdmanager.napcat.requests.other +package top.r3944realms.ltdmanager.napcat.request.other import kotlinx.serialization.Serializable -import kotlinx.serialization.encodeToString -import kotlinx.serialization.json.Json import top.r3944realms.ltdmanager.napcat.Developing /** diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/other/GetCollectionListRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/other/GetCollectionListRequest.kt similarity index 89% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/other/GetCollectionListRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/other/GetCollectionListRequest.kt index 1cdb748..dca5a0e 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/other/GetCollectionListRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/other/GetCollectionListRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.other +package top.r3944realms.ltdmanager.napcat.request.other import kotlinx.serialization.Serializable import kotlinx.serialization.encodeToString diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/other/GetGroupIgnoreAddRequestRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/other/GetGroupIgnoreAddRequestRequest.kt similarity index 85% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/other/GetGroupIgnoreAddRequestRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/other/GetGroupIgnoreAddRequestRequest.kt index 8e973f4..f1ca6a5 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/other/GetGroupIgnoreAddRequestRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/other/GetGroupIgnoreAddRequestRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.other +package top.r3944realms.ltdmanager.napcat.request.other import kotlinx.serialization.Serializable import top.r3944realms.ltdmanager.napcat.Developing diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/other/GetGuildListRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/other/GetGuildListRequest.kt similarity index 68% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/other/GetGuildListRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/other/GetGuildListRequest.kt index 2bdc362..03ee8e8 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/other/GetGuildListRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/other/GetGuildListRequest.kt @@ -1,9 +1,7 @@ -package top.r3944realms.ltdmanager.napcat.requests.other +package top.r3944realms.ltdmanager.napcat.request.other import kotlinx.serialization.Serializable -import kotlinx.serialization.encodeToString -import kotlinx.serialization.json.Json import top.r3944realms.ltdmanager.napcat.Developing /** diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/other/GetGuildServiceProfileRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/other/GetGuildServiceProfileRequest.kt similarity index 70% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/other/GetGuildServiceProfileRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/other/GetGuildServiceProfileRequest.kt index b76aa2e..5855c72 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/other/GetGuildServiceProfileRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/other/GetGuildServiceProfileRequest.kt @@ -1,9 +1,7 @@ -package top.r3944realms.ltdmanager.napcat.requests.other +package top.r3944realms.ltdmanager.napcat.request.other import kotlinx.serialization.Serializable -import kotlinx.serialization.encodeToString -import kotlinx.serialization.json.Json import top.r3944realms.ltdmanager.napcat.Developing /** diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/other/SendGroupMsgRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/other/SendGroupMsgRequest.kt similarity index 91% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/other/SendGroupMsgRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/other/SendGroupMsgRequest.kt index 381703b..f58bb3d 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/other/SendGroupMsgRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/other/SendGroupMsgRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.other +package top.r3944realms.ltdmanager.napcat.request.other import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/other/SendMsgRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/other/SendMsgRequest.kt similarity index 93% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/other/SendMsgRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/other/SendMsgRequest.kt index 450db85..2333477 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/other/SendMsgRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/other/SendMsgRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.other +package top.r3944realms.ltdmanager.napcat.request.other import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/other/SendPrivateMsgRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/other/SendPrivateMsgRequest.kt similarity index 91% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/other/SendPrivateMsgRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/other/SendPrivateMsgRequest.kt index d07987f..fc74a14 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/other/SendPrivateMsgRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/other/SendPrivateMsgRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.other +package top.r3944realms.ltdmanager.napcat.request.other import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/other/UnknownRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/other/UnknownRequest.kt similarity index 66% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/other/UnknownRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/other/UnknownRequest.kt index 0331051..4e74b26 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/other/UnknownRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/other/UnknownRequest.kt @@ -1,9 +1,7 @@ -package top.r3944realms.ltdmanager.napcat.requests.other +package top.r3944realms.ltdmanager.napcat.request.other import kotlinx.serialization.Serializable -import kotlinx.serialization.encodeToString -import kotlinx.serialization.json.Json import top.r3944realms.ltdmanager.napcat.Developing /** diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/passkey/AbstractPassKeyRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/passkey/AbstractPassKeyRequest.kt similarity index 60% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/passkey/AbstractPassKeyRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/passkey/AbstractPassKeyRequest.kt index 953e2be..7caaeb9 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/passkey/AbstractPassKeyRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/passkey/AbstractPassKeyRequest.kt @@ -1,7 +1,7 @@ -package top.r3944realms.ltdmanager.napcat.requests.passkey +package top.r3944realms.ltdmanager.napcat.request.passkey import kotlinx.serialization.Serializable -import top.r3944realms.ltdmanager.napcat.requests.NapCatRequest +import top.r3944realms.ltdmanager.napcat.request.NapCatRequest @Serializable abstract class AbstractPassKeyRequest diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/passkey/GetClientkeyRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/passkey/GetClientkeyRequest.kt similarity index 80% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/passkey/GetClientkeyRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/passkey/GetClientkeyRequest.kt index 9875574..ea5de63 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/passkey/GetClientkeyRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/passkey/GetClientkeyRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.passkey +package top.r3944realms.ltdmanager.napcat.request.passkey import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/passkey/GetCookiesRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/passkey/GetCookiesRequest.kt similarity index 86% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/passkey/GetCookiesRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/passkey/GetCookiesRequest.kt index ac9971c..0d4700f 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/passkey/GetCookiesRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/passkey/GetCookiesRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.passkey +package top.r3944realms.ltdmanager.napcat.request.passkey import kotlinx.serialization.Serializable import kotlinx.serialization.encodeToString diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/passkey/GetCredentialsRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/passkey/GetCredentialsRequest.kt similarity index 86% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/passkey/GetCredentialsRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/passkey/GetCredentialsRequest.kt index 170bbfa..81ebfb5 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/passkey/GetCredentialsRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/passkey/GetCredentialsRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.passkey +package top.r3944realms.ltdmanager.napcat.request.passkey import kotlinx.serialization.Serializable import kotlinx.serialization.encodeToString diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/passkey/GetCsrfTokenRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/passkey/GetCsrfTokenRequest.kt similarity index 80% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/passkey/GetCsrfTokenRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/passkey/GetCsrfTokenRequest.kt index ef35f26..a40493b 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/passkey/GetCsrfTokenRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/passkey/GetCsrfTokenRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.passkey +package top.r3944realms.ltdmanager.napcat.request.passkey import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/passkey/GetRkeyRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/passkey/GetRkeyRequest.kt similarity index 79% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/passkey/GetRkeyRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/passkey/GetRkeyRequest.kt index c788f3f..5f09174 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/passkey/GetRkeyRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/passkey/GetRkeyRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.passkey +package top.r3944realms.ltdmanager.napcat.request.passkey import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/passkey/GetRkeyServerRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/passkey/GetRkeyServerRequest.kt similarity index 80% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/passkey/GetRkeyServerRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/passkey/GetRkeyServerRequest.kt index 912184c..99d8d70 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/passkey/GetRkeyServerRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/passkey/GetRkeyServerRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.passkey +package top.r3944realms.ltdmanager.napcat.request.passkey import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/passkey/NcGetRkeyRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/passkey/NcGetRkeyRequest.kt similarity index 79% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/passkey/NcGetRkeyRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/passkey/NcGetRkeyRequest.kt index 53bc8da..653f7ce 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/passkey/NcGetRkeyRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/passkey/NcGetRkeyRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.passkey +package top.r3944realms.ltdmanager.napcat.request.passkey import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/personal/AbstractPersonalRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/personal/AbstractPersonalRequest.kt similarity index 60% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/personal/AbstractPersonalRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/personal/AbstractPersonalRequest.kt index 4722202..1e25793 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/personal/AbstractPersonalRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/personal/AbstractPersonalRequest.kt @@ -1,7 +1,7 @@ -package top.r3944realms.ltdmanager.napcat.requests.personal +package top.r3944realms.ltdmanager.napcat.request.personal import kotlinx.serialization.Serializable -import top.r3944realms.ltdmanager.napcat.requests.NapCatRequest +import top.r3944realms.ltdmanager.napcat.request.NapCatRequest @Serializable abstract class AbstractPersonalRequest diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/personal/CanSendImageRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/personal/CanSendImageRequest.kt similarity index 80% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/personal/CanSendImageRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/personal/CanSendImageRequest.kt index 4f8112b..e184ef3 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/personal/CanSendImageRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/personal/CanSendImageRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.personal +package top.r3944realms.ltdmanager.napcat.request.personal import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/personal/CanSendRecordRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/personal/CanSendRecordRequest.kt similarity index 80% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/personal/CanSendRecordRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/personal/CanSendRecordRequest.kt index fa3203f..7720520 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/personal/CanSendRecordRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/personal/CanSendRecordRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.personal +package top.r3944realms.ltdmanager.napcat.request.personal import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/personal/ClickInlineKeyboardButtonRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/personal/ClickInlineKeyboardButtonRequest.kt similarity index 86% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/personal/ClickInlineKeyboardButtonRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/personal/ClickInlineKeyboardButtonRequest.kt index b2253e5..35ec957 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/personal/ClickInlineKeyboardButtonRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/personal/ClickInlineKeyboardButtonRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.personal +package top.r3944realms.ltdmanager.napcat.request.personal import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable @@ -16,13 +16,13 @@ data class ClickInlineKeyboardButtonRequest( val botAppid: String, @SerialName("button_id") - val buttonID: String, + val buttonId: String, @SerialName("callback_data") val callbackData: String, @SerialName("group_id") - val groupID: ID, + val groupId: ID, @SerialName("msg_seq") val msgSeq: String diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/personal/GetAiCharactersRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/personal/GetAiCharactersRequest.kt similarity index 90% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/personal/GetAiCharactersRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/personal/GetAiCharactersRequest.kt index febf1de..90eb068 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/personal/GetAiCharactersRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/personal/GetAiCharactersRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.personal +package top.r3944realms.ltdmanager.napcat.request.personal import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/personal/GetAiRecordRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/personal/GetAiRecordRequest.kt similarity index 90% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/personal/GetAiRecordRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/personal/GetAiRecordRequest.kt index 2f36115..131e01f 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/personal/GetAiRecordRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/personal/GetAiRecordRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.personal +package top.r3944realms.ltdmanager.napcat.request.personal import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/personal/OcrImageRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/personal/OcrImageRequest.kt similarity index 85% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/personal/OcrImageRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/personal/OcrImageRequest.kt index d03022b..03bed2e 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/personal/OcrImageRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/personal/OcrImageRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.personal +package top.r3944realms.ltdmanager.napcat.request.personal import kotlinx.serialization.Serializable import kotlinx.serialization.encodeToString diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/personal/PointHandleQuickOperationRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/personal/PointHandleQuickOperationRequest.kt similarity index 90% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/personal/PointHandleQuickOperationRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/personal/PointHandleQuickOperationRequest.kt index efae21f..1cd4876 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/personal/PointHandleQuickOperationRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/personal/PointHandleQuickOperationRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.personal +package top.r3944realms.ltdmanager.napcat.request.personal import kotlinx.serialization.Serializable import kotlinx.serialization.encodeToString diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/personal/PointOcrImageRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/personal/PointOcrImageRequest.kt similarity index 86% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/personal/PointOcrImageRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/personal/PointOcrImageRequest.kt index 66b2f5f..82bfeef 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/personal/PointOcrImageRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/personal/PointOcrImageRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.personal +package top.r3944realms.ltdmanager.napcat.request.personal import kotlinx.serialization.Serializable import kotlinx.serialization.encodeToString diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/personal/SetInputStatusRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/personal/SetInputStatusRequest.kt similarity index 92% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/personal/SetInputStatusRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/personal/SetInputStatusRequest.kt index aee6850..d43895e 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/personal/SetInputStatusRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/personal/SetInputStatusRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.personal +package top.r3944realms.ltdmanager.napcat.request.personal import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/personal/TranslateEn2zhRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/personal/TranslateEn2zhRequest.kt similarity index 87% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/personal/TranslateEn2zhRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/personal/TranslateEn2zhRequest.kt index 5272543..20930fe 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/personal/TranslateEn2zhRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/personal/TranslateEn2zhRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.personal +package top.r3944realms.ltdmanager.napcat.request.personal import kotlinx.serialization.Serializable import kotlinx.serialization.encodeToString diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/system/AbstractSystemRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/system/AbstractSystemRequest.kt similarity index 60% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/system/AbstractSystemRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/system/AbstractSystemRequest.kt index bd5fa14..bb4fde9 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/system/AbstractSystemRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/system/AbstractSystemRequest.kt @@ -1,7 +1,7 @@ -package top.r3944realms.ltdmanager.napcat.requests.system +package top.r3944realms.ltdmanager.napcat.request.system import kotlinx.serialization.Serializable -import top.r3944realms.ltdmanager.napcat.requests.NapCatRequest +import top.r3944realms.ltdmanager.napcat.request.NapCatRequest @Serializable abstract class AbstractSystemRequest diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/system/BotExitRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/system/BotExitRequest.kt similarity index 84% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/system/BotExitRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/system/BotExitRequest.kt index ccbdd3c..4c63588 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/system/BotExitRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/system/BotExitRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.system +package top.r3944realms.ltdmanager.napcat.request.system import kotlinx.serialization.Serializable import kotlinx.serialization.encodeToString diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/system/GetRobotUinRangeRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/system/GetRobotUinRangeRequest.kt similarity index 81% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/system/GetRobotUinRangeRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/system/GetRobotUinRangeRequest.kt index 4857874..4c205f3 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/system/GetRobotUinRangeRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/system/GetRobotUinRangeRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.system +package top.r3944realms.ltdmanager.napcat.request.system import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/system/GetVersionInfoRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/system/GetVersionInfoRequest.kt similarity index 80% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/system/GetVersionInfoRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/system/GetVersionInfoRequest.kt index e2dd244..0a772d1 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/system/GetVersionInfoRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/system/GetVersionInfoRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.system +package top.r3944realms.ltdmanager.napcat.request.system import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/system/NcGetPacketStatusRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/system/NcGetPacketStatusRequest.kt similarity index 81% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/system/NcGetPacketStatusRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/system/NcGetPacketStatusRequest.kt index 7d9cf03..35b9c9e 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/system/NcGetPacketStatusRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/system/NcGetPacketStatusRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.system +package top.r3944realms.ltdmanager.napcat.request.system import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/system/SendPacketRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/system/SendPacketRequest.kt similarity index 83% rename from src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/system/SendPacketRequest.kt rename to src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/system/SendPacketRequest.kt index 76e7d0e..c89e496 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/system/SendPacketRequest.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/request/system/SendPacketRequest.kt @@ -1,5 +1,5 @@ -package top.r3944realms.ltdmanager.napcat.requests.system +package top.r3944realms.ltdmanager.napcat.request.system import kotlinx.serialization.Serializable import top.r3944realms.ltdmanager.napcat.Developing diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/PrioritizedRequest.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/PrioritizedRequest.kt deleted file mode 100644 index 695ebff..0000000 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/PrioritizedRequest.kt +++ /dev/null @@ -1,22 +0,0 @@ -package top.r3944realms.ltdmanager.napcat.requests - -/** - * 带优先级的消息封装 - * @property request 原始请求 - * @property priority 优先级数值(越大优先级越高) - */ -data class PrioritizedRequest( - val request: NapCatRequest, - val priority: Int = DEFAULT_PRIORITY, -) :Comparable { - companion object { - const val HIGH_PRIORITY = 1000 - const val DEFAULT_PRIORITY = 500 - const val LOW_PRIORITY = 100 - } - override fun compareTo(other: PrioritizedRequest): Int { - return compareValuesBy(other, this, - { it.priority }, - { it.request.createTime }) // 优先级相同则先创建的优先 - } -} \ No newline at end of file diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/PriorityMessageQueue.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/PriorityMessageQueue.kt deleted file mode 100644 index e099e8f..0000000 --- a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/requests/PriorityMessageQueue.kt +++ /dev/null @@ -1,33 +0,0 @@ -package top.r3944realms.ltdmanager.napcat.requests - -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.channels.Channel -import kotlinx.coroutines.withContext -import java.util.concurrent.PriorityBlockingQueue - -/** - * 线程安全的优先级消息队列 - */ -class PriorityMessageQueue { - private val queue = PriorityBlockingQueue() - private val pendingSignal = Channel(Channel.UNLIMITED) - - suspend fun enqueue(request: PrioritizedRequest) { - queue.put(request) - pendingSignal.send(Unit) // 通知有新消息 - } - suspend fun dequeue(): PrioritizedRequest { - // 队列为空时挂起等待 - if (queue.isEmpty()) { - pendingSignal.receive() - } - return withContext(Dispatchers.IO) { - queue.take() - } - } - fun size(): Int = queue.size - - fun close() { - pendingSignal.close() - } -} \ No newline at end of file diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/napcat/serializer/IDSerializer.kt b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/serializer/IDSerializer.kt new file mode 100644 index 0000000..8e9f368 --- /dev/null +++ b/src/main/kotlin/top/r3944realms/ltdmanager/napcat/serializer/IDSerializer.kt @@ -0,0 +1,39 @@ +package top.r3944realms.ltdmanager.napcat.serializer + +import kotlinx.serialization.KSerializer +import kotlinx.serialization.descriptors.PrimitiveKind +import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor +import kotlinx.serialization.descriptors.SerialDescriptor +import kotlinx.serialization.encoding.Decoder +import kotlinx.serialization.encoding.Encoder +import kotlinx.serialization.json.JsonDecoder +import kotlinx.serialization.json.jsonPrimitive +import kotlinx.serialization.json.long +import kotlinx.serialization.json.longOrNull +import top.r3944realms.ltdmanager.napcat.data.ID + +object IDSerializer : KSerializer { + // 序列化时安全输出为字符串 + override fun serialize(encoder: Encoder, value: ID) { + when (value) { + is ID.StringValue -> encoder.encodeString(value.value) + is ID.LongValue -> encoder.encodeString(value.value.toString()) // 改为 encodeString + } + } + + // 反序列化统一为 StringValue，保证大数字安全 + override fun deserialize(decoder: Decoder): ID { + return if (decoder is JsonDecoder) { + val element = decoder.decodeJsonElement() + when { + element.jsonPrimitive.isString -> ID.StringValue(element.jsonPrimitive.content) + element.jsonPrimitive.longOrNull != null -> ID.StringValue(element.jsonPrimitive.long.toString()) + else -> throw IllegalArgumentException("无法解析ID: $element") + } + } else { + ID.StringValue(decoder.decodeString()) + } + } + + override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("ID", PrimitiveKind.STRING) +} \ No newline at end of file diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/test.kt b/src/main/kotlin/top/r3944realms/ltdmanager/test.kt new file mode 100644 index 0000000..0712644 --- /dev/null +++ b/src/main/kotlin/top/r3944realms/ltdmanager/test.kt @@ -0,0 +1,43 @@ +package top.r3944realms.ltdmanager + +import kotlinx.coroutines.delay +import kotlinx.coroutines.runBlocking +import top.r3944realms.ltdmanager.module.GroupRequestHandlerModule +import top.r3944realms.ltdmanager.module.RconPlayerListModule +import top.r3944realms.ltdmanager.utils.LoggerUtil +import java.util.concurrent.atomic.AtomicBoolean + + +fun main() = runBlocking { + // 标记程序是否运行 + val isRunning = AtomicBoolean(true) + + // 创建模块实例 + val groupModule = GroupRequestHandlerModule( + client = GlobalManager.napCatClient, + targetGroupId = 538751386 + ) + + + // 注册模块到全局模块管理器 + GlobalManager.moduleManager.registerModule(groupModule) + + // 加载模块 + GlobalManager.moduleManager.loadModule(groupModule.name) + + // 捕获 JVM 关闭信号，优雅退出 + Runtime.getRuntime().addShutdownHook(Thread { + runBlocking { + LoggerUtil.logger.info("\n收到退出信号，正在停止所有模块...") + GlobalManager.moduleManager.stopAllModules() // 批量 stop + LoggerUtil.logger.info("模块卸载完成，程序退出。") + GlobalManager.shutdown() + } + isRunning.set(false) + }) + + // 持续挂起，保持主线程运行 + while (isRunning.get()) { + delay(1000L) + } +} \ No newline at end of file diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/utils/ApiType.kt b/src/main/kotlin/top/r3944realms/ltdmanager/utils/ApiType.kt new file mode 100644 index 0000000..e61f42d --- /dev/null +++ b/src/main/kotlin/top/r3944realms/ltdmanager/utils/ApiType.kt @@ -0,0 +1,7 @@ +package top.r3944realms.ltdmanager.utils + +enum class ApiType { + HTTP, + WEBSOCKET, + ; +} \ No newline at end of file diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/utils/CmdUtil.kt b/src/main/kotlin/top/r3944realms/ltdmanager/utils/CmdUtil.kt new file mode 100644 index 0000000..32a73af --- /dev/null +++ b/src/main/kotlin/top/r3944realms/ltdmanager/utils/CmdUtil.kt @@ -0,0 +1,34 @@ +package top.r3944realms.ltdmanager.utils + +import java.io.BufferedReader +import java.io.InputStreamReader + +open class CmdUtil { + companion object { + fun runExeCommand(exePath: String, vararg args: String): String { + // 构建命令 + val command = mutableListOf(exePath) + command.addAll(args) + + // 启动进程 + val processBuilder = ProcessBuilder(command) + processBuilder.redirectErrorStream(true) // 将错误流也合并到标准输出 + + val process = processBuilder.start() + + // 读取输出 + val output = StringBuilder() + BufferedReader(InputStreamReader(process.inputStream)).use { reader -> + var line: String? + while (reader.readLine().also { line = it } != null) { + output.appendLine(line) + } + } + + // 等待程序执行完成 + process.waitFor() + + return output.toString() + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/utils/ConfigInitializer.kt b/src/main/kotlin/top/r3944realms/ltdmanager/utils/ConfigInitializer.kt new file mode 100644 index 0000000..4350d12 --- /dev/null +++ b/src/main/kotlin/top/r3944realms/ltdmanager/utils/ConfigInitializer.kt @@ -0,0 +1,66 @@ +package top.r3944realms.ltdmanager.utils + +import top.r3944realms.ltdmanager.core.config.YamlConfigLoader +import java.nio.file.Files +import java.nio.file.Paths +import java.nio.file.StandardCopyOption +import kotlin.system.exitProcess + +object ConfigInitializer { + + /** + * 初始化配置文件 + * @param fileName YAML 文件名，如 application.yml + * @param configDir 配置目录，如 config + */ + fun initConfig(fileName: String = "application.yml", configDir: String = "config") { + val dirPath = Paths.get(configDir) + if (!Files.exists(dirPath)) { + Files.createDirectories(dirPath) + LoggerUtil.logger.info("已创建配置目录: $configDir") + } + + val filePath = dirPath.resolve(fileName) + + if (!Files.exists(filePath)) { + // 从 resources 复制默认配置 + val resourceStream = YamlConfigLoader::class.java.classLoader.getResourceAsStream(fileName) + if (resourceStream != null) { + Files.copy(resourceStream, filePath, StandardCopyOption.REPLACE_EXISTING) + LoggerUtil.logger.info("已生成默认配置文件: $filePath") + } else { + // 资源文件不存在，可写入内置默认 YAML + val defaultYaml = """ + database: + url: "jdbc:mysql://localhost:3306/quizdb?useSSL=false&serverTimezone=UTC" + user: "root" + encrypted-password: "123123aa" + crypto: + secret-key: "ltd25r3944realms" + mode: + bot-api-type: HTTP + environment: DEVELOPMENT + http: + url: "https://127.0.0.1:3001" + encrypted-token: "123123bb" + websocket: + url: "wss://127.0.0.1:3002" + encrypted-token: "123123cc" + tools: + rcon: + mc-rcon-tool-path: "/path/to/rcon" + mc-rcon-tool-config-path: "/path/to/rcon_config" + server-url: "your.minecraft.server" + rcon-password: "123123dd" + """.trimIndent() + + Files.writeString(filePath, defaultYaml) + LoggerUtil.logger.info("已生成默认配置文件(使用内置内容): $filePath") + } + LoggerUtil.logger.info("第一次启动，请修改配置后再启动") + exitProcess(-1); + } else { + LoggerUtil.logger.info("配置文件已存在: $filePath") + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/utils/CryptoUtil.kt b/src/main/kotlin/top/r3944realms/ltdmanager/utils/CryptoUtil.kt index 5082c2d..e1954ab 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/utils/CryptoUtil.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/utils/CryptoUtil.kt @@ -10,19 +10,24 @@ object CryptoUtil { private const val SECRET_KEY = "ltd25r3944realms" private const val ALGORITHM = "AES" - private val secretKey: String - get() { - return YamlConfigLoader.loadCryptoConfig().secretKey ?: SECRET_KEY - } - + private var secretKey: String = "" + private fun getSecretKey() :String { + if (secretKey.isEmpty()) + synchronized(CryptoUtil::class.java) { + if (secretKey.isEmpty()) { + this.secretKey = YamlConfigLoader.loadCryptoConfig().secretKey.toString() + } + } + return this.secretKey; + } // 解密 fun decrypt(encryptedText: String): String { - return decrypt(encryptedText, secretKey) + return decrypt(encryptedText, getSecretKey()) } // 加密 fun encrypt(plainText: String): String { - return encrypt(plainText, secretKey) + return encrypt(plainText, getSecretKey()) } fun decrypt(encryptedText: String, secretKey: String): String { diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/utils/Environment.kt b/src/main/kotlin/top/r3944realms/ltdmanager/utils/Environment.kt new file mode 100644 index 0000000..7f0acc0 --- /dev/null +++ b/src/main/kotlin/top/r3944realms/ltdmanager/utils/Environment.kt @@ -0,0 +1,23 @@ +package top.r3944realms.ltdmanager.utils + +import top.r3944realms.ltdmanager.core.config.YamlConfigLoader + +enum class Environment { + DEVELOPMENT, + DEBUG, + PRODUCTION, + ; + companion object { + private val environment: Environment? + get() = YamlConfigLoader.loadModeConfig().environment + fun isDevelopment(): Boolean { + return environment == DEVELOPMENT + } + fun isProduction(): Boolean { + return environment == PRODUCTION + } + fun isDebug(): Boolean { + return environment == DEBUG + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/utils/LoggerUtil.kt b/src/main/kotlin/top/r3944realms/ltdmanager/utils/LoggerUtil.kt new file mode 100644 index 0000000..756bff5 --- /dev/null +++ b/src/main/kotlin/top/r3944realms/ltdmanager/utils/LoggerUtil.kt @@ -0,0 +1,11 @@ +package top.r3944realms.ltdmanager.utils + +import org.slf4j.LoggerFactory + +class LoggerUtil { + companion object { + val logger by lazy { + LoggerFactory.getLogger("LTDManagerBot") + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/top/r3944realms/ltdmanager/utils/YamlUpdater.kt b/src/main/kotlin/top/r3944realms/ltdmanager/utils/YamlUpdater.kt index f0178b6..f5c7a37 100644 --- a/src/main/kotlin/top/r3944realms/ltdmanager/utils/YamlUpdater.kt +++ b/src/main/kotlin/top/r3944realms/ltdmanager/utils/YamlUpdater.kt @@ -1,56 +1,73 @@ package top.r3944realms.ltdmanager.utils -import org.yaml.snakeyaml.DumperOptions -import org.yaml.snakeyaml.Yaml -import java.io.FileInputStream -import java.io.FileWriter -import java.io.IOException +import org.snakeyaml.engine.v2.api.Dump +import org.snakeyaml.engine.v2.api.DumpSettings +import org.snakeyaml.engine.v2.api.Load +import org.snakeyaml.engine.v2.api.LoadSettings +import org.snakeyaml.engine.v2.common.FlowStyle +import org.snakeyaml.engine.v2.nodes.* +import java.nio.file.Files +import java.nio.file.NoSuchFileException +import java.nio.file.Paths object YamlUpdater { /** - * 更新 YAML 文件字段值，保留原始格式 - * @param filePath YAML 文件路径 - * @param keyPath 层级字段路径（如 "database.url"） - * @param newValue 新值 + * 更新 YAML 文件字段值（不保留注释） + * @param filePath YAML 文件路径 + * @param keyPath 层级字段路径（如 "database.url"） + * @param newValue 新值 */ - @Throws(IOException::class) - fun updateYamlValue(filePath: String, keyPath: String, newValue: String) { - // 1. 读取原始 YAML 文件 - // 标准化路径 - val normalizedPath = filePath.replaceFirst("^/(.:/)".toRegex(), "$1") // 修复Windows路径 - val yaml = Yaml() - val yamlData: Map - FileInputStream(normalizedPath).use { inputStream -> - yamlData = yaml.load(inputStream) + @Throws(Exception::class) + fun updateYaml(filePath: String, keyPath: String, newValue: Any?) { + val normalizedPath = normalizePath(filePath) + val content = try { + Files.readString(Paths.get(normalizedPath)) + .takeIf { it.isNotBlank() } + ?: throw IllegalStateException("YAML 文件为空") + } catch (e: NoSuchFileException) { + throw IllegalStateException("文件不存在: $normalizedPath") } - // 2. 更新嵌套 Map 中的值 - updateNestedValue(yamlData, keyPath.split("\\.".toRegex()).toTypedArray(), 0, newValue) + val settings = LoadSettings.builder() + .setLabel("YAML 配置文件") + .build() - // 3. 配置 YAML 输出格式（保留原始风格） - val options = DumperOptions().apply { - defaultFlowStyle = DumperOptions.FlowStyle.FLOW // 使用 {} 风格 - indent = 2 // 缩进2空格 - isPrettyFlow = true // 保持可读性 + val loader = Load(settings) + val parsed = loader.loadFromString(content) + + if (parsed !is MutableMap<*, *>) { + throw IllegalStateException("文档根节点必须是 Map，实际是: ${parsed?.javaClass?.name}") } - // 4. 写回文件 - FileWriter(normalizedPath).use { writer -> - Yaml(options).dump(yamlData, writer) - } + @Suppress("UNCHECKED_CAST") + val root = parsed as MutableMap + + // 更新节点 + updateMap(root, keyPath.split('.'), newValue) + + // 保存 + val dumpSettings = DumpSettings.builder() + .setDefaultFlowStyle(FlowStyle.BLOCK) + .setIndent(2) + .setWidth(120) + .build() + + Files.writeString(Paths.get(normalizedPath), Dump(dumpSettings).dumpToString(root)) } - private fun updateNestedValue(map: Map, keys: Array, index: Int, newValue: Any) { - if (index == keys.size - 1) { - (map as MutableMap)[keys[index]] = newValue // 更新最终字段 + + private fun updateMap(map: MutableMap, keys: List, value: Any?) { + if (keys.size == 1) { + map[keys[0]] = value } else { - val nested = map[keys[index]] - if (nested is Map<*, *>) { - @Suppress("UNCHECKED_CAST") - val nestedMap = nested as Map - updateNestedValue(nestedMap, keys, index + 1, newValue) - } else { - throw IllegalArgumentException("Invalid YAML path: ${keys.joinToString(".")}") + val child = map[keys[0]] + if (child !is MutableMap<*, *>) { + throw IllegalArgumentException("Invalid path: ${keys[0]}") } + @Suppress("UNCHECKED_CAST") + updateMap(child as MutableMap, keys.drop(1), value) } } -} \ No newline at end of file + private fun normalizePath(path: String): String = + path.replace("^/([A-Za-z]:/)".toRegex(), "$1") +} + diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 9e05550..8edeaac 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -1,4 +1,3 @@ -# 重载后注释将会消失 database: # 数据库地址 url: "jdbc:mysql://localhost:3306/quizdb?useSSL=false&serverTimezone=UTC" @@ -9,6 +8,21 @@ database: crypto: # 示例AES加密密钥 密钥字段必需是16字节的正整数倍 secret-key: "ltd25r3944realms" +mode: + bot-api-type: HTTP + environment: DEVELOPMENT +http: + url: "https://127.0.0.1:3001" + # 格式为 ENC(XXX),若不是则会在加载完成配置后自动加密 + encrypted-token: "123123bb" websocket: - url: - token: \ No newline at end of file + url: "wss://127.0.0.1:3002" + # 格式为 ENC(XXX),若不是则会在加载完成配置后自动加密 + encrypted-token: "123123cc" +tools: + rcon: + mc-rcon-tool-path: "/path/to/rcon" + mc-rcon-tool-config-path: "/path/to/rcon_config" + server-url: "your.minecraft.server" + # 格式为 ENC(XXX),若不是则会在加载完成配置后自动加密 + rcon-password: "123123dd" \ No newline at end of file diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml index 889d53a..c441bda 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -1,36 +1,62 @@ - - - %d{yyyy-MM-dd HH:mm:ss} [%t] %-5level %logger{36} - %msg%n - logs/app.log - - - + - + - - - - + + + + [%d{yyyy-MM-dd HH:mm:ss}] %-5level %logger{36} - %msg%n + + + + + + + + + + + + + + + + + + + [%d{yyyy-MM-dd HH:mm:ss}] %-5level %logger{36} - %msg%n + + + + + + + + + + + + - - - - - + + + + + - - - - + + + - + \ No newline at end of file