From 47192f3ee326a39f512cabaed5ac390a43a5a737 Mon Sep 17 00:00:00 2001 From: Him188 Date: Mon, 5 Jul 2021 15:28:13 +0800 Subject: [PATCH] Make `Announcements.asStream` not suspend --- .../src/commonMain/kotlin/contact/announcement/Announcements.kt | 2 +- .../commonMain/kotlin/contact/announcement/AnnouncementsImpl.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mirai-core-api/src/commonMain/kotlin/contact/announcement/Announcements.kt b/mirai-core-api/src/commonMain/kotlin/contact/announcement/Announcements.kt index 92b037d20..f1f50534d 100644 --- a/mirai-core-api/src/commonMain/kotlin/contact/announcement/Announcements.kt +++ b/mirai-core-api/src/commonMain/kotlin/contact/announcement/Announcements.kt @@ -37,7 +37,7 @@ public interface Announcements { /** * 创建一个能获取该群内所有群公告列表的 [Stream]. 在 [Stream] 被使用时才会分页下载 [OnlineAnnouncement]. */ - public suspend fun asStream(): Stream + public fun asStream(): Stream /** * 获取所有群公告列表, 将全部 [OnlineAnnouncement] 都下载后再返回. diff --git a/mirai-core/src/commonMain/kotlin/contact/announcement/AnnouncementsImpl.kt b/mirai-core/src/commonMain/kotlin/contact/announcement/AnnouncementsImpl.kt index d163d89e0..2f34ce96d 100644 --- a/mirai-core/src/commonMain/kotlin/contact/announcement/AnnouncementsImpl.kt +++ b/mirai-core/src/commonMain/kotlin/contact/announcement/AnnouncementsImpl.kt @@ -73,7 +73,7 @@ internal class AnnouncementsImpl( }.map { it.toAnnouncement(group) } } - override suspend fun asStream(): Stream { + override fun asStream(): Stream { return stream { var i = 1 while (true) {