fix: sign for review

Author: cssxsh

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

@@ -2817,9 +2817,10 @@ public final class net/mamoe/mirai/event/events/OtherClientOnlineEvent : net/mam
 
 public final class net/mamoe/mirai/event/events/SignEvent : net/mamoe/mirai/event/AbstractEvent, net/mamoe/mirai/event/events/BotEvent, net/mamoe/mirai/internal/network/Packet {
 	public fun getBot ()Lnet/mamoe/mirai/Bot;
-	public final fun getHasRank ()Z
+	public final fun getRank ()Ljava/lang/Integer;
 	public final fun getSign ()Ljava/lang/String;
 	public final fun getUser ()Lnet/mamoe/mirai/contact/UserOrBot;
+	public final fun hasRank ()Z
 	public fun toString ()Ljava/lang/String;
 }
 

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

@@ -2817,9 +2817,10 @@ public final class net/mamoe/mirai/event/events/OtherClientOnlineEvent : net/mam
 
 public final class net/mamoe/mirai/event/events/SignEvent : net/mamoe/mirai/event/AbstractEvent, net/mamoe/mirai/event/events/BotEvent, net/mamoe/mirai/internal/network/Packet {
 	public fun getBot ()Lnet/mamoe/mirai/Bot;
-	public final fun getHasRank ()Z
+	public final fun getRank ()Ljava/lang/Integer;
 	public final fun getSign ()Ljava/lang/String;
 	public final fun getUser ()Lnet/mamoe/mirai/contact/UserOrBot;
+	public final fun hasRank ()Z
 	public fun toString ()Ljava/lang/String;
 }
 

mirai-core-api/src/commonMain/kotlin/event/events/SignEvent.kt

@@ -26,20 +26,24 @@ import kotlin.jvm.JvmName
  * @property user 打卡发起人
  * @property sign 打卡标记
  * @property hasRank 有排名的打卡，通常是前三名
+ * @property rank 打卡排名，没有排名或识别失败时为 null
+ * @since 2.14
  */
 public class SignEvent @MiraiInternalApi constructor(
     public val user: UserOrBot,
     public val sign: String,
-    public val hasRank: Boolean
+    @get:JvmName("hasRank")
+    public val hasRank: Boolean,
+    public val rank: Int?
 ) : AbstractEvent(), BotEvent, Packet {
     override val bot: Bot get() = user.bot
 
     override fun toString(): String {
         return when (user) {
-            is Bot -> "SignEvent(bot=${user.id}, sign=${sign}, hasRank=${hasRank})"
-            is Member -> "SignEvent(bot=${user.bot.id}, group=${user.group.id}, member=${user.id}, sign=${sign}, hasRank=${hasRank})"
-            is Friend -> "SignEvent(bot=${user.bot.id}, friend=${user.id} sign=${sign}, hasRank=${hasRank})"
-            else -> "SignEvent(user=${user}, sign=${sign}, hasRank=${hasRank})"
+            is Bot -> "SignEvent(bot=${user.id}, sign=${sign})"
+            is Member -> "SignEvent(bot=${user.bot.id}, group=${user.group.id}, member=${user.id}, sign=${sign})"
+            is Friend -> "SignEvent(bot=${user.bot.id}, friend=${user.id} sign=${sign})"
+            else -> "SignEvent(user=${user}, sign=${sign})"
         }
     }
 }

mirai-core/src/commonMain/kotlin/network/notice/group/GroupNotificationProcessor.kt

@@ -349,11 +349,13 @@ internal class GroupNotificationProcessor(
                 val user = grayTip.msgTemplParam["mqq_uin"]?.findMember() ?: group.botAsMember
                 val sign = grayTip.msgTemplParam["user_sign"].orEmpty()
                 val img = grayTip.msgTemplParam["rank_img"]
+                val rank = """今日第(\d+)个打卡""".toRegex().matchEntire(sign)?.groupValues?.get(1)?.toInt()
 
                 collected += SignEvent(
                     user = user,
                     sign = sign,
-                    hasRank = img != null
+                    hasRank = img != null,
+                    rank = rank
                 )
             }
             // 龙王