From 19d5c910fdcdf4e40b8e71f16576825b21bc2c6c Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Tue, 24 Dec 2019 00:05:02 +0800
Subject: [PATCH] Make startUpdater not suspend
---
.../net.mamoe.mirai.timpc/network/ContactImpl.kt | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/ContactImpl.kt b/mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/ContactImpl.kt
index 8518ab32c..34cf17c6c 100644
--- a/mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/ContactImpl.kt
+++ b/mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/ContactImpl.kt
@@ -6,13 +6,13 @@ import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Job
import kotlinx.coroutines.withContext
import net.mamoe.mirai.contact.*
-import net.mamoe.mirai.event.subscribeAlways
-import net.mamoe.mirai.message.data.ImageId
-import net.mamoe.mirai.message.data.MessageChain
import net.mamoe.mirai.data.FriendNameRemark
import net.mamoe.mirai.data.GroupInfo
import net.mamoe.mirai.data.PreviousNameList
import net.mamoe.mirai.data.Profile
+import net.mamoe.mirai.event.subscribeAlways
+import net.mamoe.mirai.message.data.ImageId
+import net.mamoe.mirai.message.data.MessageChain
import net.mamoe.mirai.qqAccount
import net.mamoe.mirai.timpc.TIMPCBot
import net.mamoe.mirai.timpc.internal.RawGroupInfo
@@ -32,7 +32,7 @@ internal sealed class ContactImpl : Contact {
/**
* 开始监听事件, 以同步更新资料
*/
- internal abstract suspend fun startUpdater()
+ internal abstract fun startUpdater()
}
@Suppress("MemberVisibilityCanBePrivate", "CanBeParameter")
@@ -93,7 +93,7 @@ internal class GroupImpl internal constructor(bot: TIMPCBot, val groupId: GroupI
}
@UseExperimental(MiraiInternalAPI::class)
- override suspend fun startUpdater() {
+ override fun startUpdater() {
subscribeAlways<MemberJoinEventPacket> {
members.delegate.addLast(it.member)
}
@@ -148,7 +148,7 @@ internal class QQImpl @PublishedApi internal constructor(bot: TIMPCBot, override
}
@PublishedApi
- override suspend fun startUpdater() {
+ override fun startUpdater() {
// TODO: 2019/11/28 被删除好友事件
}
@@ -186,7 +186,7 @@ internal data class MemberImpl(
}
@PublishedApi
- override suspend fun startUpdater() {
+ override fun startUpdater() {
// TODO: 2019/12/6 更新群成员信息
}