加入文件操作

mirai-api-http/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     id("kotlinx-serialization")
     kotlin("jvm")
-    id("net.mamoe.mirai-console") version "2.5.0"
+    id("net.mamoe.mirai-console") version "2.5.1-dev-1"
 }
 
 val httpVersion: String by rootProject.ext

mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/data/common/FileDTO.kt

@@ -0,0 +1,70 @@
+/*
+ * Copyright 2020-2021 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.api.http.data.common
+
+import kotlinx.serialization.Serializable
+import net.mamoe.mirai.utils.RemoteFile
+import net.mamoe.mirai.utils.RemoteFile.DownloadInfo
+import net.mamoe.mirai.utils.RemoteFile.FileInfo
+import net.mamoe.mirai.utils.toUHexString
+
+@Serializable
+sealed class FileDTO : DTO {
+    abstract val name: String
+
+}
+
+@Serializable
+data class RemoteFileDTO(
+    override val name: String,
+    val id: String?,
+    val path: String,
+    val type: String
+
+) : FileDTO() {
+    constructor(remoteFile: RemoteFile, isFile: Boolean) : this(
+        remoteFile.name,
+        remoteFile.id,
+        remoteFile.path,
+        if (isFile) "File"
+        else "Dir"
+    )
+
+}
+
+@Serializable
+data class FileInfoDTO(
+    override val name: String,
+    val id: String?,
+    val path: String,
+    val length: Long,
+    val downloadTimes: Int,
+    val uploaderId: Long,
+    val uploadTime: Long,
+    val lastModifyTime: Long,
+    val downloadUrl: String,
+    val sha1: String,
+    val md5: String,
+) : FileDTO() {
+    constructor(fileInfo: FileInfo, file: DownloadInfo) : this(
+        fileInfo.name,
+        fileInfo.id,
+        fileInfo.path,
+        fileInfo.length,
+        fileInfo.downloadTimes,
+        fileInfo.uploaderId,
+        fileInfo.uploadTime,
+        fileInfo.lastModifyTime,
+        file.url,
+        fileInfo.sha1.toUHexString(""),
+        fileInfo.md5.toUHexString(""),
+
+        )
+}

mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/data/common/MessageDTO.kt

@@ -125,6 +125,15 @@ data class PokeMessageDTO(
     val name: String
 ) : MessageDTO()
 
+@Serializable
+@SerialName("File")
+data class FileMessageDTO(
+    val id: String,
+    val internalId: Int,
+    val name: String,
+    val size: Long
+) : MessageDTO()
+
 @Serializable
 @SerialName("Unknown")
 object UnknownMessageDTO : MessageDTO()
@@ -191,6 +200,7 @@ suspend fun Message.toDTO() = when (this) {
         },
         origin = (source.originalMessage + source).toMessageChainDTO { it != UnknownMessageDTO })
     is PokeMessage -> PokeMessageDTO(PokeMap[pokeType])
+    is FileMessage -> FileMessageDTO(id, internalId, name, size)
     else -> UnknownMessageDTO
 }
 
@@ -227,7 +237,9 @@ suspend fun MessageDTO.toMessage(contact: Contact) = when (this) {
     is VoiceDTO -> when {
         contact !is Group -> null
         !voiceId.isNullOrBlank() -> Voice(voiceId, voiceId.substringBefore(".").toHexArray(), 0, 0, "")
-        !url.isNullOrBlank() -> withContext(Dispatchers.IO) { URL(url).openStream().toExternalResource().uploadAsVoice(contact) }
+        !url.isNullOrBlank() -> withContext(Dispatchers.IO) {
+            URL(url).openStream().toExternalResource().uploadAsVoice(contact)
+        }
         !path.isNullOrBlank() -> with(HttpApiPluginBase.voice(path)) {
             if (exists()) {
                 inputStream().toExternalResource().uploadAsVoice(contact)
@@ -242,6 +254,7 @@ suspend fun MessageDTO.toMessage(contact: Contact) = when (this) {
     // ignore
     is QuoteDTO,
     is MessageSourceDTO,
+    is FileMessageDTO,
     is UnknownMessageDTO
     -> null
 }

mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/route/BaseRoute.kt

@@ -262,7 +262,6 @@ internal inline fun <reified R> PipelineContext<Unit, ApplicationCall>.paramOrNu
         }
 
         String::class -> call.parameters[name]
-
         UByte::class -> call.parameters[name]?.toUByte()
         UInt::class -> call.parameters[name]?.toUInt()
         UShort::class -> call.parameters[name]?.toUShort()

mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/route/InfoRouteModule.kt

@@ -11,9 +11,8 @@ package net.mamoe.mirai.api.http.route
 
 import io.ktor.application.*
 import io.ktor.routing.*
-import net.mamoe.mirai.api.http.data.common.GroupDTO
-import net.mamoe.mirai.api.http.data.common.MemberDTO
-import net.mamoe.mirai.api.http.data.common.QQDTO
+import kotlinx.coroutines.flow.toList
+import net.mamoe.mirai.api.http.data.common.*
 import net.mamoe.mirai.api.http.util.toJson
 
 /**
@@ -46,6 +45,41 @@ fun Application.infoModule() {
             call.respondJson(ls.toJson())
         }
 
+        /**
+         * 查询群文件列表
+         */
+        miraiGet("/fileList") { it ->
+            val dir: String = call.parameters["dir"].orEmpty()
+            val ls = it.bot.getGroupOrFail(paramOrNull("target")).filesRoot.let {
+                if (dir.isEmpty()) it.listFiles()
+                    .toList().map { remoteFile ->
+                        RemoteFileDTO(remoteFile, remoteFile.isFile())
+                    }
+                else it.resolve("/$dir").listFiles()
+                    .toList().map { remoteFile ->
+                        RemoteFileDTO(remoteFile, true)
+                    }
+            }
+
+            call.respondJson(ls.toJson())
+        }
+
+        /**
+         * 获取文件详细信息
+         */
+        miraiGet("/fileInfo") {
+            val id: String = paramOrNull("id")
+            val fileInfo = it.bot.getGroupOrFail(paramOrNull("target")).filesRoot.resolveById(id)
+                ?: throw error("文件ID $id 不存在")
+
+            call.respondJson(
+                FileInfoDTO(
+                    fileInfo.getInfo()!!,
+                    fileInfo.getDownloadInfo() ?: throw error("文件ID $id 是一个目录")
+                ).toJson()
+            )
+        }
+
 //        /**
 //         * 查询机器人个人信息
 //         */