From 2f267e1926fc6bab82228ca782f19013aa4bf1e9 Mon Sep 17 00:00:00 2001 From: Mrs4s Date: Sun, 6 Jun 2021 14:48:16 +0800 Subject: [PATCH] remove: delete_group_file api folder_id param. --- coolq/api.go | 4 ++-- go.sum | 2 ++ server/api.go | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/coolq/api.go b/coolq/api.go index 798a5fd..fc1f7f6 100644 --- a/coolq/api.go +++ b/coolq/api.go @@ -321,13 +321,13 @@ func (bot *CQBot) CQGroupFileDeleteFolder(groupID int64, id string) MSG { // CQGroupFileDeleteFile 拓展API-删除群文件 // // -func (bot *CQBot) CQGroupFileDeleteFile(groupID int64, parentID, id string, busID int32) MSG { +func (bot *CQBot) CQGroupFileDeleteFile(groupID int64, id string, busID int32) MSG { fs, err := bot.Client.GetGroupFileSystem(groupID) if err != nil { log.Errorf("获取群 %v 文件系统信息失败: %v", groupID, err) return Failed(100, "FILE_SYSTEM_API_ERROR", err.Error()) } - if res := fs.DeleteFile(parentID, id, busID); res != "" { + if res := fs.DeleteFile("", id, busID); res != "" { log.Errorf("删除群 %v 文件 %v 时出现文件: %v", groupID, id, res) return Failed(200, "FILE_SYSTEM_API_ERROR", res) } diff --git a/go.sum b/go.sum index f0a4a6c..2c4e451 100644 --- a/go.sum +++ b/go.sum @@ -13,12 +13,14 @@ github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= github.com/gin-gonic/gin v1.6.0/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M= github.com/gin-gonic/gin v1.7.1 h1:qC89GU3p8TvKWMAVhEpmpB2CIb1hnqt2UdKZaP93mS8= github.com/gin-gonic/gin v1.7.1/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjXkfUtY= +github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A= github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q= github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= diff --git a/server/api.go b/server/api.go index 206ff9e..ecc62d9 100644 --- a/server/api.go +++ b/server/api.go @@ -271,7 +271,7 @@ func deleteGroupFolder(bot *coolq.CQBot, p resultGetter) coolq.MSG { } func deleteGroupFile(bot *coolq.CQBot, p resultGetter) coolq.MSG { - return bot.CQGroupFileDeleteFile(p.Get("group_id").Int(), p.Get("folder_id").Str, p.Get("file_id").Str, int32(p.Get("bus_id").Int())) + return bot.CQGroupFileDeleteFile(p.Get("group_id").Int(), p.Get("file_id").Str, int32(p.Get("bus_id").Int())) } func getGroupMsgHistory(bot *coolq.CQBot, p resultGetter) coolq.MSG {