Explicitly extend CoroutineScope; Use top-level fun to replace constructors

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/Bot.kt

@@ -8,7 +8,7 @@ import kotlinx.coroutines.sync.withLock
 import net.mamoe.mirai.Bot.ContactSystem
 import net.mamoe.mirai.contact.*
 import net.mamoe.mirai.contact.internal.Group
-import net.mamoe.mirai.contact.internal.QQImpl
+import net.mamoe.mirai.contact.internal.QQ
 import net.mamoe.mirai.network.BotNetworkHandler
 import net.mamoe.mirai.network.protocol.tim.TIMBotNetworkHandler
 import net.mamoe.mirai.network.protocol.tim.packet.login.LoginResult
@@ -186,7 +186,7 @@ class Bot(val account: BotAccount, val logger: MiraiLogger, context: CoroutineCo
         suspend fun getQQ(id: UInt): QQ =
             if (_qqs.containsKey(id)) _qqs[id]!!
             else qqsLock.withLock {
-                _qqs.getOrPut(id) { QQImpl(bot, id, coroutineContext) }
+                _qqs.getOrPut(id) { QQ(bot, id, coroutineContext) }
             }
 
         // NO INLINE!! to help Java
@@ -194,7 +194,7 @@ class Bot(val account: BotAccount, val logger: MiraiLogger, context: CoroutineCo
         suspend fun getQQ(id: Long): QQ = id.coerceAtLeastOrFail(0).toUInt().let {
             if (_qqs.containsKey(it)) _qqs[it]!!
             else qqsLock.withLock {
-                _qqs.getOrPut(it) { QQImpl(bot, it, coroutineContext) }
+                _qqs.getOrPut(it) { QQ(bot, it, coroutineContext) }
             }
         }
 

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Group.kt

@@ -2,6 +2,7 @@
 
 package net.mamoe.mirai.contact
 
+import kotlinx.coroutines.CoroutineScope
 import net.mamoe.mirai.network.protocol.tim.packet.action.GroupInfo
 import net.mamoe.mirai.network.protocol.tim.packet.action.QuitGroupResponse
 import net.mamoe.mirai.utils.internal.PositiveNumbers
@@ -16,7 +17,7 @@ import net.mamoe.mirai.utils.internal.coerceAtLeastOrFail
  * - Group ID([Group.internalId]) 是与调用 API 时使用的 id.(在 QQ 客户端中不可见)
  * @author Him188moe
  */
-interface Group : Contact, Iterable<Member>/*, Map<UInt, Member>*/ { // TODO: 2019/12/4 在 inline 稳定后实现 Map<UInt, Member>. 目前这样做会导致问题
+interface Group : Contact, CoroutineScope, Iterable<Member>/*, Map<UInt, Member>*/ { // TODO: 2019/12/4 在 inline 稳定后实现 Map<UInt, Member>. 目前这样做会导致问题
     /**
      * 内部 ID. 内部 ID 为 [GroupId] 的映射
      */

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/QQ.kt

@@ -2,6 +2,7 @@
 
 package net.mamoe.mirai.contact
 
+import kotlinx.coroutines.CoroutineScope
 import net.mamoe.mirai.Bot
 import net.mamoe.mirai.contact.data.Profile
 import net.mamoe.mirai.network.BotSession
@@ -20,7 +21,7 @@ import net.mamoe.mirai.network.protocol.tim.packet.action.PreviousNameList
  *
  * @author Him188moe
  */
-interface QQ : Contact {
+interface QQ : Contact, CoroutineScope {
     /**
      * 查询用户资料
      */

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/internal/ContactImpl.kt

@@ -26,7 +26,7 @@ internal sealed class ContactImpl : Contact {
     /**
      * 开始监听事件, 以同步更新资料
      */
-    internal abstract suspend fun CoroutineContext.startUpdater()
+    internal abstract suspend fun startUpdater()
 }
 
 /**
@@ -41,7 +41,7 @@ internal suspend fun Group(bot: Bot, groupId: GroupId, context: CoroutineContext
         e.logStacktrace()
         error("Cannot obtain group info for id ${groupId.value}")
     }
-    return GroupImpl(bot, groupId, context).apply { this.info = info.parseBy(this) }
+    return GroupImpl(bot, groupId, context).apply { this.info = info.parseBy(this); startUpdater() }
 }
 
 @Suppress("MemberVisibilityCanBePrivate", "CanBeParameter")
@@ -73,7 +73,7 @@ internal data class GroupImpl internal constructor(override val bot: Bot, val gr
     }
 
     @UseExperimental(MiraiInternalAPI::class)
-    override suspend fun CoroutineContext.startUpdater() {
+    override suspend fun startUpdater() {
         subscribeAlways<MemberJoinEventPacket> {
             // FIXME: 2019/11/29 非线程安全!!
             members.mutable[it.member.id] = it.member
@@ -89,7 +89,12 @@ internal data class GroupImpl internal constructor(override val bot: Bot, val gr
     override fun iterator(): Iterator<Member> = members.values.iterator()
 }
 
-internal data class QQImpl internal constructor(override val bot: Bot, override val id: UInt, override val coroutineContext: CoroutineContext) : ContactImpl(),
+@Suppress("FunctionName")
+suspend inline fun QQ(bot: Bot, id: UInt, coroutineContext: CoroutineContext): QQ = QQImpl(bot, id, coroutineContext).apply { startUpdater() }
+
+@PublishedApi
+internal data class QQImpl @PublishedApi internal constructor(override val bot: Bot, override val id: UInt, override val coroutineContext: CoroutineContext) :
+    ContactImpl(),
     QQ, CoroutineScope {
     override suspend fun sendMessage(message: MessageChain) =
         bot.sendPacket(SendFriendMessagePacket(bot.qqAccount, id, bot.sessionKey, message))
@@ -106,26 +111,38 @@ internal data class QQImpl internal constructor(override val bot: Bot, override
         QueryFriendRemarkPacket(bot.qqAccount, sessionKey, id).sendAndExpect()
     }
 
-    override suspend fun CoroutineContext.startUpdater() {
+    @PublishedApi
+    override suspend fun startUpdater() {
         // TODO: 2019/11/28 被删除好友事件
     }
 
     override fun toString(): String = "QQ(${this.id})"
 }
 
+@Suppress("FunctionName")
+suspend inline fun Member(delegate: QQ, group: Group, permission: MemberPermission, coroutineContext: CoroutineContext): Member =
+    MemberImpl(delegate, group, permission, coroutineContext).apply { startUpdater() }
+
 /**
  * 群成员
  */
 @PublishedApi
-internal data class MemberImpl(private val delegate: QQ, override val group: Group, override val permission: MemberPermission) : QQ by delegate, Member {
+internal data class MemberImpl(
+    private val delegate: QQ,
+    override val group: Group,
+    override val permission: MemberPermission,
+    override val coroutineContext: CoroutineContext
+) : QQ by delegate, CoroutineScope, Member, ContactImpl() {
     override fun toString(): String = "Member(id=${this.id}, group=${group.id}, permission=$permission)"
 
     override suspend fun mute(durationSeconds: Int): Boolean = bot.withSession {
         require(durationSeconds > 0) { "duration must be greater than 0 second" }
+        require(durationSeconds <= 30 * 24 * 3600) { "duration must be no more than 30 days" }
 
         if (permission == MemberPermission.OWNER) return false
-
-        when (group.getMember(bot.qqAccount).permission) {
+        val operator = group.getMember(bot.qqAccount)
+        check(operator.id != id) { "The bot is the owner of group ${group.id.toLong()}, it cannot mute itself!" }
+        when (operator.permission) {
             MemberPermission.MEMBER -> return false
             MemberPermission.ADMINISTRATOR -> if (permission == MemberPermission.ADMINISTRATOR) return false
             MemberPermission.OWNER -> {
@@ -136,6 +153,11 @@ internal data class MemberImpl(private val delegate: QQ, override val group: Gro
         return true
     }
 
+    @PublishedApi
+    override suspend fun startUpdater() {
+        // TODO: 2019/12/6 更新群成员信息
+    }
+
     override suspend fun unmute(): Unit = bot.withSession {
         GroupPacket.Mute(qqAccount, group.internalId, sessionKey, id, 0u).sendAndExpect<GroupPacket.MuteResponse>()
     }