github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-04-25 04:50:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix loading deviceJson from JSON string on JVM; fix loading deviceJson from JSON string and file on native.

Browse Source
This commit is contained in:
Him188 2022-06-01 20:45:04 +01:00
parent b5246d8a30
commit 06616bac35
No known key found for this signature in database
GPG Key ID: BA439CDDCF652375
2 changed files with 3 additions and 3 deletions
mirai-core-api/src
jvmBaseMain/kotlin/utils
BotConfiguration.kt
nativeMain/kotlin/utils
BotConfiguration.kt

2
mirai-core-api/src/jvmBaseMain/kotlin/utils/BotConfiguration.kt
View File

@ -341,7 +341,7 @@ public actual open class BotConfiguration { // open for Java
@ConfigurationDsl
public actual fun loadDeviceInfoJson(json: String) {
deviceInfo = {
this.json.decodeFromString(DeviceInfo.serializer(), json)
DeviceInfoManager.deserialize(json, this.json)
}
}

4
mirai-core-api/src/nativeMain/kotlin/utils/BotConfiguration.kt
View File

@ -314,7 +314,7 @@ public actual open class BotConfiguration { // open for Java
@ConfigurationDsl
public actual fun loadDeviceInfoJson(json: String) {
deviceInfo = {
Companion.json.decodeFromString(DeviceInfo.serializer(), json)
DeviceInfoManager.deserialize(json, Companion.json)
}
}
@ -329,7 +329,7 @@ public actual open class BotConfiguration { // open for Java
public actual fun fileBasedDeviceInfo(filepath: String) {
deviceInfo = {
val file = MiraiFile.create(workingDir).resolve(filepath)
Json.decodeFromString(DeviceInfo.serializer(), file.readText())
DeviceInfoManager.deserialize(file.readText(), json)
}
}