From b238d13a32b25c2494bed9e58e6a0a585eab674d Mon Sep 17 00:00:00 2001
From: StageGuard <45701251+StageGuard@users.noreply.github.com>
Date: Sat, 9 Sep 2023 00:05:14 +0800
Subject: [PATCH] [core] dont pass groupUin to RefineContextKey.GroupIdOrZero
 (#2794)

---
 .../kotlin/contact/roaming/RoamingMessagesImplGroup.kt        | 2 +-
 .../kotlin/network/notice/group/GroupMessageProcessor.kt      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mirai-core/src/commonMain/kotlin/contact/roaming/RoamingMessagesImplGroup.kt b/mirai-core/src/commonMain/kotlin/contact/roaming/RoamingMessagesImplGroup.kt
index b73fdbac0..dec8c2b3c 100644
--- a/mirai-core/src/commonMain/kotlin/contact/roaming/RoamingMessagesImplGroup.kt
+++ b/mirai-core/src/commonMain/kotlin/contact/roaming/RoamingMessagesImplGroup.kt
@@ -75,7 +75,7 @@ internal class RoamingMessagesImplGroup(
                                 SimpleRefineContext(
                                     RefineContextKey.MessageSourceKind to MessageSourceKind.GROUP,
                                     RefineContextKey.FromId to it.msgHead.fromUin,
-                                    RefineContextKey.GroupIdOrZero to contact.uin,
+                                    RefineContextKey.GroupIdOrZero to contact.id,
                                 )
                             )
                         }
diff --git a/mirai-core/src/commonMain/kotlin/network/notice/group/GroupMessageProcessor.kt b/mirai-core/src/commonMain/kotlin/network/notice/group/GroupMessageProcessor.kt
index cedaba803..f8d308cae 100644
--- a/mirai-core/src/commonMain/kotlin/network/notice/group/GroupMessageProcessor.kt
+++ b/mirai-core/src/commonMain/kotlin/network/notice/group/GroupMessageProcessor.kt
@@ -169,7 +169,7 @@ internal class GroupMessageProcessor(
                             mutableMapOf(
                                 RefineContextKey.MessageSourceKind to MessageSourceKind.GROUP,
                                 RefineContextKey.FromId to sender.uin,
-                                RefineContextKey.GroupIdOrZero to group.uin,
+                                RefineContextKey.GroupIdOrZero to group.id,
                             )
                         )
                     ),
@@ -195,7 +195,7 @@ internal class GroupMessageProcessor(
                             mutableMapOf(
                                 RefineContextKey.MessageSourceKind to MessageSourceKind.GROUP,
                                 RefineContextKey.FromId to sender.uin,
-                                RefineContextKey.GroupIdOrZero to group.uin,
+                                RefineContextKey.GroupIdOrZero to group.id,
                             )
                         )
                     ),