diff --git a/go.mod b/go.mod index f6bd3c74..4ede811c 100644 --- a/go.mod +++ b/go.mod @@ -4,17 +4,10 @@ go 1.15 require ( github.com/antchfx/htmlquery v1.2.3 - github.com/antchfx/xpath v1.2.0 // indirect - github.com/fumiama/ZeroBot-Plugin-Timer v0.0.0-20210606064339-d55b94d71eee - github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect - github.com/golang/protobuf v1.5.2 // indirect + github.com/fumiama/ZeroBot-Plugin-Timer v0.0.0-20210606075146-09f50acdb4de github.com/mattn/go-sqlite3 v1.14.7 - github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/sirupsen/logrus v1.8.1 github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816 github.com/tidwall/gjson v1.8.0 - github.com/tidwall/pretty v1.1.1 // indirect github.com/wdvxdr1123/ZeroBot v1.2.0 - golang.org/x/net v0.0.0-20210525063256-abc453219eb5 // indirect - golang.org/x/sys v0.0.0-20210603125802-9665404d3644 // indirect ) diff --git a/go.sum b/go.sum index c878779e..a7b60124 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,4 @@ +github.com/Yiwen-Chan/ZeroBot-Plugin v0.0.0-20210606065432-ce326ce97753/go.mod h1:54LOXRTKW0iR0BcKwRSUK46KfLPz7hiLcGMD5GGtL0k= github.com/antchfx/htmlquery v1.2.3 h1:sP3NFDneHx2stfNXCKbhHFo8XgNjCACnU/4AO5gWz6M= github.com/antchfx/htmlquery v1.2.3/go.mod h1:B0ABL+F5irhhMWg54ymEZinzMSi0Kt3I2if0BLYa3V0= github.com/antchfx/xpath v1.1.6/go.mod h1:Yee4kTMuNiPYJ7nSNorELQMr1J33uOpXDMByNYhvtNk= @@ -7,8 +8,9 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/fumiama/ZeroBot-Plugin-Timer v0.0.0-20210606064339-d55b94d71eee h1:IfBMBcPUUbmEzXjIVkDiSSPoUBkH8Xbk1K9PllgrAfo= github.com/fumiama/ZeroBot-Plugin-Timer v0.0.0-20210606064339-d55b94d71eee/go.mod h1:RN0gCtafWRu2d7lMg9/5UfZDhtsPgdeUovsyuSwl+oQ= +github.com/fumiama/ZeroBot-Plugin-Timer v0.0.0-20210606075146-09f50acdb4de h1:KqKjgGk8gFw27epuvhc2GvgLgEoHMVamcBkVndH3hPg= +github.com/fumiama/ZeroBot-Plugin-Timer v0.0.0-20210606075146-09f50acdb4de/go.mod h1:vG2ODqgJYFQobphBnhhmNv3TO+j/ZNYvN6FjUP/zkmA= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= diff --git a/picsearcher/pic_searcher.go b/picsearcher/pic_searcher.go index 4fd7d1ac..c33b1267 100644 --- a/picsearcher/pic_searcher.go +++ b/picsearcher/pic_searcher.go @@ -2,6 +2,7 @@ package picsearcher import ( "fmt" + "os" "strconv" "strings" "time" @@ -14,9 +15,16 @@ import ( utils "github.com/Yiwen-Chan/ZeroBot-Plugin/picsearcher/utils" ) -var CACHEPATH = "/tmp/picsch/" // 缓冲图片路径 +var ( + CACHEPATH = os.TempDir() // 缓冲图片路径 +) func init() { // 插件主体 + if strings.Contains(CACHEPATH, "\\") { + CACHEPATH += "\\picsch\\" + } else { + CACHEPATH += "/picsch/" + } apiutils.CreatePath(CACHEPATH) // 根据PID搜图 zero.OnRegex(`^搜图(\d+)$`).SetBlock(true).SetPriority(30). @@ -38,7 +46,6 @@ func init() { // 插件主体 // 发送搜索结果 ctx.Send(illust.DetailPic(savePath)) illust.RmPic(CACHEPATH) - return }) // 以图搜图 zero.OnMessage(FullMatchText("以图搜图", "搜索图片", "以图识图"), MustHasPicture()).SetBlock(true).SetPriority(999). @@ -60,7 +67,6 @@ func init() { // 插件主体 ctx.SendChain(message.Text("ERROR: ", err)) } } - return }) } diff --git a/zerobot b/zerobot new file mode 100755 index 00000000..cd6f1089 Binary files /dev/null and b/zerobot differ