Add low-level apis

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.kt

@@ -96,26 +96,27 @@ internal abstract class QQAndroidBotBase constructor(
         ).sendAndExpect<GroupInfoImpl>(retry = 2)
     }
 
-    override suspend fun queryGroupMemberList(groupUin: Long, groupCode: Long, ownerId: Long): Sequence<MemberInfo> = network.run {
-        var nextUin = 0L
-        var sequence = sequenceOf<MemberInfoImpl>()
-        while (true) {
-            val data = FriendList.GetTroopMemberList(
-                client = bot.client,
-                targetGroupUin = groupUin,
-                targetGroupCode = groupCode,
-                nextUin = nextUin
-            ).sendAndExpect<FriendList.GetTroopMemberList.Response>(timeoutMillis = 3000)
-            sequence += data.members.asSequence().map { troopMemberInfo ->
-                MemberInfoImpl(troopMemberInfo, ownerId)
-            }
-            nextUin = data.nextUin
-            if (nextUin == 0L) {
-                break
+    override suspend fun queryGroupMemberList(groupUin: Long, groupCode: Long, ownerId: Long): Sequence<MemberInfo> =
+        network.run {
+            var nextUin = 0L
+            var sequence = sequenceOf<MemberInfoImpl>()
+            while (true) {
+                val data = FriendList.GetTroopMemberList(
+                    client = bot.client,
+                    targetGroupUin = groupUin,
+                    targetGroupCode = groupCode,
+                    nextUin = nextUin
+                ).sendAndExpect<FriendList.GetTroopMemberList.Response>(timeoutMillis = 3000)
+                sequence += data.members.asSequence().map { troopMemberInfo ->
+                    MemberInfoImpl(troopMemberInfo, ownerId)
+                }
+                nextUin = data.nextUin
+                if (nextUin == 0L) {
+                    break
+                }
             }
+            return sequence
         }
-        return sequence
-    }
 
     override suspend fun addFriend(id: Long, message: String?, remark: String?): AddFriendResult {
         TODO("not implemented")
@@ -137,26 +138,24 @@ internal abstract class QQAndroidBotBase constructor(
                         source.sequenceId,
                         source.messageRandom,
                         source.time
-                    )
-                        .sendAndExpect()
+                    ).sendAndExpect()
                 } else {
                     PbMessageSvc.PbMsgWithDraw.Group(
                         bot.client,
                         source.groupId,
                         source.sequenceId,
                         source.messageRandom
-                    )
-                        .sendAndExpect()
+                    ).sendAndExpect()
                 }
 
             check(response is PbMessageSvc.PbMsgWithDraw.Response.Success) { "Failed to recall message #${source.id}: $response" }
         }
     }
 
-    override suspend fun _lowLevelRecallFriendMessage(friendId: Long, messageId: Long) {
+    override suspend fun _lowLevelRecallFriendMessage(friendId: Long, messageId: Long, time: Long) {
         network.run {
             val response: PbMessageSvc.PbMsgWithDraw.Response =
-                PbMessageSvc.PbMsgWithDraw.Friend(client, friendId, (messageId shr 32).toInt(), messageId.toInt(), 0)
+                PbMessageSvc.PbMsgWithDraw.Friend(client, friendId, (messageId shr 32).toInt(), messageId.toInt(), time)
                     .sendAndExpect()
 
             check(response is PbMessageSvc.PbMsgWithDraw.Response.Success) { "Failed to recall message #${messageId}: $response" }

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

@@ -42,7 +42,7 @@ import kotlin.jvm.JvmStatic
  * @see kotlinx.coroutines.isActive 判断 [Bot] 是否正常运行中. (在线, 且没有被 [close])
  */
 @UseExperimental(MiraiInternalAPI::class)
-abstract class Bot : CoroutineScope {
+abstract class Bot : CoroutineScope, LowLevelBotAPIAccessor {
     companion object {
         /**
          * 复制一份此时的 [Bot] 实例列表.
@@ -214,22 +214,13 @@ abstract class Bot : CoroutineScope {
      * @param source 消息源. 可从 [MessageReceipt.source] 获得, 或从消息事件中的 [MessageChain] 获得.
      *
      * @throws PermissionDeniedException 当 [Bot] 无权限操作时
+     *
      * @see Bot.recall (扩展函数) 接受参数 [MessageChain]
+     * @see _lowLevelRecallFriendMessage 低级 API
+     * @see _lowLevelRecallGroupMessage 低级 API
      */
     abstract suspend fun recall(source: MessageSource)
 
-    /**
-     * 撤回一条由机器人发送给好友的消息
-     */
-    @MiraiExperimentalAPI
-    abstract suspend fun _lowLevelRecallFriendMessage(friendId: Long, messageId: Long)
-
-    /**
-     * 撤回一条群里的消息. 可以是机器人发送也可以是其他群员发送.
-     */
-    @MiraiExperimentalAPI
-    abstract suspend fun _lowLevelRecallGroupMessage(groupId: Long, messageId: Long)
-
     /**
      * 获取图片下载链接
      */

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

+/*
+ * Copyright 2020 Mamoe Technologies and contributors.
+ *
+ * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证.
+ * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link.
+ *
+ * https://github.com/mamoe/mirai/blob/master/LICENSE
+ */
+
+package net.mamoe.mirai
+
+import net.mamoe.mirai.message.data.MessageSource
+import net.mamoe.mirai.utils.MiraiExperimentalAPI
+
+/**
+ * 标示这个 API 是低级的 API.
+ *
+ * 使用低级的 API 无法带来任何安全和便捷保障.
+ * 仅在某些使用结构化 API 可能影响性能的情况下使用这些低级 API.
+ */
+@Retention(AnnotationRetention.BINARY)
+@Target(AnnotationTarget.CLASS, AnnotationTarget.TYPE, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY)
+annotation class LowLevelAPI
+
+/**
+ * [Bot] 相关协议层低级 API.
+ */
+@MiraiExperimentalAPI
+@Suppress("FunctionName", "unused")
+@LowLevelAPI
+interface LowLevelBotAPIAccessor {
+    /**
+     * 撤回一条由机器人发送给好友的消息
+     * @param messageId [MessageSource.id]
+     */
+    @MiraiExperimentalAPI("还未实现")
+    @LowLevelAPI
+    suspend fun _lowLevelRecallFriendMessage(friendId: Long, messageId: Long, time: Long)
+
+    /**
+     * 撤回一条群里的消息. 可以是机器人发送也可以是其他群员发送.
+     * @param messageId [MessageSource.id]
+     */
+    @LowLevelAPI
+    suspend fun _lowLevelRecallGroupMessage(groupId: Long, messageId: Long)
+}
\ No newline at end of file