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

Code cleanup

Browse Source
This commit is contained in:
Him188 2021-01-08 11:37:09 +08:00
parent 179746c5f7
commit 1885db5523
5 changed files with 7 additions and 9 deletions
mirai-core-api/src/commonMain/kotlin/message/data
ForwardMessage.kt
mirai-core/src/commonMain/kotlin
message
outgoingSourceImpl.kt
network/protocol/packet/chat
MultiMsg.ktPbMessageSvc.kt
image
ImgStore.kt

4
mirai-core-api/src/commonMain/kotlin/message/data/ForwardMessage.kt
View File

@ -25,6 +25,7 @@ import net.mamoe.mirai.message.data.ForwardMessage.DisplayStrategy
import net.mamoe.mirai.utils.MiraiExperimentalApi
import net.mamoe.mirai.utils.currentTimeSeconds
import net.mamoe.mirai.utils.safeCast
import net.mamoe.mirai.utils.toLongUnsigned
@MiraiExperimentalApi
@ -576,9 +577,6 @@ public class ForwardMessageBuilder private constructor(
}
}
@Suppress("NOTHING_TO_INLINE")
internal inline fun Int.toLongUnsigned(): Long = this.toLong().and(0xFFFF_FFFF)
private fun ForwardMessage.INode.toNode(): ForwardMessage.Node {
return ForwardMessage.Node(senderId, time, senderName, messageChain)
}

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

@ -23,11 +23,11 @@ import net.mamoe.mirai.internal.network.protocol.data.proto.ImMsgBody
import net.mamoe.mirai.internal.network.protocol.data.proto.MsgComm
import net.mamoe.mirai.internal.network.protocol.data.proto.SourceMsg
import net.mamoe.mirai.internal.network.protocol.packet.chat.receive.OnlinePushPbPushGroupMsg.SendGroupMessageReceipt
import net.mamoe.mirai.internal.network.protocol.packet.chat.toLongUnsigned
import net.mamoe.mirai.internal.utils.io.serialization.toByteArray
import net.mamoe.mirai.message.data.MessageChain
import net.mamoe.mirai.message.data.MessageSource
import net.mamoe.mirai.message.data.OnlineMessageSource
import net.mamoe.mirai.utils.toLongUnsigned
import java.util.concurrent.atomic.AtomicBoolean

3
mirai-core/src/commonMain/kotlin/network/protocol/packet/chat/MultiMsg.kt
View File

@ -34,6 +34,7 @@ import net.mamoe.mirai.message.data.ForwardMessage
import net.mamoe.mirai.message.data.toMessageChain
import net.mamoe.mirai.utils.gzip
import net.mamoe.mirai.utils.md5
import net.mamoe.mirai.utils.toLongUnsigned
internal class MessageValidationData(
val data: ByteArray,
@ -44,8 +45,6 @@ internal class MessageValidationData(
}
}
@Suppress("NOTHING_TO_INLINE")
internal inline fun Int.toLongUnsigned(): Long = this.toLong().and(0xFFFF_FFFF)
internal fun Collection<ForwardMessage.INode>.calculateValidationDataForGroup(
sequenceId: Int,
random: Int,

3
mirai-core/src/commonMain/kotlin/network/protocol/packet/chat/PbMessageSvc.kt
View File

@ -1,5 +1,5 @@
/*
* Copyright 2019-2020 Mamoe Technologies and contributors.
* Copyright 2019-2021 Mamoe Technologies and contributors.
*
* 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证.
* Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link.
@ -24,6 +24,7 @@ import net.mamoe.mirai.internal.utils.io.serialization.readProtoBuf
import net.mamoe.mirai.internal.utils.io.serialization.toByteArray
import net.mamoe.mirai.internal.utils.io.serialization.writeProtoBuf
import net.mamoe.mirai.utils.hexToBytes
import net.mamoe.mirai.utils.toLongUnsigned
internal class PbMessageSvc {
object PbMsgWithDraw : OutgoingPacketFactory<PbMsgWithDraw.Response>(

4
mirai-core/src/commonMain/kotlin/network/protocol/packet/chat/image/ImgStore.kt
View File

@ -1,5 +1,5 @@
/*
* Copyright 2019-2020 Mamoe Technologies and contributors.
* Copyright 2019-2021 Mamoe Technologies and contributors.
*
* 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证.
* Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link.
@ -17,9 +17,9 @@ import net.mamoe.mirai.internal.network.protocol.data.proto.Cmd0x388
import net.mamoe.mirai.internal.network.protocol.packet.OutgoingPacket
import net.mamoe.mirai.internal.network.protocol.packet.OutgoingPacketFactory
import net.mamoe.mirai.internal.network.protocol.packet.buildOutgoingUniPacket
import net.mamoe.mirai.internal.network.protocol.packet.chat.toLongUnsigned
import net.mamoe.mirai.internal.utils.io.serialization.readProtoBuf
import net.mamoe.mirai.internal.utils.io.serialization.writeProtoBuf
import net.mamoe.mirai.utils.toLongUnsigned
import kotlin.random.Random
import kotlin.random.nextInt