update: announcement protocol

mirai-core-api/compatibility-validation/android/api/android.api

@@ -803,6 +803,7 @@ public final class net/mamoe/mirai/contact/announcement/AnnouncementImage {
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getHeight ()I
 	public final fun getId ()Ljava/lang/String;
+	public final fun getUrl ()Ljava/lang/String;
 	public final fun getWidth ()I
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;

mirai-core-api/compatibility-validation/jvm/api/jvm.api

@@ -803,6 +803,7 @@ public final class net/mamoe/mirai/contact/announcement/AnnouncementImage {
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getHeight ()I
 	public final fun getId ()Ljava/lang/String;
+	public final fun getUrl ()Ljava/lang/String;
 	public final fun getWidth ()I
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;

mirai-core-api/src/commonMain/kotlin/contact/announcement/AnnouncementImage.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 Mamoe Technologies and contributors.
+ * Copyright 2019-2023 Mamoe Technologies and contributors.
  *
  * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证.
  * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link.
@@ -31,6 +31,11 @@ public class AnnouncementImage private constructor(
 ) {
     // For stability, do not make it `data class`.
 
+    /**
+     * @since 2.15
+     */
+    public val url: String get() = "https://gdynamic.qpic.cn/gdynamic/$id/628"
+
     public companion object {
         public const val SERIAL_NAME: String = "AnnouncementImage"
 

mirai-core/src/commonMain/kotlin/contact/announcement/AnnouncementsImpl.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 Mamoe Technologies and contributors.
+ * Copyright 2019-2023 Mamoe Technologies and contributors.
  *
  * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证.
  * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link.
@@ -48,12 +48,7 @@ import net.mamoe.mirai.utils.*
 import net.mamoe.mirai.utils.Either.Companion.onLeft
 import net.mamoe.mirai.utils.Either.Companion.rightOrNull
 
-internal expect class AnnouncementsImpl(
-    group: GroupImpl,
-    logger: MiraiLogger,
-) : CommonAnnouncementsImpl
-
-internal abstract class CommonAnnouncementsImpl(
+internal class AnnouncementsImpl(
     protected val group: GroupImpl,
     protected val logger: MiraiLogger,
 ) : Announcements {
@@ -412,6 +407,7 @@ internal object AnnouncementProtocol {
                 showPopup = settings.tipWindowType == 0
                 requireConfirmation = settings.confirmRequired == 1
                 showEditCard = settings.isShowEditCard == 1
+                image = msg.images.firstOrNull()?.toPublic()
             },
             fid = fid,
             allConfirmed = isAllConfirm != 0,

mirai-core/src/commonMain/kotlin/contact/announcement/GroupAnnouncement.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 Mamoe Technologies and contributors.
+ * Copyright 2019-2023 Mamoe Technologies and contributors.
  *
  * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证.
  * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link.
@@ -63,7 +63,8 @@ internal class GroupAnnouncementImage @MiraiInternalApi constructor(
 @Serializable
 internal data class GroupAnnouncementMsg(
     val text: String,
-    val text_face: String? = null,
+    @SerialName("text_face") val textFace: String? = null,
+    @SerialName("pics") val images: List<GroupAnnouncementImage> = emptyList(),
 //    val title: String? = null // no title any more
 )