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
447e7349
Commit
447e7349
authored
Jul 02, 2020
by
Him188
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move MiraiProtocol from BotConfigurationBase to BotConfiguration
parent
69a50f4a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
40 additions
and
22 deletions
+40
-22
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/BotConfiguration.common.kt
...n/kotlin/net.mamoe.mirai/utils/BotConfiguration.common.kt
+19
-22
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/BotConfiguration.kt
.../jvmMain/kotlin/net/mamoe/mirai/utils/BotConfiguration.kt
+21
-0
No files found.
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/BotConfiguration.common.kt
View file @
447e7349
...
@@ -16,10 +16,10 @@ import kotlinx.serialization.UnstableDefault
...
@@ -16,10 +16,10 @@ import kotlinx.serialization.UnstableDefault
import
kotlinx.serialization.json.Json
import
kotlinx.serialization.json.Json
import
kotlinx.serialization.json.JsonConfiguration
import
kotlinx.serialization.json.JsonConfiguration
import
net.mamoe.mirai.Bot
import
net.mamoe.mirai.Bot
import
net.mamoe.mirai.utils.BotConfiguration.MiraiProtocol
import
kotlin.coroutines.CoroutineContext
import
kotlin.coroutines.CoroutineContext
import
kotlin.coroutines.EmptyCoroutineContext
import
kotlin.coroutines.EmptyCoroutineContext
import
kotlin.coroutines.coroutineContext
import
kotlin.coroutines.coroutineContext
import
kotlin.jvm.JvmField
import
kotlin.jvm.JvmStatic
import
kotlin.jvm.JvmStatic
import
kotlin.jvm.JvmSynthetic
import
kotlin.jvm.JvmSynthetic
...
@@ -52,6 +52,24 @@ expect open class BotConfiguration() : BotConfigurationBase {
...
@@ -52,6 +52,24 @@ expect open class BotConfiguration() : BotConfigurationBase {
@ConfigurationDsl
@ConfigurationDsl
fun
randomDeviceInfo
()
fun
randomDeviceInfo
()
enum
class
MiraiProtocol
{
/**
* Android 手机.
*
* - 与手机冲突
* - 与平板和电脑不冲突
*/
ANDROID_PHONE
,
/**
* Android 平板.
*
* - 与平板冲突
* - 与手机和电脑不冲突
*/
ANDROID_PAD
}
companion
object
{
companion
object
{
/** 默认的配置实例. 可以进行修改 */
/** 默认的配置实例. 可以进行修改 */
@JvmStatic
@JvmStatic
...
@@ -129,27 +147,6 @@ open class BotConfigurationBase internal constructor() {
...
@@ -129,27 +147,6 @@ open class BotConfigurationBase internal constructor() {
Json
(
JsonConfiguration
(
isLenient
=
true
,
ignoreUnknownKeys
=
true
))
Json
(
JsonConfiguration
(
isLenient
=
true
,
ignoreUnknownKeys
=
true
))
}.
getOrElse
{
Json
(
JsonConfiguration
.
Stable
)
}
}.
getOrElse
{
Json
(
JsonConfiguration
.
Stable
)
}
enum
class
MiraiProtocol
(
/** 协议模块使用的 ID */
@JvmField
internal
val
id
:
Long
)
{
/**
* Android 手机.
*
* - 与手机冲突
* - 与平板和电脑不冲突
*/
ANDROID_PHONE
(
537062845
),
/**
* Android 平板.
*
* - 与平板冲突
* - 与手机和电脑不冲突
*/
ANDROID_PAD
(
537062409
)
}
/**
/**
* 不显示网络日志. 不推荐.
* 不显示网络日志. 不推荐.
* @see networkLoggerSupplier 更多日志处理方式
* @see networkLoggerSupplier 更多日志处理方式
...
...
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/BotConfiguration.kt
View file @
447e7349
...
@@ -127,6 +127,27 @@ actual open class BotConfiguration : BotConfigurationBase() { // open for Java
...
@@ -127,6 +127,27 @@ actual open class BotConfiguration : BotConfigurationBase() { // open for Java
botLoggerSupplier
=
{
SingleFileLogger
(
identity
(
it
),
file
)
}
botLoggerSupplier
=
{
SingleFileLogger
(
identity
(
it
),
file
)
}
}
}
actual
enum
class
MiraiProtocol
actual
constructor
(
/** 协议模块使用的 ID */
@JvmField
actual
internal
val
id
:
Long
)
{
/**
* Android 手机.
*
* - 与手机冲突
* - 与平板和电脑不冲突
*/
ANDROID_PHONE
(
537062845
),
/**
* Android 平板.
*
* - 与平板冲突
* - 与手机和电脑不冲突
*/
ANDROID_PAD
(
537062409
)
}
actual
companion
object
{
actual
companion
object
{
/** 默认的配置实例. 可以进行修改 */
/** 默认的配置实例. 可以进行修改 */
@JvmStatic
@JvmStatic
...
...
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