From 1675a4446f14d79ba22c777058903477d0799179 Mon Sep 17 00:00:00 2001 From: fumiama Date: Tue, 3 Aug 2021 23:56:32 +0800 Subject: [PATCH 1/3] =?UTF-8?q?ACGImage=E6=94=AF=E6=8C=81=E7=A7=81?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- go.mod | 4 ++-- go.sum | 16 ++++++++++++++++ main.go | 11 ++++++----- 4 files changed, 25 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 0a100ad9..83e3d90d 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ - [x] 以图搜图|搜索图片|以图识图[图片] - [x] 搜图[P站图片ID] - 随机图片与AI点评 `github.com/FloatTech/ZeroBot-ACGImage` - - [x] 随机图片 + - [x] 随机图片(评级大于6的图将私发) - [x] 直接随机(无r18检测，务必小心，仅管理可用) - [x] 设置随机图片网址[url] - [x] 太涩了(撤回最近发的图) diff --git a/go.mod b/go.mod index 82e24642..00951725 100644 --- a/go.mod +++ b/go.mod @@ -4,9 +4,9 @@ go 1.16 require ( github.com/FloatTech/AnimeAPI v0.0.0-20210713044920-63367fe18ccd - github.com/FloatTech/ZeroBot-ACGImage v1.5.1 + github.com/FloatTech/ZeroBot-ACGImage v1.5.5 github.com/FloatTech/ZeroBot-Plugin-Timer v1.3.4 - github.com/FloatTech/Zerobot-ACGImage-Classify v1.2.1 + github.com/FloatTech/Zerobot-ACGImage-Classify v1.3.3 github.com/StackExchange/wmi v1.2.1 // indirect github.com/go-ole/go-ole v1.2.5 // indirect github.com/robfig/cron v1.2.0 diff --git a/go.sum b/go.sum index b0b462a6..2b5b0e84 100644 --- a/go.sum +++ b/go.sum @@ -18,6 +18,14 @@ github.com/FloatTech/ZeroBot-ACGImage v1.4.3 h1:lQTKfrVYdO5T+4KfC8U2bIxYnZql2hG2 github.com/FloatTech/ZeroBot-ACGImage v1.4.3/go.mod h1:CtEYnFTjgzH4v1jaowyyjBmjSKK3p8WPXExfGnVmx1E= github.com/FloatTech/ZeroBot-ACGImage v1.5.1 h1:iolon1PR4AjEJJmUHEDfCXL8tBZOx5W21hRvNirX1Bw= github.com/FloatTech/ZeroBot-ACGImage v1.5.1/go.mod h1:Q9k43tGy2c5sDxw3XZc2An4YfqkN1wWIXeXUH2GlaBg= +github.com/FloatTech/ZeroBot-ACGImage v1.5.2 h1:jiwZd5KEqtiKAY5QsUa6LqtW0+c1ZTg5ffqDiyDpXA8= +github.com/FloatTech/ZeroBot-ACGImage v1.5.2/go.mod h1:BWZWhP/ZVtSRTkI7CHcLO2+E7kQ/kaMPrZkMMT9VNAc= +github.com/FloatTech/ZeroBot-ACGImage v1.5.3 h1:wgG7S8z+LeoCf2nkkJ3CmOX1g5JgH47TfdBMM3KSlBA= +github.com/FloatTech/ZeroBot-ACGImage v1.5.3/go.mod h1:E2hb+uQdzpiq+kB/EoOHgMFhLt61rGDz8hNiGcZr2wo= +github.com/FloatTech/ZeroBot-ACGImage v1.5.4 h1:jPS962qvBmOR+wy8qj6wpScYZv0pLKdnl5fKdFBjNEw= +github.com/FloatTech/ZeroBot-ACGImage v1.5.4/go.mod h1:olj7sxGxAPrxy9JmbfVwkCNxrVYJ7SKnp42WbEKvWD8= +github.com/FloatTech/ZeroBot-ACGImage v1.5.5 h1:cmAsXHl99RHJR38vQXL+q/U0BGWg5LyMHxBw5Mf8f1o= +github.com/FloatTech/ZeroBot-ACGImage v1.5.5/go.mod h1:TDGCgGHKjgcnA0akLaEwUcFwL+/ya7p6PZITdJQ1vnQ= github.com/FloatTech/ZeroBot-Plugin-Timer v1.2.4 h1:BMrSHJO1lWKTKU1DCK+XEpTaK38FMlBEIywFLIiatu8= github.com/FloatTech/ZeroBot-Plugin-Timer v1.2.4/go.mod h1:femu/wVuqVSN/rg209qksMx8/2OKUF8l1PZCNg4RwVA= github.com/FloatTech/ZeroBot-Plugin-Timer v1.3.1 h1:AT/nudxY5murKpEyP+ZZTczknSipeZPP2tId6/2I7Nw= @@ -30,6 +38,14 @@ github.com/FloatTech/ZeroBot-Plugin-Timer v1.3.4 h1:nRJqY/S7TRlN32MQGIBH3UWfVrpj github.com/FloatTech/ZeroBot-Plugin-Timer v1.3.4/go.mod h1:NuODdnVhf9AClsJBdYFqnL9sQE7VIRZyZos37J286n0= github.com/FloatTech/Zerobot-ACGImage-Classify v1.2.1 h1:HEdT6yq06lV94jcArutpyqQLaPpczs0bTd6gdwVG1ps= github.com/FloatTech/Zerobot-ACGImage-Classify v1.2.1/go.mod h1:swPvVKyXu1YFWZ7Kt6R79LgIa16hs4cE1E5LroBB2SQ= +github.com/FloatTech/Zerobot-ACGImage-Classify v1.3.0 h1:4lwSBYlwPsUE7uDzSaTH4/ZlaQwWbF1jeincg6eOByg= +github.com/FloatTech/Zerobot-ACGImage-Classify v1.3.0/go.mod h1:swPvVKyXu1YFWZ7Kt6R79LgIa16hs4cE1E5LroBB2SQ= +github.com/FloatTech/Zerobot-ACGImage-Classify v1.3.1 h1:T8cSLwoVppbMRPKnwFgItl8523BFBiyYjxo81KXGZFk= +github.com/FloatTech/Zerobot-ACGImage-Classify v1.3.1/go.mod h1:swPvVKyXu1YFWZ7Kt6R79LgIa16hs4cE1E5LroBB2SQ= +github.com/FloatTech/Zerobot-ACGImage-Classify v1.3.2 h1:7s06Cw2TggudMEz3t+OSAiSv/JAetNdNYgfmuLZhGwU= +github.com/FloatTech/Zerobot-ACGImage-Classify v1.3.2/go.mod h1:swPvVKyXu1YFWZ7Kt6R79LgIa16hs4cE1E5LroBB2SQ= +github.com/FloatTech/Zerobot-ACGImage-Classify v1.3.3 h1:mMaBe23yg8mk5U0yb9OS9iX/9hju6Dj+Z+Fty18vIhU= +github.com/FloatTech/Zerobot-ACGImage-Classify v1.3.3/go.mod h1:swPvVKyXu1YFWZ7Kt6R79LgIa16hs4cE1E5LroBB2SQ= github.com/StackExchange/wmi v0.0.0-20210224194228-fe8f1750fd46 h1:5sXbqlSomvdjlRbWyNqkPsJ3Fg+tQZCbgeX1VGljbQY= github.com/StackExchange/wmi v0.0.0-20210224194228-fe8f1750fd46/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= github.com/StackExchange/wmi v1.2.0 h1:noJEYkMQVlFCEAc+2ma5YyRhlfjcWfZqk5sBRYozdyM= diff --git a/main.go b/main.go index 38bb2959..55501ef2 100644 --- a/main.go +++ b/main.go @@ -18,7 +18,7 @@ import ( // 娱乐类 _ "github.com/FloatTech/ZeroBot-Plugin/plugin_ai_false" // 服务器监控 - _ "github.com/FloatTech/ZeroBot-Plugin/plugin_minecraft" + //_ "github.com/FloatTech/ZeroBot-Plugin/plugin_minecraft" _ "github.com/FloatTech/ZeroBot-Plugin/plugin_music" // 点歌 _ "github.com/FloatTech/ZeroBot-Plugin/plugin_shindan" // 测定 @@ -29,9 +29,10 @@ import ( // 二次元图片 _ "github.com/FloatTech/ZeroBot-ACGImage" // 随机图片与AI点评 _ "github.com/FloatTech/ZeroBot-Plugin/plugin_image_finder" // 关键字搜图 - _ "github.com/FloatTech/ZeroBot-Plugin/plugin_lolicon" // lolicon 随机图片 - _ "github.com/FloatTech/ZeroBot-Plugin/plugin_saucenao" // 以图搜图 - _ "github.com/FloatTech/ZeroBot-Plugin/plugin_setutime" // 来份涩图 + + //_ "github.com/FloatTech/ZeroBot-Plugin/plugin_lolicon" // lolicon 随机图片 + _ "github.com/FloatTech/ZeroBot-Plugin/plugin_saucenao" // 以图搜图 + //_ "github.com/FloatTech/ZeroBot-Plugin/plugin_setutime" // 来份涩图 // 以下为内置依赖，勿动 zero "github.com/wdvxdr1123/ZeroBot" @@ -70,7 +71,7 @@ func main() { // SuperUsers 某些功能需要主人权限，可通过以下两种方式修改 // []string{}：通过代码写死的方式添加主人账号 // os.Args[1:]：通过命令行参数的方式添加主人账号 - SuperUsers: append([]string{"12345678", "87654321"}, os.Args[1:]...), + SuperUsers: os.Args[1:], Driver: []zero.Driver{ &driver.WSClient{ From 0d1da0877acaf82e9a30f20c7c3f356bb34955ad Mon Sep 17 00:00:00 2001 From: fumiama Date: Wed, 4 Aug 2021 00:09:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=88=A0=E9=99=A4indirect?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go.mod | 2 -- 1 file changed, 2 deletions(-) diff --git a/go.mod b/go.mod index 00951725..acd5d750 100644 --- a/go.mod +++ b/go.mod @@ -6,9 +6,7 @@ require ( github.com/FloatTech/AnimeAPI v0.0.0-20210713044920-63367fe18ccd github.com/FloatTech/ZeroBot-ACGImage v1.5.5 github.com/FloatTech/ZeroBot-Plugin-Timer v1.3.4 - github.com/FloatTech/Zerobot-ACGImage-Classify v1.3.3 github.com/StackExchange/wmi v1.2.1 // indirect - github.com/go-ole/go-ole v1.2.5 // indirect github.com/robfig/cron v1.2.0 github.com/shirou/gopsutil v3.21.7+incompatible github.com/sirupsen/logrus v1.8.1 From b6533472c8f4c7d53c7a23955d0ce4b4388df28a Mon Sep 17 00:00:00 2001 From: fumiama Date: Wed, 4 Aug 2021 00:10:05 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=A0=E9=99=A4indirect?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go.sum | 64 +-------------------------------------------------------- main.go | 11 +++++----- 2 files changed, 6 insertions(+), 69 deletions(-) diff --git a/go.sum b/go.sum index 2b5b0e84..c47fe794 100644 --- a/go.sum +++ b/go.sum @@ -1,55 +1,11 @@ github.com/FloatTech/AnimeAPI v0.0.0-20210713044920-63367fe18ccd h1:rvV66DIEqNJMEKwYXDJvw6kpJuGg+Pz/BooewuTBjXs= github.com/FloatTech/AnimeAPI v0.0.0-20210713044920-63367fe18ccd/go.mod h1:GYrQD70HvBzry1XiZ1tHFNOsOqRkR+ao4XGYZqV4I9c= -github.com/FloatTech/ZeroBot-ACGImage v1.1.2 h1:Q+FwOb1vCCYG2B7hPU0uBMzWwB85eVlC0pWRJZ+rBCQ= -github.com/FloatTech/ZeroBot-ACGImage v1.1.2/go.mod h1:CtEYnFTjgzH4v1jaowyyjBmjSKK3p8WPXExfGnVmx1E= -github.com/FloatTech/ZeroBot-ACGImage v1.2.1 h1:GQR1dudKIPh13EKybH5o3GZys0m6Wy87BF5DpcNzutw= -github.com/FloatTech/ZeroBot-ACGImage v1.2.1/go.mod h1:CtEYnFTjgzH4v1jaowyyjBmjSKK3p8WPXExfGnVmx1E= -github.com/FloatTech/ZeroBot-ACGImage v1.3.1 h1:P9zfrVJcyFFViYz7qr/+DTD34oIpn5/hilmuhIeatwY= -github.com/FloatTech/ZeroBot-ACGImage v1.3.1/go.mod h1:CtEYnFTjgzH4v1jaowyyjBmjSKK3p8WPXExfGnVmx1E= -github.com/FloatTech/ZeroBot-ACGImage v1.3.3 h1:Y1fZO9YAMM1wQBN+ZbOXCEKpp+8TrM5TwaUqgWffVsI= -github.com/FloatTech/ZeroBot-ACGImage v1.3.3/go.mod h1:CtEYnFTjgzH4v1jaowyyjBmjSKK3p8WPXExfGnVmx1E= -github.com/FloatTech/ZeroBot-ACGImage v1.3.4 h1:oyPYs9R+yKMCzTEgEZkP4yMOTs/GTvnQv0jQ6ulWdQo= -github.com/FloatTech/ZeroBot-ACGImage v1.3.4/go.mod h1:CtEYnFTjgzH4v1jaowyyjBmjSKK3p8WPXExfGnVmx1E= -github.com/FloatTech/ZeroBot-ACGImage v1.4.1 h1:P4Pjci0djSQ99nnCGnSLh6mh4Jq5qOL+PBQzAG0ZyZc= -github.com/FloatTech/ZeroBot-ACGImage v1.4.1/go.mod h1:CtEYnFTjgzH4v1jaowyyjBmjSKK3p8WPXExfGnVmx1E= -github.com/FloatTech/ZeroBot-ACGImage v1.4.2 h1:/jj/+5a4EeejeqIDkeUbaxpCpZfLPCODa3sw/1m/Das= -github.com/FloatTech/ZeroBot-ACGImage v1.4.2/go.mod h1:CtEYnFTjgzH4v1jaowyyjBmjSKK3p8WPXExfGnVmx1E= -github.com/FloatTech/ZeroBot-ACGImage v1.4.3 h1:lQTKfrVYdO5T+4KfC8U2bIxYnZql2hG2tSo/msTGRcI= -github.com/FloatTech/ZeroBot-ACGImage v1.4.3/go.mod h1:CtEYnFTjgzH4v1jaowyyjBmjSKK3p8WPXExfGnVmx1E= -github.com/FloatTech/ZeroBot-ACGImage v1.5.1 h1:iolon1PR4AjEJJmUHEDfCXL8tBZOx5W21hRvNirX1Bw= -github.com/FloatTech/ZeroBot-ACGImage v1.5.1/go.mod h1:Q9k43tGy2c5sDxw3XZc2An4YfqkN1wWIXeXUH2GlaBg= -github.com/FloatTech/ZeroBot-ACGImage v1.5.2 h1:jiwZd5KEqtiKAY5QsUa6LqtW0+c1ZTg5ffqDiyDpXA8= -github.com/FloatTech/ZeroBot-ACGImage v1.5.2/go.mod h1:BWZWhP/ZVtSRTkI7CHcLO2+E7kQ/kaMPrZkMMT9VNAc= -github.com/FloatTech/ZeroBot-ACGImage v1.5.3 h1:wgG7S8z+LeoCf2nkkJ3CmOX1g5JgH47TfdBMM3KSlBA= -github.com/FloatTech/ZeroBot-ACGImage v1.5.3/go.mod h1:E2hb+uQdzpiq+kB/EoOHgMFhLt61rGDz8hNiGcZr2wo= -github.com/FloatTech/ZeroBot-ACGImage v1.5.4 h1:jPS962qvBmOR+wy8qj6wpScYZv0pLKdnl5fKdFBjNEw= -github.com/FloatTech/ZeroBot-ACGImage v1.5.4/go.mod h1:olj7sxGxAPrxy9JmbfVwkCNxrVYJ7SKnp42WbEKvWD8= github.com/FloatTech/ZeroBot-ACGImage v1.5.5 h1:cmAsXHl99RHJR38vQXL+q/U0BGWg5LyMHxBw5Mf8f1o= github.com/FloatTech/ZeroBot-ACGImage v1.5.5/go.mod h1:TDGCgGHKjgcnA0akLaEwUcFwL+/ya7p6PZITdJQ1vnQ= -github.com/FloatTech/ZeroBot-Plugin-Timer v1.2.4 h1:BMrSHJO1lWKTKU1DCK+XEpTaK38FMlBEIywFLIiatu8= -github.com/FloatTech/ZeroBot-Plugin-Timer v1.2.4/go.mod h1:femu/wVuqVSN/rg209qksMx8/2OKUF8l1PZCNg4RwVA= -github.com/FloatTech/ZeroBot-Plugin-Timer v1.3.1 h1:AT/nudxY5murKpEyP+ZZTczknSipeZPP2tId6/2I7Nw= -github.com/FloatTech/ZeroBot-Plugin-Timer v1.3.1/go.mod h1:NuODdnVhf9AClsJBdYFqnL9sQE7VIRZyZos37J286n0= -github.com/FloatTech/ZeroBot-Plugin-Timer v1.3.2 h1:mVkuGVtznDH1n0l00TJesmA5K2NZ+98OaXcqyPh6TVM= -github.com/FloatTech/ZeroBot-Plugin-Timer v1.3.2/go.mod h1:NuODdnVhf9AClsJBdYFqnL9sQE7VIRZyZos37J286n0= -github.com/FloatTech/ZeroBot-Plugin-Timer v1.3.3 h1:NXk18XCfy4cCSMXru/NHfCdf26o3fBWOTuEvxFcweeg= -github.com/FloatTech/ZeroBot-Plugin-Timer v1.3.3/go.mod h1:NuODdnVhf9AClsJBdYFqnL9sQE7VIRZyZos37J286n0= github.com/FloatTech/ZeroBot-Plugin-Timer v1.3.4 h1:nRJqY/S7TRlN32MQGIBH3UWfVrpjxpJXCnp42pd2O2Q= github.com/FloatTech/ZeroBot-Plugin-Timer v1.3.4/go.mod h1:NuODdnVhf9AClsJBdYFqnL9sQE7VIRZyZos37J286n0= -github.com/FloatTech/Zerobot-ACGImage-Classify v1.2.1 h1:HEdT6yq06lV94jcArutpyqQLaPpczs0bTd6gdwVG1ps= -github.com/FloatTech/Zerobot-ACGImage-Classify v1.2.1/go.mod h1:swPvVKyXu1YFWZ7Kt6R79LgIa16hs4cE1E5LroBB2SQ= -github.com/FloatTech/Zerobot-ACGImage-Classify v1.3.0 h1:4lwSBYlwPsUE7uDzSaTH4/ZlaQwWbF1jeincg6eOByg= -github.com/FloatTech/Zerobot-ACGImage-Classify v1.3.0/go.mod h1:swPvVKyXu1YFWZ7Kt6R79LgIa16hs4cE1E5LroBB2SQ= -github.com/FloatTech/Zerobot-ACGImage-Classify v1.3.1 h1:T8cSLwoVppbMRPKnwFgItl8523BFBiyYjxo81KXGZFk= -github.com/FloatTech/Zerobot-ACGImage-Classify v1.3.1/go.mod h1:swPvVKyXu1YFWZ7Kt6R79LgIa16hs4cE1E5LroBB2SQ= -github.com/FloatTech/Zerobot-ACGImage-Classify v1.3.2 h1:7s06Cw2TggudMEz3t+OSAiSv/JAetNdNYgfmuLZhGwU= -github.com/FloatTech/Zerobot-ACGImage-Classify v1.3.2/go.mod h1:swPvVKyXu1YFWZ7Kt6R79LgIa16hs4cE1E5LroBB2SQ= github.com/FloatTech/Zerobot-ACGImage-Classify v1.3.3 h1:mMaBe23yg8mk5U0yb9OS9iX/9hju6Dj+Z+Fty18vIhU= github.com/FloatTech/Zerobot-ACGImage-Classify v1.3.3/go.mod h1:swPvVKyXu1YFWZ7Kt6R79LgIa16hs4cE1E5LroBB2SQ= -github.com/StackExchange/wmi v0.0.0-20210224194228-fe8f1750fd46 h1:5sXbqlSomvdjlRbWyNqkPsJ3Fg+tQZCbgeX1VGljbQY= -github.com/StackExchange/wmi v0.0.0-20210224194228-fe8f1750fd46/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= -github.com/StackExchange/wmi v1.2.0 h1:noJEYkMQVlFCEAc+2ma5YyRhlfjcWfZqk5sBRYozdyM= -github.com/StackExchange/wmi v1.2.0/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= github.com/StackExchange/wmi v1.2.1 h1:VIkavFPXSjcnS+O8yTq7NI32k0R5Aj+v39y29VYDOSA= github.com/StackExchange/wmi v1.2.1/go.mod h1:rcmrprowKIVzvc+NUiLncP2uuArMWLCbu9SBzvHz7e8= github.com/antchfx/htmlquery v1.2.3 h1:sP3NFDneHx2stfNXCKbhHFo8XgNjCACnU/4AO5gWz6M= @@ -85,8 +41,7 @@ github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:C github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= -github.com/mattn/go-sqlite3 v1.14.6 h1:dNPt6NO46WmLVt2DLNpwczCmdV5boIZ6g/tlDrlRUbg= -github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= +github.com/mattn/go-sqlite3 v1.14.8 h1:gDp86IdQsN/xWjIEmr9MF6o9mpksUgh0fu+9ByFxzIU= github.com/mattn/go-sqlite3 v1.14.8/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -102,8 +57,6 @@ github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6O github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/robfig/cron v1.2.0 h1:ZjScXvvxeQ63Dbyxy76Fj3AT3Ut0aKsyd2/tl3DTMuQ= github.com/robfig/cron v1.2.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k= -github.com/shirou/gopsutil v3.21.6+incompatible h1:mmZtAlWSd8U2HeRTjswbnDLPxqsEoK01NK+GZ1P+nEM= -github.com/shirou/gopsutil v3.21.6+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/shirou/gopsutil v3.21.7+incompatible h1:g/wcPHcuCQvHSePVofjQljd2vX4ty0+J6VoMB+NPcdk= github.com/shirou/gopsutil v3.21.7+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= @@ -126,16 +79,10 @@ github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JT github.com/tidwall/pretty v1.1.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs= github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= -github.com/tklauser/go-sysconf v0.3.6 h1:oc1sJWvKkmvIxhDHeKWvZS4f6AW+YcoguSfRF2/Hmo4= -github.com/tklauser/go-sysconf v0.3.6/go.mod h1:MkWzOF4RMCshBAMXuhXJs64Rte09mITnppBXY/rYEFI= github.com/tklauser/go-sysconf v0.3.7 h1:HT7h4+536gjqeq1ZIJPgOl1rg1XFatQGVZWp7Py53eg= github.com/tklauser/go-sysconf v0.3.7/go.mod h1:JZIdXh4RmBvZDBZ41ld2bGxRV3n4daiiqA3skYhAoQ4= -github.com/tklauser/numcpus v0.2.2 h1:oyhllyrScuYI6g+h/zUvNXNp1wy7x8qQy3t/piefldA= -github.com/tklauser/numcpus v0.2.2/go.mod h1:x3qojaO3uyYt0i56EW/VUYs7uBvdl2fkfZFu0T9wgjM= github.com/tklauser/numcpus v0.2.3 h1:nQ0QYpiritP6ViFhrKYsiv6VVxOpum2Gks5GhnJbS/8= github.com/tklauser/numcpus v0.2.3/go.mod h1:vpEPS/JC+oZGGQ/My/vJnNsvMDQL6PwOqt8dsCw5j+E= -github.com/wdvxdr1123/ZeroBot v1.2.1 h1:ougeP+VOAGlQWCAUSB7fjA5trzEvPepU7pujsoYTCq8= -github.com/wdvxdr1123/ZeroBot v1.2.1/go.mod h1:83nHtG8V5TAxPwH/LCDxLpZk4khIgs29dkr5TBWf7fc= github.com/wdvxdr1123/ZeroBot v1.2.2 h1:BKEy3l80BMrQWpFWaII0AfFMyf9bqrB0TxfWhTdoV58= github.com/wdvxdr1123/ZeroBot v1.2.2/go.mod h1:83nHtG8V5TAxPwH/LCDxLpZk4khIgs29dkr5TBWf7fc= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -169,9 +116,7 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -183,8 +128,6 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.3-0.20210608163600-9ed039809d4c h1:Pv9gNyJFYVdpUAVZYJ1BDSU4eGgXQ+0f3DIGAdolO5s= -golang.org/x/tools v0.1.3-0.20210608163600-9ed039809d4c/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5 h1:ouewzE6p+/VEB31YYnTbEJdi8pFqKp4P4n85vwo3DHA= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -203,11 +146,9 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= lukechampine.com/uint128 v1.1.1 h1:pnxCASz787iMf+02ssImqk6OLt+Z5QHMoZyUXR4z6JU= lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= -modernc.org/cc/v3 v3.33.6 h1:r63dgSzVzRxUpAJFPQWHy1QeZeY1ydNENUDaBx1GqYc= modernc.org/cc/v3 v3.33.6/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= modernc.org/cc/v3 v3.33.7 h1:Rvxffgx6LHSpGS6IO8bffSYN1wpPsWHEWY9CV95vpro= modernc.org/cc/v3 v3.33.7/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/ccgo/v3 v3.9.5 h1:dEuUSf8WN51rDkprFuAqjfchKEzN0WttP/Py3enBwjk= modernc.org/ccgo/v3 v3.9.5/go.mod h1:umuo2EP2oDSBnD3ckjaVUXMrmeAw8C8OSICVa0iFf60= modernc.org/ccgo/v3 v3.9.6 h1:rCjLgu6iRxK2bqq8A0CCOnDP+tdA81LfbBUlM1L6ZIY= modernc.org/ccgo/v3 v3.9.6/go.mod h1:KGOi0NhaT6CO19xeSXcpXBl0OkoD6T1U4dPd633G9Sg= @@ -219,7 +160,6 @@ modernc.org/libc v1.9.11 h1:QUxZMs48Ahg2F7SN41aERvMfGLY2HU/ADnB9DC4Yts8= modernc.org/libc v1.9.11/go.mod h1:NyF3tsA5ArIjJ83XB0JlqhjTabTCHm9aX4XMPHyQn0Q= modernc.org/mathutil v1.1.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= modernc.org/mathutil v1.2.2/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= -modernc.org/mathutil v1.4.0 h1:GCjoRaBew8ECCKINQA2nYjzvufFW9YiEuuB+rQ9bn2E= modernc.org/mathutil v1.4.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= modernc.org/mathutil v1.4.1 h1:ij3fYGe8zBF4Vu+g0oT7mB06r8sqGWKuJu1yXeR4by8= modernc.org/mathutil v1.4.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= @@ -227,8 +167,6 @@ modernc.org/memory v1.0.4 h1:utMBrFcpnQDdNsmM6asmyH/FM9TqLPS7XF7otpJmrwM= modernc.org/memory v1.0.4/go.mod h1:nV2OApxradM3/OVbs2/0OsP6nPfakXpi50C7dcoHXlc= modernc.org/opt v0.1.1 h1:/0RX92k9vwVeDXj+Xn23DKp2VJubL7k8qNffND6qn3A= modernc.org/opt v0.1.1/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0= -modernc.org/sqlite v1.11.1 h1:SSLaty1rFr9JhVH/Usm2BxzlzaCtf0GhTJ/MJ32GU3Y= -modernc.org/sqlite v1.11.1/go.mod h1:+mhs/P1ONd+6G7hcAs6irwDi/bjTQ7nLW6LHRBsEa3A= modernc.org/sqlite v1.12.0 h1:AMAOgk4CkblRJc6YLKSYtz3pZ6DW5wjQ1uYH/rN7/Kk= modernc.org/sqlite v1.12.0/go.mod h1:ppqJ4cQ+R09YLzl9haEL9AYgj6wX8FcfwDTOI0nYykU= modernc.org/strutil v1.1.1 h1:xv+J1BXY3Opl2ALrBwyfEikFAj8pmqcpnfmuwUwcozs= diff --git a/main.go b/main.go index 55501ef2..38bb2959 100644 --- a/main.go +++ b/main.go @@ -18,7 +18,7 @@ import ( // 娱乐类 _ "github.com/FloatTech/ZeroBot-Plugin/plugin_ai_false" // 服务器监控 - //_ "github.com/FloatTech/ZeroBot-Plugin/plugin_minecraft" + _ "github.com/FloatTech/ZeroBot-Plugin/plugin_minecraft" _ "github.com/FloatTech/ZeroBot-Plugin/plugin_music" // 点歌 _ "github.com/FloatTech/ZeroBot-Plugin/plugin_shindan" // 测定 @@ -29,10 +29,9 @@ import ( // 二次元图片 _ "github.com/FloatTech/ZeroBot-ACGImage" // 随机图片与AI点评 _ "github.com/FloatTech/ZeroBot-Plugin/plugin_image_finder" // 关键字搜图 - - //_ "github.com/FloatTech/ZeroBot-Plugin/plugin_lolicon" // lolicon 随机图片 - _ "github.com/FloatTech/ZeroBot-Plugin/plugin_saucenao" // 以图搜图 - //_ "github.com/FloatTech/ZeroBot-Plugin/plugin_setutime" // 来份涩图 + _ "github.com/FloatTech/ZeroBot-Plugin/plugin_lolicon" // lolicon 随机图片 + _ "github.com/FloatTech/ZeroBot-Plugin/plugin_saucenao" // 以图搜图 + _ "github.com/FloatTech/ZeroBot-Plugin/plugin_setutime" // 来份涩图 // 以下为内置依赖，勿动 zero "github.com/wdvxdr1123/ZeroBot" @@ -71,7 +70,7 @@ func main() { // SuperUsers 某些功能需要主人权限，可通过以下两种方式修改 // []string{}：通过代码写死的方式添加主人账号 // os.Args[1:]：通过命令行参数的方式添加主人账号 - SuperUsers: os.Args[1:], + SuperUsers: append([]string{"12345678", "87654321"}, os.Args[1:]...), Driver: []zero.Driver{ &driver.WSClient{