From d40b74b3118859da5e4a0a1ac07d472abe4bfd34 Mon Sep 17 00:00:00 2001
From: Karlatemp <karlatemp@vip.qq.com>
Date: Thu, 15 Jul 2021 22:26:09 +0800
Subject: [PATCH] Fix announcement publishing with `sendToNewMember=true`

---
 .../kotlin/contact/announcement/AnnouncementsImpl.kt     | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/mirai-core/src/commonMain/kotlin/contact/announcement/AnnouncementsImpl.kt b/mirai-core/src/commonMain/kotlin/contact/announcement/AnnouncementsImpl.kt
index ccb5e1710..5b87fea88 100644
--- a/mirai-core/src/commonMain/kotlin/contact/announcement/AnnouncementsImpl.kt
+++ b/mirai-core/src/commonMain/kotlin/contact/announcement/AnnouncementsImpl.kt
@@ -203,7 +203,13 @@ internal object AnnouncementProtocol {
         image: AnnouncementImage?,
     ): String {
         return Mirai.Http.post<String> {
-            url("https://web.qun.qq.com/cgi-bin/announce/add_qun_notice")
+            url(
+                "https://web.qun.qq.com/cgi-bin/announce/add_qun_" + if (announcement.type == 20) {
+                    "instruction"
+                } else {
+                    "notice"
+                }
+            )
             body = MultiPartFormDataContent(formData {
                 append("qid", groupId)
                 this.append("bkn", bkn)
@@ -219,6 +225,7 @@ internal object AnnouncementProtocol {
                     announcement.settings.toJsonString(GroupAnnouncementSettings.serializer()),
                 )
                 append("format", "json")
+                // append("type", announcement.type.toString())
             })
             cookie("uin", "o$id")
             cookie("p_uin", "o$id")