Merge remote-tracking branch 'mirai/dev' into dev

README.md

@@ -85,6 +85,7 @@ mirai 是一个在全平台下运行，提供 QQ Android 协议支持的高效
 - 闪照
 - 撤回群员消息
 - 自定义消息
+- 音乐分享
 
 **群相关**
 - 群列表

mirai-core/src/commonMain/kotlin/contact/SendMessageHandler.kt

@@ -65,6 +65,13 @@ internal abstract class SendMessageHandler<C : Contact> {
             groupCard = senderName // Cinnamon
         ) else null
 
+    // For ForwardMessage display
+    val ForwardMessage.INode.groupInfo: MsgComm.GroupInfo
+        get() = MsgComm.GroupInfo(
+            groupCode = if (isToGroup) targetGroupCode!! else 0,
+            groupCard = senderName
+        )
+
     val isToGroup: Boolean get() = contact is Group
 
     suspend fun MessageChain.convertToLongMessageIfNeeded(

mirai-core/src/commonMain/kotlin/network/protocol/packet/chat/MultiMsg.kt

@@ -62,7 +62,7 @@ internal fun Collection<ForwardMessage.INode>.calculateValidationData(
                     msgId = 1
                 ),
                 msgType = 82, // troop
-                groupInfo = handler.groupInfo,
+                groupInfo = handler.run { chain.groupInfo },
                 isSrcMsg = false
             ),
             msgBody = ImMsgBody.MsgBody(