From 13d6bd29d4d1f7987a517c49bd28906ecdf61fd8 Mon Sep 17 00:00:00 2001 From: Him188 Date: Fri, 7 Feb 2020 23:35:07 +0800 Subject: [PATCH] Fix build --- .../network/QQAndroidBotNetworkHandler.kt | 18 +++++++++--------- .../main/kotlin/demo/gentleman/GentleImage.kt | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt index c04e46fca..9a7a8b0ec 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt +++ b/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 { diff --git a/mirai-demos/mirai-demo-gentleman/src/main/kotlin/demo/gentleman/GentleImage.kt b/mirai-demos/mirai-demo-gentleman/src/main/kotlin/demo/gentleman/GentleImage.kt index 159faa52f..ca9d056dc 100644 --- a/mirai-demos/mirai-demo-gentleman/src/main/kotlin/demo/gentleman/GentleImage.kt +++ b/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)