Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
Mirai
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
Mirai
Commits
56073012
Commit
56073012
authored
Jul 30, 2020
by
Him188
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Close #450: add `BotConfiguration.loadDeviceInfoJson`
parent
ac91e77b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
2 deletions
+18
-2
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/BotConfiguration.common.kt
...n/kotlin/net.mamoe.mirai/utils/BotConfiguration.common.kt
+6
-0
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/BotConfiguration.kt
.../jvmMain/kotlin/net/mamoe/mirai/utils/BotConfiguration.kt
+12
-2
No files found.
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/BotConfiguration.common.kt
View file @
56073012
...
...
@@ -52,6 +52,12 @@ public expect open class BotConfiguration() : BotConfigurationBase {
@ConfigurationDsl
public
fun
randomDeviceInfo
()
/**
* 使用特定由 [DeviceInfoData] 序列化产生的 JSON 的设备信息
*/
@SinceMirai
(
"1.2.0"
)
public
fun
loadDeviceInfoJson
(
json
:
String
)
/**
* 协议类型, 服务器仅允许使用不同协议同时登录.
*/
...
...
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/BotConfiguration.kt
View file @
56073012
...
...
@@ -51,10 +51,20 @@ public actual open class BotConfiguration : BotConfigurationBase() { // open for
* @see deviceInfo
*/
@ConfigurationDsl
public
actual
fun
randomDeviceInfo
()
{
public
actual
fun
randomDeviceInfo
()
{
deviceInfo
=
null
}
/**
* 使用特定由 [DeviceInfoData] 序列化产生的 JSON 的设备信息
*/
@SinceMirai
(
"1.2.0"
)
public
actual
fun
loadDeviceInfoJson
(
json
:
String
)
{
deviceInfo
=
{
context
->
this
.
json
.
parse
(
DeviceInfoData
.
serializer
(),
json
).
also
{
it
.
context
=
context
}
}
}
/**
* 重定向 [网络日志][networkLoggerSupplier] 到指定目录. 若目录不存在将会自动创建 ([File.mkdirs])
* @see DirectoryLogger
...
...
@@ -63,7 +73,7 @@ public actual open class BotConfiguration : BotConfigurationBase() { // open for
@JvmOverloads
@ConfigurationDsl
@SinceMirai
(
"1.1.0"
)
public
fun
redirectNetworkLogToDirectory
(
public
fun
redirectNetworkLogToDirectory
(
dir
:
File
=
File
(
"logs"
),
retain
:
Long
=
1
.
weeksToMillis
,
identity
:
(
bot
:
Bot
)
->
String
=
{
"Net ${it.id}"
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment