support delete group files

jianmj · Dec 11, 2023 · 3028c30 · 3028c30
1 parent bad4daa
commit 3028c30
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 4 deletions.
diff --git a/onebot/src/main/java/cn/evole/onebot/sdk/enums/ActionPathEnum.java b/onebot/src/main/java/cn/evole/onebot/sdk/enums/ActionPathEnum.java
@@ -283,6 +283,14 @@ public enum ActionPathEnum implements ActionPath {
      * 获取用户资料卡
      */
     GET_USER_INFO("get_user_info"),
+    /**
+     * 删除群文件
+     */
+    DELETE_GROUP_FILE("delete_group_file"),
+    /**
+     * 删除群文件夹
+     */
+    DELETE_GROUP_FOLDER("delete_group_folder"),
 
     ;
 

diff --git a/onebot/src/main/kotlin/cn/evolvefield/onebot/client/core/Bot.kt b/onebot/src/main/kotlin/cn/evolvefield/onebot/client/core/Bot.kt
@@ -1426,6 +1426,42 @@ class Bot(
             object : TypeToken<ActionData<UserInfoResp>>() {}.type
         )
     }
+
+    /**
+     * 删除群文件
+     *
+     * @param groupId 群号
+     * @param fileId 文件ID
+     * @param busid 此参数可在群文件相关接口中获取
+     * @return [ActionRaw]
+     */
+    @JvmBlockingBridge
+    suspend fun deleteGroupFile(groupId: Long, fileId: String, busid: Int): ActionRaw {
+        val action = ActionPathEnum.DELETE_GROUP_FILE
+        val params = JsonObject()
+        params.addProperty("group_id", groupId)
+        params.addProperty("file_id", fileId)
+        params.addProperty("busid", busid)
+        val result = actionHandler.action(channel, action, params)
+        return GsonUtil.strToJavaBean(result.toString(), ActionRaw::class.java)
+    }
+
+    /**
+     * 删除群文件夹
+     *
+     * @param groupId 群号
+     * @param folderId 文件夹ID
+     * @return [ActionRaw]
+     */
+    @JvmBlockingBridge
+    suspend fun deleteGroupFolder(groupId: Long, folderId: String): ActionRaw {
+        val action = ActionPathEnum.DELETE_GROUP_FOLDER
+        val params = JsonObject()
+        params.addProperty("group_id", groupId)
+        params.addProperty("folder_id", folderId)
+        val result = actionHandler.action(channel, action, params)
+        return GsonUtil.strToJavaBean(result.toString(), ActionRaw::class.java)
+    }
 }
 
 fun <T> List<T>.toJsonArray(): JsonArray {

diff --git a/...low-core/src/main/kotlin/top/mrxiaom/overflow/internal/contact/data/RemoteFilesWrapper.kt b/...low-core/src/main/kotlin/top/mrxiaom/overflow/internal/contact/data/RemoteFilesWrapper.kt
@@ -60,7 +60,7 @@ class FolderWrapper(
         }
 
     override suspend fun delete(): Boolean {
-        TODO("Not yet implemented")
+        return contact.botWrapper.impl.deleteGroupFolder(contact.id, id).status != "failed"
     }
 
     override suspend fun exists(): Boolean {
@@ -179,7 +179,8 @@ class FileWrapper(
     override val expiryTime: Long,
     override val lastModifiedTime: Long,
     override val uploadTime: Long,
-    override val uploaderId: Long
+    override val uploaderId: Long,
+    val busid: Int,
 ) : AbsoluteFile {
     override val isFile: Boolean = true
     override val isFolder: Boolean = false
@@ -194,7 +195,7 @@ class FileWrapper(
         }
 
     override suspend fun delete(): Boolean {
-        TODO("Not yet implemented")
+        return contact.botWrapper.impl.deleteGroupFile(contact.id, id, busid).status != "failed"
     }
 
     override suspend fun exists(): Boolean {

diff --git a/overflow-core/src/main/kotlin/top/mrxiaom/overflow/internal/utils/TransformerUtils.kt b/overflow-core/src/main/kotlin/top/mrxiaom/overflow/internal/utils/TransformerUtils.kt
@@ -97,7 +97,7 @@ fun List<GroupFilesResp.Files>.toMiraiFiles(group: GroupWrapper, parent: FolderW
         val md5 = it.md5?.hexToBytes() ?: ByteArray(16)
         val sha1 = it.sha1?.hexToBytes() ?: ByteArray(16)
         FileWrapper(group, parent,
-            it.fileId, it.fileName, md5, sha1, it.fileSize, it.deadTime, it.modifyTime, it.uploadTime, it.uploader
+            it.fileId, it.fileName, md5, sha1, it.fileSize, it.deadTime, it.modifyTime, it.uploadTime, it.uploader, it.busid
         )
     }
 }