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

Support sending friend image to group, #307

Browse Source
This commit is contained in:
Him188 2021-01-05 22:30:49 +08:00
parent ac03d405f9
commit f00bb216b6
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mirai-core/src/commonMain/kotlin/contact/GroupImpl.kt
View File

@ -20,9 +20,7 @@ import net.mamoe.mirai.event.broadcast
import net.mamoe.mirai.event.events.* import net.mamoe.mirai.event.events.*
import net.mamoe.mirai.internal.MiraiImpl import net.mamoe.mirai.internal.MiraiImpl
import net.mamoe.mirai.internal.QQAndroidBot import net.mamoe.mirai.internal.QQAndroidBot
import net.mamoe.mirai.internal.message.MessageSourceToGroupImpl import net.mamoe.mirai.internal.message.*
import net.mamoe.mirai.internal.message.OfflineGroupImage
import net.mamoe.mirai.internal.message.ensureSequenceIdAvailable
import net.mamoe.mirai.internal.message.firstIsInstanceOrNull import net.mamoe.mirai.internal.message.firstIsInstanceOrNull
import net.mamoe.mirai.internal.network.QQAndroidBotNetworkHandler import net.mamoe.mirai.internal.network.QQAndroidBotNetworkHandler
import net.mamoe.mirai.internal.network.highway.HighwayHelper import net.mamoe.mirai.internal.network.highway.HighwayHelper
@ -153,8 +151,11 @@ internal class GroupImpl(
throw EventCancelledException("exception thrown when broadcasting GroupMessagePreSendEvent", it) throw EventCancelledException("exception thrown when broadcasting GroupMessagePreSendEvent", it)
}.message.asMessageChain() }.message.asMessageChain()
var length: Int = 0 @Suppress("VARIABLE_WITH_REDUNDANT_INITIALIZER")
var imageCnt: Int = 0 var length = 0
@Suppress("VARIABLE_WITH_REDUNDANT_INITIALIZER") // stupid compiler
var imageCnt = 0
chain.verityLength(message, this, lengthCallback = { chain.verityLength(message, this, lengthCallback = {
length = it length = it
}, imageCntCallback = { }, imageCntCallback = {
@ -181,6 +182,17 @@ internal class GroupImpl(
msg.firstIsInstanceOrNull<QuoteReply>()?.source?.ensureSequenceIdAvailable() msg.firstIsInstanceOrNull<QuoteReply>()?.source?.ensureSequenceIdAvailable()
msg.filterIsInstance<FriendImage>().forEach { image ->
bot.network.run {
ImgStore.GroupPicUp(
bot.client,
uin = bot.id,
groupCode = id,
md5 = image.md5,
size = if (image is OnlineFriendImageImpl) image.delegate.fileLen else 0
).sendAndExpect<ImgStore.GroupPicUp.Response>()
}
}
val result = bot.network.runCatching { val result = bot.network.runCatching {
val source: MessageSourceToGroupImpl val source: MessageSourceToGroupImpl