Merge remote-tracking branch 'origin/master'

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt

@@ -185,13 +185,13 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler
                             coroutineContext = bot.coroutineContext,
                             id = troopNum.groupCode,
                             uin = troopNum.groupUin,
-                            initName = troopNum.groupName,
-                            initAnnouncement = troopNum.groupMemo,
-                            initAllowMemberInvite = groupInfoResponse.allowMemberInvite,
-                            initConfessTalk = groupInfoResponse.confessTalk,
-                            initMuteAll = troopNum.dwShutUpTimestamp != 0L,
-                            initAutoApprove = groupInfoResponse.autoApprove,
-                            initAnonymousChat = groupInfoResponse.allowAnonymousChat,
+                            _name = troopNum.groupName,
+                            _announcement = troopNum.groupMemo,
+                            _allowMemberInvite = groupInfoResponse.allowMemberInvite,
+                            _confessTalk = groupInfoResponse.confessTalk,
+                            _muteAll = troopNum.dwShutUpTimestamp != 0L,
+                            _autoApprove = groupInfoResponse.autoApprove,
+                            _anonymousChat = groupInfoResponse.allowAnonymousChat,
                             members = contactList
                         )
                     toGet[group] = contactList
@@ -260,8 +260,8 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler
             data.members.forEach {
                 val member = MemberImpl(
                     qq = bot.QQ(it.memberUin) as QQImpl,
-                    initGroupCard = it.autoRemark ?: it.nick,
-                    initSpecialTitle = it.sSpecialTitle ?: "",
+                    _groupCard = it.autoRemark ?: it.nick,
+                    _specialTitle = it.sSpecialTitle ?: "",
                     group = group,
                     coroutineContext = group.coroutineContext,
                     permission = when {

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/PushNotifyPack.kt

@@ -26,7 +26,7 @@ internal data class RequestPushNotify(
 ) : JceStruct, Packet
 
 @Serializable
-internal data class MsgInfo(
+internal class MsgInfo(
     @SerialId(0) val lFromUin: Long? = 0L,
     @SerialId(1) val uMsgTime: Long? = 0L,
     @SerialId(2) val shMsgType: Short,

mirai-demos/mirai-demo-gentleman/src/main/kotlin/demo/gentleman/GentleImage.kt

@@ -33,7 +33,7 @@ class GentleImage(val contact: Contact, val keyword: String) {
                     )
 
                     val result =
-                        Json.plain.parse(
+                        Json.nonstrict.parse(
                             Result.serializer(),
                             Jsoup.connect("https://api.lolicon.app/setu/?r18=$r18" + if (keyword.isNotBlank()) "&keyword=$keyword&num=10" else "")
                                 .ignoreContentType(true)