github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-03-03 15:10:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix build

Browse Source
This commit is contained in:
Him188 2020-02-07 23:35:07 +08:00
parent 68d86a924f
commit 13d6bd29d4
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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