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

Simplify logical process

Browse Source
This commit is contained in:
Him188 2019-11-13 19:54:13 +08:00
parent c15651b9f7
commit cc2343e220
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/action/UploadImage.kt
View File

@ -36,27 +36,27 @@ class OverFileSizeMaxException : IllegalStateException()
*/ */
suspend fun Group.uploadImage(image: ExternalImage): ImageId = withSession { suspend fun Group.uploadImage(image: ExternalImage): ImageId = withSession {
val userContext = coroutineContext val userContext = coroutineContext
GroupImageIdRequestPacket(bot.qqAccount, internalId, image, sessionKey) val response = GroupImageIdRequestPacket(bot.qqAccount, internalId, image, sessionKey).sendAndExpect<GroupImageIdRequestPacket.Response>()
.sendAndExpectAsync<GroupImageIdRequestPacket.Response, Unit> {
withContext(userContext) {
when (it) {
is GroupImageIdRequestPacket.Response.RequireUpload -> httpClient.postImage(
htcmd = "0x6ff0071",
uin = bot.qqAccount,
groupId = GroupId(id),
imageInput = image.input,
inputSize = image.inputSize,
uKeyHex = it.uKey.toUHexString("")
)
is GroupImageIdRequestPacket.Response.AlreadyExists -> { withContext(userContext) {
} when (response) {
is GroupImageIdRequestPacket.Response.RequireUpload -> httpClient.postImage(
htcmd = "0x6ff0071",
uin = bot.qqAccount,
groupId = GroupId(id),
imageInput = image.input,
inputSize = image.inputSize,
uKeyHex = response.uKey.toUHexString("")
)
is GroupImageIdRequestPacket.Response.OverFileSizeMax -> throw OverFileSizeMaxException() is GroupImageIdRequestPacket.Response.AlreadyExists -> {
}
} }
}.join()
image.groupImageId is GroupImageIdRequestPacket.Response.OverFileSizeMax -> throw OverFileSizeMaxException()
}
}
return image.groupImageId
} }
/** /**