From b42a57736d8f68bcb38cf98bf8b199c37d83b643 Mon Sep 17 00:00:00 2001
From: Karlatemp <karlatemp@vip.qq.com>
Date: Thu, 11 Nov 2021 23:30:29 +0800
Subject: [PATCH] Fix ServiceMessage not refined in `ANDROID_WATCH`; fix #1652

---
 .../kotlin/message/ReceiveMessageHandler.kt   | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/mirai-core/src/commonMain/kotlin/message/ReceiveMessageHandler.kt b/mirai-core/src/commonMain/kotlin/message/ReceiveMessageHandler.kt
index 488edc3bc..afe5ad91b 100644
--- a/mirai-core/src/commonMain/kotlin/message/ReceiveMessageHandler.kt
+++ b/mirai-core/src/commonMain/kotlin/message/ReceiveMessageHandler.kt
@@ -489,7 +489,23 @@ internal object ReceiveMessageTransformer {
                 else -> error("unknown compression flag=${richMsg.template1[0]}")
             }
         }
-        when (richMsg.serviceId) {
+
+        fun findStringProperty(name: String): String {
+            return content.substringAfter("$name=\"", "").substringBefore("\"", "")
+        }
+
+        val serviceId = when (val sid = richMsg.serviceId) {
+            0 -> {
+                val serviceIdStr = findStringProperty("serviceID")
+                if (serviceIdStr.isEmpty() || serviceIdStr.isBlank()) {
+                    0
+                } else {
+                    serviceIdStr.toIntOrNull() ?: 0
+                }
+            }
+            else -> sid
+        }
+        when (serviceId) {
             // 5: 使用微博长图转换功能分享到QQ群
             /*
                         <?xml version="1.0" encoding="utf-8"?><msg serviceID="5" templateID="12345" brief="[分享]想要沐浴阳光，就别钻进
@@ -507,9 +523,6 @@ internal object ReceiveMessageTransformer {
              * [LongMessageInternal], [ForwardMessage]
              */
             35 -> {
-                fun findStringProperty(name: String): String {
-                    return content.substringAfter("$name=\"", "").substringBefore("\"", "")
-                }
 
                 val resId = findStringProperty("m_resid")
 
@@ -539,7 +552,7 @@ internal object ReceiveMessageTransformer {
 
             // 104 新群员入群的消息
             else -> {
-                builder.add(SimpleServiceMessage(richMsg.serviceId, content))
+                builder.add(SimpleServiceMessage(serviceId, content))
             }
         }
     }