github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-09 18:00:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Him188 2020-01-17 11:51:31 +08:00
parent 038d69b7ac
commit 192594896e
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/Bot.kt
View File

@ -126,6 +126,9 @@ abstract class Bot : CoroutineScope {
// endregion // endregion
/**
* 关闭这个 [Bot], 停止一切相关活动. 不可重新登录.
*/
abstract fun dispose(throwable: Throwable?) abstract fun dispose(throwable: Throwable?)
// region extensions // region extensions

2
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/QQ.kt
View File

@ -11,7 +11,7 @@ import net.mamoe.mirai.data.Profile
/** /**
* QQ 对象. * QQ 对象.
* 注意: 一个 [QQ] 实例并不是独立的, 它属于一个 [Bot]. * 注意: 一个 [QQ] 实例并不是独立的, 它属于一个 [Bot].
* 它不能被直接构造. 任何时候都应从 [Bot.qq], [Bot.ContactSystem.getQQ], [BotSession.qq] 或事件中获取. * 它不能被直接构造. 任何时候都应从 [Bot.getQQ] 或事件中获取.
* *
* 对于同一个 [Bot] 任何一个人的 [QQ] 实例都是单一的. * 对于同一个 [Bot] 任何一个人的 [QQ] 实例都是单一的.
* *

9
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/cryptor/Proto.kt
View File

@ -184,6 +184,7 @@ fun Any?.contentToString(prefix: String = ""): String = when (this) {
expect fun Any.contentToStringReflectively(prefix: String = ""): String expect fun Any.contentToStringReflectively(prefix: String = ""): String
@Suppress("UNCHECKED_CAST")
fun ByteReadPacket.readProtoMap(length: Long = this.remaining): ProtoMap { fun ByteReadPacket.readProtoMap(length: Long = this.remaining): ProtoMap {
val map = ProtoMap(mutableMapOf()) val map = ProtoMap(mutableMapOf())
@ -206,14 +207,8 @@ fun ByteReadPacket.readProtoMap(length: Long = this.remaining): ProtoMap {
} }
if (map.containsKey(id)) { if (map.containsKey(id)) {
if (map[id] is MutableList<*>) { if (map[id] !is MutableList<*>) map[id] = mutableListOf(map[id]!!)
@Suppress("UNCHECKED_CAST")
(map[id] as MutableList<Any>) += readValue() (map[id] as MutableList<Any>) += readValue()
} else {
map[id] = mutableListOf(map[id]!!)
@Suppress("UNCHECKED_CAST")
(map[id] as MutableList<Any>) += readValue()
}
} else { } else {
map[id] = readValue() map[id] = readValue()
} }