|
@@ -18,6 +18,7 @@ import net.mamoe.mirai.contact.file.AbsoluteFolder
|
|
import net.mamoe.mirai.contact.isOperator
|
|
import net.mamoe.mirai.contact.isOperator
|
|
import net.mamoe.mirai.internal.contact.GroupImpl
|
|
import net.mamoe.mirai.internal.contact.GroupImpl
|
|
import net.mamoe.mirai.internal.contact.file.RemoteFilesImpl.Companion.findFileByPath
|
|
import net.mamoe.mirai.internal.contact.file.RemoteFilesImpl.Companion.findFileByPath
|
|
|
|
+import net.mamoe.mirai.internal.message.MiraiInternalMessageFlag
|
|
import net.mamoe.mirai.internal.network.QQAndroidClient
|
|
import net.mamoe.mirai.internal.network.QQAndroidClient
|
|
import net.mamoe.mirai.internal.network.components.ClockHolder.Companion.clock
|
|
import net.mamoe.mirai.internal.network.components.ClockHolder.Companion.clock
|
|
import net.mamoe.mirai.internal.network.highway.Highway
|
|
import net.mamoe.mirai.internal.network.highway.Highway
|
|
@@ -171,7 +172,7 @@ internal class AbsoluteFolderImpl(
|
|
// 当为 true 时跳过上传, 但仍然需要完成 `sendMessage(FileMessage)` 才是正常逻辑
|
|
// 当为 true 时跳过上传, 但仍然需要完成 `sendMessage(FileMessage)` 才是正常逻辑
|
|
callback?.onBegin(file, content)
|
|
callback?.onBegin(file, content)
|
|
val result = kotlin.runCatching {
|
|
val result = kotlin.runCatching {
|
|
- folder.contact.sendMessage(file.toMessage())
|
|
|
|
|
|
+ folder.contact.sendMessage(file.toMessage() + MiraiInternalMessageFlag)
|
|
}.map { content.size }
|
|
}.map { content.size }
|
|
callback?.onFinished(file, content, result)
|
|
callback?.onFinished(file, content, result)
|
|
return file
|
|
return file
|
|
@@ -235,7 +236,7 @@ internal class AbsoluteFolderImpl(
|
|
)
|
|
)
|
|
}.let { result0 ->
|
|
}.let { result0 ->
|
|
val result = result0.onSuccessCatching {
|
|
val result = result0.onSuccessCatching {
|
|
- folder.contact.sendMessage(file.toMessage())
|
|
|
|
|
|
+ folder.contact.sendMessage(file.toMessage() + MiraiInternalMessageFlag)
|
|
}
|
|
}
|
|
callback?.onFinished(file, content, result.map { content.size })
|
|
callback?.onFinished(file, content, result.map { content.size })
|
|
}
|
|
}
|