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

Declare type explicitly for IDE inference issue

Browse Source
This commit is contained in:
Him188 2021-04-08 18:07:21 +08:00
parent 45c6adf956
commit 951ddc3138
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mirai-core/src/commonMain/kotlin/message/incomingSourceImpl.kt
View File

@ -52,7 +52,7 @@ internal class OnlineMessageSourceFromFriendImpl(
}
override val sender: Friend = bot.getFriendOrFail(msg.first().msgHead.fromUin)
private val jceData by lazy { msg.toJceDataPrivate(internalIds) }
private val jceData: ImMsgBody.SourceMsg by lazy { msg.toJceDataPrivate(internalIds) }
override fun toJceData(): ImMsgBody.SourceMsg = jceData
}
@ -76,7 +76,7 @@ internal class OnlineMessageSourceFromStrangerImpl(
}
override val sender: Stranger = bot.getStrangerOrFail(msg.first().msgHead.fromUin)
private val jceData by lazy { msg.toJceDataPrivate(internalIds) }
private val jceData: ImMsgBody.SourceMsg by lazy { msg.toJceDataPrivate(internalIds) }
override fun toJceData(): ImMsgBody.SourceMsg = jceData
}
@ -139,7 +139,7 @@ internal class OnlineMessageSourceFromTempImpl(
bot.getGroupOrFail(c2cTmpMsgHead!!.groupUin).getOrFail(fromUin)
}
private val jceData by lazy { msg.toJceDataPrivate(internalIds) }
private val jceData: ImMsgBody.SourceMsg by lazy { msg.toJceDataPrivate(internalIds) }
override fun toJceData(): ImMsgBody.SourceMsg = jceData
}
@ -178,7 +178,7 @@ internal class OnlineMessageSourceFromGroupImpl(
}
}
private val jceData by lazy {
private val jceData: ImMsgBody.SourceMsg by lazy {
ImMsgBody.SourceMsg(
origSeqs = intArrayOf(msg.first().msgHead.msgSeq),
senderUin = msg.first().msgHead.fromUin,

12
mirai-core/src/commonMain/kotlin/message/outgoingSourceImpl.kt
View File

@ -90,7 +90,7 @@ internal class OnlineMessageSourceToFriendImpl(
override val ids: IntArray
get() = sequenceIds
override var isRecalledOrPlanned: AtomicBoolean = AtomicBoolean(false)
private val jceData by lazy { toJceDataImpl(subject) }
private val jceData: ImMsgBody.SourceMsg by lazy { toJceDataImpl(subject) }
override fun toJceData(): ImMsgBody.SourceMsg = jceData
}
@ -105,7 +105,7 @@ internal class OnlineMessageSourceToStrangerImpl(
) : OnlineMessageSource.Outgoing.ToStranger(), MessageSourceInternal {
constructor(
delegate: OnlineMessageSource.Outgoing,
delegate: Outgoing,
target: Stranger
) : this(delegate.ids, delegate.internalIds, delegate.time, delegate.originalMessage, delegate.sender, target)
@ -116,7 +116,7 @@ internal class OnlineMessageSourceToStrangerImpl(
override val ids: IntArray
get() = sequenceIds
override var isRecalledOrPlanned: AtomicBoolean = AtomicBoolean(false)
private val jceData by lazy { toJceDataImpl(subject) }
private val jceData: ImMsgBody.SourceMsg by lazy { toJceDataImpl(subject) }
override fun toJceData(): ImMsgBody.SourceMsg = jceData
}
@ -130,7 +130,7 @@ internal class OnlineMessageSourceToTempImpl(
override val target: Member
) : OnlineMessageSource.Outgoing.ToTemp(), MessageSourceInternal {
constructor(
delegate: OnlineMessageSource.Outgoing,
delegate: Outgoing,
target: Member
) : this(delegate.ids, delegate.internalIds, delegate.time, delegate.originalMessage, delegate.sender, target)
@ -141,7 +141,7 @@ internal class OnlineMessageSourceToTempImpl(
override val ids: IntArray
get() = sequenceIds
override var isRecalledOrPlanned: AtomicBoolean = AtomicBoolean(false)
private val jceData by lazy { toJceDataImpl(subject) }
private val jceData: ImMsgBody.SourceMsg by lazy { toJceDataImpl(subject) }
override fun toJceData(): ImMsgBody.SourceMsg = jceData
}
@ -190,7 +190,7 @@ internal class OnlineMessageSourceToGroupImpl(
suspend fun ensureSequenceIdAvailable() = kotlin.run { sequenceIdDeferred.await() }
private val jceData by lazy {
private val jceData: ImMsgBody.SourceMsg by lazy {
val elements = originalMessage.toRichTextElems(subject, withGeneralFlags = true)
ImMsgBody.SourceMsg(
origSeqs = sequenceIds,

2
mirai-core/src/commonMain/kotlin/utils/contentToString.kt
View File

@ -32,7 +32,7 @@ private fun <T> Sequence<T>.joinToStringPrefixed(prefix: String, transform: (T)
return this.joinToString(prefix = "$prefix$indent", separator = "\n$prefix$indent", transform = transform)
}
private val SoutvLogger by lazy { MiraiLogger.create("soutv") }
private val SoutvLogger: MiraiLogger by lazy { MiraiLogger.create("soutv") }
internal fun Any?.soutv(name: String = "unnamed") {
@Suppress("DEPRECATION")
SoutvLogger.debug { "$name = ${this._miraiContentToString()}" }