Skip to content

update device #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 8, 2020
Merged

update device #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/kotlin/net/lz1998/mirai/entity/WebSocketBotClient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ class WebsocketBotClient(override var botId: Long, override var password: String
override suspend fun initBot() {
wsClient = httpClient.newWebSocket(wsRequest, wsListener)
bot = Bot(botId, password) {
fileStrBasedDeviceInfo("device.json")
fileStrBasedDeviceInfo("device/${botId}.json")
loginSolver = MyLoginSolver
noNetworkLog()
}.alsoLogin()
Expand Down
3 changes: 3 additions & 0 deletions src/main/kotlin/net/lz1998/mirai/ext/MyDeviceInfo.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,9 @@ fun BotConfiguration.getFileStrBasedDeviceInfoSupplier(filename: String): ((Cont
fun File.loadStrAsDeviceInfo(json: Json, context: Context = ContextImpl()): DeviceInfo {
if (!this.exists() || this.length() == 0L) {
return MyDeviceInfo(context).also {
if (!this.parentFile.exists()) {
this.parentFile.mkdirs()
}
this.writeText(json.encodeToString(MyDeviceInfo.serializer(), it))
}
}
Expand Down