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

fix: digest message (#2672)

Browse Source 
fix: unsigned int
This commit is contained in:
cssxsh 2023-05-27 19:40:48 +08:00 committed by GitHub
parent 8b4af6d8cf
commit 3dfe86bbe0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mirai-core/src/commonMain/kotlin/contact/essence/EssencesImpl.kt
View File

@ -79,8 +79,8 @@ internal class EssencesImpl(
private suspend fun source(digests: DigestMessage, parse: Boolean): MessageSource {
return group.bot.buildMessageSource(MessageSourceKind.GROUP) {
ids = intArrayOf(digests.msgSeq)
internalIds = intArrayOf(digests.msgRandom)
ids = intArrayOf(digests.msgSeq.toInt())
internalIds = intArrayOf(digests.msgRandom.toInt())
time = digests.senderTime
fromId = digests.senderUin
@ -122,8 +122,8 @@ internal class EssencesImpl(
override suspend fun share(source: MessageSource): String {
val share = group.bot.shareDigest(
groupCode = group.id,
msgSeq = source.ids.first(),
msgRandom = source.internalIds.first(),
msgSeq = source.ids.first().toLong().and(0xFFFF_FFFF),
msgRandom = source.internalIds.first().toLong().and(0xFFFF_FFFF),
targetGroupCode = 0
)
return "https://qun.qq.com/essence/share?_wv=3&_wwv=128&_wvx=2&sharekey=${share.shareKey}"
@ -143,8 +143,8 @@ internal class EssencesImpl(
try {
group.bot.cancelDigest(
groupCode = group.id,
msgSeq = source.ids.first(),
msgRandom = source.internalIds.first()
msgSeq = source.ids.first().toLong().and(0xFFFF_FFFF),
msgRandom = source.internalIds.first().toLong().and(0xFFFF_FFFF)
)
} catch (cause: IllegalStateException) {
cause.addSuppressed(IllegalStateException(result.msg))

8
mirai-core/src/commonMain/kotlin/contact/essence/GroupDigestProtocol.kt
View File

@ -60,9 +60,9 @@ internal data class DigestMessage(
@SerialName("msg_content")
val msgContent: List<JsonObject> = emptyList(),
@SerialName("msg_random")
val msgRandom: Int = 0,
val msgRandom: Long = 0,
@SerialName("msg_seq")
val msgSeq: Int = 0,
val msgSeq: Long = 0,
@SerialName("sender_nick")
val senderNick: String = "",
@SerialName("sender_time")
@ -108,7 +108,7 @@ internal suspend fun QQAndroidBot.getDigestList(
}
internal suspend fun QQAndroidBot.cancelDigest(
groupCode: Long, msgSeq: Int, msgRandom: Int
groupCode: Long, msgSeq: Long, msgRandom: Long
) {
val data = components[HttpClientProvider].getHttpClient().get {
url("https://qun.qq.com/cgi-bin/group_digest/cancel_digest")
@ -133,7 +133,7 @@ internal suspend fun QQAndroidBot.cancelDigest(
}
internal suspend fun QQAndroidBot.shareDigest(
groupCode: Long, msgSeq: Int, msgRandom: Int, targetGroupCode: Long
groupCode: Long, msgSeq: Long, msgRandom: Long, targetGroupCode: Long
): DigestShare {
return components[HttpClientProvider].getHttpClient().get {
url("https://qun.qq.com/cgi-bin/group_digest/share_digest")