From ea8ed178445aa6715f7e16a70b0ca249ae20d607 Mon Sep 17 00:00:00 2001
From: mzdluo123 <mzdluo123@foxmail.com>
Date: Tue, 18 Aug 2020 10:31:03 +0800
Subject: [PATCH] add @SinceMirai("1.2.0") to voice upload api

---
 .../kotlin/net/mamoe/mirai/qqandroid/contact/GroupImpl.kt      | 3 ++-
 .../src/commonMain/kotlin/net.mamoe.mirai/contact/Group.kt     | 1 +
 .../kotlin/net/mamoe/mirai/message/SendImageUtilsJvm.kt        | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/contact/GroupImpl.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/contact/GroupImpl.kt
index 19c57f841..48efde3a9 100644
--- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/contact/GroupImpl.kt
+++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/contact/GroupImpl.kt
@@ -453,6 +453,7 @@ internal class GroupImpl(
      */
     @JvmSynthetic
     @MiraiExperimentalAPI
+    @SinceMirai("1.2.0")
     override suspend fun uploadGroupVoice(input: InputStream): Voice {
         val content = ByteArray(input.available())
         input.read(content)
@@ -462,7 +463,7 @@ internal class GroupImpl(
         val md5 = MiraiPlatformUtils.md5(content)
         return bot.network.run {
             val response: PttStore.GroupPttUp.Response.RequireUpload =
-                PttStore.GroupPttUp(bot.client, bot.id, 0L, md5, content.size.toLong()).sendAndExpect()
+                PttStore.GroupPttUp(bot.client, bot.id, id, md5, content.size.toLong()).sendAndExpect()
             HighwayHelper.uploadPttToServers(
                 bot,
                 response.uploadIpList.zip(response.uploadPortList),
diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Group.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Group.kt
index 5dea700df..a4b250e4e 100644
--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Group.kt
+++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Group.kt
@@ -182,6 +182,7 @@ public abstract class Group : Contact(), CoroutineScope {
      */
     @JvmSynthetic
     @MiraiExperimentalAPI
+    @SinceMirai("1.2.0")
     public abstract suspend fun uploadGroupVoice(input: InputStream): Voice
 
 
diff --git a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/message/SendImageUtilsJvm.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/message/SendImageUtilsJvm.kt
index 5ba1a4580..025cea72e 100644
--- a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/message/SendImageUtilsJvm.kt
+++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/message/SendImageUtilsJvm.kt
@@ -127,6 +127,7 @@ public suspend fun File.uploadAsImage(contact: Contact): Image {
  */
 @Throws(OverFileSizeMaxException::class)
 @MiraiExperimentalAPI
+@SinceMirai("1.2.0")
 public suspend fun InputStream.uploadAsGroupVoice(group: Group): Voice {
     return group.uploadGroupVoice(this)
 }