From be63ec48faa3888685d59a8885c48238a09aa3d6 Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Wed, 26 Feb 2020 12:54:06 +0800
Subject: [PATCH] Review: misc improvements
---
build.gradle | 12 +++++++-----
.../kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.kt | 4 ++--
.../kotlin/net.mamoe.mirai/contact/ContactList.kt | 2 ++
3 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/build.gradle b/build.gradle
index c48df075d..ee2023fb2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,18 +1,18 @@
buildscript {
repositories {
mavenLocal()
- maven { url "https://mirrors.huaweicloud.com/repository/maven" }
+ maven { url 'https://mirrors.huaweicloud.com/repository/maven' }
jcenter()
mavenCentral()
google()
- maven { url "https://dl.bintray.com/kotlin/kotlin-eap" }
- maven { url 'https://dl.bintray.com/kotlin/kotlin-dev/'}
+ maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
+ maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
- classpath("com.github.jengelman.gradle.plugins:shadow:5.2.0")
+ classpath 'com.github.jengelman.gradle.plugins:shadow:5.2.0'
classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlinVersion"
classpath "org.jetbrains.kotlinx:atomicfu-gradle-plugin:$atomicFuVersion"
}
@@ -27,7 +27,9 @@ try {
} else {
project.ext.set("isAndroidSDKAvailable", false)
}
-}catch(Exception e){}
+} catch (Exception ignored) {
+}
+
allprojects {
group = "net.mamoe"
version = getProperty("mirai_version")
diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.kt
index c6e697b35..6b0a475f3 100644
--- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.kt
+++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.kt
@@ -75,11 +75,11 @@ internal abstract class QQAndroidBotBase constructor(
// internally visible only
fun getGroupByUin(uin: Long): Group {
- return groups.delegate.filteringGetOrNull { (it as GroupImpl).uin == uin } ?: throw NoSuchElementException("Can not found group with ID=${uin}")
+ return groups.delegate.getOrNull(uin) ?: throw NoSuchElementException("Can not found group with ID=${uin}")
}
fun getGroupByUinOrNull(uin: Long): Group? {
- return groups.delegate.filteringGetOrNull { (it as GroupImpl).uin == uin }
+ return groups.delegate.getOrNull(uin)
}
override suspend fun queryGroupList(): Sequence<Long> {
diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/ContactList.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/ContactList.kt
index c3e3deb11..0d397a9a4 100644
--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/ContactList.kt
+++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/ContactList.kt
@@ -16,6 +16,8 @@ import net.mamoe.mirai.utils.*
/**
* 只读联系人列表, lock-free 实现
+ *
+ * @see ContactList.asSequence
*/
@UseExperimental(MiraiInternalAPI::class)
@Suppress("unused")