Merge remote-tracking branch 'origin/master'

.github/workflows/main.yml

@@ -9,6 +9,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v1
-    - name: Gradle Android
-      uses: Raul6469/android-gradle-action@1.0.0
+    - name: setup-android
+      uses: msfjarvis/setup-android@0.2
+      with:
+        # Gradle tasks to run - If you want to run ./gradlew assemble, specify assemble here. 
+        gradleTasks: build
     

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/GroupIdConvertions.kt

@@ -24,7 +24,7 @@ fun GroupId.toInternalId(): GroupInternalId {
             in 11..19 -> plusLeft(469, 6)
             in 20..66 -> plusLeft(208, 7)
             in 67..156 ->  plusLeft(1943, 6)
-            in 157..209 -> plusLeft(1997, 7)
+            in 157..209 -> plusLeft(199, 7)
             in 210..309 -> plusLeft(389, 7)
             in 310..499 -> plusLeft(349, 7)
             else -> null