diff --git a/README.md b/README.md index 82882d0e..8a8c6fca 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ zerobot [-h] [-t token] [-u url] [-n nickname] [-p prefix] [-d|w] [-g 监听地 ## 功能 > 在编译时,以下功能除插件控制外,均可通过注释`main.go`中的相应`import`而物理禁用,减小插件体积。 > 通过插件控制,还可动态管理某个功能在某个群的打开/关闭。 -- **web管理** `import _ "github.com/FloatTech/zbpctrl/web"` +- **web管理** `import _ "github.com/FloatTech/zbputils/control/web"` - 开启后可执行文件大约增加 5M ,默认注释不开启。如需开启请自行编辑`main.go`取消注释 - 需要配合 [webgui](https://github.com/FloatTech/bot-manager) 使用 - **动态加载插件** `import _ github.com/FloatTech/ZeroBot-Plugin-Dynamic/dyloader` diff --git a/go.mod b/go.mod index d00ebed6..96604e86 100644 --- a/go.mod +++ b/go.mod @@ -4,8 +4,7 @@ go 1.17 require ( github.com/FloatTech/AnimeAPI v1.2.0 - github.com/FloatTech/zbpctrl v1.2.3-add2 - github.com/FloatTech/zbputils v1.2.3-add2 + github.com/FloatTech/zbputils v1.2.3-add6 github.com/antchfx/htmlquery v1.2.4 github.com/corona10/goimagehash v1.0.3 github.com/fogleman/gg v1.3.0 @@ -49,8 +48,8 @@ require ( github.com/yusufpapurcu/wmi v1.2.2 // indirect golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 // indirect golang.org/x/mod v0.5.1 // indirect - golang.org/x/net v0.0.0-20220107192237-5cfca573fb4d // indirect - golang.org/x/sys v0.0.0-20220110181412-a018aaa089fe // indirect + golang.org/x/net v0.0.0-20220111093109-d55c255bac03 // indirect + golang.org/x/sys v0.0.0-20220111092808-5a964db01320 // indirect golang.org/x/text v0.3.7 // indirect golang.org/x/tools v0.1.8 // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect diff --git a/go.sum b/go.sum index 1fdd2e94..bb22b648 100644 --- a/go.sum +++ b/go.sum @@ -1,11 +1,9 @@ github.com/FloatTech/AnimeAPI v1.2.0 h1:1P6hOEqNOB8EeC7PD5LuIRL9aWRKNVjKF6kP8X1ZYmI= github.com/FloatTech/AnimeAPI v1.2.0/go.mod h1:P2pJSBhflFXJsJPUwhHt13obMVBRc9WJxEKx4bJ+11Q= github.com/FloatTech/bot-manager v1.0.0/go.mod h1:8YYRJ16oroGHQGD2En0oVnmcKJkxR9O/jd5BPSfWfOQ= -github.com/FloatTech/zbpctrl v1.2.3-add2 h1:lvBIQOo22RPOrc+ZgzmcyGEuhV36NrKMOemZN/UOoig= -github.com/FloatTech/zbpctrl v1.2.3-add2/go.mod h1:s4ux9AgS8m+30ELebKOf7TpMtZEPJpk8ll3CSv0Oz5s= github.com/FloatTech/zbputils v1.2.3-add1/go.mod h1:+NZ6tqt9lR2ilyiIh/+90tZlSW2pXx0IyOFlpOiqadE= -github.com/FloatTech/zbputils v1.2.3-add2 h1:b+W7+cWriDVcUXh6NLnQ/z6hkrY+FvrJuoAowsUaFrQ= -github.com/FloatTech/zbputils v1.2.3-add2/go.mod h1:OXX382tuGcev9XfWG9aYE+OmbvEKGCXfuM+ZmW9BTLw= +github.com/FloatTech/zbputils v1.2.3-add6 h1:OposCMCRJYd0FLxPEMYFfUaBt9jso1cOUjGAKOeAYUE= +github.com/FloatTech/zbputils v1.2.3-add6/go.mod h1:ZIuQP4tuhn7jiowEy+PALiHmr4zzPQBj4VdjEyd5/Es= github.com/Mrs4s/MiraiGo v0.0.0-20211120033824-43b23f4e6fcb h1:Rkj28fqIwGx/EgBzRYtpmJRfH6wqVn7cNdc7aJ0QE4M= github.com/Mrs4s/MiraiGo v0.0.0-20211120033824-43b23f4e6fcb/go.mod h1:imVKbfKqqeit+C/eaWGb4MKQ3z3gN6pRpBU5RMtp5so= github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc= @@ -182,8 +180,8 @@ golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220107192237-5cfca573fb4d h1:62NvYBuaanGXR2ZOfwDFkhhl6X1DUgf8qg3GuQvxZsE= -golang.org/x/net v0.0.0-20220107192237-5cfca573fb4d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220111093109-d55c255bac03 h1:0FB83qp0AzVJm+0wcIlauAjJ+tNdh7jLuacRYCIVv7s= +golang.org/x/net v0.0.0-20220111093109-d55c255bac03/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -208,8 +206,8 @@ golang.org/x/sys v0.0.0-20210902050250-f475640dd07b/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211013075003-97ac67df715c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220110181412-a018aaa089fe h1:W8vbETX/n8S6EmY0Pu4Ix7VvpsJUESTwl0oCK8MJOgk= -golang.org/x/sys v0.0.0-20220110181412-a018aaa089fe/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220111092808-5a964db01320 h1:0jf+tOCoZ3LyutmCOWpVni1chK4VfFLhRsDK7MhqGRY= +golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= diff --git a/main.go b/main.go index 67b0f921..088be233 100644 --- a/main.go +++ b/main.go @@ -10,7 +10,7 @@ import ( // 下列插件可与 wdvxdr1123/ZeroBot v1.1.2 以上配合单独使用 // 插件控制 - // webctrl "github.com/FloatTech/zbpctrl/web" // web 后端控制 + // webctrl "github.com/FloatTech/zbputils/control/web" // web 后端控制 // 词库类 _ "github.com/FloatTech/ZeroBot-Plugin/plugin_ai_reply" // 人工智能回复 diff --git a/plugin_acgimage/classify.go b/plugin_acgimage/classify.go index 527f8463..5e170299 100644 --- a/plugin_acgimage/classify.go +++ b/plugin_acgimage/classify.go @@ -12,7 +12,7 @@ import ( "github.com/wdvxdr1123/ZeroBot/extension/rate" "github.com/wdvxdr1123/ZeroBot/message" - control "github.com/FloatTech/zbpctrl" + control "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/web" ) diff --git a/plugin_ai_false/ai_false.go b/plugin_ai_false/ai_false.go index e9f5d3c1..4b7bdf5c 100644 --- a/plugin_ai_false/ai_false.go +++ b/plugin_ai_false/ai_false.go @@ -7,7 +7,7 @@ import ( "os" "time" - control "github.com/FloatTech/zbpctrl" + control "github.com/FloatTech/zbputils/control" "github.com/shirou/gopsutil/v3/cpu" "github.com/shirou/gopsutil/v3/disk" "github.com/shirou/gopsutil/v3/mem" diff --git a/plugin_ai_reply/main.go b/plugin_ai_reply/main.go index 0228be79..15eed697 100644 --- a/plugin_ai_reply/main.go +++ b/plugin_ai_reply/main.go @@ -5,7 +5,7 @@ import ( "time" "github.com/FloatTech/AnimeAPI/aireply" - control "github.com/FloatTech/zbpctrl" + control "github.com/FloatTech/zbputils/control" zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/extension/rate" "github.com/wdvxdr1123/ZeroBot/message" diff --git a/plugin_ai_reply/tts.go b/plugin_ai_reply/tts.go index 7dda3d52..9c08927f 100644 --- a/plugin_ai_reply/tts.go +++ b/plugin_ai_reply/tts.go @@ -8,7 +8,7 @@ import ( "github.com/FloatTech/AnimeAPI/aireply" "github.com/FloatTech/AnimeAPI/mockingbird" - control "github.com/FloatTech/zbpctrl" + control "github.com/FloatTech/zbputils/control" ) const ttsprio = 250 diff --git a/plugin_aiwife/non-existent.go b/plugin_aiwife/non-existent.go index f347c459..48935cce 100644 --- a/plugin_aiwife/non-existent.go +++ b/plugin_aiwife/non-existent.go @@ -6,7 +6,7 @@ import ( "math/rand" "time" - control "github.com/FloatTech/zbpctrl" + control "github.com/FloatTech/zbputils/control" zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" ) diff --git a/plugin_atri/atri.go b/plugin_atri/atri.go index 95bef123..eb9967b7 100644 --- a/plugin_atri/atri.go +++ b/plugin_atri/atri.go @@ -12,7 +12,7 @@ import ( zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" - control "github.com/FloatTech/zbpctrl" + control "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/process" ) diff --git a/plugin_b14/main.go b/plugin_b14/main.go index 562b3ca8..4578e975 100644 --- a/plugin_b14/main.go +++ b/plugin_b14/main.go @@ -4,7 +4,7 @@ package b14coder import ( "unsafe" - control "github.com/FloatTech/zbpctrl" + control "github.com/FloatTech/zbputils/control" base14 "github.com/fumiama/go-base16384" tea "github.com/fumiama/gofastTEA" zero "github.com/wdvxdr1123/ZeroBot" diff --git a/plugin_bilibili/fansDaily.go b/plugin_bilibili/fansDaily.go index de6b1b24..9e5249d3 100644 --- a/plugin_bilibili/fansDaily.go +++ b/plugin_bilibili/fansDaily.go @@ -5,7 +5,7 @@ import ( "net/http" "time" - control "github.com/FloatTech/zbpctrl" + control "github.com/FloatTech/zbputils/control" "github.com/fumiama/cron" zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" diff --git a/plugin_bilibili/info.go b/plugin_bilibili/info.go index 307326f1..a89d2675 100644 --- a/plugin_bilibili/info.go +++ b/plugin_bilibili/info.go @@ -5,7 +5,7 @@ import ( "io/ioutil" "net/http" - control "github.com/FloatTech/zbpctrl" + control "github.com/FloatTech/zbputils/control" "github.com/tidwall/gjson" zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" diff --git a/plugin_book_review/book_review.go b/plugin_book_review/book_review.go index 3914374d..84f32370 100644 --- a/plugin_book_review/book_review.go +++ b/plugin_book_review/book_review.go @@ -7,7 +7,7 @@ import ( "github.com/wdvxdr1123/ZeroBot/message" "github.com/wdvxdr1123/ZeroBot/utils/helper" - control "github.com/FloatTech/zbpctrl" + control "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/txt2img" ) diff --git a/plugin_cangtoushi/cangtoushi.go b/plugin_cangtoushi/cangtoushi.go index e91ee7e8..73d6a744 100644 --- a/plugin_cangtoushi/cangtoushi.go +++ b/plugin_cangtoushi/cangtoushi.go @@ -9,7 +9,7 @@ import ( "net/url" "strings" - control "github.com/FloatTech/zbpctrl" + control "github.com/FloatTech/zbputils/control" "github.com/antchfx/htmlquery" log "github.com/sirupsen/logrus" zero "github.com/wdvxdr1123/ZeroBot" diff --git a/plugin_chat/chat.go b/plugin_chat/chat.go index 56e2d38e..82eb1b4e 100644 --- a/plugin_chat/chat.go +++ b/plugin_chat/chat.go @@ -6,7 +6,7 @@ import ( "strconv" "time" - control "github.com/FloatTech/zbpctrl" + control "github.com/FloatTech/zbputils/control" zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/extension/rate" "github.com/wdvxdr1123/ZeroBot/message" diff --git a/plugin_choose/choose.go b/plugin_choose/choose.go index 9d4f2fc4..999cbb48 100644 --- a/plugin_choose/choose.go +++ b/plugin_choose/choose.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - control "github.com/FloatTech/zbpctrl" + control "github.com/FloatTech/zbputils/control" zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" ) diff --git a/plugin_chouxianghua/chouxianghua.go b/plugin_chouxianghua/chouxianghua.go index aab457ff..03ad790e 100644 --- a/plugin_chouxianghua/chouxianghua.go +++ b/plugin_chouxianghua/chouxianghua.go @@ -2,7 +2,7 @@ package chouxianghua import ( - control "github.com/FloatTech/zbpctrl" + control "github.com/FloatTech/zbputils/control" zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" ) diff --git a/plugin_coser/coser.go b/plugin_coser/coser.go index 97bd25c8..a12ea0ff 100644 --- a/plugin_coser/coser.go +++ b/plugin_coser/coser.go @@ -12,7 +12,7 @@ import ( "github.com/wdvxdr1123/ZeroBot/message" "github.com/wdvxdr1123/ZeroBot/utils/helper" - control "github.com/FloatTech/zbpctrl" + control "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/web" ) diff --git a/plugin_cpstory/cpstory.go b/plugin_cpstory/cpstory.go index 8692210c..add1d7ae 100644 --- a/plugin_cpstory/cpstory.go +++ b/plugin_cpstory/cpstory.go @@ -7,7 +7,7 @@ import ( zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" - control "github.com/FloatTech/zbpctrl" + control "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/ctxext" "github.com/FloatTech/zbputils/math" ) diff --git a/plugin_curse/curse.go b/plugin_curse/curse.go index c050db1d..a0b663d6 100644 --- a/plugin_curse/curse.go +++ b/plugin_curse/curse.go @@ -8,7 +8,7 @@ import ( "github.com/wdvxdr1123/ZeroBot/extension/rate" "github.com/wdvxdr1123/ZeroBot/message" - control "github.com/FloatTech/zbpctrl" + control "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/process" ) diff --git a/plugin_diana/bing.go b/plugin_diana/bing.go index b5a97aec..e81d0457 100644 --- a/plugin_diana/bing.go +++ b/plugin_diana/bing.go @@ -8,7 +8,7 @@ import ( zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" - control "github.com/FloatTech/zbpctrl" + control "github.com/FloatTech/zbputils/control" "github.com/FloatTech/ZeroBot-Plugin/plugin_diana/data" ) diff --git a/plugin_fortune/fortune.go b/plugin_fortune/fortune.go index 8f629479..73b98ff9 100644 --- a/plugin_fortune/fortune.go +++ b/plugin_fortune/fortune.go @@ -21,7 +21,7 @@ import ( "github.com/wdvxdr1123/ZeroBot/message" "github.com/wdvxdr1123/ZeroBot/utils/helper" - control "github.com/FloatTech/zbpctrl" + control "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/file" "github.com/FloatTech/zbputils/math" ) diff --git a/plugin_funny/laugh.go b/plugin_funny/laugh.go index 1d417517..9230623a 100644 --- a/plugin_funny/laugh.go +++ b/plugin_funny/laugh.go @@ -9,7 +9,7 @@ import ( "github.com/wdvxdr1123/ZeroBot/extension/rate" "github.com/wdvxdr1123/ZeroBot/message" - control "github.com/FloatTech/zbpctrl" + control "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/ctxext" "github.com/FloatTech/zbputils/sql" ) diff --git a/plugin_gif/run.go b/plugin_gif/run.go index 9a418abf..7668da2b 100644 --- a/plugin_gif/run.go +++ b/plugin_gif/run.go @@ -8,7 +8,7 @@ import ( "strings" "time" - control "github.com/FloatTech/zbpctrl" + control "github.com/FloatTech/zbputils/control" zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" ) diff --git a/plugin_github/repo_searcher.go b/plugin_github/repo_searcher.go index 9efc8997..c06b5d94 100644 --- a/plugin_github/repo_searcher.go +++ b/plugin_github/repo_searcher.go @@ -9,7 +9,7 @@ import ( "net/url" "strings" - control "github.com/FloatTech/zbpctrl" + control "github.com/FloatTech/zbputils/control" zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" diff --git a/plugin_hs/run.go b/plugin_hs/run.go index 32f653d8..f33bebee 100644 --- a/plugin_hs/run.go +++ b/plugin_hs/run.go @@ -12,7 +12,7 @@ import ( "github.com/wdvxdr1123/ZeroBot/message" "github.com/wdvxdr1123/ZeroBot/utils/helper" - control "github.com/FloatTech/zbpctrl" + control "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/file" "github.com/FloatTech/zbputils/web" ) diff --git a/plugin_image_finder/keyword.go b/plugin_image_finder/keyword.go index de1ac6b5..55728c89 100644 --- a/plugin_image_finder/keyword.go +++ b/plugin_image_finder/keyword.go @@ -8,7 +8,7 @@ import ( "net/http" "time" - control "github.com/FloatTech/zbpctrl" + control "github.com/FloatTech/zbputils/control" zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" ) diff --git a/plugin_juejuezi/juejuezi.go b/plugin_juejuezi/juejuezi.go index 7369d3ba..ea582562 100644 --- a/plugin_juejuezi/juejuezi.go +++ b/plugin_juejuezi/juejuezi.go @@ -8,7 +8,7 @@ import ( "strings" "time" - control "github.com/FloatTech/zbpctrl" + control "github.com/FloatTech/zbputils/control" log "github.com/sirupsen/logrus" "github.com/tidwall/gjson" zero "github.com/wdvxdr1123/ZeroBot" diff --git a/plugin_lolicon/lolicon.go b/plugin_lolicon/lolicon.go index f65e58d5..1b18bd9f 100644 --- a/plugin_lolicon/lolicon.go +++ b/plugin_lolicon/lolicon.go @@ -11,7 +11,7 @@ import ( zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" - control "github.com/FloatTech/zbpctrl" + control "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/math" ) diff --git a/plugin_manager/manager.go b/plugin_manager/manager.go index ed700aea..16c01080 100644 --- a/plugin_manager/manager.go +++ b/plugin_manager/manager.go @@ -15,7 +15,7 @@ import ( "github.com/wdvxdr1123/ZeroBot/extension/rate" "github.com/wdvxdr1123/ZeroBot/message" - control "github.com/FloatTech/zbpctrl" + control "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/ctxext" "github.com/FloatTech/zbputils/math" "github.com/FloatTech/zbputils/process" diff --git a/plugin_minecraft/manager.go b/plugin_minecraft/manager.go index f1963797..e7503aae 100644 --- a/plugin_minecraft/manager.go +++ b/plugin_minecraft/manager.go @@ -6,7 +6,7 @@ import ( "io/ioutil" "net/http" - control "github.com/FloatTech/zbpctrl" + control "github.com/FloatTech/zbputils/control" zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/extension" "github.com/wdvxdr1123/ZeroBot/message" diff --git a/plugin_moyu/run.go b/plugin_moyu/run.go index 6f3eba6a..d9ad7c46 100644 --- a/plugin_moyu/run.go +++ b/plugin_moyu/run.go @@ -4,7 +4,7 @@ package moyu import ( "time" - control "github.com/FloatTech/zbpctrl" + control "github.com/FloatTech/zbputils/control" "github.com/fumiama/cron" zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" diff --git a/plugin_music/selecter.go b/plugin_music/selecter.go index 0e9e2f15..a685f204 100644 --- a/plugin_music/selecter.go +++ b/plugin_music/selecter.go @@ -11,7 +11,7 @@ import ( "strings" "time" - control "github.com/FloatTech/zbpctrl" + control "github.com/FloatTech/zbputils/control" "github.com/tidwall/gjson" zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/extension/rate" diff --git a/plugin_nativesetu/main.go b/plugin_nativesetu/main.go index 49efbe17..c1390e4c 100644 --- a/plugin_nativesetu/main.go +++ b/plugin_nativesetu/main.go @@ -10,7 +10,7 @@ import ( "github.com/wdvxdr1123/ZeroBot/message" "github.com/wdvxdr1123/ZeroBot/utils/helper" - control "github.com/FloatTech/zbpctrl" + control "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/rule" ) diff --git a/plugin_nativewife/main.go b/plugin_nativewife/main.go index 97093fce..8767765f 100644 --- a/plugin_nativewife/main.go +++ b/plugin_nativewife/main.go @@ -17,7 +17,7 @@ import ( "github.com/wdvxdr1123/ZeroBot/message" "github.com/wdvxdr1123/ZeroBot/utils/helper" - control "github.com/FloatTech/zbpctrl" + control "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/ctxext" "github.com/FloatTech/zbputils/file" ) diff --git a/plugin_novel/qianbi.go b/plugin_novel/qianbi.go index af05ec07..80fd1275 100644 --- a/plugin_novel/qianbi.go +++ b/plugin_novel/qianbi.go @@ -18,8 +18,8 @@ import ( "github.com/wdvxdr1123/ZeroBot/message" "github.com/wdvxdr1123/ZeroBot/utils/helper" - control "github.com/FloatTech/zbpctrl" ub "github.com/FloatTech/zbputils/binary" + control "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/txt2img" ) diff --git a/plugin_omikuji/sensou.go b/plugin_omikuji/sensou.go index 37740361..7b251b24 100644 --- a/plugin_omikuji/sensou.go +++ b/plugin_omikuji/sensou.go @@ -12,7 +12,7 @@ import ( "github.com/wdvxdr1123/ZeroBot/message" "github.com/wdvxdr1123/ZeroBot/utils/helper" - control "github.com/FloatTech/zbpctrl" + control "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/txt2img" ) diff --git a/plugin_reborn/main.go b/plugin_reborn/main.go index 38ac8a71..52b64760 100644 --- a/plugin_reborn/main.go +++ b/plugin_reborn/main.go @@ -6,7 +6,7 @@ import ( "math/rand" "time" - control "github.com/FloatTech/zbpctrl" + control "github.com/FloatTech/zbputils/control" zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" ) diff --git a/plugin_runcode/code_runner.go b/plugin_runcode/code_runner.go index 960a046d..dce65136 100644 --- a/plugin_runcode/code_runner.go +++ b/plugin_runcode/code_runner.go @@ -9,7 +9,7 @@ import ( "strings" "time" - control "github.com/FloatTech/zbpctrl" + control "github.com/FloatTech/zbputils/control" zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/extension/rate" "github.com/wdvxdr1123/ZeroBot/message" diff --git a/plugin_saucenao/searcher.go b/plugin_saucenao/searcher.go index 4d1ed7ac..63b8aedd 100644 --- a/plugin_saucenao/searcher.go +++ b/plugin_saucenao/searcher.go @@ -14,7 +14,7 @@ import ( zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" - control "github.com/FloatTech/zbpctrl" + control "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/file" ) diff --git a/plugin_score/data.go b/plugin_score/data.go index 19aac564..3e3faf55 100644 --- a/plugin_score/data.go +++ b/plugin_score/data.go @@ -14,8 +14,8 @@ const ( dbfile = dbpath + "score.db" ) -// SDB 得分数据库 -var SDB *DB +// sdb 得分数据库 +var sdb *scoredb // 加载数据库 func init() { @@ -24,7 +24,7 @@ func init() { _ = os.MkdirAll(dbpath, 0755) os.RemoveAll(cachePath) _ = os.MkdirAll(cachePath, 0755) - SDB = Initialize(dbfile) + sdb = initialize(dbfile) log.Println("[score]加载score数据库") }() } diff --git a/plugin_score/model.go b/plugin_score/model.go index ec50d692..b4f0935d 100644 --- a/plugin_score/model.go +++ b/plugin_score/model.go @@ -8,34 +8,34 @@ import ( _ "github.com/logoove/sqlite" // import sql ) -// DB 分数数据库 -type DB gorm.DB +// scoredb 分数数据库 +type scoredb gorm.DB -// Score 分数结构体 -type Score struct { +// scoretable 分数结构体 +type scoretable struct { UID int64 `gorm:"column:uid;primary_key"` Score int `gorm:"column:score;default:0"` } // TableName ... -func (Score) TableName() string { +func (scoretable) TableName() string { return "score" } -// SignIn 签到结构体 -type SignIn struct { +// signintable 签到结构体 +type signintable struct { UID int64 `gorm:"column:uid;primary_key"` Count int `gorm:"column:count;default:0"` UpdatedAt time.Time } // TableName ... -func (SignIn) TableName() string { +func (signintable) TableName() string { return "sign_in" } -// Initialize 初始化ScoreDB数据库 -func Initialize(dbpath string) *DB { +// initialize 初始化ScoreDB数据库 +func initialize(dbpath string) *scoredb { var err error if _, err = os.Stat(dbpath); err != nil || os.IsNotExist(err) { // 生成文件 @@ -49,46 +49,37 @@ func Initialize(dbpath string) *DB { if err != nil { panic(err) } - gdb.AutoMigrate(&Score{}).AutoMigrate(&SignIn{}) - return (*DB)(gdb) -} - -// Open ... -func Open(dbpath string) (*DB, error) { - db, err := gorm.Open("sqlite3", dbpath) - if err != nil { - return nil, err - } - return (*DB)(db), nil + gdb.AutoMigrate(&scoretable{}).AutoMigrate(&signintable{}) + return (*scoredb)(gdb) } // Close ... -func (sdb *DB) Close() error { +func (sdb *scoredb) Close() error { db := (*gorm.DB)(sdb) return db.Close() } // GetScoreByUID 取得分数 -func (sdb *DB) GetScoreByUID(uid int64) (s Score) { +func (sdb *scoredb) GetScoreByUID(uid int64) (s scoretable) { db := (*gorm.DB)(sdb) - db.Debug().Model(&Score{}).FirstOrCreate(&s, "uid = ? ", uid) + db.Debug().Model(&scoretable{}).FirstOrCreate(&s, "uid = ? ", uid) return s } // InsertOrUpdateScoreByUID 插入或更新分数 -func (sdb *DB) InsertOrUpdateScoreByUID(uid int64, score int) (err error) { +func (sdb *scoredb) InsertOrUpdateScoreByUID(uid int64, score int) (err error) { db := (*gorm.DB)(sdb) - s := Score{ + s := scoretable{ UID: uid, Score: score, } - if err = db.Debug().Model(&Score{}).First(&s, "uid = ? ", uid).Error; err != nil { + if err = db.Debug().Model(&scoretable{}).First(&s, "uid = ? ", uid).Error; err != nil { // error handling... if gorm.IsRecordNotFoundError(err) { - db.Debug().Model(&Score{}).Create(&s) // newUser not user + db.Debug().Model(&scoretable{}).Create(&s) // newUser not user } } else { - err = db.Debug().Model(&Score{}).Where("uid = ? ", uid).Update( + err = db.Debug().Model(&scoretable{}).Where("uid = ? ", uid).Update( map[string]interface{}{ "score": score, }).Error @@ -97,26 +88,26 @@ func (sdb *DB) InsertOrUpdateScoreByUID(uid int64, score int) (err error) { } // GetSignInByUID 取得签到次数 -func (sdb *DB) GetSignInByUID(uid int64) (si SignIn) { +func (sdb *scoredb) GetSignInByUID(uid int64) (si signintable) { db := (*gorm.DB)(sdb) - db.Debug().Model(&SignIn{}).FirstOrCreate(&si, "uid = ? ", uid) + db.Debug().Model(&signintable{}).FirstOrCreate(&si, "uid = ? ", uid) return si } // InsertOrUpdateSignInCountByUID 插入或更新签到次数 -func (sdb *DB) InsertOrUpdateSignInCountByUID(uid int64, count int) (err error) { +func (sdb *scoredb) InsertOrUpdateSignInCountByUID(uid int64, count int) (err error) { db := (*gorm.DB)(sdb) - si := SignIn{ + si := signintable{ UID: uid, Count: count, } - if err = db.Debug().Model(&SignIn{}).First(&si, "uid = ? ", uid).Error; err != nil { + if err = db.Debug().Model(&signintable{}).First(&si, "uid = ? ", uid).Error; err != nil { // error handling... if gorm.IsRecordNotFoundError(err) { - db.Debug().Model(&SignIn{}).Create(&si) // newUser not user + db.Debug().Model(&signintable{}).Create(&si) // newUser not user } } else { - err = db.Debug().Model(&SignIn{}).Where("uid = ? ", uid).Update( + err = db.Debug().Model(&signintable{}).Where("uid = ? ", uid).Update( map[string]interface{}{ "count": count, }).Error diff --git a/plugin_score/sign_in.go b/plugin_score/sign_in.go index 3383f701..6e753ac3 100644 --- a/plugin_score/sign_in.go +++ b/plugin_score/sign_in.go @@ -5,7 +5,6 @@ import ( "fmt" "os" "strconv" - "sync" "time" "github.com/fogleman/gg" @@ -15,7 +14,7 @@ import ( "github.com/wdvxdr1123/ZeroBot/message" "github.com/wdvxdr1123/ZeroBot/utils/helper" - control "github.com/FloatTech/zbpctrl" + control "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/ctxext" "github.com/FloatTech/zbputils/file" "github.com/FloatTech/zbputils/txt2img" @@ -28,8 +27,8 @@ const ( referer = "https://iw233.cn/main.html" ua = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.110 Safari/537.36" signinMax = 1 - // ScoreMax 分数上限定为120 - ScoreMax = 120 + // SCOREMAX 分数上限定为120 + SCOREMAX = 120 ) var ( @@ -38,8 +37,6 @@ var ( Help: "签到得分\n- 签到\n- 获得签到背景[@xxx]|获得签到背景", }) levelArray = [...]int{0, 1, 2, 5, 10, 20, 35, 55, 75, 100, 120} - // 下载锁 - mu sync.Mutex ) func init() { @@ -48,16 +45,10 @@ func init() { uid := ctx.Event.UserID now := time.Now() today := now.Format("20060102") - si := SDB.GetSignInByUID(uid) - picFile := cachePath + strconv.FormatInt(uid, 10) + today + ".png" - if file.IsNotExist(picFile) { - mu.Lock() - initPic(picFile) - mu.Unlock() - } + si := sdb.GetSignInByUID(uid) siUpdateTimeStr := si.UpdatedAt.Format("20060102") if siUpdateTimeStr != today { - if err := SDB.InsertOrUpdateSignInCountByUID(uid, 0); err != nil { + if err := sdb.InsertOrUpdateSignInCountByUID(uid, 0); err != nil { log.Errorln("[score]:", err) } } @@ -65,7 +56,11 @@ func init() { ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("今天你已经签到过了!")) return } - if err := SDB.InsertOrUpdateSignInCountByUID(uid, si.Count+1); err != nil { + + picFile := cachePath + strconv.FormatInt(uid, 10) + today + ".png" + initPic(picFile) + + if err := sdb.InsertOrUpdateSignInCountByUID(uid, si.Count+1); err != nil { log.Errorln("[score]:", err) } back, err := gg.LoadImage(picFile) @@ -91,13 +86,13 @@ func init() { } add := 1 canvas.DrawString(nickName+fmt.Sprintf(" 小熊饼干+%d", add), float64(back.Bounds().Size().X)*0.1, float64(back.Bounds().Size().Y)*1.3) - score := SDB.GetScoreByUID(uid).Score + score := sdb.GetScoreByUID(uid).Score score += add - if score > ScoreMax { - score = ScoreMax + if score > SCOREMAX { + score = SCOREMAX ctx.SendChain(message.At(uid), message.Text("你获得的小熊饼干已经达到上限")) } - if err := SDB.InsertOrUpdateScoreByUID(uid, score); err != nil { + if err := sdb.InsertOrUpdateScoreByUID(uid, score); err != nil { log.Println("[score]:", err) } level := getLevel(score) @@ -110,14 +105,14 @@ func init() { if level < 10 { nextLevelScore = levelArray[level+1] } else { - nextLevelScore = ScoreMax + nextLevelScore = SCOREMAX } canvas.SetRGB255(0, 0, 0) canvas.DrawRectangle(float64(back.Bounds().Size().X)*0.1, float64(back.Bounds().Size().Y)*1.55, float64(back.Bounds().Size().X)*0.6*float64(score)/float64(nextLevelScore), float64(back.Bounds().Size().Y)*0.1) canvas.SetRGB255(102, 102, 102) canvas.Fill() canvas.DrawString(fmt.Sprintf("%d/%d", score, nextLevelScore), float64(back.Bounds().Size().X)*0.75, float64(back.Bounds().Size().Y)*1.62) - canvasBase64, err := txt2img.CanvasToBase64(canvas) + canvasBase64, err := txt2img.TxtCanvas{canvas}.ToBase64() if err != nil { log.Println("[score]:", err) } @@ -134,9 +129,8 @@ func init() { } picFile := cachePath + uidStr + time.Now().Format("20060102") + ".png" if file.IsNotExist(picFile) { - mu.Lock() - initPic(picFile) - mu.Unlock() + ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("请先签到!")) + return } ctx.SendChain(message.Image("file:///" + file.BOTPATH + "/" + picFile)) }) diff --git a/plugin_setutime/setu_geter.go b/plugin_setutime/setu_geter.go index fbf1c3ec..d6b38664 100644 --- a/plugin_setutime/setu_geter.go +++ b/plugin_setutime/setu_geter.go @@ -14,7 +14,7 @@ import ( "github.com/wdvxdr1123/ZeroBot/extension/rate" "github.com/wdvxdr1123/ZeroBot/message" - control "github.com/FloatTech/zbpctrl" + control "github.com/FloatTech/zbputils/control" fileutil "github.com/FloatTech/zbputils/file" "github.com/FloatTech/zbputils/math" "github.com/FloatTech/zbputils/process" diff --git a/plugin_shadiao/shadiao.go b/plugin_shadiao/shadiao.go index 4255ae36..958cc282 100644 --- a/plugin_shadiao/shadiao.go +++ b/plugin_shadiao/shadiao.go @@ -4,7 +4,7 @@ package shadiao import ( "time" - control "github.com/FloatTech/zbpctrl" + control "github.com/FloatTech/zbputils/control" "github.com/wdvxdr1123/ZeroBot/extension/rate" ) diff --git a/plugin_shindan/shindan.go b/plugin_shindan/shindan.go index 5894deb6..f27694ff 100644 --- a/plugin_shindan/shindan.go +++ b/plugin_shindan/shindan.go @@ -11,7 +11,7 @@ import ( "github.com/wdvxdr1123/ZeroBot/message" "github.com/wdvxdr1123/ZeroBot/utils/helper" - control "github.com/FloatTech/zbpctrl" + control "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/ctxext" "github.com/FloatTech/zbputils/txt2img" ) diff --git a/plugin_sleep_manage/sleep_manage.go b/plugin_sleep_manage/sleep_manage.go index 726fbd54..8d156896 100644 --- a/plugin_sleep_manage/sleep_manage.go +++ b/plugin_sleep_manage/sleep_manage.go @@ -9,7 +9,7 @@ import ( zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" - control "github.com/FloatTech/zbpctrl" + control "github.com/FloatTech/zbputils/control" "github.com/FloatTech/ZeroBot-Plugin/plugin_sleep_manage/model" ) diff --git a/plugin_tracemoe/moe.go b/plugin_tracemoe/moe.go index 715529a6..d765b9d9 100644 --- a/plugin_tracemoe/moe.go +++ b/plugin_tracemoe/moe.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/FloatTech/AnimeAPI/picture" - control "github.com/FloatTech/zbpctrl" + control "github.com/FloatTech/zbputils/control" trmoe "github.com/fumiama/gotracemoe" zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" diff --git a/plugin_translation/tl.go b/plugin_translation/tl.go index 95280a64..97650549 100644 --- a/plugin_translation/tl.go +++ b/plugin_translation/tl.go @@ -13,7 +13,7 @@ import ( "github.com/wdvxdr1123/ZeroBot/extension/rate" "github.com/wdvxdr1123/ZeroBot/message" - control "github.com/FloatTech/zbpctrl" + control "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/process" ) diff --git a/plugin_vtb_quotation/vtb_quotation.go b/plugin_vtb_quotation/vtb_quotation.go index 7a161a16..9caf4be2 100644 --- a/plugin_vtb_quotation/vtb_quotation.go +++ b/plugin_vtb_quotation/vtb_quotation.go @@ -14,7 +14,7 @@ import ( "github.com/wdvxdr1123/ZeroBot/message" "github.com/wdvxdr1123/ZeroBot/utils/helper" - control "github.com/FloatTech/zbpctrl" + control "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/txt2img" "github.com/FloatTech/ZeroBot-Plugin/plugin_vtb_quotation/model" diff --git a/plugin_wtf/main.go b/plugin_wtf/main.go index 8cfe4029..8cb3277d 100644 --- a/plugin_wtf/main.go +++ b/plugin_wtf/main.go @@ -6,7 +6,7 @@ import ( "strconv" "time" - control "github.com/FloatTech/zbpctrl" + control "github.com/FloatTech/zbputils/control" zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/extension/rate" "github.com/wdvxdr1123/ZeroBot/message"