🔖 1.4.1-beta3

* 通过修改顺序解决签到背景API出问题

* Update sign_in.go

* 🎨 改进代码样式

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

.github/workflows/pull.yml

@@ -25,9 +25,6 @@ jobs:
           # Optional: golangci-lint command line arguments.
           # args: --issues-exit-code=0
 
-          # Optional: if set to true then the action will use pre-installed Go.
-          skip-go-installation: true
-
           # Optional: show only new issues if it's a pull request. The default value is `false`.
           # only-new-issues: true
 

.github/workflows/push.yml

@@ -18,8 +18,6 @@ jobs:
         with:
           version: latest
           args: --issues-exit-code=0
-          # Optional: if set to true then the action will use pre-installed Go.
-          skip-go-installation: true
       - name: Commit back
         continue-on-error: true
         run: |

.golangci.yml

@@ -62,6 +62,7 @@ run:
   tests: false
   skip-dirs:
     - order
+  go: '1.18'
 
 # output configuration options
 output:

config.go

@@ -0,0 +1,13 @@
+package main
+
+import (
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/driver"
+)
+
+type zbpcfg struct {
+	Z zero.Config        `json:"zero"`
+	W []*driver.WSClient `json:"ws"`
+}
+
+var config zbpcfg

go.mod

@@ -3,53 +3,56 @@ module github.com/FloatTech/ZeroBot-Plugin
 go 1.18
 
 require (
-	github.com/FloatTech/AnimeAPI v1.3.2-0.20220319114940-c6c7d308c43b
+	github.com/FloatTech/AnimeAPI v1.4.1-0.20220520130802-b8c30f649145
 	github.com/FloatTech/sqlite v0.2.1
-	github.com/FloatTech/zbputils v1.3.2-0.20220319114731-e5088958ce00
+	github.com/FloatTech/zbputils v1.4.1-0.20220525034822-233c3292b457
 	github.com/antchfx/htmlquery v1.2.4
 	github.com/corona10/goimagehash v1.0.3
 	github.com/fogleman/gg v1.3.0
 	github.com/fumiama/cron v1.3.0
-	github.com/fumiama/go-base16384 v1.4.0
-	github.com/fumiama/go-registry v0.1.1
+	github.com/fumiama/go-base16384 v1.5.2
+	github.com/fumiama/go-registry v0.1.6
 	github.com/fumiama/gofastTEA v0.0.10
 	github.com/fumiama/gotracemoe v0.0.3
 	github.com/fumiama/sqlite3 v1.14.6
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0
 	github.com/jinzhu/gorm v1.9.16
+	github.com/jozsefsallai/gophersauce v1.0.1
 	github.com/mroth/weightedrand v0.4.1
 	github.com/pkumza/numcn v1.0.0
-	github.com/shirou/gopsutil/v3 v3.22.2
+	github.com/shirou/gopsutil/v3 v3.22.3
 	github.com/sirupsen/logrus v1.8.1
-	github.com/tidwall/gjson v1.14.0
-	github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220314043738-2ff63b4ac217
-	golang.org/x/image v0.0.0-20220302094943-723b81ca9867
+	github.com/tidwall/gjson v1.14.1
+	github.com/wcharczuk/go-chart/v2 v2.1.0
+	github.com/wdvxdr1123/ZeroBot v1.5.2-0.20220509035736-f3ad8fa960d7
+	golang.org/x/image v0.0.0-20220413100746-70e8d0d3baa9
 )
 
 require (
+	github.com/RomiChan/syncx v0.0.0-20220404072119-d7ea0ae15a4c // indirect
 	github.com/RomiChan/websocket v1.4.3-0.20220123145318-307a86b127bc // indirect
 	github.com/antchfx/xpath v1.2.0 // indirect
 	github.com/disintegration/imaging v1.6.2 // indirect
 	github.com/ericpauley/go-quantize v0.0.0-20200331213906-ae555eb2afa4 // indirect
+	github.com/gabriel-vasile/mimetype v1.0.4 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
-	github.com/mattn/go-sqlite3 v1.14.12 // indirect
 	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
-	github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
+	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.0 // indirect
 	github.com/tklauser/go-sysconf v0.3.10 // indirect
 	github.com/tklauser/numcpus v0.4.0 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
-	golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
-	golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 // indirect
+	golang.org/x/net v0.0.0-20201021035429-f5854403a974 // indirect
+	golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
 	golang.org/x/text v0.3.7 // indirect
-	modernc.org/libc v1.14.11 // indirect
+	modernc.org/libc v1.14.6 // indirect
 	modernc.org/mathutil v1.4.1 // indirect
-	modernc.org/memory v1.0.6 // indirect
+	modernc.org/memory v1.0.5 // indirect
 )

go.sum

@@ -1,10 +1,12 @@
-github.com/FloatTech/AnimeAPI v1.3.2-0.20220319114940-c6c7d308c43b h1:lgYo6Q8s9yf/mkb2AeXS2d6mVrzNSLrDKf/FeNM5oxg=
-github.com/FloatTech/AnimeAPI v1.3.2-0.20220319114940-c6c7d308c43b/go.mod h1:VgjXeR2M2wxs43Rmh9/3ybn+gAtzSFRwBmb/rXFEwsM=
+github.com/FloatTech/AnimeAPI v1.4.1-0.20220520130802-b8c30f649145 h1:COSibysiEmRsI7pICkZMdaX6XM35mlqbtB3f4Tbf6ow=
+github.com/FloatTech/AnimeAPI v1.4.1-0.20220520130802-b8c30f649145/go.mod h1:7lhHG03Mqoze1ig/zXnzT3WZGSzdwCl6jk1Eh0f/T9s=
 github.com/FloatTech/sqlite v0.2.1 h1:9t6Me48XJJCIoPy4nLRvcdhcVKfT0c2lilp7SEKROG8=
 github.com/FloatTech/sqlite v0.2.1/go.mod h1:6NfHRzqOo9RWeMJEoAQVuo51Omd5LFNxCNQhMF02/9U=
-github.com/FloatTech/zbputils v1.3.2-0.20220319114731-e5088958ce00 h1:aNrYgJ4wTF7bUpbOt3CZPBn2/LeCOCicRqUBMJ8vgUw=
-github.com/FloatTech/zbputils v1.3.2-0.20220319114731-e5088958ce00/go.mod h1:Z4pVG8bHlDgVuPjgPvMyylPOBrroFq6x3a5QSVK1V08=
+github.com/FloatTech/zbputils v1.4.1-0.20220525034822-233c3292b457 h1:V6O5IqwT2oGAJTDg8WU3C2v7ReULUY3lXaVCd56ABqo=
+github.com/FloatTech/zbputils v1.4.1-0.20220525034822-233c3292b457/go.mod h1:Cf2wAFtq7OUj4RUHcSQtcAYgAspP06wQseKZwtCJRXQ=
 github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
+github.com/RomiChan/syncx v0.0.0-20220404072119-d7ea0ae15a4c h1:cNPOdTNiVwxLpROLjXCgbIPvdkE+BwvxDvgmdYmWx6Q=
+github.com/RomiChan/syncx v0.0.0-20220404072119-d7ea0ae15a4c/go.mod h1:KqZzu7slNKROh3TSYEH/IUMG6f4M+1qubZ5e52QypsE=
 github.com/RomiChan/websocket v1.4.3-0.20220123145318-307a86b127bc h1:AAx50/fb/xS4lvsdQg+bFbGvqSDhyV1MF+p2PLCamZ0=
 github.com/RomiChan/websocket v1.4.3-0.20220123145318-307a86b127bc/go.mod h1:OMmITAib6POA37xCichWM0aRnoVpSMZO1rB/G01wrr0=
 github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
@@ -28,19 +30,20 @@ github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 h1:Yzb9+7DP
 github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0=
 github.com/fogleman/gg v1.3.0 h1:/7zJX8F6AaYQc57WQCyN9cAIz+4bCJGO9B+dyW29am8=
 github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
-github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fumiama/cron v1.3.0 h1:ZWlwuexF+HQHl3cYytEE5HNwD99q+3vNZF1GrEiXCFo=
 github.com/fumiama/cron v1.3.0/go.mod h1:bz5Izvgi/xEUI8tlBN8BI2jr9Moo8N4or0KV8xXuPDY=
-github.com/fumiama/go-base16384 v1.4.0 h1:4KrtewnmAChrZjPA7/QYc72t+vvsKF+DYB0q1iRPdpo=
-github.com/fumiama/go-base16384 v1.4.0/go.mod h1:OEn+947GV5gsbTAnyuUW/SrfxJYUdYupSIQXOuGOcXM=
-github.com/fumiama/go-registry v0.1.1 h1:cmCRizjXHFW2ApwUHCXi8wKLJ6Gtt4GrShJlamGPbVI=
-github.com/fumiama/go-registry v0.1.1/go.mod h1:iJT3DVgH7KXpJZs6waXEjnWtJPUBBGhF+ByJIMRfngk=
+github.com/fumiama/go-base16384 v1.5.2 h1:cbxXTcDH92PNgG7bEBwiCEoWb5O+nwZKxKOG94ilFo8=
+github.com/fumiama/go-base16384 v1.5.2/go.mod h1:OEn+947GV5gsbTAnyuUW/SrfxJYUdYupSIQXOuGOcXM=
+github.com/fumiama/go-registry v0.1.6 h1:Ee/tXCCIR/xt8celhbbw0W/xDMdhAXLwy2YFBB/LWFk=
+github.com/fumiama/go-registry v0.1.6/go.mod h1:dIUVbiOgfk9oZcsgwDvNLC72i+ctibVukSXR/9bLviI=
 github.com/fumiama/gofastTEA v0.0.10 h1:JJJ+brWD4kie+mmK2TkspDXKzqq0IjXm89aGYfoGhhQ=
 github.com/fumiama/gofastTEA v0.0.10/go.mod h1:RIdbYZyB4MbH6ZBlPymRaXn3cD6SedlCu5W/HHfMPBk=
 github.com/fumiama/gotracemoe v0.0.3 h1:iI5EbE9A3UUbfukG6+/soYPjp1S31eCNYf4tw7s6/Jc=
 github.com/fumiama/gotracemoe v0.0.3/go.mod h1:tyqahdUzHf0bQIAVY/GYmDWvYYe5ik1ZbhnGYh+zl40=
 github.com/fumiama/sqlite3 v1.14.6 h1:+e+iygyiDXQJVi7xeXIviBvR7hAc5y20WA9hRwfKn10=
 github.com/fumiama/sqlite3 v1.14.6/go.mod h1:Xx9a2/OtHuy9pBjow0N+bE/RhNeZ7zZz5xh25vqbA5A=
+github.com/gabriel-vasile/mimetype v1.0.4 h1:uBejfH8l3/2f+5vjl1e4xIaSyNEhRBZ5N/ij7ohpNd8=
+github.com/gabriel-vasile/mimetype v1.0.4/go.mod h1:6CDPel/o/3/s4+bp6kIbsWATq8pmgOisOPG40CJa6To=
 github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
@@ -50,26 +53,23 @@ github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZ
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
+github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY=
 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=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
 github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/jinzhu/gorm v1.9.16 h1:+IyIjPEABKRpsu/F8OvDPy9fyQlgsg2luMV2ZIH5i5o=
 github.com/jinzhu/gorm v1.9.16/go.mod h1:G3LB3wezTOWM2ITLzPxEXgSkOXAntiLHS7UdBefADcs=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 github.com/jinzhu/now v1.0.1 h1:HjfetcXq097iXP0uoPCdnM4Efp5/9MsM0/M+XOTeR3M=
 github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
+github.com/jozsefsallai/gophersauce v1.0.1 h1:BA3ovtQRrAb1qYU9JoRLbDHpxnDunlNcEkEfhCvDDCM=
+github.com/jozsefsallai/gophersauce v1.0.1/go.mod h1:YVEI7djliMTmZ1Vh01YPF8bUHi+oKhe3yXgKf1T49vg=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
-github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/lib/pq v1.1.1 h1:sJZmqHoEaY7f+NPP8pgLB/WxulyR3fewgCM2qaSlBb4=
 github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
@@ -77,53 +77,42 @@ github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
+github.com/mattn/go-sqlite3 v1.14.0 h1:mLyGNKR8+Vv9CAU7PphKa2hkEqxxhn8i32J6FPj1/QA=
 github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus=
-github.com/mattn/go-sqlite3 v1.14.12 h1:TJ1bhYJPV44phC+IMu1u2K/i5RriLTPe+yc68XDJ1Z0=
-github.com/mattn/go-sqlite3 v1.14.12/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/mroth/weightedrand v0.4.1 h1:rHcbUBopmi/3x4nnrvwGJBhX9d0vk+KgoLUZeDP6YyI=
 github.com/mroth/weightedrand v0.4.1/go.mod h1:3p2SIcC8al1YMzGhAIoXD+r9olo/g/cdJgAD905gyNE=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
-github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/pkumza/numcn v1.0.0 h1:ZT5cf9IJkUZgRgEtCiNNykk0RwsrKXSTsvDHOwUTzgE=
 github.com/pkumza/numcn v1.0.0/go.mod h1:QSeH+al9dWCd8di5HZM/ZqHqhZmUKfph572e9Ev/ETc=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
-github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c h1:NRoLoZvkBTKvR5gQLgA3e0hqjkY9u1wm+iOL45VN/qI=
-github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
-github.com/shirou/gopsutil/v3 v3.22.2 h1:wCrArWFkHYIdDxx/FSfF5RB4dpJYW6t7rcp3+zL8uks=
-github.com/shirou/gopsutil/v3 v3.22.2/go.mod h1:WapW1AOOPlHyXr+yOyw3uYx36enocrtSoSBy0L5vUHY=
-github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
+github.com/shirou/gopsutil/v3 v3.22.3 h1:UebRzEomgMpv61e3hgD1tGooqX5trFbdU/ehphbHd00=
+github.com/shirou/gopsutil/v3 v3.22.3/go.mod h1:D01hZJ4pVHPpCTZ3m3T2+wDF2YAGfd+H4ifUguaQzHM=
 github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
-github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816/go.mod h1:tzym/CEb5jnFI+Q0k4Qq3+LvRF4gO3E2pxS8fHP8jcA=
-github.com/tidwall/gjson v1.13.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
-github.com/tidwall/gjson v1.14.0 h1:6aeJ0bzojgWLa82gDQHcx3S0Lr/O51I9bJ5nv6JFx5w=
-github.com/tidwall/gjson v1.14.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
+github.com/tidwall/gjson v1.14.1 h1:iymTbGkQBhveq21bEvAQ81I0LEBork8BFe1CUZXdyuo=
+github.com/tidwall/gjson v1.14.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
 github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
 github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
 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.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs=
 github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw=
 github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk=
-github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8=
 github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o=
 github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ=
-github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220314043738-2ff63b4ac217 h1:mJPi1JVivQ3F9fDZUiGE8pW9ShNct01C8yqBPcbcepI=
-github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220314043738-2ff63b4ac217/go.mod h1:NwXIp7PgjV+kUALMXJ4v4/3QcsRSOodtjhLekuPXFog=
+github.com/wcharczuk/go-chart/v2 v2.1.0 h1:tY2slqVQ6bN+yHSnDYwZebLQFkphK4WNrVwnt7CJZ2I=
+github.com/wcharczuk/go-chart/v2 v2.1.0/go.mod h1:yx7MvAVNcP/kN9lKXM/NTce4au4DFN99j6i1OwDclNA=
+github.com/wdvxdr1123/ZeroBot v1.5.2-0.20220509035736-f3ad8fa960d7 h1:GDJ+ZhbaGGBdlaT6qljgt61A/rlZdrNtA5fQyb5uVP4=
+github.com/wdvxdr1123/ZeroBot v1.5.2-0.20220509035736-f3ad8fa960d7/go.mod h1:LJ+VOf523i3IrykuLK53UEeWqnAclRL5d2wGT4sS4Zk=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=
 github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
@@ -131,29 +120,25 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20220314234724-5d542ad81a58 h1:L8CkJyVoa0/NslN3RUMLgasK5+KatNvyRGQ9QyCYAfc=
 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.0.0-20220302094943-723b81ca9867 h1:TcHcE0vrmgzNH1v3ppjcMGbhG5+9fMuvOmUYwNEF4q4=
-golang.org/x/image v0.0.0-20220302094943-723b81ca9867/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
+golang.org/x/image v0.0.0-20200927104501-e162460cd6b5/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/image v0.0.0-20220413100746-70e8d0d3baa9 h1:LRtI4W37N+KFebI/qV0OFiLUv4GLOWeEW5hn/KEJvxE=
+golang.org/x/image v0.0.0-20220413100746-70e8d0d3baa9/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974 h1:IX6qOQeG5uLjB/hjjwjedwfjND0hgjPMMyO1RoIXQNI=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20220225172249-27dd8689420f h1:oA4XRj0qtSt8Yo1Zms0CUlsT3KG69V2UGQWPBxujDmc=
-golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-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=
-golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -162,14 +147,13 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210902050250-f475640dd07b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 h1:y/woIyUBFbpQGKS0u1aHF/40WUDnek3fPOyD08H5Vng=
-golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0=
+golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -184,9 +168,6 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
@@ -206,7 +187,6 @@ modernc.org/cc/v3 v3.35.17/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g
 modernc.org/cc/v3 v3.35.18/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
 modernc.org/cc/v3 v3.35.20/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
 modernc.org/cc/v3 v3.35.22/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
-modernc.org/cc/v3 v3.35.24/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI=
 modernc.org/ccgo/v3 v3.9.5/go.mod h1:umuo2EP2oDSBnD3ckjaVUXMrmeAw8C8OSICVa0iFf60=
 modernc.org/ccgo/v3 v3.10.0/go.mod h1:c0yBmkRFi7uW4J7fwx/JiijwOjeAeR2NoSaRVFPmjMw=
 modernc.org/ccgo/v3 v3.11.0/go.mod h1:dGNposbDp9TOZ/1KBxghxtUp/bzErD0/0QW4hhSaBMI=
@@ -248,12 +228,7 @@ modernc.org/ccgo/v3 v3.13.1/go.mod h1:aBYVOUfIlcSnrsRVU8VRS35y2DIfpgkmVkYZ0tpIXi
 modernc.org/ccgo/v3 v3.15.9/go.mod h1:md59wBwDT2LznX/OTCPoVS6KIsdRgY8xqQwBV+hkTH0=
 modernc.org/ccgo/v3 v3.15.10/go.mod h1:wQKxoFn0ynxMuCLfFD09c8XPUCc8obfchoVR9Cn0fI8=
 modernc.org/ccgo/v3 v3.15.12/go.mod h1:VFePOWoCd8uDGRJpq/zfJ29D0EVzMSyID8LCMWYbX6I=
-modernc.org/ccgo/v3 v3.15.14/go.mod h1:144Sz2iBCKogb9OKwsu7hQEub3EVgOlyI8wMUPGKUXQ=
-modernc.org/ccgo/v3 v3.15.15/go.mod h1:z5qltXjU4PJl0pE5nhYQCvA9DhPHiWsl5GWl89+NSYE=
-modernc.org/ccgo/v3 v3.15.16/go.mod h1:XbKRMeMWMdq712Tr5ECgATYMrzJ+g9zAZEj2ktzBe24=
-modernc.org/ccgo/v3 v3.15.17/go.mod h1:bofnFkpRFf5gLY+mBZIyTW6FEcp26xi2lgOFk2Rlvs0=
 modernc.org/ccorpus v1.11.1/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ=
-modernc.org/ccorpus v1.11.6/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ=
 modernc.org/httpfs v1.0.6/go.mod h1:7dosgurJGp0sPaRanU53W4xZYKh14wfzX420oZADeHM=
 modernc.org/libc v1.9.8/go.mod h1:U1eq8YWr/Kc1RWCMFUWEdkTg8OTcfLw2kY8EDwl039w=
 modernc.org/libc v1.9.11/go.mod h1:NyF3tsA5ArIjJ83XB0JlqhjTabTCHm9aX4XMPHyQn0Q=
@@ -297,21 +272,16 @@ modernc.org/libc v1.14.1/go.mod h1:npFeGWjmZTjFeWALQLrvklVmAxv4m80jnG3+xI8FdJk=
 modernc.org/libc v1.14.2/go.mod h1:MX1GBLnRLNdvmK9azU9LCxZ5lMyhrbEMK8rG3X/Fe34=
 modernc.org/libc v1.14.3/go.mod h1:GPIvQVOVPizzlqyRX3l756/3ppsAgg1QgPxjr5Q4agQ=
 modernc.org/libc v1.14.5/go.mod h1:2PJHINagVxO4QW/5OQdRrvMYo+bm5ClpUFfyXCYl9ak=
+modernc.org/libc v1.14.6 h1:SSiZiE5199iYsGM9gtkDj90xqcXVwubWG8CtoYE+Mnk=
 modernc.org/libc v1.14.6/go.mod h1:2PJHINagVxO4QW/5OQdRrvMYo+bm5ClpUFfyXCYl9ak=
-modernc.org/libc v1.14.7/go.mod h1:f8xfWXW8LW41qb4X5+huVQo5dcfPlq7Cbny2TDheMv0=
-modernc.org/libc v1.14.8/go.mod h1:9+JCLb1MWSY23smyOpIPbd5ED+rSS/ieiDWUpdyO3mo=
-modernc.org/libc v1.14.10/go.mod h1:y1MtIWhwpJFpLYm6grAThtuXJKEsY6xkdZmXbRngIdo=
-modernc.org/libc v1.14.11 h1:ivxNmUkfp5iSGAGMIjylvx5R53s6QTJW9qUru1yrnk4=
-modernc.org/libc v1.14.11/go.mod h1:l5/Mz/GrZwOqzwRHA3abgSCnSeJzzTl+Ify0bAwKbAw=
 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/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=
 modernc.org/memory v1.0.4/go.mod h1:nV2OApxradM3/OVbs2/0OsP6nPfakXpi50C7dcoHXlc=
+modernc.org/memory v1.0.5 h1:XRch8trV7GgvTec2i7jc33YlUI0RKVDBvZ5eZ5m8y14=
 modernc.org/memory v1.0.5/go.mod h1:B7OYswTRnfGg+4tDH1t1OeUNnsy2viGTdME4tzd+IjM=
-modernc.org/memory v1.0.6 h1:5IaT/LChMrMdxLCy/a4qmb+7SzGiU8/ozPgkEOrfvFw=
-modernc.org/memory v1.0.6/go.mod h1:/0wo5ibyrQiaoUoH7f9D8dnglAmILJ5/cxZlRECf+Nw=
 modernc.org/opt v0.1.1/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
 modernc.org/strutil v1.1.1/go.mod h1:DE+MQQ/hjKBZS2zNInV5hhcipt5rLPWkmpbGeW5mmdw=
 modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=

kanban/banner.go

@@ -10,7 +10,7 @@ import (
 var (
 	info = [...]string{
 		"* OneBot + ZeroBot + Golang",
-		"* Version 1.3.2 - 2022-03-13 13:21:15 +0800 CST",
+		"* Version 1.4.1-beta3 - 2022-05-25 11:58:18 +0800 CST",
 		"* Copyright © 2020 - 2022 FloatTech. All Rights Reserved.",
 		"* Project: https://github.com/FloatTech/ZeroBot-Plugin",
 	}

main.go

@@ -1,10 +1,12 @@
 package main
 
 import (
+	"encoding/json"
 	"flag"
 	"fmt"
 	"math/rand"
 	"os"
+	"strconv"
 	"time"
 
 	"github.com/FloatTech/ZeroBot-Plugin/kanban" // 在最前打印 banner
@@ -55,7 +57,6 @@ import (
 	//                          vvvvvvvvvvvvvv                          //
 	//                               vvvv                               //
 
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/acgimage"       // 随机图片与AI点评
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/ai_false"       // 服务器监控
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/aiwife"         // 随机老婆
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/b14"            // base16384加解密
@@ -73,12 +74,14 @@ import (
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/drift_bottle"   // 漂流瓶
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/emojimix"       // 合成emoji
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/epidemic"       // 城市疫情查询
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/font"           // 渲染任意文字到图片
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/fortune"        // 运势
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/funny"          // 笑话
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/genshin"        // 原神抽卡
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/gif"            // 制图
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/github"         // 搜索GitHub仓库
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/hs"             // 炉石
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/hyaku"          // 百人一首
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/image_finder"   // 关键字搜图
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/inject"         // 注入指令
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/jandan"         // 煎蛋网无聊图
@@ -93,6 +96,7 @@ import (
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/novel"          // 铅笔小说网搜索
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/nsfw"           // nsfw图片识别
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/omikuji"        // 浅草寺求签
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/qqwife"         // 一群一天一夫一妻制群老婆
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/reborn"         // 投胎
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/runcode"        // 在线运行代码
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/saucenao"       // 以图搜图
@@ -101,11 +105,13 @@ import (
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/setutime"       // 来份涩图
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/shadiao"        // 沙雕app
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/shindan"        // 测定
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/tarot"          // 抽塔罗牌
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/tiangou"        // 舔狗日记
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/tracemoe"       // 搜番
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/translation"    // 翻译
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/vtb_quotation"  // vtb语录
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/wangyiyun"      // 网易云音乐热评
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/word_count"     // 聊天热词
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/wordle"         // 猜单词
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/ymgal"          // 月幕galgame
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/zaobao"         // 早报
@@ -155,31 +161,26 @@ import (
 	// -----------------------以上为内置依赖，勿动------------------------ //
 )
 
-var (
-	nicks  = []string{"ATRI", "atri", "亚托莉", "アトリ"}
-	token  *string
-	url    *string
-	adana  *string
-	prefix *string
-)
-
 func init() {
+	sus := make([]int64, 0, 16)
 	// 解析命令行参数
+	// 输入 `-g 监听地址:端口` 指定 gui 访问地址，默认 127.0.0.1:3000
+	// g := flag.String("g", "127.0.0.1:3000", "Set web gui listening address.")
 	d := flag.Bool("d", false, "Enable debug level log and higher.")
 	w := flag.Bool("w", false, "Enable warning level log and higher.")
 	h := flag.Bool("h", false, "Display this help.")
-	// 解析命令行参数，输入 `-g 监听地址:端口` 指定 gui 访问地址，默认 127.0.0.1:3000
-	// g := flag.String("g", "127.0.0.1:3000", "Set web gui listening address.")
-
 	// 直接写死 AccessToken 时，请更改下面第二个参数
-	token = flag.String("t", "", "Set AccessToken of WSClient.")
+	token := flag.String("t", "", "Set AccessToken of WSClient.")
 	// 直接写死 URL 时，请更改下面第二个参数
-	url = flag.String("u", "ws://127.0.0.1:6700", "Set Url of WSClient.")
+	url := flag.String("u", "ws://127.0.0.1:6700", "Set Url of WSClient.")
 	// 默认昵称
-	adana = flag.String("n", "椛椛", "Set default nickname.")
-	prefix = flag.String("p", "/", "Set command prefix.")
+	adana := flag.String("n", "椛椛", "Set default nickname.")
+	prefix := flag.String("p", "/", "Set command prefix.")
+	runcfg := flag.String("c", "", "Run from config file.")
+	save := flag.String("s", "", "Save default config to file and exit.")
 
 	flag.Parse()
+
 	if *h {
 		kanban.PrintBanner()
 		fmt.Println("Usage:")
@@ -194,8 +195,61 @@ func init() {
 		}
 	}
 
+	for _, s := range flag.Args() {
+		i, err := strconv.ParseInt(s, 10, 64)
+		if err != nil {
+			continue
+		}
+		sus = append(sus, i)
+	}
+
+	// 通过代码写死的方式添加主人账号
+	// sus = append(sus, 12345678)
+	// sus = append(sus, 87654321)
+
 	// 启用 gui
 	// webctrl.InitGui(*g)
+
+	if *runcfg != "" {
+		f, err := os.Open(*runcfg)
+		if err != nil {
+			panic(err)
+		}
+		config.W = make([]*driver.WSClient, 0, 2)
+		err = json.NewDecoder(f).Decode(&config)
+		f.Close()
+		if err != nil {
+			panic(err)
+		}
+		config.Z.Driver = make([]zero.Driver, len(config.W))
+		for i, w := range config.W {
+			config.Z.Driver[i] = w
+		}
+		logrus.Infoln("[main] 从", *runcfg, "读取配置文件")
+		return
+	}
+
+	config.W = []*driver.WSClient{driver.NewWebSocketClient(*url, *token)}
+	config.Z = zero.Config{
+		NickName:      append([]string{*adana}, "ATRI", "atri", "亚托莉", "アトリ"),
+		CommandPrefix: *prefix,
+		SuperUsers:    sus,
+		Driver:        []zero.Driver{config.W[0]},
+	}
+
+	if *save != "" {
+		f, err := os.Create(*save)
+		if err != nil {
+			panic(err)
+		}
+		err = json.NewEncoder(f).Encode(&config)
+		f.Close()
+		if err != nil {
+			panic(err)
+		}
+		logrus.Infoln("[main] 配置文件已保存到", *save)
+		os.Exit(0)
+	}
 }
 
 func main() {
@@ -209,15 +263,5 @@ func main() {
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SendChain(message.Text(kanban.Kanban()))
 		})
-	zero.RunAndBlock(
-		zero.Config{
-			NickName:      append([]string{*adana}, nicks...),
-			CommandPrefix: *prefix,
-			// SuperUsers 某些功能需要主人权限，可通过以下两种方式修改
-			// SuperUsers: []string{"12345678", "87654321"}, // 通过代码写死的方式添加主人账号
-			SuperUsers: flag.Args(), // 通过命令行参数的方式添加主人账号
-			Driver:     []zero.Driver{driver.NewWebSocketClient(*url, *token)},
-		},
-		process.GlobalInitMutex.Unlock,
-	)
+	zero.RunAndBlock(config.Z, process.GlobalInitMutex.Unlock)
 }

plugin/acgimage/classify.go

@@ -1,173 +0,0 @@
-// Package acgimage 随机图片与AI点评
-package acgimage
-
-import (
-	"net/url"
-	"strings"
-
-	zero "github.com/wdvxdr1123/ZeroBot"
-	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/AnimeAPI/classify"
-
-	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
-	"github.com/FloatTech/zbputils/ctxext"
-	"github.com/FloatTech/zbputils/img/pool"
-	"github.com/FloatTech/zbputils/web"
-)
-
-const (
-	lolipxy   = "https://sayuri.fumiama.top/dice?class=0&loli=true&r18=true"
-	apihead   = "https://sayuri.fumiama.top/img?path="
-	apiheadv6 = "http://aikae.v6.army:62002/img?arg=get&name="
-)
-
-var (
-	// r18有一定保护，一般不会发出图片
-	randapi = "&loli=true&r18=true"
-	msgof   = make(map[int64]message.MessageID)
-	block   = false
-)
-
-func init() { // 插件主体
-	engine := control.Register("acgimage", order.AcquirePrio(), &control.Options{
-		DisableOnDefault: false,
-		Help: "随机图片与AI点评\n" +
-			"- 随机图片(评级大于6的图将私发)\n" +
-			"- 直接随机(无r18检测，务必小心，仅管理可用)\n" +
-			"- 设置随机图片网址[url]\n" +
-			"- 太涩了(撤回最近发的图)\n" +
-			"- 评价图片(发送一张图片让bot评分)",
-	}).ApplySingle(ctxext.DefaultSingle)
-	engine.OnRegex(`^设置随机图片网址(.*)$`, zero.OnlyPrivate, zero.SuperUserPermission).SetBlock(true).
-		Handle(func(ctx *zero.Ctx) {
-			url := ctx.State["regex_matched"].([]string)[1]
-			if !strings.HasPrefix(url, "http") {
-				ctx.SendChain(message.Text("URL非法!"))
-			} else {
-				randapi = url
-				ctx.SendChain(message.Text("设置好啦"))
-			}
-		})
-	// 有保护的随机图片
-	engine.OnFullMatch("随机图片", zero.OnlyGroup).Limit(ctxext.LimitByUser).SetBlock(true).
-		Handle(func(ctx *zero.Ctx) {
-			class, dhash, _, err := classify.Classify(randapi, true)
-			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
-				return
-			}
-			err = reply(ctx, class, dhash, classify.Comments[class])
-			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
-				return
-			}
-		})
-	// 直接随机图片，无r18保护，后果自负。如果出r18图可尽快通过发送"太涩了"撤回
-	engine.OnFullMatch("直接随机", zero.UserOrGrpAdmin).SetBlock(true).
-		Handle(func(ctx *zero.Ctx) {
-			if block {
-				ctx.SendChain(message.Text("请稍后再试哦"))
-			} else if randapi != "" {
-				block = true
-				var url string
-				if randapi[0] == '&' {
-					url = lolipxy
-				} else {
-					url = randapi
-				}
-				setLastMsg(ctx.Event.GroupID, message.NewMessageID(
-					ctx.SendGroupForwardMessage(ctx.Event.GroupID,
-						message.Message{
-							ctxext.FakeSenderForwardNode(ctx,
-								message.Image(url).Add("cache", "0"),
-							),
-						}).Get("message_id").String()))
-				block = false
-			}
-		})
-	// 撤回最后的直接随机图片
-	engine.OnFullMatch("太涩了", zero.OnlyGroup).SetBlock(true).
-		Handle(func(ctx *zero.Ctx) {
-			msg, ok := msgof[ctx.Event.GroupID]
-			if ok {
-				ctx.DeleteMessage(msg)
-				delete(msgof, ctx.Event.GroupID)
-			}
-		})
-	// 上传一张图进行评价
-	engine.OnKeywordGroup([]string{"评价图片"}, zero.OnlyGroup, zero.MustProvidePicture).SetBlock(true).
-		Handle(func(ctx *zero.Ctx) {
-			ctx.SendChain(message.Text("少女祈祷中..."))
-			url := ctx.State["image_url"].([]string)[0]
-			class, _, _, err := classify.Classify(url, true)
-			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
-				return
-			}
-			ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(classify.Comments[class]))
-		})
-	engine.OnRegex(`^给你点提示哦：(.*)$`, zero.OnlyPrivate).SetBlock(true).
-		Handle(func(ctx *zero.Ctx) {
-			dhash := ctx.State["regex_matched"].([]string)[1]
-			if len(dhash) == 5*3 {
-				var u string
-				if web.IsSupportIPv6 {
-					u = apiheadv6 + dhash + ".webp"
-				} else {
-					u = apihead + dhash
-				}
-
-				err := pool.SendRemoteImageFromPool(dhash, u, ctxext.Send(ctx), ctxext.GetMessage(ctx))
-				if err != nil {
-					ctx.SendChain(message.Text("ERROR:", err))
-					return
-				}
-			}
-		})
-}
-
-func setLastMsg(id int64, msg message.MessageID) {
-	msgof[id] = msg
-}
-
-func reply(ctx *zero.Ctx, class int, dhash string, comment string) error {
-	b14, err := url.QueryUnescape(dhash)
-	if err != nil {
-		return err
-	}
-
-	var u string
-	if web.IsSupportIPv6 {
-		u = apiheadv6 + dhash + ".webp"
-	} else {
-		u = apihead + dhash
-	}
-
-	var send ctxext.NoCtxSendMsg
-	if class > 5 {
-		send = ctxext.SendTo(ctx, ctx.Event.UserID)
-		if dhash != "" {
-			ctx.SendChain(message.Text(comment + "\n给你点提示哦：" + b14))
-		} else {
-			ctx.SendChain(message.Text(comment))
-		}
-	} else {
-		send = func(msg interface{}) int64 {
-			return ctx.SendGroupForwardMessage(ctx.Event.GroupID, message.Message{
-				ctxext.FakeSenderForwardNode(ctx, append(
-					msg.(message.Message),
-					message.Text(comment))...,
-				),
-			}).Get("message_id").Int()
-		}
-	}
-
-	return pool.SendRemoteImageFromPool(b14, u, send, func(i int64) zero.Message {
-		if class > 5 {
-			return ctxext.GetMessage(ctx)(i)
-		}
-		return ctxext.GetFirstMessageInForward(ctx)(i)
-	})
-}

plugin/ai_false/ai_false.go

@@ -12,14 +12,12 @@ import (
 	"github.com/shirou/gopsutil/v3/disk"
 	"github.com/shirou/gopsutil/v3/mem"
 
-	"github.com/FloatTech/zbputils/control/order"
-
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 )
 
 func init() { // 插件主体
-	engine := control.Register("aifalse", order.AcquirePrio(), &control.Options{
+	engine := control.Register("aifalse", &control.Options{
 		DisableOnDefault: false,
 		Help: "AIfalse\n" +
 			"- 查询计算机当前活跃度: [检查身体 | 自检 | 启动自检 | 系统状态]",

plugin/ai_reply/ai_tts.go

@@ -17,26 +17,11 @@ import (
 	"github.com/FloatTech/AnimeAPI/tts/mockingbird"
 	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const ttsServiceName = "tts"
 
-var (
-	t = &ttsInstances{
-		m: map[string]tts.TTS{
-			"百度女声":   baidutts.NewBaiduTTS(0),
-			"百度男声":   baidutts.NewBaiduTTS(1),
-			"百度度逍遥":  baidutts.NewBaiduTTS(3),
-			"百度度丫丫":  baidutts.NewBaiduTTS(4),
-			"拟声鸟阿梓":  mockingbird.NewMockingBirdTTS(0),
-			"拟声鸟药水哥": mockingbird.NewMockingBirdTTS(1),
-		},
-		l: []string{"拟声鸟阿梓", "拟声鸟药水哥", "百度女声", "百度男声", "百度度逍遥", "百度度丫丫"},
-	}
-	re = regexp.MustCompile(`(\-|\+)?\d+(\.\d+)?`)
-)
+var re = regexp.MustCompile(`(\-|\+)?\d+(\.\d+)?`)
 
 type ttsInstances struct {
 	sync.RWMutex
@@ -53,31 +38,55 @@ func (t *ttsInstances) List() []string {
 }
 
 func init() {
-	engine := control.Register(ttsServiceName, order.AcquirePrio(), &control.Options{
+	t := &ttsInstances{
+		m: map[string]tts.TTS{
+			"百度女声":   baidutts.NewBaiduTTS(0),
+			"百度男声":   baidutts.NewBaiduTTS(1),
+			"百度度逍遥":  baidutts.NewBaiduTTS(3),
+			"百度度丫丫":  baidutts.NewBaiduTTS(4),
+			"拟声鸟阿梓":  nil,
+			"拟声鸟文静":  nil,
+			"拟声鸟药水哥": nil,
+		},
+		l: []string{"拟声鸟阿梓", "拟声鸟文静", "拟声鸟药水哥", "百度女声", "百度男声", "百度度逍遥", "百度度丫丫"},
+	}
+	engine := control.Register(ttsServiceName, &control.Options{
 		DisableOnDefault: true,
 		Help: "语音回复(包括拟声鸟和百度)\n" +
 			"- @Bot 任意文本(任意一句话回复)\n" +
-			"- 设置语音模式[拟声鸟阿梓 | 拟声鸟药水哥 | 百度女声 | 百度男声| 百度度逍遥 | 百度度丫丫]\n" +
-			"- 设置默认语音模式[拟声鸟阿梓 | 拟声鸟药水哥 | 百度女声 | 百度男声| 百度度逍遥 | 百度度丫丫]\n",
+			"- 设置语音模式[拟声鸟阿梓 | 拟声鸟文静 | 拟声鸟药水哥 | 百度女声 | 百度男声| 百度度逍遥 | 百度度丫丫]\n" +
+			"- 设置默认语音模式[拟声鸟阿梓 | 拟声鸟文静 | 拟声鸟药水哥 | 百度女声 | 百度男声| 百度度逍遥 | 百度度丫丫]\n",
 	})
 	engine.OnMessage(zero.OnlyToMe).SetBlock(true).Limit(ctxext.LimitByUser).
 		Handle(func(ctx *zero.Ctx) {
 			msg := ctx.ExtractPlainText()
 			r := aireply.NewAIReply(getReplyMode(ctx))
-			tts := t.new(t.getSoundMode(ctx))
-			ctx.SendChain(message.Record(tts.Speak(ctx.Event.UserID, func() string {
-				reply := r.TalkPlain(msg, zero.BotConfig.NickName[0])
-				reply = re.ReplaceAllStringFunc(reply, func(s string) string {
-					f, err := strconv.ParseFloat(s, 64)
-					if err != nil {
-						log.Errorln("[tts]:", err)
-						return s
-					}
-					return numcn.EncodeFromFloat64(f)
+			tts, err := t.new(t.getSoundMode(ctx))
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			var reply string
+			if tts != nil {
+				rec, err := tts.Speak(ctx.Event.UserID, func() string {
+					reply = r.TalkPlain(msg, zero.BotConfig.NickName[0])
+					reply = re.ReplaceAllStringFunc(reply, func(s string) string {
+						f, err := strconv.ParseFloat(s, 64)
+						if err != nil {
+							log.Errorln("[tts]:", err)
+							return s
+						}
+						return numcn.EncodeFromFloat64(f)
+					})
+					log.Debugln("[tts]:", reply)
+					return reply
 				})
-				log.Println("[tts]:", reply)
-				return reply
-			})))
+				if err == nil {
+					ctx.SendChain(message.Record(rec))
+				} else {
+					ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(reply))
+				}
+			}
 		})
 	engine.OnRegex(`^设置语音模式(.*)$`, ctxext.FirstValueInList(t)).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
@@ -98,8 +107,27 @@ func init() {
 }
 
 // new 语音简单工厂
-func (t *ttsInstances) new(name string) tts.TTS {
-	return t.m[name]
+func (t *ttsInstances) new(name string) (ts tts.TTS, err error) {
+	t.RLock()
+	ts = t.m[name]
+	t.RUnlock()
+	if ts == nil {
+		switch name {
+		case "拟声鸟阿梓":
+			t.Lock()
+			ts, err = mockingbird.NewMockingBirdTTS(0)
+			t.Unlock()
+		case "拟声鸟文静":
+			t.Lock()
+			ts, err = mockingbird.NewMockingBirdTTS(1)
+			t.Unlock()
+		case "拟声鸟药水哥":
+			t.Lock()
+			ts, err = mockingbird.NewMockingBirdTTS(2)
+			t.Unlock()
+		}
+	}
+	return
 }
 
 func (t *ttsInstances) setSoundMode(ctx *zero.Ctx, name string) error {

plugin/ai_reply/main.go

@@ -10,8 +10,6 @@ import (
 	"github.com/FloatTech/zbputils/ctxext"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -21,7 +19,7 @@ const (
 var replyModes = [...]string{"青云客", "小爱"}
 
 func init() { // 插件主体
-	engine := control.Register(replyServiceName, order.AcquirePrio(), &control.Options{
+	engine := control.Register(replyServiceName, &control.Options{
 		DisableOnDefault: false,
 		Help: "人工智能回复\n" +
 			"- @Bot 任意文本(任意一句话回复)\n- 设置回复模式[青云客  |  小爱]\n- ",

plugin/aiwife/non-existent.go

@@ -9,8 +9,6 @@ import (
 	"github.com/FloatTech/zbputils/ctxext"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -18,7 +16,7 @@ const (
 )
 
 func init() { // 插件主体
-	control.Register("aiwife", order.AcquirePrio(), &control.Options{
+	control.Register("aiwife", &control.Options{
 		DisableOnDefault: false,
 		Help: "AIWife\n" +
 			"- waifu | 随机waifu",

plugin/atri/atri.go

@@ -14,8 +14,6 @@ import (
 
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/process"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -26,7 +24,7 @@ const (
 )
 
 func init() { // 插件主体
-	engine := control.Register(servicename, order.AcquirePrio(), &control.Options{
+	engine := control.Register(servicename, &control.Options{
 		DisableOnDefault: false,
 		Help: "本插件基于 ATRI ，为 Golang 移植版\n" +
 			"- ATRI醒醒\n- ATRI睡吧\n- 萝卜子\n- 喜欢 | 爱你 | 爱 | suki | daisuki | すき | 好き | 贴贴 | 老婆 | 亲一个 | mua\n" +
@@ -34,26 +32,16 @@ func init() { // 插件主体
 			"- 中午好 | 午安 | 午好\n- 晚安 | oyasuminasai | おやすみなさい | 晚好 | 晚上好\n- 高性能 | 太棒了 | すごい | sugoi | 斯国一 | よかった\n" +
 			"- 没事 | 没关系 | 大丈夫 | 还好 | 不要紧 | 没出大问题 | 没伤到哪\n- 好吗 | 是吗 | 行不行 | 能不能 | 可不可以\n- 啊这\n- 我好了\n- ？ | ? | ¿\n" +
 			"- 离谱\n- 答应我",
+		OnEnable: func(ctx *zero.Ctx) {
+			process.SleepAbout1sTo2s()
+			ctx.SendChain(message.Text("嗯呜呜……夏生先生……？"))
+		},
+		OnDisable: func(ctx *zero.Ctx) {
+			process.SleepAbout1sTo2s()
+			ctx.SendChain(message.Text("Zzz……Zzz……"))
+		},
 	})
-	zero.OnFullMatch("ATRI醒醒", zero.AdminPermission).SetBlock(true).
-		Handle(func(ctx *zero.Ctx) {
-			c, ok := control.Lookup(servicename)
-			if ok && !c.IsEnabledIn(ctx.Event.GroupID) {
-				c.Enable(ctx.Event.GroupID)
-				process.SleepAbout1sTo2s()
-				ctx.SendChain(message.Text("嗯呜呜……夏生先生……？"))
-			}
-		})
-	engine.OnFullMatch("ATRI睡吧", zero.AdminPermission).SetBlock(true).
-		Handle(func(ctx *zero.Ctx) {
-			c, ok := control.Lookup(servicename)
-			if ok && c.IsEnabledIn(ctx.Event.GroupID) {
-				c.Disable(ctx.Event.GroupID)
-				process.SleepAbout1sTo2s()
-				ctx.SendChain(message.Text("Zzz……Zzz……"))
-			}
-		})
-	engine.OnFullMatch("萝卜子", atriSleep).SetBlock(true).
+	engine.OnFullMatch("萝卜子", isAtriSleeping).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			process.SleepAbout1sTo2s()
 			switch rand.Intn(2) {
@@ -63,12 +51,12 @@ func init() { // 插件主体
 				ctx.SendChain(randRecord("RocketPunch.amr"))
 			}
 		})
-	engine.OnFullMatchGroup([]string{"喜欢", "爱你", "爱", "suki", "daisuki", "すき", "好き", "贴贴", "老婆", "亲一个", "mua"}, atriSleep, zero.OnlyToMe).SetBlock(true).
+	engine.OnFullMatchGroup([]string{"喜欢", "爱你", "爱", "suki", "daisuki", "すき", "好き", "贴贴", "老婆", "亲一个", "mua"}, isAtriSleeping, zero.OnlyToMe).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			process.SleepAbout1sTo2s()
 			ctx.SendChain(randImage("SUKI.jpg", "SUKI1.jpg", "SUKI2.png"))
 		})
-	engine.OnKeywordGroup([]string{"草你妈", "操你妈", "脑瘫", "废柴", "fw", "five", "废物", "战斗", "爬", "爪巴", "sb", "SB", "傻B"}, atriSleep, zero.OnlyToMe).SetBlock(true).
+	engine.OnKeywordGroup([]string{"草你妈", "操你妈", "脑瘫", "废柴", "fw", "five", "废物", "战斗", "爬", "爪巴", "sb", "SB", "傻B"}, isAtriSleeping, zero.OnlyToMe).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			process.SleepAbout1sTo2s()
 			ctx.SendChain(randImage("FN.jpg", "WQ.jpg", "WQ1.jpg"))
@@ -169,7 +157,7 @@ func init() { // 插件主体
 				))
 			}
 		})
-	engine.OnKeywordGroup([]string{"高性能", "太棒了", "すごい", "sugoi", "斯国一", "よかった"}, atriSleep, zero.OnlyToMe).SetBlock(true).
+	engine.OnKeywordGroup([]string{"高性能", "太棒了", "すごい", "sugoi", "斯国一", "よかった"}, isAtriSleeping, zero.OnlyToMe).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			process.SleepAbout1sTo2s()
 			ctx.SendChain(randText(
@@ -190,7 +178,7 @@ func init() { // 插件主体
 				"呣......我的高性能，毫无遗憾地施展出来了......",
 			))
 		})
-	engine.OnKeywordGroup([]string{"没事", "没关系", "大丈夫", "还好", "不要紧", "没出大问题", "没伤到哪"}, atriSleep, zero.OnlyToMe).SetBlock(true).
+	engine.OnKeywordGroup([]string{"没事", "没关系", "大丈夫", "还好", "不要紧", "没出大问题", "没伤到哪"}, isAtriSleeping, zero.OnlyToMe).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			process.SleepAbout1sTo2s()
 			ctx.SendChain(randText(
@@ -205,26 +193,26 @@ func init() { // 插件主体
 			))
 		})
 
-	engine.OnKeywordGroup([]string{"好吗", "是吗", "行不行", "能不能", "可不可以"}, atriSleep).SetBlock(true).
+	engine.OnKeywordGroup([]string{"好吗", "是吗", "行不行", "能不能", "可不可以"}, isAtriSleeping).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			process.SleepAbout1sTo2s()
 			if rand.Intn(2) == 0 {
 				ctx.SendChain(randImage("YES.png", "NO.jpg"))
 			}
 		})
-	engine.OnKeywordGroup([]string{"啊这"}, atriSleep).SetBlock(true).
+	engine.OnKeywordGroup([]string{"啊这"}, isAtriSleeping).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			process.SleepAbout1sTo2s()
 			if rand.Intn(2) == 0 {
 				ctx.SendChain(randImage("AZ.jpg", "AZ1.jpg"))
 			}
 		})
-	engine.OnKeywordGroup([]string{"我好了"}, atriSleep).SetBlock(true).
+	engine.OnKeywordGroup([]string{"我好了"}, isAtriSleeping).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			process.SleepAbout1sTo2s()
 			ctx.SendChain(message.Reply(ctx.Event.MessageID), randText("不许好！", "憋回去！"))
 		})
-	engine.OnFullMatchGroup([]string{"？", "?", "¿"}, atriSleep).SetBlock(true).
+	engine.OnFullMatchGroup([]string{"？", "?", "¿"}, isAtriSleeping).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			process.SleepAbout1sTo2s()
 			switch rand.Intn(5) {
@@ -234,7 +222,7 @@ func init() { // 插件主体
 				ctx.SendChain(randImage("WH.jpg", "WH1.jpg", "WH2.jpg", "WH3.jpg"))
 			}
 		})
-	engine.OnKeyword("离谱", atriSleep).SetBlock(true).
+	engine.OnKeyword("离谱", isAtriSleeping).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			switch rand.Intn(5) {
 			case 0:
@@ -243,7 +231,7 @@ func init() { // 插件主体
 				ctx.SendChain(randImage("WH.jpg"))
 			}
 		})
-	engine.OnKeyword("答应我", atriSleep, zero.OnlyToMe).SetBlock(true).
+	engine.OnKeyword("答应我", isAtriSleeping, zero.OnlyToMe).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			process.SleepAbout1sTo2s()
 			ctx.SendChain(randText("我无法回应你的请求"))
@@ -262,8 +250,8 @@ func randRecord(file ...string) message.MessageSegment {
 	return message.Record(res + file[rand.Intn(len(file))])
 }
 
-// atriSleep 凌晨0点到6点，ATRI 在睡觉，不回应任何请求
-func atriSleep(ctx *zero.Ctx) bool {
+// isAtriSleeping 凌晨0点到6点，ATRI 在睡觉，不回应任何请求
+func isAtriSleeping(ctx *zero.Ctx) bool {
 	if now := time.Now().Hour(); now >= 1 && now < 6 {
 		return false
 	}

plugin/b14/main.go

@@ -10,12 +10,10 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 func init() {
-	en := control.Register("base16384", order.AcquirePrio(), &control.Options{
+	en := control.Register("base16384", &control.Options{
 		DisableOnDefault: false,
 		Help: "base16384加解密\n" +
 			"- 加密xxx\n- 解密xxx\n- 用yyy加密xxx\n- 用yyy解密xxx",
@@ -35,7 +33,7 @@ func init() {
 			str := ctx.State["regex_matched"].([]string)[1]
 			es := base14.DecodeString(str)
 			if es != "" {
-				ctx.SendChain(message.Text(base14.DecodeString(es)))
+				ctx.SendChain(message.Text(es))
 			} else {
 				ctx.SendChain(message.Text("解密失败!"))
 			}

plugin/baidu/search.go

@@ -8,12 +8,11 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"
 
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/ctxext"
 )
 
 func init() {
-	control.Register("baidu", order.AcquirePrio(), &control.Options{
+	control.Register("baidu", &control.Options{
 		DisableOnDefault: false,
 		Help: "baidu\n" +
 			"- 百度下[xxx]",

plugin/bilibili/api.go

@@ -0,0 +1,179 @@
+package bilibili
+
+import (
+	"encoding/json"
+	"errors"
+	"io"
+	"net/http"
+
+	"github.com/FloatTech/zbputils/binary"
+	"github.com/FloatTech/zbputils/web"
+	"github.com/tidwall/gjson"
+)
+
+var (
+	errNeedCookie = errors.New("该api需要设置b站cookie，请发送命令设置cookie，例如\"设置b站cookie SESSDATA=82da790d,1663822823,06ecf*31\"")
+)
+
+type searchResult struct {
+	Mid    int64  `json:"mid"`
+	Uname  string `json:"uname"`
+	Gender int64  `json:"gender"`
+	Usign  string `json:"usign"`
+	Level  int64  `json:"level"`
+}
+
+// 搜索api：通过把触发指令传入的昵称找出uid返回
+func search(keyword string) (r []searchResult, err error) {
+	searchURL := "http://api.bilibili.com/x/web-interface/search/type?search_type=bili_user&keyword=" + keyword
+	data, err := web.GetData(searchURL)
+	if err != nil {
+		return
+	}
+	j := gjson.ParseBytes(data)
+	if j.Get("data.numResults").Int() == 0 {
+		err = errors.New("查无此人")
+		return
+	}
+	err = json.Unmarshal(binary.StringToBytes(j.Get("data.result").Raw), &r)
+	if err != nil {
+		return
+	}
+	return
+}
+
+type follower struct {
+	Mid      int    `json:"mid"`
+	Uname    string `json:"uname"`
+	Video    int    `json:"video"`
+	Roomid   int    `json:"roomid"`
+	Rise     int    `json:"rise"`
+	Follower int    `json:"follower"`
+	GuardNum int    `json:"guardNum"`
+	AreaRank int    `json:"areaRank"`
+}
+
+// 请求api
+func fansapi(uid string) (result follower, err error) {
+	fanURL := "https://api.vtbs.moe/v1/detail/" + uid
+	data, err := web.GetData(fanURL)
+	if err != nil {
+		return
+	}
+	if err = json.Unmarshal(data, &result); err != nil {
+		return
+	}
+	return
+}
+
+func followings(uid string) (s string, err error) {
+	followingURL := "https://api.bilibili.com/x/relation/same/followings?vmid=" + uid
+	method := "GET"
+	client := &http.Client{}
+	req, err := http.NewRequest(method, followingURL, nil)
+	if err != nil {
+		return
+	}
+	c := vdb.getBilibiliCookie()
+	req.Header.Add("cookie", c.Value)
+	res, err := client.Do(req)
+	if err != nil {
+		return
+	}
+	defer res.Body.Close()
+	body, err := io.ReadAll(res.Body)
+	if err != nil {
+		return
+	}
+	j := gjson.ParseBytes(body)
+	s = j.Get("data.list.#.uname").Raw
+	if j.Get("code").Int() == -101 {
+		err = errNeedCookie
+		return
+	}
+	if j.Get("code").Int() != 0 {
+		err = errors.New(j.Get("message").String())
+		return
+	}
+	return
+}
+
+type userinfo struct {
+	Name       string  `json:"name"`
+	Mid        string  `json:"mid"`
+	Face       string  `json:"face"`
+	Fans       int64   `json:"fans"`
+	Regtime    int64   `json:"regtime"`
+	Attentions []int64 `json:"attentions"`
+}
+
+type medalInfo struct {
+	Mid              int64  `json:"target_id"`
+	MedalName        string `json:"medal_name"`
+	Level            int64  `json:"level"`
+	MedalColorStart  int64  `json:"medal_color_start"`
+	MedalColorEnd    int64  `json:"medal_color_end"`
+	MedalColorBorder int64  `json:"medal_color_border"`
+}
+type medal struct {
+	Uname     string `json:"target_name"`
+	medalInfo `json:"medal_info"`
+}
+
+type medalSlice []medal
+
+func (m medalSlice) Len() int {
+	return len(m)
+}
+func (m medalSlice) Swap(i, j int) {
+	m[i], m[j] = m[j], m[i]
+}
+func (m medalSlice) Less(i, j int) bool {
+	return m[i].Level > m[j].Level
+}
+
+// 获取详情
+func card(uid string) (result userinfo, err error) {
+	cardURL := "https://account.bilibili.com/api/member/getCardByMid?mid=" + uid
+	data, err := web.GetData(cardURL)
+	if err != nil {
+		return
+	}
+	err = json.Unmarshal(binary.StringToBytes(gjson.ParseBytes(data).Get("card").Raw), &result)
+	if err != nil {
+		return
+	}
+	return
+}
+
+// 获得牌子
+func medalwall(uid string) (result []medal, err error) {
+	medalwallURL := "https://api.live.bilibili.com/xlive/web-ucenter/user/MedalWall?target_id=" + uid
+	method := "GET"
+	client := &http.Client{}
+	req, err := http.NewRequest(method, medalwallURL, nil)
+	if err != nil {
+		return
+	}
+	c := vdb.getBilibiliCookie()
+	req.Header.Add("cookie", c.Value)
+	res, err := client.Do(req)
+	if err != nil {
+		return
+	}
+	defer res.Body.Close()
+	data, err := io.ReadAll(res.Body)
+	if err != nil {
+		return
+	}
+	j := gjson.ParseBytes(data)
+	if j.Get("code").Int() == -101 {
+		err = errNeedCookie
+		return
+	}
+	if j.Get("code").Int() != 0 {
+		err = errors.New(j.Get("message").String())
+	}
+	_ = json.Unmarshal(binary.StringToBytes(j.Get("data.list").Raw), &result)
+	return
+}

plugin/bilibili/info.go

@@ -2,64 +2,356 @@
 package bilibili
 
 import (
-	"io"
-	"net/http"
+	"encoding/binary"
+	"fmt"
+	"image"
+	"image/color"
+	"os"
+	"path"
+	"regexp"
+	"sort"
+	"strconv"
+	"time"
 
 	control "github.com/FloatTech/zbputils/control"
-	"github.com/tidwall/gjson"
+	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/file"
+	"github.com/FloatTech/zbputils/img"
+	"github.com/FloatTech/zbputils/img/text"
+	"github.com/FloatTech/zbputils/img/writer"
+	"github.com/FloatTech/zbputils/web"
+	"github.com/fogleman/gg"
+	log "github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
-var engine = control.Register("bilibili", order.AcquirePrio(), &control.Options{
+var engine = control.Register("bilibili", &control.Options{
 	DisableOnDefault: false,
 	Help: "bilibili\n" +
-		"- >vup info [名字 | uid]\n" +
-		"- >user info [名字 | uid]",
+		"- >vup info [xxx]\n" +
+		"- >user info [xxx]\n" +
+		"- 查成分 [xxx]\n" +
+		"- 设置b站cookie SESSDATA=82da790d,1663822823,06ecf*31\n" +
+		"- 更新vup",
+	PublicDataFolder: "Bilibili",
 })
+var re = regexp.MustCompile(`^\d+$`)
 
 // 查成分的
 func init() {
-	engine.OnRegex(`^>(?:user|vup)\s?info\s?(.{1,25})$`).SetBlock(true).
+	cachePath := engine.DataFolder() + "cache/"
+	_ = os.RemoveAll(cachePath)
+	_ = os.MkdirAll(cachePath, 0755)
+	var getdb = ctxext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool {
+		var err error
+		_, _ = engine.GetLazyData("bilibili.db", false)
+		vdb, err = initialize(engine.DataFolder() + "bilibili.db")
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR:", err))
+			return false
+		}
+		return true
+	})
+
+	engine.OnRegex(`^>user info\s?(.{1,25})$`, getdb).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			keyword := ctx.State["regex_matched"].([]string)[1]
-			rest, err := uid(keyword)
+			uidRes, err := search(keyword)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
-			id := rest.Get("data.result.0.mid").String()
-			url := "https://api.bilibili.com/x/relation/same/followings?vmid=" + id
-			method := "GET"
-			client := &http.Client{}
-			req, err := http.NewRequest(method, url, nil)
+			id := strconv.FormatInt(uidRes[0].Mid, 10)
+			follwings, err := followings(id)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
-				return
+				ctx.SendChain(message.Text("ERROR:", err))
 			}
-			req.Header.Add("cookie", "CURRENT_FNVAL=80; _uuid=772B88E8-3ED1-D589-29BB-F6CB5214239A06137infoc; blackside_state=1; bfe_id=6f285c892d9d3c1f8f020adad8bed553; rpdid=|(umY~Jkl|kJ0J'uYkR|)lu|); fingerprint=0ec2b1140fb30b56d7b5e415bc3b5fb1; buvid_fp=C91F5265-3DF4-4D5A-9FF3-C546370B14C0143096infoc; buvid_fp_plain=C91F5265-3DF4-4D5A-9FF3-C546370B14C0143096infoc; SESSDATA=9e0266f6%2C1639637127%2Cb0172%2A61; bili_jct=96ddbd7e22d527abdc0501339a12d4d3; DedeUserID=695737880; DedeUserID__ckMd5=0117660e75db7b01; sid=5labuhaf; PVID=1; bfe_id=1e33d9ad1cb29251013800c68af42315")
-			res, err := client.Do(req)
-			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
-				return
-			}
-			defer res.Body.Close()
-
-			body, err := io.ReadAll(res.Body)
-			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
-				return
-			}
-			data := string(body)
 			ctx.SendChain(message.Text(
-				"uid: ", rest.Get("data.result.0.mid").Int(), "\n",
-				"name: ", rest.Get("data.result.0.uname").Str, "\n",
-				"sex: ", []string{"", "", "女", "男"}[rest.Get("data.result.0.gender").Int()], "\n",
-				"sign: ", rest.Get("data.result.0.usign").Str, "\n",
-				"level: ", rest.Get("data.result.0.level").Int(), "\n",
-				"follow: ", gjson.Get(data, "data.list.#.uname"),
+				"search: ", uidRes[0].Mid, "\n",
+				"name: ", uidRes[0].Uname, "\n",
+				"sex: ", []string{"", "男", "女", "未知"}[uidRes[0].Gender], "\n",
+				"sign: ", uidRes[0].Usign, "\n",
+				"level: ", uidRes[0].Level, "\n",
+				"follow: ", follwings,
 			))
 		})
+
+	engine.OnRegex(`^>vup info\s?(.{1,25})$`).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			keyword := ctx.State["regex_matched"].([]string)[1]
+			res, err := search(keyword)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			id := strconv.FormatInt(res[0].Mid, 10)
+			// 获取详情
+			fo, err := fansapi(id)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			ctx.SendChain(message.Text(
+				"search: ", fo.Mid, "\n",
+				"名字: ", fo.Uname, "\n",
+				"当前粉丝数: ", fo.Follower, "\n",
+				"24h涨粉数: ", fo.Rise, "\n",
+				"视频投稿数: ", fo.Video, "\n",
+				"直播间id: ", fo.Roomid, "\n",
+				"舰队: ", fo.GuardNum, "\n",
+				"直播总排名: ", fo.AreaRank, "\n",
+				"数据来源: ", "https://vtbs.moe/detail/", fo.Mid, "\n",
+				"数据获取时间: ", time.Now().Format("2006-01-02 15:04:05"),
+			))
+		})
+
+	engine.OnRegex(`^查成分\s?(.{1,25})$`, getdb, getPara).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			id := ctx.State["uid"].(string)
+			today := time.Now().Format("20060102")
+			drawedFile := cachePath + id + today + "vupLike.png"
+			if file.IsExist(drawedFile) {
+				ctx.SendChain(message.Image("file:///" + file.BOTPATH + "/" + drawedFile))
+				return
+			}
+			u, err := card(id)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			vups, err := vdb.filterVup(u.Attentions)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			vupLen := len(vups)
+			medals, err := medalwall(id)
+			sort.Sort(medalSlice(medals))
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+			}
+			frontVups := make([]vup, 0)
+			medalMap := make(map[int64]medal)
+			for _, v := range medals {
+				up := vup{
+					Mid:   v.Mid,
+					Uname: v.Uname,
+				}
+				frontVups = append(frontVups, up)
+				medalMap[v.Mid] = v
+			}
+			vups = append(vups, frontVups...)
+			copy(vups[len(frontVups):], vups)
+			copy(vups, frontVups)
+			for i := len(frontVups); i < len(vups); i++ {
+				if _, ok := medalMap[vups[i].Mid]; ok {
+					vups = append(vups[:i], vups[i+1:]...)
+					i--
+				}
+			}
+			facePath := cachePath + id + "vupFace" + path.Ext(u.Face)
+			backX := 500
+			backY := 500
+			var back image.Image
+			if path.Ext(u.Face) != ".webp" {
+				err = initFacePic(facePath, u.Face)
+				if err != nil {
+					ctx.SendChain(message.Text("ERROR:", err))
+					return
+				}
+				back, err = gg.LoadImage(facePath)
+				if err != nil {
+					ctx.SendChain(message.Text("ERROR:", err))
+					return
+				}
+				back = img.Size(back, backX, backY).Im
+			}
+			if len(vups) > 50 {
+				ctx.SendChain(message.Text(u.Name + "关注的up主太多了，只展示前50个up"))
+				vups = vups[:50]
+			}
+			canvas := gg.NewContext(1500, int(500*(1.1+float64(len(vups))/3)))
+			fontSize := 50.0
+			canvas.SetColor(color.White)
+			canvas.Clear()
+			if back != nil {
+				canvas.DrawImage(back, 0, 0)
+			}
+			canvas.SetColor(color.Black)
+			_, err = file.GetLazyData(text.BoldFontFile, true)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+			}
+			if err = canvas.LoadFontFace(text.BoldFontFile, fontSize); err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			sl, _ := canvas.MeasureString("好")
+			length, h := canvas.MeasureString(u.Mid)
+			n, _ := canvas.MeasureString(u.Name)
+			canvas.DrawString(u.Name, 550, 160-h)
+			canvas.DrawRoundedRectangle(600+n-length*0.1, 160-h*2.5, length*1.2, h*2, fontSize*0.2)
+			canvas.SetRGB255(221, 221, 221)
+			canvas.Fill()
+			canvas.SetColor(color.Black)
+			canvas.DrawString(u.Mid, 600+n, 160-h)
+			canvas.DrawString(fmt.Sprintf("粉丝：%d", u.Fans), 550, 240-h)
+			canvas.DrawString(fmt.Sprintf("关注：%d", len(u.Attentions)), 1000, 240-h)
+			canvas.DrawString(fmt.Sprintf("管人痴成分：%.2f%%（%d/%d）", float64(vupLen)/float64(len(u.Attentions))*100, vupLen, len(u.Attentions)), 550, 320-h)
+			regtime := time.Unix(u.Regtime, 0).Format("2006-01-02 15:04:05")
+			canvas.DrawString("注册日期："+regtime, 550, 400-h)
+			canvas.DrawString("查询日期："+time.Now().Format("2006-01-02"), 550, 480-h)
+			for i, v := range vups {
+				if i%2 == 1 {
+					canvas.SetRGB255(245, 245, 245)
+					canvas.DrawRectangle(0, float64(backY)*1.1+float64(i)*float64(backY)/3, float64(backX*3), float64(backY)/3)
+					canvas.Fill()
+				}
+				canvas.SetColor(color.Black)
+				nl, _ := canvas.MeasureString(v.Uname)
+				canvas.DrawString(v.Uname, float64(backX)*0.1, float64(backY)*1.1+float64(i+1)*float64(backY)/3-2*h)
+				ml, _ := canvas.MeasureString(strconv.FormatInt(v.Mid, 10))
+				canvas.DrawRoundedRectangle(nl-0.1*ml+float64(backX)*0.2, float64(backY)*1.1+float64(i+1)*float64(backY)/3-h*3.5, ml*1.2, h*2, fontSize*0.2)
+				canvas.SetRGB255(221, 221, 221)
+				canvas.Fill()
+				canvas.SetColor(color.Black)
+				canvas.DrawString(strconv.FormatInt(v.Mid, 10), nl+float64(backX)*0.2, float64(backY)*1.1+float64(i+1)*float64(backY)/3-2*h)
+				if m, ok := medalMap[v.Mid]; ok {
+					mnl, _ := canvas.MeasureString(m.MedalName)
+					grad := gg.NewLinearGradient(nl+ml-sl/2+float64(backX)*0.4, float64(backY)*1.1+float64(i+1)*float64(backY)/3-3.5*h, nl+ml+mnl+sl/2+float64(backX)*0.4, float64(backY)*1.1+float64(i+1)*float64(backY)/3-1.5*h)
+					r, g, b := int2rbg(m.MedalColorStart)
+					grad.AddColorStop(0, color.RGBA{R: uint8(r), G: uint8(g), B: uint8(b), A: 255})
+					r, g, b = int2rbg(m.MedalColorEnd)
+					grad.AddColorStop(1, color.RGBA{R: uint8(r), G: uint8(g), B: uint8(b), A: 255})
+					canvas.SetFillStyle(grad)
+					canvas.SetLineWidth(4)
+					canvas.MoveTo(nl+ml-sl/2+float64(backX)*0.4, float64(backY)*1.1+float64(i+1)*float64(backY)/3-3.5*h)
+					canvas.LineTo(nl+ml+mnl+sl/2+float64(backX)*0.4, float64(backY)*1.1+float64(i+1)*float64(backY)/3-3.5*h)
+					canvas.LineTo(nl+ml+mnl+sl/2+float64(backX)*0.4, float64(backY)*1.1+float64(i+1)*float64(backY)/3-1.5*h)
+					canvas.LineTo(nl+ml-sl/2+float64(backX)*0.4, float64(backY)*1.1+float64(i+1)*float64(backY)/3-1.5*h)
+					canvas.ClosePath()
+					canvas.Fill()
+					canvas.SetColor(color.White)
+					canvas.DrawString(m.MedalName, nl+ml+float64(backX)*0.4, float64(backY)*1.1+float64(i+1)*float64(backY)/3-2*h)
+					r, g, b = int2rbg(m.MedalColorBorder)
+					canvas.SetRGB255(int(r), int(g), int(b))
+					canvas.DrawString(strconv.FormatInt(m.Level, 10), nl+ml+mnl+sl+float64(backX)*0.4, float64(backY)*1.1+float64(i+1)*float64(backY)/3-2*h)
+					mll, _ := canvas.MeasureString(strconv.FormatInt(m.Level, 10))
+					canvas.SetLineWidth(4)
+					canvas.MoveTo(nl+ml-sl/2+float64(backX)*0.4, float64(backY)*1.1+float64(i+1)*float64(backY)/3-3.5*h)
+					canvas.LineTo(nl+ml+mnl+mll+sl/2+float64(backX)*0.5, float64(backY)*1.1+float64(i+1)*float64(backY)/3-3.5*h)
+					canvas.LineTo(nl+ml+mnl+mll+sl/2+float64(backX)*0.5, float64(backY)*1.1+float64(i+1)*float64(backY)/3-1.5*h)
+					canvas.LineTo(nl+ml-sl/2+float64(backX)*0.4, float64(backY)*1.1+float64(i+1)*float64(backY)/3-1.5*h)
+					canvas.ClosePath()
+					canvas.Stroke()
+				}
+			}
+			f, err := os.Create(drawedFile)
+			if err != nil {
+				log.Errorln("[bilibili]", err)
+				data, cl := writer.ToBytes(canvas.Image())
+				ctx.SendChain(message.ImageBytes(data))
+				cl()
+				return
+			}
+			_, err = writer.WriteTo(canvas.Image(), f)
+			_ = f.Close()
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			ctx.SendChain(message.Image("file:///" + file.BOTPATH + "/" + drawedFile))
+		})
+
+	engine.OnRegex(`^设置b站cookie?\s+(.{1,100})$`, zero.SuperUserPermission, getdb).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			cookie := ctx.State["regex_matched"].([]string)[1]
+			err := vdb.setBilibiliCookie(cookie)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			ctx.SendChain(message.Text("成功设置b站cookie为" + cookie))
+		})
+
+	engine.OnFullMatch("更新vup", zero.SuperUserPermission, getdb).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			ctx.SendChain(message.Text("少女祈祷中..."))
+			err := updateVup()
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			ctx.SendChain(message.Text("vup已更新"))
+		})
+}
+
+func initFacePic(filename, faceURL string) error {
+	if file.IsNotExist(filename) {
+		data, err := web.GetData(faceURL)
+		if err != nil {
+			return err
+		}
+		err = os.WriteFile(filename, data, 0666)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func int2rbg(t int64) (int64, int64, int64) {
+	var buf [8]byte
+	binary.LittleEndian.PutUint64(buf[:], uint64(t))
+	b, g, r := int64(buf[0]), int64(buf[1]), int64(buf[2])
+	return r, g, b
+}
+
+func getPara(ctx *zero.Ctx) bool {
+	keyword := ctx.State["regex_matched"].([]string)[1]
+	if !re.MatchString(keyword) {
+		searchRes, err := search(keyword)
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR:", err))
+			return false
+		}
+		ctx.State["uid"] = strconv.FormatInt(searchRes[0].Mid, 10)
+		return true
+	}
+	next := zero.NewFutureEvent("message", 999, false, ctx.CheckSession())
+	recv, cancel := next.Repeat()
+	defer cancel()
+	ctx.SendChain(message.Text("输入为纯数字，请选择查询uid还是用户名，输入对应序号：\n0. 查询uid\n1. 查询用户名"))
+	for {
+		select {
+		case <-time.After(time.Second * 10):
+			ctx.SendChain(message.Text("时间太久啦！", zero.BotConfig.NickName[0], "帮你选择查询uid"))
+			ctx.State["uid"] = keyword
+			return true
+		case c := <-recv:
+			msg := c.Event.Message.ExtractPlainText()
+			num, err := strconv.Atoi(msg)
+			if err != nil {
+				ctx.SendChain(message.Text("请输入数字!"))
+				continue
+			}
+			if num < 0 || num > 1 {
+				ctx.SendChain(message.Text("序号非法!"))
+				continue
+			}
+			if num == 0 {
+				ctx.State["uid"] = keyword
+				return true
+			} else if num == 1 {
+				searchRes, err := search(keyword)
+				if err != nil {
+					ctx.SendChain(message.Text("ERROR:", err))
+					return false
+				}
+				ctx.State["uid"] = strconv.FormatInt(searchRes[0].Mid, 10)
+				return true
+			}
+		}
+	}
 }

plugin/bilibili/live_info.go

@@ -1,85 +0,0 @@
-package bilibili
-
-import (
-	"encoding/json"
-	"errors"
-	"net/http"
-	"time"
-
-	"github.com/FloatTech/zbputils/web"
-	"github.com/tidwall/gjson"
-	zero "github.com/wdvxdr1123/ZeroBot"
-	"github.com/wdvxdr1123/ZeroBot/message"
-)
-
-// 查vup粉丝数据
-func init() {
-	engine.OnRegex(`^>vup info\s?(.{1,25})$`).SetBlock(true).
-		Handle(func(ctx *zero.Ctx) {
-			keyword := ctx.State["regex_matched"].([]string)[1]
-			res, err := uid(keyword)
-			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
-				return
-			}
-			id := res.Get("data.result.0.mid").String()
-			// 获取详情
-			fo, err := fansapi(id)
-			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
-				return
-			}
-			ctx.SendChain(message.Text(
-				"uid: ", fo.Mid, "\n",
-				"名字: ", fo.Uname, "\n",
-				"当前粉丝数: ", fo.Follower, "\n",
-				"24h涨粉数: ", fo.Rise, "\n",
-				"视频投稿数: ", fo.Video, "\n",
-				"直播间id: ", fo.Roomid, "\n",
-				"舰队: ", fo.GuardNum, "\n",
-				"直播总排名: ", fo.AreaRank, "\n",
-				"数据来源: ", "https://vtbs.moe/detail/", fo.Mid, "\n",
-				"数据获取时间: ", time.Now().Format("2006-01-02 15:04:05"),
-			))
-		})
-}
-
-// 搜索api：通过把触发指令传入的昵称找出uid返回
-func uid(keyword string) (*gjson.Result, error) {
-	api := "http://api.bilibili.com/x/web-interface/search/type?search_type=bili_user&&user_type=1&keyword=" + keyword
-	data, err := web.GetData(api)
-	if err != nil {
-		return nil, err
-	}
-	json := gjson.ParseBytes(data)
-	if json.Get("data.numResults").Int() == 0 {
-		return nil, errors.New("查无此人")
-	}
-	return &json, nil
-}
-
-type follower struct {
-	Mid      int    `json:"mid"`
-	Uname    string `json:"uname"`
-	Video    int    `json:"video"`
-	Roomid   int    `json:"roomid"`
-	Rise     int    `json:"rise"`
-	Follower int    `json:"follower"`
-	GuardNum int    `json:"guardNum"`
-	AreaRank int    `json:"areaRank"`
-}
-
-// 请求api
-func fansapi(uid string) (*follower, error) {
-	url := "https://api.vtbs.moe/v1/detail/" + uid
-	resp, err := http.Get(url)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-	result := &follower{}
-	if err := json.NewDecoder(resp.Body).Decode(result); err != nil {
-		return nil, err
-	}
-	return result, nil
-}

plugin/bilibili/model.go

@@ -0,0 +1,130 @@
+package bilibili
+
+import (
+	"os"
+
+	"github.com/FloatTech/zbputils/binary"
+	"github.com/FloatTech/zbputils/web"
+	_ "github.com/fumiama/sqlite3" // use sql
+	"github.com/jinzhu/gorm"
+	"github.com/tidwall/gjson"
+)
+
+const (
+	bilibiliCookie = "bilbili_cookie"
+)
+
+var (
+	vtbURLs = [...]string{"https://api.vtbs.moe/v1/short", "https://api.tokyo.vtbs.moe/v1/short", "https://vtbs.musedash.moe/v1/short"}
+	vdb     *vupdb
+)
+
+// vupdb 分数数据库
+type vupdb gorm.DB
+
+type vup struct {
+	Mid    int64  `gorm:"column:mid;primary_key"`
+	Uname  string `gorm:"column:uname"`
+	Roomid int64  `gorm:"column:roomid"`
+}
+
+func (vup) TableName() string {
+	return "vup"
+}
+
+type config struct {
+	Key   string `gorm:"column:key;primary_key"`
+	Value string `gorm:"column:value"`
+}
+
+func (config) TableName() string {
+	return "config"
+}
+
+// initialize 初始化vtb数据库
+func initialize(dbpath string) (*vupdb, error) {
+	if _, err := os.Stat(dbpath); err != nil || os.IsNotExist(err) {
+		// 生成文件
+		f, err := os.Create(dbpath)
+		if err != nil {
+			return nil, err
+		}
+		defer f.Close()
+	}
+	gdb, err := gorm.Open("sqlite3", dbpath)
+	if err != nil {
+		return nil, err
+	}
+	gdb.AutoMigrate(&vup{}).AutoMigrate(&config{})
+	return (*vupdb)(gdb), nil
+}
+
+func (vdb *vupdb) insertVupByMid(mid int64, uname string, roomid int64) (err error) {
+	db := (*gorm.DB)(vdb)
+	v := vup{
+		Mid:    mid,
+		Uname:  uname,
+		Roomid: roomid,
+	}
+	if err = db.Model(&vup{}).First(&v, "mid = ? ", mid).Error; err != nil {
+		if gorm.IsRecordNotFoundError(err) {
+			err = db.Model(&vup{}).Create(&v).Error
+		}
+	}
+	return
+}
+
+// filterVup 筛选vup
+func (vdb *vupdb) filterVup(ids []int64) (vups []vup, err error) {
+	db := (*gorm.DB)(vdb)
+	if err = db.Model(&vup{}).Find(&vups, "mid in (?)", ids).Error; err != nil {
+		return vups, err
+	}
+	return
+}
+
+func updateVup() error {
+	for _, v := range vtbURLs {
+		data, err := web.GetData(v)
+		if err != nil {
+			return err
+		}
+		gjson.Get(binary.BytesToString(data), "@this").ForEach(func(key, value gjson.Result) bool {
+			mid := value.Get("mid").Int()
+			uname := value.Get("uname").String()
+			roomid := value.Get("roomid").Int()
+			err = vdb.insertVupByMid(mid, uname, roomid)
+			return err == nil
+		})
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (vdb *vupdb) setBilibiliCookie(cookie string) (err error) {
+	db := (*gorm.DB)(vdb)
+	c := config{
+		Key:   bilibiliCookie,
+		Value: cookie,
+	}
+	if err = db.Model(&config{}).First(&c, "key = ? ", bilibiliCookie).Error; err != nil {
+		// error handling...
+		if gorm.IsRecordNotFoundError(err) {
+			err = db.Model(&config{}).Create(&c).Error
+		}
+	} else {
+		err = db.Model(&config{}).Where("key = ? ", bilibiliCookie).Update(
+			map[string]interface{}{
+				"value": cookie,
+			}).Error
+	}
+	return
+}
+
+func (vdb *vupdb) getBilibiliCookie() (c config) {
+	db := (*gorm.DB)(vdb)
+	db.Model(&config{}).First(&c, "key = ?", bilibiliCookie)
+	return
+}

plugin/bilibili_parse/bilibili_parse.go

@@ -2,17 +2,13 @@
 package bilibiliparse
 
 import (
-	"fmt"
 	"regexp"
 	"strings"
 
 	"github.com/FloatTech/zbputils/control"
 	"github.com/antchfx/htmlquery"
-	log "github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -21,7 +17,7 @@ const (
 )
 
 func init() {
-	engine := control.Register("bilibiliparse", order.AcquirePrio(), &control.Options{
+	engine := control.Register("bilibiliparse", &control.Options{
 		DisableOnDefault: false,
 		Help: "b站视频链接解析\n" +
 			"- https://www.bilibili.com/video/BV1xx411c7BF | https://www.bilibili.com/video/av1605 | https://b23.tv/I8uzWCA | https://www.bilibili.com/video/bv1xx411c7BF",
@@ -29,17 +25,21 @@ func init() {
 
 	engine.OnRegex(bilibiliRe).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		bilibiliURL := ctx.State["regex_matched"].([]string)[0]
-		m := parseURL(bilibiliURL)
+		m, err := parseURL(bilibiliURL)
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR:", err))
+			return
+		}
 		if len(m) != 0 {
 			ctx.Send(m)
 		}
 	})
 }
 
-func parseURL(bilibiliURL string) (m message.Message) {
+func parseURL(bilibiliURL string) (m message.Message, err error) {
 	doc, err := htmlquery.LoadURL(bilibiliURL)
 	if err != nil {
-		log.Errorln("[bilibiliparse]:访问的链接为", bilibiliURL, ",错误为", err)
+		return
 	}
 	videoURL := htmlquery.FindOne(doc, "/html/head/meta[@itemprop='url']").Attr[2].Val
 	re := regexp.MustCompile(validRe)
@@ -50,9 +50,7 @@ func parseURL(bilibiliURL string) (m message.Message) {
 	title := htmlquery.FindOne(doc, "//*[@id='viewbox_report']/h1/span/text()").Data
 	m = append(m, message.Text(title+"\n"))
 	upName := strings.TrimSpace(htmlquery.FindOne(doc, "//*[@id='v_upinfo']/div[2]/div[1]/a[1]/text()").Data)
-	fmt.Println(upName)
 	fanNumber := htmlquery.InnerText(htmlquery.FindOne(doc, "//i[@class='van-icon-general_addto_s']").NextSibling.NextSibling)
-	fmt.Println(fanNumber)
 	m = append(m, message.Text("up："+upName+"，粉丝："+fanNumber+"\n"))
 	view := htmlquery.FindOne(doc, "//*[@id='viewbox_report']/div/span[@class='view']/text()").Data
 	dm := htmlquery.FindOne(doc, "//*[@id='viewbox_report']/div/span[@class='dm']/text()").Data

plugin/bilibili_push/bilibili_push.go

@@ -5,8 +5,6 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"io"
-	"net/http"
 	"strconv"
 	"time"
 
@@ -17,7 +15,6 @@ import (
 
 	"github.com/FloatTech/zbputils/binary"
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/img/text"
 	"github.com/FloatTech/zbputils/web"
 )
@@ -39,13 +36,14 @@ var bdb *bilibilipushdb
 var (
 	lastTime = map[int64]int64{}
 	typeMsg  = map[int64]string{
-		1:   "转发了一条动态",
-		2:   "有图营业",
-		4:   "无图营业",
-		8:   "发布了新投稿",
-		16:  "发布了短视频",
-		64:  "发布了新专栏",
-		256: "发布了新音频",
+		1:    "转发了一条动态",
+		2:    "有图营业",
+		4:    "无图营业",
+		8:    "发布了新投稿",
+		16:   "发布了短视频",
+		64:   "发布了新专栏",
+		256:  "发布了新音频",
+		2048: "发布了新简报",
 	}
 	liveStatus  = map[int64]int{}
 	uidErrorMsg = map[int]string{
@@ -59,14 +57,14 @@ var (
 
 func init() {
 	go bilibiliPushDaily()
-	en := control.Register(serviceName, order.AcquirePrio(), &control.Options{
+	en := control.Register(serviceName, &control.Options{
 		DisableOnDefault: false,
 		Help: "bilibilipush\n" +
-			"- 添加订阅[uid]\n" +
-			"- 取消订阅[uid]\n" +
-			"- 取消动态订阅[uid]\n" +
-			"- 取消直播订阅[uid]\n" +
-			"- 推送列表",
+			"- 添加b站订阅[uid]\n" +
+			"- 取消b站订阅[uid]\n" +
+			"- 取消b站动态订阅[uid]\n" +
+			"- 取消b站直播订阅[uid]\n" +
+			"- b站推送列表",
 		PrivateDataFolder: serviceName,
 	})
 
@@ -75,16 +73,20 @@ func init() {
 		dbpath := en.DataFolder()
 		dbfile := dbpath + "push.db"
 		bdb = initialize(dbfile)
-		log.Println("[bilibilipush]加载bilibilipush数据库")
 	}()
 
-	en.OnRegex(`^添加订阅\s?(\d+)$`, zero.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+	en.OnRegex(`^添加b站订阅\s?(\d+)$`, zero.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		buid, _ := strconv.ParseInt(ctx.State["regex_matched"].([]string)[1], 10, 64)
 		var name string
 		var ok bool
 		if name, ok = upMap[buid]; !ok {
 			var status int
-			status, name = checkBuid(buid)
+			var err error
+			status, name, err = checkBuid(buid)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
 			if status != 0 {
 				msg, ok := uidErrorMsg[status]
 				if !ok {
@@ -99,18 +101,23 @@ func init() {
 			gid = -ctx.Event.UserID
 		}
 		if err := subscribe(buid, gid); err != nil {
-			log.Errorln("[bilibilipush]:", err)
-		} else {
-			ctx.SendChain(message.Text("已添加" + name + "的订阅"))
+			ctx.SendChain(message.Text("ERROR:", err))
+			return
 		}
+		ctx.SendChain(message.Text("已添加" + name + "的订阅"))
 	})
-	en.OnRegex(`^取消订阅\s?(\d+)$`, zero.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+	en.OnRegex(`^取消b站订阅\s?(\d+)$`, zero.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		buid, _ := strconv.ParseInt(ctx.State["regex_matched"].([]string)[1], 10, 64)
 		var name string
 		var ok bool
 		if name, ok = upMap[buid]; !ok {
 			var status int
-			status, name = checkBuid(buid)
+			var err error
+			status, name, err = checkBuid(buid)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
 			if status != 0 {
 				msg, ok := uidErrorMsg[status]
 				if !ok {
@@ -125,18 +132,23 @@ func init() {
 			gid = -ctx.Event.UserID
 		}
 		if err := unsubscribe(buid, gid); err != nil {
-			log.Errorln("[bilibilipush]:", err)
-		} else {
-			ctx.SendChain(message.Text("已取消" + name + "的订阅"))
+			ctx.SendChain(message.Text("ERROR:", err))
+			return
 		}
+		ctx.SendChain(message.Text("已取消" + name + "的订阅"))
 	})
-	en.OnRegex(`^取消动态订阅\s?(\d+)$`, zero.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+	en.OnRegex(`^取消b站动态订阅\s?(\d+)$`, zero.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		buid, _ := strconv.ParseInt(ctx.State["regex_matched"].([]string)[1], 10, 64)
 		var name string
 		var ok bool
 		if name, ok = upMap[buid]; !ok {
 			var status int
-			status, name = checkBuid(buid)
+			var err error
+			status, name, err = checkBuid(buid)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
 			if status != 0 {
 				msg, ok := uidErrorMsg[status]
 				if !ok {
@@ -151,18 +163,23 @@ func init() {
 			gid = -ctx.Event.UserID
 		}
 		if err := unsubscribeDynamic(buid, gid); err != nil {
-			log.Errorln("[bilibilipush]:", err)
-		} else {
-			ctx.SendChain(message.Text("已取消" + name + "的动态订阅"))
+			ctx.SendChain(message.Text("ERROR:", err))
+			return
 		}
+		ctx.SendChain(message.Text("已取消" + name + "的动态订阅"))
 	})
-	en.OnRegex(`^取消直播订阅\s?(\d+)$`, zero.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+	en.OnRegex(`^取消b站直播订阅\s?(\d+)$`, zero.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		buid, _ := strconv.ParseInt(ctx.State["regex_matched"].([]string)[1], 10, 64)
 		var name string
 		var ok bool
 		if name, ok = upMap[buid]; !ok {
 			var status int
-			status, name = checkBuid(buid)
+			var err error
+			status, name, err = checkBuid(buid)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
 			if status != 0 {
 				msg, ok := uidErrorMsg[status]
 				if !ok {
@@ -177,23 +194,21 @@ func init() {
 			gid = -ctx.Event.UserID
 		}
 		if err := unsubscribeLive(buid, gid); err != nil {
-			log.Errorln("[bilibilipush]:", err)
-		} else {
-			ctx.SendChain(message.Text("已取消" + name + "的直播订阅"))
+			ctx.SendChain(message.Text("ERROR:", err))
+			return
 		}
+		ctx.SendChain(message.Text("已取消" + name + "的直播订阅"))
 	})
-	en.OnFullMatch("推送列表", zero.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+	en.OnFullMatch("b站推送列表", zero.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		gid := ctx.Event.GroupID
 		if gid == 0 {
 			gid = -ctx.Event.UserID
 		}
 		bpl := bdb.getAllPushByGroup(gid)
-		fmt.Println(bpl)
-		msg := "--------推送列表--------"
+		msg := "--------b站推送列表--------"
 		for _, v := range bpl {
 			if _, ok := upMap[v.BilibiliUID]; !ok {
 				bdb.updateAllUp()
-				fmt.Println(upMap)
 			}
 			msg += fmt.Sprintf("\nuid:%-12d 动态：", v.BilibiliUID)
 			if v.DynamicDisable == 0 {
@@ -211,10 +226,11 @@ func init() {
 		}
 		data, err := text.RenderToBase64(msg, text.FontFile, 600, 20)
 		if err != nil {
-			log.Errorln("[bilibilipush]:", err)
+			ctx.SendChain(message.Text("ERROR:", err))
+			return
 		}
 		if id := ctx.SendChain(message.Image("base64://" + binary.BytesToString(data))); id.ID() == 0 {
-			ctx.SendChain(message.Text("ERROR: 可能被风控了"))
+			ctx.SendChain(message.Text("ERROR:可能被风控了"))
 		}
 	})
 }
@@ -223,16 +239,16 @@ func bilibiliPushDaily() {
 	t := time.NewTicker(time.Second * 10)
 	defer t.Stop()
 	for range t.C {
-		log.Println("-----bilibilipush拉取推送信息-----")
-		sendDynamic()
-		sendLive()
+		log.Debugln("-----bilibilipush拉取推送信息-----")
+		_ = sendDynamic()
+		_ = sendLive()
 	}
 }
 
-func checkBuid(buid int64) (status int, name string) {
+func checkBuid(buid int64) (status int, name string, err error) {
 	data, err := web.RequestDataWith(web.NewDefaultClient(), fmt.Sprintf(infoURL, buid), "GET", referer, ua)
 	if err != nil {
-		log.Errorln("[bilibilipush]:", err)
+		return
 	}
 	status = int(gjson.Get(binary.BytesToString(data), "code").Int())
 	name = gjson.Get(binary.BytesToString(data), "data.name").String()
@@ -287,50 +303,37 @@ func unsubscribeLive(buid, groupid int64) (err error) {
 	return
 }
 
-func getUserDynamicCard(buid int64) (cardList []gjson.Result) {
+func getUserDynamicCard(buid int64) (cardList []gjson.Result, err error) {
 	data, err := web.RequestDataWith(web.NewDefaultClient(), fmt.Sprintf(userDynamicURL, buid), "GET", referer, ua)
 	if err != nil {
-		log.Errorln("[bilibilipush]:", err)
+		return
 	}
 	cardList = gjson.Get(binary.BytesToString(data), "data.cards").Array()
 	return
 }
 
-func getLiveList(uids ...int64) string {
+func getLiveList(uids ...int64) (string, error) {
 	m := make(map[string]interface{})
 	m["uids"] = uids
 	b, _ := json.Marshal(m)
-	client := &http.Client{}
-	// 提交请求
-	request, err := http.NewRequest("POST", liveListURL, bytes.NewBuffer(b))
+	data, err := web.PostData(liveListURL, "application/json", bytes.NewReader(b))
 	if err != nil {
-		log.Errorln("[bilibilipush]:", err)
+		return "", err
 	}
-	request.Header.Add("Referer", referer)
-	request.Header.Add("User-Agent", ua)
-	response, err := client.Do(request)
-	if err != nil {
-		log.Errorln("[bilibilipush]:", err)
-	}
-	defer response.Body.Close()
-	data, err := io.ReadAll(response.Body)
-	if err != nil {
-		log.Errorln("[bilibilipush]:", err)
-	}
-	return binary.BytesToString(data)
+	return binary.BytesToString(data), nil
 }
 
-func sendDynamic() {
+func sendDynamic() error {
 	uids := bdb.getAllBuidByDynamic()
 	for _, buid := range uids {
-		cardList := getUserDynamicCard(buid)
-		if len(cardList) == 0 {
-			return
+		cardList, err := getUserDynamicCard(buid)
+		if err != nil {
+			return err
 		}
 		t, ok := lastTime[buid]
 		if !ok {
 			lastTime[buid] = cardList[0].Get("desc.timestamp").Int()
-			return
+			return nil
 		}
 		for i := len(cardList) - 1; i >= 0; i-- {
 			ct := cardList[i].Get("desc.timestamp").Int()
@@ -417,6 +420,19 @@ func sendDynamic() {
 							msg = append(msg, message.Text(cTitle))
 							cCover := gjson.Get(cOrigin, "cover").String()
 							msg = append(msg, message.Image(cCover))
+						case 2048:
+							cName := gjson.Get(cOrigin, "user.uname").String()
+							msg = append(msg, message.Text(cName+typeMsg[cOrigType]+"\n"))
+							cContent := gjson.Get(cOrigin, "vest.content").String()
+							msg = append(msg, message.Text(cContent+"\n"))
+							cTitle := gjson.Get(cOrigin, "sketch.title").String()
+							msg = append(msg, message.Text(cTitle+"\n"))
+							cDescText := gjson.Get(cOrigin, "sketch.desc_text").String()
+							msg = append(msg, message.Text(cDescText))
+							cCoverURL := gjson.Get(cOrigin, "sketch.cover_url").String()
+							msg = append(msg, message.Image(cCoverURL))
+							cTargetURL := gjson.Get(cOrigin, "sketch.target_url").String()
+							msg = append(msg, message.Text("简报链接："+cTargetURL+"\n"))
 						default:
 							msg = append(msg, message.Text("未知动态类型"+strconv.FormatInt(cOrigType, 10)+"\n"))
 						}
@@ -478,6 +494,19 @@ func sendDynamic() {
 						msg = append(msg, message.Text(cTitle))
 						cCover := gjson.Get(cardStr, "cover").String()
 						msg = append(msg, message.Image(cCover))
+					case 2048:
+						cName := gjson.Get(cardStr, "user.uname").String()
+						msg = append(msg, message.Text(cName+typeMsg[cType]+"\n"))
+						cContent := gjson.Get(cardStr, "vest.content").String()
+						msg = append(msg, message.Text(cContent+"\n"))
+						cTitle := gjson.Get(cardStr, "sketch.title").String()
+						msg = append(msg, message.Text(cTitle+"\n"))
+						cDescText := gjson.Get(cardStr, "sketch.desc_text").String()
+						msg = append(msg, message.Text(cDescText))
+						cCoverURL := gjson.Get(cardStr, "sketch.cover_url").String()
+						msg = append(msg, message.Image(cCoverURL))
+						cTargetURL := gjson.Get(cardStr, "sketch.target_url").String()
+						msg = append(msg, message.Text("简报链接："+cTargetURL+"\n"))
 					default:
 						msg = append(msg, message.Text("未知动态类型"+strconv.FormatInt(cType, 10)+"\n"))
 					}
@@ -492,8 +521,6 @@ func sendDynamic() {
 									ctx.SendGroupMessage(gid, msg)
 								case gid < 0:
 									ctx.SendPrivateMessage(-gid, msg)
-								default:
-									log.Errorln("[bilibilipush]:gid为0")
 								}
 							}
 						}
@@ -503,11 +530,16 @@ func sendDynamic() {
 			}
 		}
 	}
+	return nil
 }
 
-func sendLive() {
+func sendLive() error {
 	uids := bdb.getAllBuidByLive()
-	gjson.Get(getLiveList(uids...), "data").ForEach(func(key, value gjson.Result) bool {
+	ll, err := getLiveList(uids...)
+	if err != nil {
+		return err
+	}
+	gjson.Get(ll, "data").ForEach(func(key, value gjson.Result) bool {
 		newStatus := int(value.Get("live_status").Int())
 		if newStatus == 2 {
 			newStatus = 0
@@ -546,8 +578,6 @@ func sendLive() {
 								ctx.SendGroupMessage(gid, msg)
 							case gid < 0:
 								ctx.SendPrivateMessage(-gid, msg)
-							default:
-								log.Errorln("[bilibilipush]:gid为0")
 							}
 						}
 					}
@@ -559,4 +589,5 @@ func sendLive() {
 		}
 		return true
 	})
+	return nil
 }

plugin/bilibili_push/model.go

@@ -59,12 +59,12 @@ func (bdb *bilibilipushdb) insertOrUpdateLiveAndDynamic(bpMap map[string]interfa
 	bp := bilibilipush{}
 	data, _ := json.Marshal(&bpMap)
 	_ = json.Unmarshal(data, &bp)
-	if err = db.Debug().Model(&bilibilipush{}).First(&bp, "bilibili_uid = ? and group_id = ?", bp.BilibiliUID, bp.GroupID).Error; err != nil {
+	if err = db.Model(&bilibilipush{}).First(&bp, "bilibili_uid = ? and group_id = ?", bp.BilibiliUID, bp.GroupID).Error; err != nil {
 		if gorm.IsRecordNotFoundError(err) {
-			err = db.Debug().Model(&bilibilipush{}).Create(&bp).Error
+			err = db.Model(&bilibilipush{}).Create(&bp).Error
 		}
 	} else {
-		err = db.Debug().Model(&bilibilipush{}).Where("bilibili_uid = ? and group_id = ?", bp.BilibiliUID, bp.GroupID).Update(bpMap).Error
+		err = db.Model(&bilibilipush{}).Where("bilibili_uid = ? and group_id = ?", bp.BilibiliUID, bp.GroupID).Update(bpMap).Error
 	}
 	return
 }
@@ -72,7 +72,7 @@ func (bdb *bilibilipushdb) insertOrUpdateLiveAndDynamic(bpMap map[string]interfa
 func (bdb *bilibilipushdb) getAllBuidByLive() (buidList []int64) {
 	db := (*gorm.DB)(bdb)
 	var bpl []bilibilipush
-	db.Debug().Model(&bilibilipush{}).Find(&bpl, "live_disable = 0")
+	db.Model(&bilibilipush{}).Find(&bpl, "live_disable = 0")
 	temp := make(map[int64]bool)
 	for _, v := range bpl {
 		_, ok := temp[v.BilibiliUID]
@@ -87,7 +87,7 @@ func (bdb *bilibilipushdb) getAllBuidByLive() (buidList []int64) {
 func (bdb *bilibilipushdb) getAllBuidByDynamic() (buidList []int64) {
 	db := (*gorm.DB)(bdb)
 	var bpl []bilibilipush
-	db.Debug().Model(&bilibilipush{}).Find(&bpl, "dynamic_disable = 0")
+	db.Model(&bilibilipush{}).Find(&bpl, "dynamic_disable = 0")
 	temp := make(map[int64]bool)
 	for _, v := range bpl {
 		_, ok := temp[v.BilibiliUID]
@@ -102,7 +102,7 @@ func (bdb *bilibilipushdb) getAllBuidByDynamic() (buidList []int64) {
 func (bdb *bilibilipushdb) getAllGroupByBuidAndLive(buid int64) (groupList []int64) {
 	db := (*gorm.DB)(bdb)
 	var bpl []bilibilipush
-	db.Debug().Model(&bilibilipush{}).Find(&bpl, "bilibili_uid = ? and live_disable = 0", buid)
+	db.Model(&bilibilipush{}).Find(&bpl, "bilibili_uid = ? and live_disable = 0", buid)
 	for _, v := range bpl {
 		groupList = append(groupList, v.GroupID)
 	}
@@ -112,7 +112,7 @@ func (bdb *bilibilipushdb) getAllGroupByBuidAndLive(buid int64) (groupList []int
 func (bdb *bilibilipushdb) getAllGroupByBuidAndDynamic(buid int64) (groupList []int64) {
 	db := (*gorm.DB)(bdb)
 	var bpl []bilibilipush
-	db.Debug().Model(&bilibilipush{}).Find(&bpl, "bilibili_uid = ? and dynamic_disable = 0", buid)
+	db.Model(&bilibilipush{}).Find(&bpl, "bilibili_uid = ? and dynamic_disable = 0", buid)
 	for _, v := range bpl {
 		groupList = append(groupList, v.GroupID)
 	}
@@ -121,7 +121,7 @@ func (bdb *bilibilipushdb) getAllGroupByBuidAndDynamic(buid int64) (groupList []
 
 func (bdb *bilibilipushdb) getAllPushByGroup(groupID int64) (bpl []bilibilipush) {
 	db := (*gorm.DB)(bdb)
-	db.Debug().Model(&bilibilipush{}).Find(&bpl, "group_id = ? and (live_disable = 0 or dynamic_disable = 0)", groupID)
+	db.Model(&bilibilipush{}).Find(&bpl, "group_id = ? and (live_disable = 0 or dynamic_disable = 0)", groupID)
 	return
 }
 
@@ -131,13 +131,13 @@ func (bdb *bilibilipushdb) insertBilibiliUp(buid int64, name string) {
 		BilibiliUID: buid,
 		Name:        name,
 	}
-	db.Debug().Model(&bilibiliup{}).Create(bu)
+	db.Model(&bilibiliup{}).Create(bu)
 }
 
 func (bdb *bilibilipushdb) updateAllUp() {
 	db := (*gorm.DB)(bdb)
 	var bul []bilibiliup
-	db.Debug().Model(&bilibiliup{}).Find(&bul)
+	db.Model(&bilibiliup{}).Find(&bul)
 	for _, v := range bul {
 		upMap[v.BilibiliUID] = v.Name
 	}

plugin/book_review/book_review.go

@@ -8,56 +8,59 @@ import (
 
 	"github.com/FloatTech/zbputils/binary"
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
-	"github.com/FloatTech/zbputils/file"
+	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/img/text"
 )
 
 func init() {
-	engine := control.Register("bookreview", order.AcquirePrio(), &control.Options{
+	engine := control.Register("bookreview", &control.Options{
 		DisableOnDefault: false,
 		Help:             "哀伤雪刃推书记录\n- 书评[xxx]\n- 随机书评",
 		PublicDataFolder: "BookReview",
 	})
 
-	go func() {
-		dbpath := engine.DataFolder()
-		db.DBPath = dbpath + "bookreview.db"
+	getdb := ctxext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool {
+		db.DBPath = engine.DataFolder() + "bookreview.db"
 		// os.RemoveAll(dbpath)
-		_, _ = file.GetLazyData(db.DBPath, false, true)
+		_, _ = engine.GetLazyData("bookreview.db", true)
 		err := db.Create("bookreview", &book{})
 		if err != nil {
-			panic(err)
+			ctx.SendChain(message.Text("ERROR:", err))
+			return false
 		}
 		n, err := db.Count("bookreview")
 		if err != nil {
-			panic(err)
+			ctx.SendChain(message.Text("ERROR:", err))
+			return false
 		}
-		log.Printf("[bookreview]读取%d条书评", n)
-	}()
+		log.Infof("[bookreview]读取%d条书评", n)
+		return true
+	})
 
 	// 中文、英文、数字但不包括下划线等符号
-	engine.OnRegex("^书评([\u4E00-\u9FA5A-Za-z0-9]{1,25})$").SetBlock(true).
+	engine.OnRegex("^书评([\u4E00-\u9FA5A-Za-z0-9]{1,25})$", getdb).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			b := getBookReviewByKeyword(ctx.State["regex_matched"].([]string)[1])
 			data, err := text.RenderToBase64(b.BookReview, text.FontFile, 400, 20)
 			if err != nil {
-				log.Println("err:", err)
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
 			}
 			if id := ctx.SendChain(message.Image("base64://" + binary.BytesToString(data))); id.ID() == 0 {
-				ctx.SendChain(message.Text("ERROR: 可能被风控了"))
+				ctx.SendChain(message.Text("ERROR:可能被风控了"))
 			}
 		})
 
-	engine.OnFullMatch("随机书评").SetBlock(true).
+	engine.OnFullMatch("随机书评", getdb).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			br := getRandomBookReview()
 			data, err := text.RenderToBase64(br.BookReview, text.FontFile, 400, 20)
 			if err != nil {
-				log.Println("err:", err)
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
 			}
 			if id := ctx.SendChain(message.Image("base64://" + binary.BytesToString(data))); id.ID() == 0 {
-				ctx.SendChain(message.Text("ERROR: 可能被风控了"))
+				ctx.SendChain(message.Text("ERROR:可能被风控了"))
 			}
 		})
 }

plugin/cangtoushi/cangtoushi.go

@@ -11,12 +11,9 @@ import (
 
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/antchfx/htmlquery"
-	log "github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -32,92 +29,110 @@ var (
 )
 
 func init() {
-	engine := control.Register("cangtoushi", order.AcquirePrio(), &control.Options{
+	engine := control.Register("cangtoushi", &control.Options{
 		DisableOnDefault: false,
 		Help: "藏头诗\n" +
 			"- 藏头诗[xxx]\n- 藏尾诗[xxx]",
 	})
 	engine.OnRegex(`藏头诗\s?([一-龥]{3,10})$`).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		kw := ctx.State["regex_matched"].([]string)[1]
-		login()
+		err := login()
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR:", err))
+			return
+		}
 		data, err := search(kw, "7", "0")
 		if err != nil {
-			log.Errorln("[cangtoushi]:", err)
+			ctx.SendChain(message.Text("ERROR:", err))
+			return
+		}
+		text, err := dealHTML(helper.BytesToString(data))
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR:", err))
+			return
 		}
-		text := dealHTML(helper.BytesToString(data))
 		ctx.SendChain(message.Text(text))
 	})
 
 	engine.OnRegex(`藏尾诗\s?([一-龥]{3,10})$`).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		kw := ctx.State["regex_matched"].([]string)[1]
-		login()
+		err := login()
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR:", err))
+			return
+		}
 		data, err := search(kw, "7", "2")
 		if err != nil {
-			log.Errorln("[cangtoushi]:", err)
+			ctx.SendChain(message.Text("ERROR:", err))
+			return
+		}
+		text, err := dealHTML(helper.BytesToString(data))
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR:", err))
+			return
 		}
-		text := dealHTML(helper.BytesToString(data))
 		ctx.SendChain(message.Text(text))
 	})
 }
 
-func login() {
+func login() error {
 	gCurCookieJar, _ = cookiejar.New(nil)
 	client := &http.Client{
 		Jar: gCurCookieJar,
 	}
 	request, err := http.NewRequest("GET", loginURL, nil)
 	if err != nil {
-		log.Errorln("[cangtoushi]:", err)
+		return err
 	}
 	request.Header.Add("User-Agent", ua)
 	response, err := client.Do(request)
 	if err != nil {
-		log.Errorln("[cangtoushi]:", err)
+		return err
 	}
 	data, err := io.ReadAll(response.Body)
 	if err != nil {
-		log.Errorln("[cangtoushi]:", err)
+		return err
 	}
 	response.Body.Close()
 	doc, err := htmlquery.Parse(strings.NewReader(helper.BytesToString(data)))
 	if err != nil {
-		log.Errorln("[cangtoushi]:", err)
+		return err
 	}
 	csrf = htmlquery.SelectAttr(htmlquery.FindOne(doc, "//input[@name='_csrf']"), "value")
+	return nil
 }
 
 func search(kw, zishu, position string) (data []byte, err error) {
 	postStr := fmt.Sprintf("_csrf=%s&kw=%s&zishu=%s&position=%s", url.QueryEscape(csrf), url.QueryEscape(kw), zishu, position)
-	log.Println("postStr:", postStr)
 	client := &http.Client{
 		Jar: gCurCookieJar,
 	}
 	request, err := http.NewRequest("POST", searchURL, strings.NewReader(postStr))
 	if err != nil {
-		log.Errorln("[cangtoushi]:", err)
+		return nil, err
 	}
 	request.Header.Add("Referer", referer)
 	request.Header.Add("User-Agent", ua)
 	request.Header.Add("Content-Type", "application/x-www-form-urlencoded")
 	response, err := client.Do(request)
 	if err != nil {
-		log.Errorln("[cangtoushi]:", err)
+		return nil, err
 	}
 	data, err = io.ReadAll(response.Body)
 	if err != nil {
-		log.Errorln("[cangtoushi]:", err)
+		return nil, err
 	}
 	response.Body.Close()
 	return
 }
 
-func dealHTML(data string) (text string) {
+func dealHTML(data string) (text string, err error) {
 	doc, err := htmlquery.Parse(strings.NewReader(data))
 	if err != nil {
-		log.Errorln("[cangtoushi]:", err)
+		return "", err
 	}
 	text = htmlquery.InnerText(htmlquery.FindOne(doc, "//div[@class='card']/div[@class='card']"))
 	text = strings.ReplaceAll(text, " ", "")
 	text = strings.Replace(text, "\n", "", 1)
-	return text
+	return text, nil
 }

plugin/chat/chat.go

@@ -10,13 +10,11 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/extension/rate"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 var (
-	poke   = rate.NewManager(time.Minute*5, 8) // 戳一戳
-	engine = control.Register("chat", order.AcquirePrio(), &control.Options{
+	poke   = rate.NewManager[int64](time.Minute*5, 8) // 戳一戳
+	engine = control.Register("chat", &control.Options{
 		DisableOnDefault: false,
 		Help:             "chat\n- [BOT名字]\n- [戳一戳BOT]\n- 空调开\n- 空调关\n- 群温度\n- 设置温度[正整数]",
 	})

plugin/choose/choose.go

@@ -9,12 +9,10 @@ import (
 	control "github.com/FloatTech/zbputils/control"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 func init() {
-	engine := control.Register("choose", order.AcquirePrio(), &control.Options{
+	engine := control.Register("choose", &control.Options{
 		DisableOnDefault: false,
 		Help: "choose\n" +
 			"- 选择可口可乐还是百事可乐\n" +

plugin/chouxianghua/chouxianghua.go

@@ -7,34 +7,35 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"
 
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
-	"github.com/FloatTech/zbputils/file"
+	"github.com/FloatTech/zbputils/ctxext"
 )
 
 func init() {
-	en := control.Register("chouxianghua", order.AcquirePrio(), &control.Options{
+	en := control.Register("chouxianghua", &control.Options{
 		DisableOnDefault: false,
 		Help:             "抽象话\n- 抽象翻译xxx",
 		PublicDataFolder: "ChouXiangHua",
 	})
 
-	go func() {
-		dbpath := en.DataFolder()
-		db.DBPath = dbpath + "cxh.db"
-		// os.RemoveAll(dbpath)
-		_, _ = file.GetLazyData(db.DBPath, false, true)
-		err := db.Create("pinyin", &pinyin{})
-		if err != nil {
-			panic(err)
-		}
-		n, err := db.Count("pinyin")
-		if err != nil {
-			panic(err)
-		}
-		logrus.Printf("[chouxianghua]读取%d条拼音", n)
-	}()
-
-	en.OnRegex("^抽象翻译((\\s|[\\r\\n]|[\\p{Han}\\p{P}A-Za-z0-9])+)$").SetBlock(true).
+	en.OnRegex("^抽象翻译((\\s|[\\r\\n]|[\\p{Han}\\p{P}A-Za-z0-9])+)$",
+		ctxext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool {
+			db.DBPath = en.DataFolder() + "cxh.db"
+			// os.RemoveAll(dbpath)
+			_, _ = en.GetLazyData("cxh.db", true)
+			err := db.Create("pinyin", &pinyin{})
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return false
+			}
+			n, err := db.Count("pinyin")
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return false
+			}
+			logrus.Printf("[chouxianghua]读取%d条拼音", n)
+			return true
+		}),
+	).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			r := cx(ctx.State["regex_matched"].([]string)[1])
 			ctx.SendChain(message.Text(r))

plugin/coser/coser.go

@@ -2,9 +2,10 @@
 package coser
 
 import (
+	"regexp"
+
 	"github.com/tidwall/gjson"
 
-	log "github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
@@ -12,17 +13,16 @@ import (
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/web"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 var (
 	ua       = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.93 Safari/537.36"
 	coserURL = "http://ovooa.com/API/cosplay/api.php"
+	datestr  = regexp.MustCompile(`/\d{4}-\d{2}-\d{2}/`)
 )
 
 func init() {
-	control.Register("coser", order.AcquirePrio(), &control.Options{
+	control.Register("coser", &control.Options{
 		DisableOnDefault: false,
 		Help:             "三次元小姐姐\n- coser",
 	}).ApplySingle(ctxext.DefaultSingle).OnFullMatch("coser", zero.OnlyGroup).SetBlock(true).Limit(ctxext.LimitByGroup).
@@ -30,12 +30,18 @@ func init() {
 			ctx.SendChain(message.Text("少女祈祷中......"))
 			data, err := web.RequestDataWith(web.NewDefaultClient(), coserURL, "GET", "", ua)
 			if err != nil {
-				log.Println("err为:", err)
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
 			}
-
 			text := gjson.Get(helper.BytesToString(data), "data.Title").String()
 			m := message.Message{ctxext.FakeSenderForwardNode(ctx, message.Text(text))}
+			ds := ""
 			gjson.Get(helper.BytesToString(data), "data.data").ForEach(func(_, value gjson.Result) bool {
+				if ds == "" {
+					ds = datestr.FindString(value.String())
+				} else if ds != datestr.FindString(value.String()) {
+					return false
+				}
 				m = append(m, ctxext.FakeSenderForwardNode(ctx, message.Image(value.String())))
 				return true
 			})
@@ -43,7 +49,7 @@ func init() {
 			if id := ctx.SendGroupForwardMessage(
 				ctx.Event.GroupID,
 				m).Get("message_id").Int(); id == 0 {
-				ctx.SendChain(message.Text("ERROR: 可能被风控了"))
+				ctx.SendChain(message.Text("ERROR:可能被风控或下载图片用时过长，请耐心等待"))
 			}
 		})
 }

plugin/cpstory/cpstory.go

@@ -9,36 +9,36 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"
 
 	control "github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/file"
+	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/math"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 func init() {
-	engine := control.Register("cpstory", order.AcquirePrio(), &control.Options{
+	engine := control.Register("cpstory", &control.Options{
 		DisableOnDefault: false,
 		Help:             "cp短打\n- 组cp[@xxx][@xxx]\n- 磕cp大老师 雪乃",
 		PublicDataFolder: "CpStory",
 	})
 
-	go func() {
-		dbpath := engine.DataFolder()
-		db.DBPath = dbpath + "cp.db"
+	getdb := ctxext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool {
+		db.DBPath = engine.DataFolder() + "cp.db"
 		// os.RemoveAll(dbpath)
-		_, _ = file.GetLazyData(db.DBPath, false, true)
+		_, _ = engine.GetLazyData("cp.db", true)
 		err := db.Create("cp_story", &cpstory{})
 		if err != nil {
-			panic(err)
+			ctx.SendChain(message.Text("ERROR:", err))
+			return false
 		}
 		n, err := db.Count("cp_story")
 		if err != nil {
-			panic(err)
+			ctx.SendChain(message.Text("ERROR:", err))
+			return false
 		}
 		logrus.Printf("[cpstory]读取%d条故事", n)
-	}()
+		return true
+	})
 
-	engine.OnRegex("^组cp.*?(\\d+).*?(\\d+)", zero.OnlyGroup).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+	engine.OnRegex("^组cp.*?(\\d+).*?(\\d+)", zero.OnlyGroup, getdb).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		cs := getRandomCpStory()
 		gong := ctx.CardOrNickName(math.Str2Int64(ctx.State["regex_matched"].([]string)[1]))
 		shou := ctx.CardOrNickName(math.Str2Int64(ctx.State["regex_matched"].([]string)[2]))
@@ -48,7 +48,7 @@ func init() {
 		text = strings.ReplaceAll(text, cs.Shou, gong)
 		ctx.SendChain(message.Text(text))
 	})
-	engine.OnPrefix("磕cp").SetBlock(true).Handle(func(ctx *zero.Ctx) {
+	engine.OnPrefix("磕cp", getdb).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		cs := getRandomCpStory()
 		params := strings.Split(ctx.State["args"].(string), " ")
 		if len(params) < 2 {

plugin/curse/curse.go

@@ -8,10 +8,7 @@ import (
 
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
-	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/process"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -20,40 +17,46 @@ const (
 )
 
 func init() {
-	engine := control.Register("curse", order.AcquirePrio(), &control.Options{
+	engine := control.Register("curse", &control.Options{
 		DisableOnDefault: true,
 		Help:             "骂人(求骂,自卫)\n- 骂我\n- 大力骂我",
 		PublicDataFolder: "Curse",
 	})
 
-	go func() {
-		dbpath := engine.DataFolder()
-		db.DBPath = dbpath + "curse.db"
-		_, err := file.GetLazyData(db.DBPath, false, true)
+	getdb := ctxext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool {
+		db.DBPath = engine.DataFolder() + "curse.db"
+		_, err := engine.GetLazyData("curse.db", true)
 		if err != nil {
-			panic(err)
+			ctx.SendChain(message.Text("ERROR:", err))
+			return false
 		}
 		err = db.Create("curse", &curse{})
 		if err != nil {
-			panic(err)
+			ctx.SendChain(message.Text("ERROR:", err))
+			return false
+		}
+		c, err := db.Count("curse")
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR:", err))
+			return false
 		}
-		c, _ := db.Count("curse")
 		logrus.Infoln("[curse]加载", c, "条骂人语录")
-	}()
+		return true
+	})
 
-	engine.OnFullMatch("骂我").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
+	engine.OnFullMatch("骂我", getdb).SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
 		process.SleepAbout1sTo2s()
 		text := getRandomCurseByLevel(minLevel).Text
 		ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(text))
 	})
 
-	engine.OnFullMatch("大力骂我").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
+	engine.OnFullMatch("大力骂我", getdb).SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
 		process.SleepAbout1sTo2s()
 		text := getRandomCurseByLevel(maxLevel).Text
 		ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(text))
 	})
 
-	engine.OnKeywordGroup([]string{"他妈", "公交车", "你妈", "操", "屎", "去死", "快死", "我日", "逼", "尼玛", "艾滋", "癌症", "有病", "烦你", "你爹", "屮", "cnm"}, zero.OnlyToMe).SetBlock(true).
+	engine.OnKeywordGroup([]string{"他妈", "公交车", "你妈", "操", "屎", "去死", "快死", "我日", "逼", "尼玛", "艾滋", "癌症", "有病", "烦你", "你爹", "屮", "cnm"}, zero.OnlyToMe, getdb).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			text := getRandomCurseByLevel(maxLevel).Text
 			ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(text))

plugin/danbooru/main.go

@@ -6,19 +6,16 @@ import (
 	"encoding/hex"
 
 	"github.com/FloatTech/AnimeAPI/danbooru"
-	"github.com/FloatTech/AnimeAPI/saucenao"
 	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/img/writer"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 func init() { // 插件主体
-	engine := control.Register("danbooru", order.AcquirePrio(), &control.Options{
+	engine := control.Register("danbooru", &control.Options{
 		DisableOnDefault: false,
 		Help: "二次元图片标签识别\n" +
 			"- 鉴赏图片[图片]",
@@ -32,14 +29,7 @@ func init() { // 插件主体
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SendChain(message.Text("少女祈祷中..."))
 			for _, url := range ctx.State["image_url"].([]string) {
-				name := ""
-				r, err := saucenao.SauceNAO(url)
-				if err != nil {
-					name = "未知图片"
-				} else {
-					name = r[0].Title
-				}
-				t, err := danbooru.TagURL(name, url)
+				t, err := danbooru.TagURL("", url)
 				if err != nil {
 					ctx.SendChain(message.Text("ERROR:", err))
 					return

plugin/diana/bing.go

@@ -6,13 +6,12 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"
 
 	control "github.com/FloatTech/zbputils/control"
-
-	"github.com/FloatTech/zbputils/control/order"
+	"github.com/FloatTech/zbputils/ctxext"
 
 	"github.com/FloatTech/ZeroBot-Plugin/plugin/diana/data"
 )
 
-var engine = control.Register("diana", order.AcquirePrio(), &control.Options{
+var engine = control.Register("diana", &control.Options{
 	DisableOnDefault: false,
 	Help: "嘉然\n" +
 		"- 小作文\n" +
@@ -23,30 +22,33 @@ var engine = control.Register("diana", order.AcquirePrio(), &control.Options{
 })
 
 func init() {
-	go func() {
-		datapath := engine.DataFolder()
-		dbfile := datapath + "text.db"
-		data.LoadText(dbfile)
-	}()
+	getdb := ctxext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool {
+		err := data.LoadText(engine.DataFolder() + "text.db")
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR:", err))
+			return false
+		}
+		return true
+	})
 
 	// 随机发送一篇上面的小作文
-	engine.OnFullMatch("小作文").SetBlock(true).
+	engine.OnFullMatch("小作文", getdb).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			// 绕过第一行发病
 			ctx.SendChain(message.Text(data.RandText()))
 		})
 	// 逆天
-	engine.OnFullMatch("发大病").SetBlock(true).
+	engine.OnFullMatch("发大病", getdb).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			// 第一行是发病
 			ctx.SendChain(message.Text(data.HentaiText()))
 		})
 	// 增加小作文
-	engine.OnRegex(`^教你一篇小作文(.*)$`, zero.AdminPermission).SetBlock(true).
+	engine.OnRegex(`^教你一篇小作文(.*)$`, zero.AdminPermission, getdb).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			err := data.AddText(ctx.State["regex_matched"].([]string)[1])
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 			} else {
 				ctx.SendChain(message.Text("记住啦!"))
 			}

plugin/diana/data/text.go

@@ -19,18 +19,22 @@ type text struct {
 }
 
 // LoadText 加载小作文
-func LoadText(dbfile string) {
-	_, err := file.GetLazyData(dbfile, false, false)
+func LoadText(dbfile string) error {
+	_, err := file.GetLazyData(dbfile, false)
 	db.DBPath = dbfile
 	if err != nil {
-		panic(err)
+		return err
 	}
 	err = db.Create("text", &text{})
 	if err != nil {
-		panic(err)
+		return err
+	}
+	c, err := db.Count("text")
+	if err != nil {
+		return err
 	}
-	c, _ := db.Count("text")
 	logrus.Printf("[Diana]读取%d条小作文", c)
+	return nil
 }
 
 // AddText 添加小作文

plugin/diana/zhiwang.go

@@ -3,106 +3,87 @@ package diana
 
 import (
 	"bytes"
-	"encoding/json"
 	"math"
+	"strings"
 	"time"
 
+	"github.com/FloatTech/zbputils/binary"
+	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/web"
+	"github.com/tidwall/gjson"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
-	"net/http"
-	"strings"
-
 	zero "github.com/wdvxdr1123/ZeroBot"
 )
 
-type zhiwang struct {
-	Code int `json:"code"`
-	Data struct {
-		EndTime   int             `json:"end_time"`
-		Rate      float64         `json:"rate"`
-		Related   [][]interface{} `json:"related"`
-		StartTime int             `json:"start_time"`
-	} `json:"data"`
-	Message string `json:"message"`
-}
-
 // 小作文查重: 回复要查的消息 查重
 func init() {
-	engine.OnMessage(fullmatch("查重")).SetBlock(true).
-		Handle(func(ctx *zero.Ctx) {
-			msg := ctx.Event.Message
-			if msg[0].Type == "reply" {
-				msg := ctx.GetMessage(message.NewMessageID(msg[0].Data["id"])).Elements[0].Data["text"]
-				zhiwangjson := zhiwangapi(msg)
-
-				if zhiwangjson == nil || zhiwangjson.Code != 0 {
-					ctx.SendChain(message.Text("api返回错误"))
-					return
-				}
-
-				if len(zhiwangjson.Data.Related) == 0 {
-					ctx.SendChain(message.Text("枝网没搜到，查重率为0%，我的评价是：一眼真"))
-					return
-				}
-
-				related := zhiwangjson.Data.Related[0][1].(map[string]interface{})
-				ctx.SendChain(message.Text(
-					"枝网文本复制检测报告(简洁)", "\n",
-					"查重时间: ", time.Now().Format("2006-01-02 15:04:05"), "\n",
-					"总文字复制比: ", math.Floor(zhiwangjson.Data.Rate*100), "%", "\n",
-					"相似小作文:", "\n",
-					related["content"].(string)[:102]+".....", "\n",
-					"获赞数", related["like_num"], "\n",
-					zhiwangjson.Data.Related[0][2].(string), "\n",
-					"作者: ", related["m_name"], "\n",
-					"发表时间: ", time.Unix(int64(related["ctime"].(float64)), 0).Format("2006-01-02 15:04:05"), "\n",
-					"查重结果仅作参考，请注意辨别是否为原创", "\n",
-					"数据来源: https://asoulcnki.asia/",
-				))
-			}
-		})
-}
-
-// 发起api请求并把返回body交由json库解析
-func zhiwangapi(text string) *zhiwang {
-	url := "https://asoulcnki.asia/v1/api/check"
-	post := "{\n\"text\":\"" + text + "\"\n}"
-	var jsonStr = []byte(post)
-
-	req, _ := http.NewRequest("POST", url, bytes.NewBuffer(jsonStr))
-	req.Header.Set("Content-Type", "application/json")
-	client := &http.Client{}
-
-	resp, err := client.Do(req)
-
-	if err != nil {
-		return nil
-	}
-	defer resp.Body.Close()
-
-	result := &zhiwang{}
-	if err1 := json.NewDecoder(resp.Body).Decode(result); err1 != nil {
-		return nil
-	}
-	return result
-}
-
-func fullmatch(src ...string) zero.Rule {
-	return func(ctx *zero.Ctx) bool {
+	engine.OnMessage(func(ctx *zero.Ctx) bool {
 		msg := ctx.Event.Message
+		if msg[0].Type != "reply" {
+			return false
+		}
 		for _, elem := range msg {
 			if elem.Type == "text" {
 				text := elem.Data["text"]
 				text = strings.ReplaceAll(text, " ", "")
 				text = strings.ReplaceAll(text, "\r", "")
 				text = strings.ReplaceAll(text, "\n", "")
-				for _, s := range src {
-					if text == s {
-						return true
-					}
+				if text == "查重" {
+					return true
 				}
 			}
 		}
 		return false
-	}
+	}).SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
+		msg := ctx.GetMessage(message.NewMessageIDFromString(ctx.Event.Message[0].Data["id"])).Elements[0].Data["text"]
+		result, err := zhiwangapi(msg)
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR:", err))
+			return
+		}
+		if result.Get("code").Int() != 0 {
+			ctx.SendChain(message.Text("api返回错误:", result.Get("code").Int()))
+			return
+		}
+		if result.Get("data.related.#").Int() == 0 {
+			ctx.Send(message.ReplyWithMessage(ctx.Event.MessageID, message.Text("枝网没搜到，查重率为0%，鉴定为原创")))
+			return
+		}
+		related := result.Get("data.related.0.reply").Map()
+		rate := result.Get("data.related.0.rate").Float()
+		relatedcontent := related["content"].String()
+		if len(relatedcontent) > 102 {
+			relatedcontent = relatedcontent[:102] + "....."
+		}
+		ctx.Send(message.ReplyWithMessage(ctx.Event.MessageID, message.Text(
+			"枝网文本复制检测报告(简洁)", "\n",
+			"查重时间: ", time.Now().Format("2006-01-02 15:04:05"), "\n",
+			"总文字复制比: ", math.Floor(rate*100), "%", "\n",
+			"相似小作文：", "\n", relatedcontent, "\n",
+			"获赞数：", related["like_num"].String(), "\n",
+			result.Get("data.related.0.reply_url").String(), "\n",
+			"作者: ", related["m_name"].String(), "\n",
+			"发表时间: ", time.Unix(int64(related["ctime"].Float()), 0).Format("2006-01-02 15:04:05"), "\n",
+			"查重结果仅作参考，请注意辨别是否为原创", "\n",
+			"数据来源: https://asoulcnki.asia/",
+		)))
+	})
+}
+
+func zhiwangapi(text string) (*gjson.Result, error) {
+	b, cl := binary.OpenWriterF(func(w *binary.Writer) {
+		w.WriteString("{\n\"text\":\"")
+		w.WriteString(text)
+		w.WriteString("\"\n}")
+	})
+
+	data, err := web.PostData("https://asoulcnki.asia/v1/api/check", "application/json", bytes.NewReader(b))
+	cl()
+	if err != nil {
+		return nil, err
+	}
+
+	result := gjson.ParseBytes(data)
+	return &result, nil
 }

plugin/drift_bottle/main.go

@@ -7,14 +7,13 @@ import (
 	"sync"
 
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 )
 
 func init() {
-	en := control.Register("driftbottle", order.AcquirePrio(), &control.Options{
+	en := control.Register("driftbottle", &control.Options{
 		DisableOnDefault:  false,
 		Help:              "漂流瓶\n- (在群xxx)丢漂流瓶(到频道xxx) [消息]\n- (从频道xxx)捡漂流瓶\n- @BOT 创建频道 xxx\n- 跳入(频道)海中\n- 注：不显式限制时，私聊发送可在所有群抽到，群聊发送仅可在本群抽到，默认频道为 global",
 		PrivateDataFolder: "driftbottle",

plugin/emojimix/mix.go

@@ -7,7 +7,6 @@ import (
 	"strconv"
 
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
@@ -17,7 +16,7 @@ import (
 const bed = "https://www.gstatic.com/android/keyboard/emojikitchen/%d/u%x/u%x_u%x.png"
 
 func init() {
-	control.Register("emojimix", order.AcquirePrio(), &control.Options{
+	control.Register("emojimix", &control.Options{
 		DisableOnDefault: false,
 		Help: "合成emoji\n" +
 			"- [emoji][emoji]",

plugin/epidemic/epidemic.go

@@ -7,21 +7,21 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
-	"github.com/FloatTech/zbputils/binary"
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/web"
 )
 
 const (
 	servicename = "epidemic"
-	txurl       = "https://view.inews.qq.com/g2/getOnsInfo?name=disease_h5"
+	txurl       = "https://api.inews.qq.com/newsqa/v1/query/inner/publish/modules/list?modules=statisGradeCityDetail,diseaseh5Shelf"
 )
 
 // result 疫情查询结果
 type result struct {
-	Data string `json:"data"`
+	Data struct {
+		Epidemic epidemic `json:"diseaseh5Shelf"`
+	} `json:"data"`
 }
 
 // epidemic 疫情数据
@@ -34,7 +34,8 @@ type epidemic struct {
 type area struct {
 	Name  string `json:"name"`
 	Today struct {
-		Confirm int `json:"confirm"`
+		Confirm int         `json:"confirm"`
+		Wzzadd  interface{} `json:"wzz_add"`
 	} `json:"today"`
 	Total struct {
 		NowConfirm int    `json:"nowConfirm"`
@@ -42,12 +43,13 @@ type area struct {
 		Dead       int    `json:"dead"`
 		Heal       int    `json:"heal"`
 		Grade      string `json:"grade"`
+		Wzz        int    `json:"wzz"`
 	} `json:"total"`
 	Children []*area `json:"children"`
 }
 
 func init() {
-	engine := control.Register(servicename, order.AcquirePrio(), &control.Options{
+	engine := control.Register(servicename, &control.Options{
 		DisableOnDefault: false,
 		Help: "城市疫情查询\n" +
 			"- xxx疫情\n",
@@ -61,7 +63,7 @@ func init() {
 			}
 			data, time, err := queryEpidemic(city)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
 			if data == nil {
@@ -71,12 +73,14 @@ func init() {
 			ctx.SendChain(
 				message.Text(
 					"【", data.Name, "】疫情数据\n",
-					"新增：", data.Today.Confirm, " ,",
-					"现有确诊：", data.Total.NowConfirm, " ,",
-					"治愈：", data.Total.Heal, " ,",
-					"死亡：", data.Total.Dead, " ", data.Total.Grade, "\n",
-					"更新时间：", time, "\n",
-					"温馨提示：请大家做好防疫工作，出门带好口罩！",
+					"新增人数：", data.Today.Confirm, "\n",
+					"现有确诊：", data.Total.NowConfirm, "\n",
+					"累计确诊：", data.Total.Confirm, "\n",
+					"治愈人数：", data.Total.Heal, "\n",
+					"死亡人数：", data.Total.Dead, "\n",
+					"无症状人数：", data.Total.Wzz, "\n",
+					"新增无症状：", data.Today.Wzzadd, "\n",
+					"更新时间：\n『", time, "』",
 				),
 			)
 		})
@@ -113,11 +117,6 @@ func queryEpidemic(findCityName string) (citydata *area, times string, err error
 	if err != nil {
 		return
 	}
-	var e epidemic
-	err = json.Unmarshal(binary.StringToBytes(r.Data), &e)
-	if err != nil {
-		return
-	}
-	citydata = rcity(e.AreaTree[0], findCityName)
-	return citydata, e.LastUpdateTime, nil
+	citydata = rcity(r.Data.Epidemic.AreaTree[0], findCityName)
+	return citydata, r.Data.Epidemic.LastUpdateTime, nil
 }

plugin/font/main.go

@@ -0,0 +1,43 @@
+// Package font 渲染任意文字到图片
+package font
+
+import (
+	"github.com/FloatTech/zbputils/binary"
+	"github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/img/text"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+)
+
+func init() {
+	control.Register("font", &control.Options{
+		DisableOnDefault: false,
+		Help:             "渲染任意文字到图片\n- (用[终末体|终末变体|紫罗兰体|樱酥体|Consolas体|苹方体])渲染文字xxx",
+	}).OnRegex(`^(用.+)?渲染文字([\s\S]+)$`).SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
+		fnt := ctx.State["regex_matched"].([]string)[1]
+		txt := ctx.State["regex_matched"].([]string)[2]
+		switch fnt {
+		case "用终末体":
+			fnt = text.SyumatuFontFile
+		case "用终末变体":
+			fnt = text.NisiFontFile
+		case "用紫罗兰体":
+			fnt = text.VioletEvergardenFontFile
+		case "用樱酥体":
+			fnt = text.SakuraFontFile
+		case "用Consolas体":
+			fnt = text.ConsolasFontFile
+		case "用苹方体":
+			fallthrough
+		default:
+			fnt = text.FontFile
+		}
+		b, err := text.RenderToBase64(txt, fnt, 400, 20)
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR:", err))
+			return
+		}
+		ctx.SendChain(message.Image("base64://" + binary.BytesToString(b)))
+	})
+}

plugin/fortune/fortune.go

@@ -8,10 +8,8 @@ import (
 	"encoding/json"
 	"image"
 	"io"
-	"math/rand"
 	"os"
 	"strconv"
-	"time"
 
 	"github.com/fogleman/gg" // 注册了 jpg png gif
 	"github.com/sirupsen/logrus"
@@ -25,8 +23,6 @@ import (
 	"github.com/FloatTech/zbputils/img/pool"
 	"github.com/FloatTech/zbputils/img/writer"
 	"github.com/FloatTech/zbputils/math"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -42,7 +38,7 @@ const (
 
 var (
 	// 底图类型列表
-	table = [...]string{"车万", "DC4", "爱因斯坦", "星空列车", "樱云之恋", "富婆妹", "李清歌", "公主连结", "原神", "明日方舟", "碧蓝航线", "碧蓝幻想", "战双", "阴阳师", "赛马娘", "东方归言录"}
+	table = [...]string{"车万", "DC4", "爱因斯坦", "星空列车", "樱云之恋", "富婆妹", "李清歌", "公主连结", "原神", "明日方舟", "碧蓝航线", "碧蓝幻想", "战双", "阴阳师", "赛马娘", "东方归言录", "奇异恩典", "夏日口袋"}
 	// 映射底图与 index
 	index = make(map[string]uint8)
 	// 签文
@@ -51,35 +47,21 @@ var (
 
 func init() {
 	// 插件主体
-	en := control.Register("fortune", order.AcquirePrio(), &control.Options{
+	en := control.Register("fortune", &control.Options{
 		DisableOnDefault: false,
 		Help: "每日运势: \n" +
 			"- 运势 | 抽签\n" +
-			"- 设置底图[车万 | DC4 | 爱因斯坦 | 星空列车 | 樱云之恋 | 富婆妹 | 李清歌 | 公主连结 | 原神 | 明日方舟 | 碧蓝航线 | 碧蓝幻想 | 战双 | 阴阳师 | 赛马娘 | 东方归言录]",
+			"- 设置底图[车万 | DC4 | 爱因斯坦 | 星空列车 | 樱云之恋 | 富婆妹 | 李清歌 | 公主连结 | 原神 | 明日方舟 | 碧蓝航线 | 碧蓝幻想 | 战双 | 阴阳师 | 赛马娘 | 东方归言录 | 奇异恩典 | 夏日口袋]",
 		PublicDataFolder: "Fortune",
 	})
-	go func() {
-		for i, s := range table {
-			index[s] = uint8(i)
-		}
-		_ = os.RemoveAll(cache)
-		err := os.MkdirAll(cache, 0755)
-		if err != nil {
-			panic(err)
-		}
-		data, err := file.GetLazyData(omikujson, true, false)
-		if err != nil {
-			panic(err)
-		}
-		err = json.Unmarshal(data, &omikujis)
-		if err != nil {
-			panic(err)
-		}
-		_, err = file.GetLazyData(font, false, true)
-		if err != nil {
-			panic(err)
-		}
-	}()
+	_ = os.RemoveAll(cache)
+	err := os.MkdirAll(cache, 0755)
+	if err != nil {
+		panic(err)
+	}
+	for i, s := range table {
+		index[s] = uint8(i)
+	}
 	en.OnRegex(`^设置底图\s?(.*)`).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			gid := ctx.Event.GroupID
@@ -104,7 +86,26 @@ func init() {
 			}
 			ctx.SendChain(message.Text("没有这个底图哦～"))
 		})
-	en.OnFullMatchGroup([]string{"运势", "抽签"}).SetBlock(true).
+	en.OnFullMatchGroup([]string{"运势", "抽签"}, ctxext.DoOnceOnSuccess(
+		func(ctx *zero.Ctx) bool {
+			data, err := file.GetLazyData(omikujson, false)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return false
+			}
+			err = json.Unmarshal(data, &omikujis)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return false
+			}
+			_, err = file.GetLazyData(font, true)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return false
+			}
+			return true
+		},
+	)).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			// 获取该群背景类型，默认车万
 			kind := "车万"
@@ -123,25 +124,22 @@ func init() {
 			}
 			// 检查背景图片是否存在
 			zipfile := images + kind + ".zip"
-			_, err := file.GetLazyData(zipfile, false, false)
+			_, err := file.GetLazyData(zipfile, false)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
 
-			// 生成种子
-			t, _ := strconv.ParseInt(time.Now().Format("20060102"), 10, 64)
-			seed := ctx.Event.UserID + t
-
 			// 随机获取背景
-			background, index, err := randimage(zipfile, seed)
+			background, index, err := randimage(zipfile, ctx)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
 
 			// 随机获取签文
-			title, text := randtext(seed)
+			randtextindex := ctxext.RandSenderPerDayN(ctx, len(omikujis))
+			title, text := omikujis[randtextindex]["title"], omikujis[randtextindex]["content"]
 			digest := md5.Sum(helper.StringToBytes(zipfile + strconv.Itoa(index) + title + text))
 			cachefile := cache + hex.EncodeToString(digest[:])
 
@@ -155,7 +153,7 @@ func init() {
 				return err
 			}, ctxext.Send(ctx), ctxext.GetMessage(ctx))
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
 		})
@@ -163,18 +161,16 @@ func init() {
 
 // @function randimage 随机选取zip内的文件
 // @param path zip路径
-// @param seed 随机数种子
+// @param ctx *zero.Ctx
 // @return 文件路径 & 错误信息
-func randimage(path string, seed int64) (im image.Image, index int, err error) {
+func randimage(path string, ctx *zero.Ctx) (im image.Image, index int, err error) {
 	reader, err := zip.OpenReader(path)
 	if err != nil {
 		return
 	}
 	defer reader.Close()
 
-	r := rand.New(rand.NewSource(seed))
-	index = r.Intn(len(reader.File))
-	file := reader.File[index]
+	file := reader.File[ctxext.RandSenderPerDayN(ctx, len(reader.File))]
 	f, err := file.Open()
 	if err != nil {
 		return
@@ -185,16 +181,6 @@ func randimage(path string, seed int64) (im image.Image, index int, err error) {
 	return
 }
 
-// @function randtext 随机选取签文
-// @param file 文件路径
-// @param seed 随机数种子
-// @return 签名 & 签文 & 错误信息
-func randtext(seed int64) (string, string) {
-	r := rand.New(rand.NewSource(seed))
-	i := r.Intn(len(omikujis))
-	return omikujis[i]["title"], omikujis[i]["content"]
-}
-
 // @function draw 绘制运势图
 // @param background 背景图片路径
 // @param seed 随机数种子

plugin/funny/laugh.go

@@ -11,9 +11,6 @@ import (
 	sql "github.com/FloatTech/sqlite"
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
-	"github.com/FloatTech/zbputils/file"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 type joke struct {
@@ -24,29 +21,33 @@ type joke struct {
 var db = &sql.Sqlite{}
 
 func init() {
-	en := control.Register("funny", order.AcquirePrio(), &control.Options{
+	en := control.Register("funny", &control.Options{
 		DisableOnDefault: false,
 		Help: "讲个笑话\n" +
-			"- 讲个笑话[@xxx] | 讲个笑话[qq号]",
+			"- 讲个笑话[@xxx|qq号|人名] | 夸夸[@xxx|qq号|人名] ",
 		PublicDataFolder: "Funny",
 	})
 
-	go func() {
-		dbpath := en.DataFolder()
-		db.DBPath = dbpath + "jokes.db"
-		_, err := file.GetLazyData(db.DBPath, false, true)
+	en.OnPrefixGroup([]string{"讲个笑话", "夸夸"}, ctxext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool {
+		db.DBPath = en.DataFolder() + "jokes.db"
+		_, err := en.GetLazyData("jokes.db", true)
 		if err != nil {
-			panic(err)
+			ctx.SendChain(message.Text("ERROR:", err))
+			return false
 		}
 		err = db.Create("jokes", &joke{})
 		if err != nil {
-			panic(err)
+			ctx.SendChain(message.Text("ERROR:", err))
+			return false
+		}
+		c, err := db.Count("jokes")
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR:", err))
+			return false
 		}
-		c, _ := db.Count("jokes")
 		logrus.Infoln("[funny]加载", c, "个笑话")
-	}()
-
-	en.OnPrefix("讲个笑话").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
+		return true
+	})).SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
 		// 获取名字
 		name := ctx.NickName()
 		var j joke

plugin/genshin/ys.go

@@ -9,13 +9,12 @@ import (
 	"image/jpeg"
 	"image/png"
 	"math/rand"
+	"regexp"
 	"strings"
 	"sync/atomic"
 
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/ctxext"
-	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/img/writer"
 	"github.com/FloatTech/zbputils/process"
 	"github.com/golang/freetype"
@@ -30,27 +29,16 @@ var (
 	totl                   uint64 // 累计抽奖次数
 	filetree               = make(zipfilestructure, 32)
 	starN3, starN4, starN5 *zip.File
+	namereg                = regexp.MustCompile(`_(.*)\.png`)
 )
 
 func init() {
-	engine := control.Register("genshin", order.AcquirePrio(), &control.Options{
+	engine := control.Register("genshin", &control.Options{
 		DisableOnDefault: false,
 		Help:             "原神抽卡\n- 原神十连\n- 切换原神卡池",
 		PublicDataFolder: "Genshin",
 	}).ApplySingle(ctxext.DefaultSingle)
 
-	go func() {
-		zipfile := engine.DataFolder() + "Genshin.zip"
-		_, err := file.GetLazyData(zipfile, false, false)
-		if err != nil {
-			panic(err)
-		}
-		err = parsezip(zipfile)
-		if err != nil {
-			panic(err)
-		}
-	}()
-
 	engine.OnFullMatch("切换原神卡池").SetBlock(true).Limit(ctxext.LimitByUser).
 		Handle(func(ctx *zero.Ctx) {
 			c, ok := control.Lookup("genshin")
@@ -77,7 +65,22 @@ func init() {
 			}
 		})
 
-	engine.OnFullMatch("原神十连").SetBlock(true).Limit(ctxext.LimitByUser).
+	engine.OnFullMatch("原神十连", ctxext.DoOnceOnSuccess(
+		func(ctx *zero.Ctx) bool {
+			zipfile := engine.DataFolder() + "Genshin.zip"
+			_, err := engine.GetLazyData("Genshin.zip", false)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return false
+			}
+			err = parsezip(zipfile)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return false
+			}
+			return true
+		},
+	)).SetBlock(true).Limit(ctxext.LimitByUser).
 		Handle(func(ctx *zero.Ctx) {
 			c, ok := control.Lookup("genshin")
 			if !ok {
@@ -89,18 +92,24 @@ func init() {
 				gid = -ctx.Event.UserID
 			}
 			store := (storage)(c.GetData(gid))
-			img, err := randnums(10, store)
+			img, str, mode, err := randnums(10, store)
 			if err != nil {
 				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
 			b, cl := writer.ToBytes(img)
-			ctx.Send(message.ReplyWithMessage(ctx.Event.MessageID, message.ImageBytes(b)))
+			if mode {
+				ctx.Send(message.ReplyWithMessage(ctx.Event.MessageID,
+					message.Text("恭喜你抽到了: \n", str), message.ImageBytes(b)))
+			} else {
+				ctx.Send(message.ReplyWithMessage(ctx.Event.MessageID,
+					message.Text("十连成功~"), message.ImageBytes(b)))
+			}
 			cl()
 		})
 }
 
-func randnums(nums int, store storage) (rgba *image.RGBA, err error) {
+func randnums(nums int, store storage) (rgba *image.RGBA, str string, replyMode bool, err error) {
 	var (
 		fours, fives                  = make([]*zip.File, 0, 10), make([]*zip.File, 0, 10)                           // 抽到 四, 五星角色
 		threeArms, fourArms, fiveArms = make([]*zip.File, 0, 10), make([]*zip.File, 0, 10), make([]*zip.File, 0, 10) // 抽到 三 , 四, 五星武器
@@ -109,13 +118,13 @@ func randnums(nums int, store storage) (rgba *image.RGBA, err error) {
 		threeN2, fourN2, fiveN2       = 0, 0, 0                                                                      // 抽到 三 , 四, 五星武器的数量
 		hero, stars                   = make([]*zip.File, 0, 10), make([]*zip.File, 0, 10)                           // 角色武器名, 储存星级图标
 
-		cicon                      = make([]*zip.File, 0, 10)                                                            // 元素图标
-		five_bg, four_bg, three_bg = filetree["five_bg.jpg"][0], filetree["four_bg.jpg"][0], filetree["three_bg.jpg"][0] // 背景图片名
-		fivelen                    = len(filetree["five"])
-		five2len                   = len(filetree["five2"])
-		threelen                   = len(filetree["Three"])
-		fourlen                    = len(filetree["four"])
-		four2len                   = len(filetree["four2"])
+		cicon                   = make([]*zip.File, 0, 10)                                                            // 元素图标
+		fivebg, fourbg, threebg = filetree["five_bg.jpg"][0], filetree["four_bg.jpg"][0], filetree["three_bg.jpg"][0] // 背景图片名
+		fivelen                 = len(filetree["five"])
+		five2len                = len(filetree["five2"])
+		threelen                = len(filetree["Three"])
+		fourlen                 = len(filetree["four"])
+		four2len                = len(filetree["four2"])
 	)
 
 	if totl%9 == 0 { // 累计9次加入一个五星
@@ -143,18 +152,18 @@ func randnums(nums int, store storage) (rgba *image.RGBA, err error) {
 		}
 	} else { // 默认模式
 		for i := 0; i < nums; i++ {
-			a := rand.Intn(1000)
-			switch { // 抽卡几率 三星75% 四星18% 五星7%
-			case a >= 0 && a <= 750:
+			a := rand.Intn(1000) // 抽卡几率 三星80% 四星17% 五星3%
+			switch {
+			case a >= 0 && a <= 800:
 				threeN2++
 				threeArms = append(threeArms, filetree["Three"][rand.Intn(threelen)])
-			case a > 750 && a <= 840:
+			case a > 800 && a <= 885:
 				fourN++
 				fours = append(fours, filetree["four"][rand.Intn(fourlen)]) // 随机角色
-			case a > 840 && a <= 930:
+			case a > 885 && a <= 970:
 				fourN2++
 				fourArms = append(fourArms, filetree["four2"][rand.Intn(four2len)]) // 随机武器
-			case a > 930 && a <= 965:
+			case a > 970 && a <= 985:
 				fiveN++
 				fives = append(fives, filetree["five"][rand.Intn(fivelen)])
 			default:
@@ -168,10 +177,10 @@ func randnums(nums int, store storage) (rgba *image.RGBA, err error) {
 			switch rand.Intn(2) {
 			case 0:
 				fourN++
-				fours = append(fours, filetree["four"][rand.Intn(fourlen)]) //随机角色
+				fours = append(fours, filetree["four"][rand.Intn(fourlen)]) // 随机角色
 			case 1:
 				fourN2++
-				fourArms = append(fourArms, filetree["four2"][rand.Intn(four2len)]) //随机武器
+				fourArms = append(fourArms, filetree["four2"][rand.Intn(four2len)]) // 随机武器
 			}
 		}
 		_ = atomic.AddUint64(&totl, 1)
@@ -207,19 +216,23 @@ func randnums(nums int, store storage) (rgba *image.RGBA, err error) {
 	}
 
 	if fiveN > 0 { // 按顺序加入
-		he(fiveN, 5, starN5, five_bg) // 五星角色
+		he(fiveN, 5, starN5, fivebg) // 五星角色
+		str += reply(fives, 1, str)
+		replyMode = true
 	}
 	if fourN > 0 {
-		he(fourN, 3, starN4, four_bg) // 四星角色
+		he(fourN, 3, starN4, fourbg) // 四星角色
 	}
 	if fiveN2 > 0 {
-		he(fiveN2, 4, starN5, five_bg) // 五星武器
+		he(fiveN2, 4, starN5, fivebg) // 五星武器
+		str += reply(fiveArms, 2, str)
+		replyMode = true
 	}
 	if fourN2 > 0 {
-		he(fourN2, 2, starN4, four_bg) // 四星武器
+		he(fourN2, 2, starN4, fourbg) // 四星武器
 	}
 	if threeN2 > 0 {
-		he(threeN2, 1, starN3, three_bg) // 三星武器
+		he(threeN2, 1, starN3, threebg) // 三星武器
 	}
 
 	var c1, c2, c3 uint8 = 50, 50, 50 // 背景颜色
@@ -254,7 +267,7 @@ func randnums(nums int, store storage) (rgba *image.RGBA, err error) {
 
 		imgs, err := bgs[i].Open() // 取出背景图片
 		if err != nil {
-			return nil, err
+			return nil, "", false, err
 		}
 		defer imgs.Close()
 
@@ -264,7 +277,7 @@ func randnums(nums int, store storage) (rgba *image.RGBA, err error) {
 
 		imgs1, err := hero[i].Open() // 取出图片名
 		if err != nil {
-			return nil, err
+			return nil, "", false, err
 		}
 		defer imgs1.Close()
 
@@ -274,7 +287,7 @@ func randnums(nums int, store storage) (rgba *image.RGBA, err error) {
 
 		imgs2, err := stars[i].Open() // 取出星级图标
 		if err != nil {
-			return nil, err
+			return nil, "", false, err
 		}
 		defer imgs2.Close()
 
@@ -284,7 +297,7 @@ func randnums(nums int, store storage) (rgba *image.RGBA, err error) {
 
 		imgs3, err := cicon[i].Open() // 取出类型图标
 		if err != nil {
-			return nil, err
+			return nil, "", false, err
 		}
 		defer imgs3.Close()
 
@@ -294,12 +307,12 @@ func randnums(nums int, store storage) (rgba *image.RGBA, err error) {
 	}
 	imgs4, err := filetree["Reply.png"][0].Open() // "分享" 图标
 	if err != nil {
-		return nil, err
+		return nil, "", false, err
 	}
 	defer imgs4.Close()
 	img4, err := png.Decode(imgs4)
 	if err != nil {
-		return nil, err
+		return nil, "", false, err
 	}
 	offset4 := image.Pt(1270, 945) // 宽, 高
 	draw.Draw(rgba, img4.Bounds().Add(offset4), img4, image.Point{}, draw.Over)
@@ -341,3 +354,21 @@ func parsezip(zipFile string) error {
 	}
 	return nil
 }
+
+// 取出角色武器名
+func reply(z []*zip.File, num int, nameStr string) string {
+	var tmp strings.Builder
+	tmp.Grow(128)
+	switch {
+	case num == 1:
+		tmp.WriteString("★五星角色★\n")
+	case num == 2 && len(nameStr) > 0:
+		tmp.WriteString("\n★五星武器★\n")
+	default:
+		tmp.WriteString("★五星武器★\n")
+	}
+	for i := range z {
+		tmp.WriteString(namereg.FindStringSubmatch(z[i].Name)[1] + " * ")
+	}
+	return tmp.String()
+}

plugin/gif/README.md

@@ -1,6 +1,6 @@
 # ZeroBot-Plugin-Gif
 [ZeroBot QQ机器人](https://github.com/wdvxdr1123/ZeroBot)插件，可以制作各种沙雕gif图
-> 素材包地址: https://codechina.csdn.net/u011570312/imagematerials
+> 素材包地址: https://gitcode.net/u011570312/imagematerials
 
 ## 触发方式
 1. [指令词]+[qq号] 如：爬123456

plugin/gif/context.go

@@ -20,7 +20,7 @@ func dlchan(name string, s *string, wg *sync.WaitGroup, exit func(error)) {
 	target := datapath + `materials/` + name
 	var err error
 	if file.IsNotExist(target) {
-		err = file.DownloadTo(`https://codechina.csdn.net/u011570312/imagematerials/-/raw/main/`+name, target, true)
+		err = file.DownloadTo(`https://gitcode.net/u011570312/imagematerials/-/raw/main/`+name, target, true)
 		if err != nil {
 			exit(err)
 			return
@@ -35,7 +35,7 @@ func dlchan(name string, s *string, wg *sync.WaitGroup, exit func(error)) {
 func dlblock(name string) (string, error) {
 	target := datapath + `materials/` + name
 	if file.IsNotExist(target) {
-		err := file.DownloadTo(`https://codechina.csdn.net/u011570312/imagematerials/-/raw/main/`+name, target, true)
+		err := file.DownloadTo(`https://gitcode.net/u011570312/imagematerials/-/raw/main/`+name, target, true)
 		if err != nil {
 			return "", err
 		}

plugin/gif/run.go

@@ -11,8 +11,6 @@ import (
 	"github.com/FloatTech/zbputils/file"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 var (
@@ -22,7 +20,7 @@ var (
 )
 
 func init() { // 插件主体
-	en := control.Register("gif", order.AcquirePrio(), &control.Options{
+	en := control.Register("gif", &control.Options{
 		DisableOnDefault:  false,
 		Help:              "制图\n- " + strings.Join(cmds, "\n- "),
 		PrivateDataFolder: "gif",

plugin/github/repo_searcher.go

@@ -13,13 +13,11 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
-	"github.com/FloatTech/zbputils/control/order"
-
 	"github.com/tidwall/gjson"
 )
 
 func init() { // 插件主体
-	control.Register("github", order.AcquirePrio(), &control.Options{
+	control.Register("github", &control.Options{
 		DisableOnDefault: false,
 		Help: "GitHub仓库搜索\n" +
 			"- >github [xxx]\n" +
@@ -36,12 +34,12 @@ func init() { // 插件主体
 			}.Encode()
 			body, err := netGet(api.String(), header)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 			}
 			// 解析请求
 			info := gjson.ParseBytes(body)
 			if info.Get("total_count").Int() == 0 {
-				ctx.SendChain(message.Text("ERROR: 没有找到这样的仓库"))
+				ctx.SendChain(message.Text("ERROR:没有找到这样的仓库"))
 				return
 			}
 			repo := info.Get("items.0")
@@ -97,7 +95,7 @@ func init() { // 插件主体
 }
 
 // notnull 如果传入文本为空，则返回默认值
-//nolint: unparam
+
 func notnull(text, defstr string) string {
 	if text == "" {
 		return defstr

plugin/hs/run.go

@@ -2,7 +2,6 @@
 package hs
 
 import (
-	"fmt"
 	"os"
 	"strconv"
 	"strings"
@@ -16,8 +15,6 @@ import (
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/web"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 var reqconf = [...]string{"GET", "https://hs.fbigame.com",
@@ -43,7 +40,7 @@ const (
 )
 
 func init() {
-	engine := control.Register("hs", order.AcquirePrio(), &control.Options{
+	engine := control.Register("hs", &control.Options{
 		DisableOnDefault: false,
 		Help: "炉石\n" +
 			"- 搜卡[xxxx]\n" +
@@ -83,13 +80,12 @@ func init() {
 			ctx.Event.GroupID,
 			sk,
 		).Get("message_id").Int(); id == 0 {
-			ctx.SendChain(message.Text("ERROR: 可能被风控了"))
+			ctx.SendChain(message.Text("ERROR:可能被风控了"))
 		}
 	})
 	// 卡组
 	engine.OnRegex(`^[\s\S]*?(AAE[a-zA-Z0-9/\+=]{70,})[\s\S]*$`).
 		SetBlock(true).Handle(func(ctx *zero.Ctx) {
-		fmt.Print("成功")
 		List := ctx.State["regex_matched"].([]string)[1]
 		ctx.SendChain(
 			message.Image(kz(List)),

plugin/hyaku/main.go

@@ -0,0 +1,122 @@
+// Package hyaku 百人一首
+package hyaku
+
+import (
+	"encoding/csv"
+	"fmt"
+	"math/rand"
+	"os"
+	"reflect"
+	"strconv"
+	"unsafe"
+
+	"github.com/FloatTech/zbputils/binary"
+	"github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/file"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+)
+
+const bed = "https://gitcode.net/u011570312/OguraHyakuninIsshu/-/raw/master/"
+
+//nolint: asciicheck
+type line struct {
+	番号, 歌人, 上の句, 下の句, 上の句ひらがな, 下の句ひらがな string
+}
+
+func (l *line) String() string {
+	b := binary.NewWriterF(func(w *binary.Writer) {
+		r := reflect.ValueOf(l).Elem().Type()
+		for i := 0; i < r.NumField(); i++ {
+			switch i {
+			case 0:
+				w.WriteString("●")
+			case 1:
+				w.WriteString("◉")
+			case 2, 3:
+				w.WriteString("○")
+			case 4, 5:
+				w.WriteString("◎")
+			}
+			w.WriteString(r.Field(i).Name)
+			w.WriteString("：")
+			w.WriteString((*[6]string)(unsafe.Pointer(l))[i])
+			w.WriteString("\n")
+		}
+	})
+	return binary.BytesToString(b)
+}
+
+var lines [100]*line
+
+func init() {
+	engine := control.Register("hyaku", &control.Options{
+		DisableOnDefault: false,
+		Help: "百人一首\n" +
+			"- 百人一首(随机发一首)\n" +
+			"- 百人一首之n",
+		PrivateDataFolder: "hyaku",
+	})
+	csvfile := engine.DataFolder() + "hyaku.csv"
+	go func() {
+		if file.IsNotExist(csvfile) {
+			err := file.DownloadTo(bed+"小倉百人一首.csv", csvfile, true)
+			if err != nil {
+				_ = os.Remove(csvfile)
+				panic(err)
+			}
+		}
+		f, err := os.Open(csvfile)
+		if err != nil {
+			panic(err)
+		}
+		records, err := csv.NewReader(f).ReadAll()
+		if err != nil {
+			panic(err)
+		}
+		_ = f.Close()
+		records = records[1:] // skip title
+		if len(records) != 100 {
+			panic("invalid csvfile")
+		}
+		for j, r := range records {
+			if len(r) != 6 {
+				panic("invalid csvfile")
+			}
+			i, err := strconv.Atoi(r[0])
+			if err != nil {
+				panic(err)
+			}
+			i--
+			if j != i {
+				panic("invalid csvfile")
+			}
+			lines[i] = (*line)(*(*unsafe.Pointer)(unsafe.Pointer(&r)))
+		}
+	}()
+	engine.OnFullMatch("百人一首").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
+		i := rand.Intn(100)
+		ctx.SendChain(
+			message.Image(fmt.Sprintf(bed+"img/%03d.jpg", i+1)),
+			message.Text("\n", lines[i]),
+			message.Image(fmt.Sprintf(bed+"img/%03d.png", i+1)),
+		)
+	})
+	engine.OnRegex(`^百人一首之\s?(\d+)$`).SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
+		i, err := strconv.Atoi(ctx.State["regex_matched"].([]string)[1])
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR:", err))
+			return
+		}
+		if i > 100 || i < 1 {
+			ctx.SendChain(message.Text("ERROR:超出范围"))
+			return
+		}
+		ctx.SendChain(
+			message.Image(fmt.Sprintf(bed+"img/%03d.jpg", i)),
+			message.Text("\n", lines[i-1]),
+			message.Image(fmt.Sprintf(bed+"img/%03d.png", i)),
+		)
+	})
+}

plugin/image_finder/keyword.go

@@ -14,9 +14,9 @@ import (
 	"github.com/FloatTech/AnimeAPI/pixiv"
 
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/img/pool"
+	"github.com/FloatTech/zbputils/process"
 	"github.com/FloatTech/zbputils/web"
 )
 
@@ -35,7 +35,7 @@ type resultjson struct {
 }
 
 func init() {
-	control.Register("imgfinder", order.AcquirePrio(), &control.Options{
+	control.Register("imgfinder", &control.Options{
 		DisableOnDefault: false,
 		Help: "关键字搜图\n" +
 			"- 来张 [xxx]",
@@ -44,13 +44,13 @@ func init() {
 			keyword := ctx.State["regex_matched"].([]string)[1]
 			soutujson, err := soutuapi(keyword)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
 			rannum := rand.Intn(len(soutujson.Data.Illusts))
 			illust, err := pixiv.Works(soutujson.Data.Illusts[rannum].ID)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
 			u := illust.ImageUrls[0]
@@ -62,7 +62,7 @@ func init() {
 				return illust.DownloadToCache(0)
 			}, ctxext.SendFakeForwardToGroup(ctx), ctxext.GetFirstMessageInForward(ctx))
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
 		})
@@ -70,13 +70,18 @@ func init() {
 
 // soutuapi 请求api
 func soutuapi(keyword string) (r resultjson, err error) {
-	data, err := web.GetData("https://copymanga.azurewebsites.net/api/pixivel?" + url.QueryEscape(keyword) + "?page=0")
-	if err != nil {
+	var data []byte
+	for i := 0; i < 3; i++ {
+		data, err = web.GetData("https://copymanga.azurewebsites.net/api/pixivel?" + url.QueryEscape(keyword) + "?page=0")
+		if err != nil {
+			process.SleepAbout1sTo2s()
+			continue
+		}
+		err = json.Unmarshal(data, &r)
+		if err == nil && r.Error {
+			err = errors.New(r.Message)
+		}
 		return
 	}
-	err = json.Unmarshal(data, &r)
-	if err == nil && r.Error {
-		err = errors.New(r.Message)
-	}
 	return
 }

plugin/inject/main.go

@@ -3,13 +3,12 @@ package inject
 
 import (
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 )
 
 func init() {
-	en := control.Register("inject", order.AcquirePrio(), &control.Options{
+	en := control.Register("inject", &control.Options{
 		DisableOnDefault: false,
 		Help: "注入指令\n" +
 			"- run[CQ码]",

plugin/jandan/jandan.go

@@ -9,13 +9,11 @@ import (
 
 	"github.com/FloatTech/zbputils/binary"
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/file"
+	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/antchfx/htmlquery"
 	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -23,28 +21,30 @@ const (
 )
 
 func init() {
-	engine := control.Register("jandan", order.AcquirePrio(), &control.Options{
+	engine := control.Register("jandan", &control.Options{
 		DisableOnDefault: false,
-		Help:             "煎蛋网无聊图\n- 来份屌图\n- 更新屌图\n",
+		Help:             "煎蛋网无聊图\n- 来份[屌|弔|吊]图\n- 更新[屌|弔|吊]图\n",
 		PublicDataFolder: "Jandan",
 	})
 
-	go func() {
-		dbpath := engine.DataFolder()
-		db.DBPath = dbpath + "pics.db"
-		_, _ = file.GetLazyData(db.DBPath, false, false)
+	getdb := ctxext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool {
+		db.DBPath = engine.DataFolder() + "pics.db"
+		_, _ = engine.GetLazyData("pics.db", false)
 		err := db.Create("picture", &picture{})
 		if err != nil {
-			panic(err)
+			ctx.SendChain(message.Text("ERROR:", err))
+			return false
 		}
 		n, err := db.Count("picture")
 		if err != nil {
-			panic(err)
+			ctx.SendChain(message.Text("ERROR:", err))
+			return false
 		}
 		logrus.Printf("[jandan]读取%d张图片", n)
-	}()
+		return true
+	})
 
-	engine.OnFullMatch("来份屌图").SetBlock(true).
+	engine.OnRegex(`来份[屌|弔|吊]图`, getdb).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			u, err := getRandomPicture()
 			if err != nil {
@@ -54,7 +54,7 @@ func init() {
 			ctx.SendChain(message.Image(u))
 		})
 
-	engine.OnFullMatch("更新屌图", zero.SuperUserPermission).SetBlock(true).
+	engine.OnRegex(`更新[屌|弔|吊]图`, zero.SuperUserPermission, getdb).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.Send("少女更新中...")
 			webpageURL := api
@@ -71,7 +71,7 @@ func init() {
 			}
 		LOOP:
 			for i := 0; i < pageTotal; i++ {
-				logrus.Infoln("[jandan]", fmt.Sprintf("处理第%d/%d页...", i, pageTotal))
+				logrus.Debugln("[jandan]", fmt.Sprintf("处理第%d/%d页...", i, pageTotal))
 				doc, err = htmlquery.LoadURL(webpageURL)
 				if err != nil {
 					ctx.SendChain(message.Text("ERROR:", err))

plugin/juejuezi/juejuezi.go

@@ -9,13 +9,10 @@ import (
 
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
-	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -25,7 +22,7 @@ const (
 )
 
 func init() {
-	control.Register("juejuezi", order.AcquirePrio(), &control.Options{
+	control.Register("juejuezi", &control.Options{
 		DisableOnDefault: false,
 		Help: "绝绝子生成器\n" +
 			"- 喝奶茶绝绝子 | 绝绝子吃饭",
@@ -37,14 +34,16 @@ func init() {
 		case 2:
 			data, err := juejuezi(string(toDealStr[0]), string(toDealStr[1]))
 			if err != nil {
-				ctx.SendChain(message.Text(err))
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
 			}
 			ctx.SendChain(message.Text(gjson.Get(helper.BytesToString(data), "text").String()))
 		default:
 			params := ctx.GetWordSlices(string(toDealStr)).Get("slices").Array()
 			data, err := juejuezi(params[0].String(), params[1].String())
 			if err != nil {
-				ctx.SendChain(message.Text(err))
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
 			}
 			ctx.SendChain(message.Text(gjson.Get(helper.BytesToString(data), "text").String()))
 		}
@@ -57,13 +56,13 @@ func juejuezi(verb, noun string) (data []byte, err error) {
 	// 提交请求
 	request, err := http.NewRequest("POST", juejueziURL, strings.NewReader(juejueziStr))
 	if err != nil {
-		log.Errorln("[juejuezi]:", err)
+		return nil, err
 	}
 	request.Header.Add("Referer", referer)
 	request.Header.Add("User-Agent", ua)
 	response, err := client.Do(request)
 	if err != nil {
-		log.Errorln("[juejuezi]:", err)
+		return nil, err
 	}
 	data, err = io.ReadAll(response.Body)
 	response.Body.Close()

plugin/lolicon/lolicon.go

@@ -2,6 +2,7 @@
 package lolicon
 
 import (
+	"encoding/base64"
 	"strings"
 	"time"
 
@@ -15,8 +16,6 @@ import (
 	"github.com/FloatTech/zbputils/math"
 	"github.com/FloatTech/zbputils/process"
 	"github.com/FloatTech/zbputils/web"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -25,26 +24,38 @@ const (
 )
 
 var (
-	queue = make(chan string, capacity)
+	queue   = make(chan string, capacity)
+	custapi = ""
 )
 
 func init() {
-	control.Register("lolicon", order.AcquirePrio(), &control.Options{
+	en := control.Register("lolicon", &control.Options{
 		DisableOnDefault: false,
 		Help: "lolicon\n" +
-			"- 来份萝莉",
-	}).ApplySingle(ctxext.DefaultSingle).OnFullMatch("来份萝莉").SetBlock(true).
+			"- 来份萝莉\n" +
+			"- 设置随机图片地址[http...]",
+	}).ApplySingle(ctxext.DefaultSingle)
+	en.OnFullMatch("来份萝莉").SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			go func() {
 				for i := 0; i < math.Min(cap(queue)-len(queue), 2); i++ {
+					if custapi != "" {
+						data, err := web.GetData(custapi)
+						if err != nil {
+							ctx.SendChain(message.Text("ERROR:", err))
+							continue
+						}
+						queue <- "base64://" + base64.StdEncoding.EncodeToString(data)
+						continue
+					}
 					data, err := web.GetData(api)
 					if err != nil {
-						ctx.SendChain(message.Text("ERROR: ", err))
+						ctx.SendChain(message.Text("ERROR:", err))
 						continue
 					}
 					json := gjson.ParseBytes(data)
 					if e := json.Get("error").Str; e != "" {
-						ctx.SendChain(message.Text("ERROR: ", e))
+						ctx.SendChain(message.Text("ERROR:", e))
 						continue
 					}
 					url := json.Get("data.0.urls.original").Str
@@ -65,10 +76,11 @@ func init() {
 			}()
 			select {
 			case <-time.After(time.Minute):
-				ctx.SendChain(message.Text("ERROR: 等待填充，请稍后再试......"))
+				ctx.SendChain(message.Text("ERROR:等待填充，请稍后再试......"))
 			case img := <-queue:
 				id := ctx.SendChain(message.Image(img))
 				if id.ID() == 0 {
+					process.SleepAbout1sTo2s()
 					id = ctx.SendChain(message.Image(img).Add("cache", "0"))
 					if id.ID() == 0 {
 						ctx.SendChain(message.Text("ERROR:图片发送失败，可能被风控了~"))
@@ -76,4 +88,13 @@ func init() {
 				}
 			}
 		})
+	en.OnPrefix("设置随机图片地址", zero.SuperUserPermission).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			u := strings.TrimSpace(ctx.State["args"].(string))
+			if !strings.HasPrefix(u, "http") {
+				ctx.SendChain(message.Text("ERROR:url非法!"))
+				return
+			}
+			custapi = u
+		})
 }

plugin/manager/manager.go

@@ -19,8 +19,6 @@ import (
 	"github.com/FloatTech/zbputils/math"
 	"github.com/FloatTech/zbputils/process"
 
-	"github.com/FloatTech/zbputils/control/order"
-
 	"github.com/FloatTech/ZeroBot-Plugin/plugin/manager/timer"
 )
 
@@ -48,8 +46,10 @@ const (
 		"- 取消在\"cron\"的提醒\n" +
 		"- 列出所有提醒\n" +
 		"- 翻牌\n" +
-		"- 设置欢迎语XXX 可选添加 [{at}] [{nickname}] [{avatar}] {at}可在发送时艾特被欢迎者 {nickname}是被欢迎者名字 {avatar}是被欢迎者头像\n" +
+		"- 设置欢迎语XXX 可选添加 [{at}] [{nickname}] [{avatar}] [{uid}] [{gid}] [{groupname}] {at}可在发送时艾特被欢迎者 {nickname}是被欢迎者名字 {avatar}是被欢迎者头像 {uid}是被欢迎者QQ号 {gid}是当前群群号 {groupname} 是当前群群名\n" +
 		"- 测试欢迎语\n" +
+		"- 设置告别辞 参数同设置欢迎语\n" +
+		"- 测试告别辞\n" +
 		"- [开启 | 关闭]入群验证"
 )
 
@@ -59,7 +59,7 @@ var (
 )
 
 func init() { // 插件主体
-	engine := control.Register("manager", order.AcquirePrio(), &control.Options{
+	engine := control.Register("manager", &control.Options{
 		DisableOnDefault:  false,
 		Help:              hint,
 		PrivateDataFolder: "manager",
@@ -76,6 +76,10 @@ func init() { // 插件主体
 		if err != nil {
 			panic(err)
 		}
+		err = db.Create("farewell", &welcome{})
+		if err != nil {
+			panic(err)
+		}
 	}()
 
 	// 升为管理
@@ -281,7 +285,7 @@ func init() { // 插件主体
 			dateStrs := ctx.State["regex_matched"].([]string)
 			ts := timer.GetFilledTimer(dateStrs, ctx.Event.SelfID, ctx.Event.GroupID, false)
 			if ts.En() {
-				go clock.RegisterTimer(ts, true)
+				go clock.RegisterTimer(ts, true, false)
 				ctx.SendChain(message.Text("记住了~"))
 			} else {
 				ctx.SendChain(message.Text("参数非法:" + ts.Alert))
@@ -304,7 +308,7 @@ func init() { // 插件主体
 			}
 			logrus.Debugln("[manager] cron:", dateStrs[1])
 			ts := timer.GetFilledCronTimer(dateStrs[1], alert, url, ctx.Event.SelfID, ctx.Event.GroupID)
-			if clock.RegisterTimer(ts, true) {
+			if clock.RegisterTimer(ts, true, false) {
 				ctx.SendChain(message.Text("记住了~"))
 			} else {
 				ctx.SendChain(message.Text("参数非法:" + ts.Alert))
@@ -345,11 +349,7 @@ func init() { // 插件主体
 	engine.OnFullMatchGroup([]string{"翻牌"}, zero.OnlyGroup).SetBlock(true).Limit(ctxext.LimitByUser).
 		Handle(func(ctx *zero.Ctx) {
 			// 无缓存获取群员列表
-			list := ctx.CallAction("get_group_member_list", zero.Params{
-				"group_id": ctx.Event.GroupID,
-				"no_cache": true,
-			}).Data
-			temp := list.Array()
+			temp := ctx.GetThisGroupMemberListNoCache().Array()
 			sort.SliceStable(temp, func(i, j int) bool {
 				return temp[i].Get("last_sent_time").Int() < temp[j].Get("last_sent_time").Int()
 			})
@@ -411,13 +411,13 @@ func init() { // 插件主体
 							}
 							return false
 						}
-						next := zero.NewFutureEvent("message", 999, false, zero.CheckUser(ctx.Event.UserID), rule)
+						next := zero.NewFutureEvent("message", 999, false, ctx.CheckSession(), rule)
 						recv, cancel := next.Repeat()
 						select {
 						case <-time.After(time.Minute):
+							cancel()
 							ctx.SendChain(message.Text("拜拜啦~"))
 							ctx.SetGroupKick(ctx.Event.GroupID, uid, false)
-							cancel()
 						case <-recv:
 							cancel()
 							ctx.SendChain(message.Text("答对啦~"))
@@ -430,16 +430,24 @@ func init() { // 插件主体
 	engine.OnNotice().SetBlock(false).
 		Handle(func(ctx *zero.Ctx) {
 			if ctx.Event.NoticeType == "group_decrease" {
-				userid := ctx.Event.UserID
-				ctx.SendChain(message.Text(ctx.CardOrNickName(userid), "(", userid, ")", "离开了我们..."))
+				var w welcome
+				err := db.Find("farewell", &w, "where gid = "+strconv.FormatInt(ctx.Event.GroupID, 10))
+				if err == nil {
+					ctx.SendGroupMessage(ctx.Event.GroupID, message.ParseMessageFromString(welcometocq(ctx, w.Msg)))
+				} else {
+					userid := ctx.Event.UserID
+					ctx.SendChain(message.Text(ctx.CardOrNickName(userid), "(", userid, ")", "离开了我们..."))
+				}
 			}
 		})
 	// 设置欢迎语
 	engine.OnRegex(`^设置欢迎语([\s\S]*)$`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
+			welcomestring := ctx.State["regex_matched"].([]string)[1]
+			welcomestring = message.UnescapeCQCodeText(welcomestring)
 			w := &welcome{
 				GrpID: ctx.Event.GroupID,
-				Msg:   ctx.State["regex_matched"].([]string)[1],
+				Msg:   welcomestring,
 			}
 			err := db.Insert("welcome", w)
 			if err == nil {
@@ -459,6 +467,34 @@ func init() { // 插件主体
 				ctx.SendChain(message.Text("欢迎~"))
 			}
 		})
+	// 设置告别辞
+	engine.OnRegex(`^设置告别辞([\s\S]*)$`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			farewellstring := ctx.State["regex_matched"].([]string)[1]
+			farewellstring = message.UnescapeCQCodeText(farewellstring)
+			w := &welcome{
+				GrpID: ctx.Event.GroupID,
+				Msg:   farewellstring,
+			}
+			err := db.Insert("farewell", w)
+			if err == nil {
+				ctx.SendChain(message.Text("记住啦!"))
+			} else {
+				ctx.SendChain(message.Text("出错啦: ", err))
+			}
+		})
+	// 测试告别辞
+	engine.OnFullMatch("测试告别辞", zero.OnlyGroup, zero.AdminPermission).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			var w welcome
+			err := db.Find("farewell", &w, "where gid = "+strconv.FormatInt(ctx.Event.GroupID, 10))
+			if err == nil {
+				ctx.SendGroupMessage(ctx.Event.GroupID, message.ParseMessageFromString(welcometocq(ctx, w.Msg)))
+			} else {
+				userid := ctx.Event.UserID
+				ctx.SendChain(message.Text(ctx.CardOrNickName(userid), "(", userid, ")", "离开了我们..."))
+			}
+		})
 	// 入群后验证开关
 	engine.OnRegex(`^(.*)入群验证$`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
@@ -528,7 +564,7 @@ func init() { // 插件主体
 			}
 			ghun := ans[:divi]
 			hash := ans[divi+1:]
-			logrus.Infoln("[manager]收到加群申请, 用户:", ghun, ", hash:", hash)
+			logrus.Debugln("[manager]收到加群申请, 用户:", ghun, ", hash:", hash)
 			ok, reason := checkNewUser(ctx.Event.UserID, ctx.Event.GroupID, ghun, hash)
 			if ok {
 				ctx.SetGroupAddRequest(ctx.Event.Flag, "add", true, "")
@@ -543,11 +579,17 @@ func init() { // 插件主体
 
 // 传入 ctx 和 welcome格式string 返回cq格式string  使用方法:welcometocq(ctx,w.Msg)
 func welcometocq(ctx *zero.Ctx, welcome string) string {
-	nickname := ctx.GetGroupMemberInfo(ctx.Event.GroupID, ctx.Event.UserID, false).Get("nickname").Str
-	at := "[CQ:at,qq=" + strconv.FormatInt(ctx.Event.UserID, 10) + "]"
-	avatar := "[CQ:image,file=" + "http://q4.qlogo.cn/g?b=qq&nk=" + strconv.FormatInt(ctx.Event.UserID, 10) + "&s=640]"
+	uid := strconv.FormatInt(ctx.Event.UserID, 10)                                  // 用户id
+	nickname := ctx.CardOrNickName(ctx.Event.UserID)                                // 用户昵称
+	at := "[CQ:at,qq=" + uid + "]"                                                  // at用户
+	avatar := "[CQ:image,file=" + "http://q4.qlogo.cn/g?b=qq&nk=" + uid + "&s=640]" // 用户头像
+	gid := strconv.FormatInt(ctx.Event.GroupID, 10)                                 // 群id
+	groupname := ctx.GetGroupInfo(ctx.Event.GroupID, true).Name                     // 群名
 	cqstring := strings.ReplaceAll(welcome, "{at}", at)
 	cqstring = strings.ReplaceAll(cqstring, "{nickname}", nickname)
 	cqstring = strings.ReplaceAll(cqstring, "{avatar}", avatar)
+	cqstring = strings.ReplaceAll(cqstring, "{uid}", uid)
+	cqstring = strings.ReplaceAll(cqstring, "{gid}", gid)
+	cqstring = strings.ReplaceAll(cqstring, "{groupname}", groupname)
 	return cqstring
 }

plugin/manager/timer/parse.go

@@ -106,10 +106,10 @@ func GetFilledTimer(dateStrs []string, botqq, grp int64, matchDateOnly bool) *Ti
 		urlStr := dateStrs[5]
 		if urlStr != "" { // 是图片url
 			t.URL = urlStr[3:] // utf-8下用为3字节
-			logrus.Println("[群管]" + t.URL)
+			logrus.Debugln("[群管]" + t.URL)
 			if !strings.HasPrefix(t.URL, "http") {
 				t.URL = "illegal"
-				logrus.Println("[群管]url非法！")
+				logrus.Debugln("[群管]url非法！")
 				return &t
 			}
 		}

plugin/manager/timer/timer.go

@@ -8,6 +8,7 @@ import (
 	"time"
 
 	sql "github.com/FloatTech/sqlite"
+	"github.com/FloatTech/zbputils/process"
 	"github.com/fumiama/cron"
 	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
@@ -47,7 +48,7 @@ func NewClock(db *sql.Sqlite) (c Clock) {
 }
 
 // RegisterTimer 注册计时器
-func (c *Clock) RegisterTimer(ts *Timer, save bool) bool {
+func (c *Clock) RegisterTimer(ts *Timer, save, isinit bool) bool {
 	var key uint32
 	if save {
 		key = ts.GetTimerID()
@@ -59,9 +60,12 @@ func (c *Clock) RegisterTimer(ts *Timer, save bool) bool {
 	if t != ts && ok { // 避免重复注册定时器
 		t.SetEn(false)
 	}
-	logrus.Println("[群管]注册计时器", key)
+	logrus.Infoln("[群管]注册计时器", key)
 	if ts.Cron != "" {
 		var ctx *zero.Ctx
+		if isinit {
+			process.GlobalInitMutex.Lock()
+		}
 		if ts.SelfID != 0 {
 			ctx = zero.GetBot(ts.SelfID)
 		} else {
@@ -71,6 +75,9 @@ func (c *Clock) RegisterTimer(ts *Timer, save bool) bool {
 				return false
 			})
 		}
+		if isinit {
+			process.GlobalInitMutex.Unlock()
+		}
 		eid, err := c.cron.AddFunc(ts.Cron, func() { ts.sendmsg(ts.GrpID, ctx) })
 		if err == nil {
 			c.entmu.Lock()
@@ -187,7 +194,7 @@ func (c *Clock) loadTimers(db *sql.Sqlite) {
 		var t Timer
 		_ = c.db.FindFor("timer", &t, "", func() error {
 			tescape := t
-			go c.RegisterTimer(&tescape, false)
+			go c.RegisterTimer(&tescape, false, true)
 			return nil
 		})
 	}

plugin/moyu/run.go

@@ -8,8 +8,6 @@ import (
 	control "github.com/FloatTech/zbputils/control"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 var (
@@ -19,7 +17,7 @@ var (
 )
 
 func init() { // 插件主体
-	control.Register("moyu", order.AcquirePrio(), &control.Options{
+	control.Register("moyu", &control.Options{
 		DisableOnDefault: true,
 		Help: "moyu\n" +
 			"- /启用 moyu\n" +

plugin/moyu_calendar/calendar.go

@@ -2,31 +2,14 @@
 package moyucalendar
 
 import (
-	"bufio"
-	"errors"
-	"fmt"
-	"io"
-	"net/http"
-	"net/url"
-	"regexp"
-	"strings"
-	"time"
-
 	control "github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
+	"github.com/FloatTech/zbputils/web"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	xpath "github.com/antchfx/htmlquery"
 )
 
-var ua = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.182 Safari/537.36"
-var weixin = regexp.MustCompile(`url \+= '(.+)';`)
-
-var client = &http.Client{}
-
 func init() {
-	control.Register("moyucalendar", order.AcquirePrio(), &control.Options{
+	control.Register("moyucalendar", &control.Options{
 		DisableOnDefault: true,
 		Help: "摸鱼人日历\n" +
 			"- /启用 moyucalendar\n" +
@@ -35,159 +18,11 @@ func init() {
 			"   - 摸鱼人日历",
 	}).OnFullMatch("摸鱼人日历").SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			title := fmt.Sprintf("摸鱼人日历 %d月%d日", time.Now().Month(), time.Now().Day())
-			sg, cookies, err := sougou(title, "摸鱼人日历", ua)
+			data, err := web.GetData("https://api.vvhan.com/api/moyu")
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
-			wx, err := redirect(sg, cookies, ua)
-			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
-				return
-			}
-			image, err := calendar(wx, ua)
-			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
-				return
-			}
-			ctx.SendChain(message.Image(image))
+			ctx.SendChain(message.ImageBytes(data))
 		})
 }
-
-func sougou(title, publisher, ua string) (string, []*http.Cookie, error) {
-	u, _ := url.Parse("https://weixin.sogou.com/weixin")
-	u.RawQuery = url.Values{
-		"type":   []string{"2"},
-		"s_from": []string{"input"},
-		"query":  []string{title},
-	}.Encode()
-	req, err := http.NewRequest("GET", u.String(), nil)
-	if err != nil {
-		return "", nil, err
-	}
-	req.Header.Set("User-Agent", ua)
-	resp, err := client.Do(req)
-	if err != nil {
-		return "", nil, err
-	}
-	defer resp.Body.Close()
-	if resp.StatusCode != http.StatusOK {
-		return "", nil, errors.New("status not ok")
-	}
-	// 解析XPATH
-	doc, err := xpath.Parse(resp.Body)
-	if err != nil {
-		return "", nil, err
-	}
-	// 取出每个返回的结果
-	list := xpath.Find(doc, `//*[@class="news-list"]/li/div[@class="txt-box"]`)
-	if len(list) == 0 {
-		return "", nil, errors.New("sougou result not found")
-	}
-	var match string
-	for i := range list {
-		account := xpath.FindOne(list[i], `//div[@class="s-p"]/a[@class="account"]`)
-		if account == nil {
-			continue
-		}
-		if xpath.InnerText(account) != publisher {
-			continue
-		}
-		target := xpath.FindOne(list[i], `//h3/a[@target="_blank"]`)
-		if target == nil {
-			continue
-		}
-		match = xpath.SelectAttr(target, "href")
-		break
-	}
-	if match == "" {
-		return "", nil, errors.New("sougou result not found")
-	}
-	return "https://weixin.sogou.com" + match, resp.Cookies(), nil
-}
-
-func redirect(link string, cookies []*http.Cookie, ua string) (string, error) {
-	req, err := http.NewRequest("GET", link, nil)
-	if err != nil {
-		return "", err
-	}
-	req.Header.Set("User-Agent", ua)
-	var c = make([]string, 0, 4)
-	for _, cookie := range cookies {
-		if cookie.Name != "ABTEST" && cookie.Name != "SNUID" &&
-			cookie.Name != "IPLOC" && cookie.Name != "SUID" {
-			continue
-		}
-		c = append(c, cookie.Name+"="+cookie.Value)
-	}
-	req.Header.Set("Cookie", strings.Join(c, "; "))
-	resp, err := client.Do(req)
-	if err != nil {
-		return "", err
-	}
-	defer resp.Body.Close()
-	if resp.StatusCode != http.StatusOK {
-		return "", errors.New("status not ok")
-	}
-	br := bufio.NewReader(resp.Body)
-	var u = make([]string, 0)
-	for {
-		b, _, err := br.ReadLine()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			return "", err
-		}
-		matcha := weixin.FindStringSubmatch(string(b))
-		if len(matcha) < 2 {
-			continue
-		}
-		u = append(u, strings.ReplaceAll(matcha[1], "@", ""))
-	}
-	if len(u) == 0 {
-		return "", errors.New("weixin url not found")
-	}
-	return strings.Join(u, ""), nil
-}
-
-func calendar(link, ua string) (string, error) {
-	req, err := http.NewRequest("GET", link, nil)
-	req.Header.Set("User-Agent", ua)
-	if err != nil {
-		return "", err
-	}
-	resp, err := client.Do(req)
-	if err != nil {
-		return "", err
-	}
-	defer resp.Body.Close()
-	if resp.StatusCode != http.StatusOK {
-		return "", errors.New("status not ok")
-	}
-	doc, err := xpath.Parse(resp.Body)
-	if err != nil {
-		return "", err
-	}
-	html := xpath.OutputHTML(doc, false)
-	if !strings.Contains(html, time.Now().Format("2006-01-02")) {
-		return "", errors.New("calendar not today")
-	}
-	images := xpath.Find(doc, `//*[@id="js_content"]/p/img`)
-	if images == nil {
-		return "", errors.New("calendar not found")
-	}
-	var image string
-	for i := range images {
-		if xpath.SelectAttr(images[i], "data-w") != "540" {
-			continue
-		}
-		image = xpath.SelectAttr(images[i], "data-src")
-		break
-	}
-	if image == "" {
-		return "", errors.New("image not found")
-	}
-	return image, nil
-}

plugin/music/selecter.go

@@ -11,17 +11,17 @@ import (
 	"strings"
 	"time"
 
+	"github.com/FloatTech/zbputils/web"
+
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/tidwall/gjson"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 func init() {
-	control.Register("music", order.AcquirePrio(), &control.Options{
+	control.Register("music", &control.Options{
 		DisableOnDefault: false,
 		Help: "点歌\n" +
 			"- 点歌[xxx]\n" +
@@ -136,81 +136,28 @@ func kugou(keyword string) message.MessageSegment {
 }
 
 // cloud163 返回网易云音乐卡片
-func cloud163(keyword string) message.MessageSegment {
-	headers := http.Header{
-		"Content-Type": []string{"application/x-www-form-urlencoded"},
-		"User-Agent":   []string{"Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:84.0) Gecko/20100101 Firefox/84.0"},
+func cloud163(keyword string) (msg message.MessageSegment) {
+	requestURL := "https://autumnfish.cn/search?keywords=" + url.QueryEscape(keyword)
+	data, err := web.GetData(requestURL)
+	if err != nil {
+		msg = message.Text("ERROR:", err)
+		return
 	}
-	data := url.Values{
-		"offset": []string{"0"},
-		"total":  []string{"true"},
-		"limit":  []string{"9"},
-		"type":   []string{"1"},
-		"s":      []string{keyword},
-	}
-	// 搜索音乐信息 第一首歌
-	info := gjson.ParseBytes(netPost("http://music.163.com/api/search/pc", data, headers)).Get("result.songs.0")
-	// 返回音乐卡片
-	return message.CustomMusic(
-		fmt.Sprintf("http://y.music.163.com/m/song?id=%d", info.Get("id").Int()),
-		fmt.Sprintf("http://music.163.com/song/media/outer/url?id=%d.mp3", info.Get("id").Int()),
-		info.Get("name").Str,
-	).Add("content", info.Get("artists.0.name").Str).Add("image", info.Get("album.blurPicUrl").Str)
+	msg = message.Music("163", gjson.ParseBytes(data).Get("result.songs.0.id").Int())
+	return
 }
 
 // qqmusic 返回QQ音乐卡片
-func qqmusic(keyword string) message.MessageSegment {
-	// 搜索音乐信息 第一首歌
-	h1 := http.Header{
-		"User-Agent": []string{"Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:84.0) Gecko/20100101 Firefox/84.0"},
+func qqmusic(keyword string) (msg message.MessageSegment) {
+	requestURL := "https://c.y.qq.com/soso/fcgi-bin/client_search_cp?w=" + url.QueryEscape(keyword)
+	data, err := web.RequestDataWith(web.NewDefaultClient(), requestURL, "GET", "", web.RandUA())
+	if err != nil {
+		msg = message.Text("ERROR:", err)
+		return
 	}
-	search, _ := url.Parse("https://c.y.qq.com/soso/fcgi-bin/client_search_cp")
-	search.RawQuery = url.Values{
-		"w": []string{keyword},
-	}.Encode()
-	res := netGet(search.String(), h1)
-	info := gjson.ParseBytes(res[9 : len(res)-1]).Get("data.song.list.0")
-	// 获得音乐直链
-	h2 := http.Header{
-		"User-Agent": []string{"Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 Safari/601.1"},
-		"referer":    []string{"http://y.qq.com"},
-	}
-	music, _ := url.Parse("https://u.y.qq.com/cgi-bin/musicu.fcg")
-	music.RawQuery = url.Values{
-		"data": []string{`{"req": {"module": "CDN.SrfCdnDispatchServer", "method": "GetCdnDispatch", "param": {"guid": "3982823384", "calltype": 0, "userip": ""}}, "req_0": {"module": "vkey.GetVkeyServer", "method": "CgiGetVkey", "param": {"guid": "3982823384", "songmid": ["` + info.Get("songmid").Str + `"], "songtype": [0], "uin": "0", "loginflag": 1, "platform": "20"}}, "comm": {"uin": 0, "format": "json", "ct": 24, "cv": 0}}`},
-	}.Encode()
-	audio := gjson.ParseBytes(netGet(music.String(), h2))
-	// 获得音乐封面
-	image := "https://y.gtimg.cn/music/photo_new/" +
-		find(
-			`photo_new\u002F`,
-			"?max_age",
-			string(
-				netGet("https://y.qq.com/n/yqq/song/"+info.Get("songmid").Str+".html", nil),
-			),
-		)
-	// 返回音乐卡片
-	return message.CustomMusic(
-		"https://y.qq.com/n/yqq/song/"+info.Get("songmid").Str+".html",
-		"https://isure.stream.qqmusic.qq.com/"+audio.Get("req_0.data.midurlinfo.0.purl").Str,
-		info.Get("songname").Str,
-	).Add("content", info.Get("singer.0.name").Str).Add("image", image)
-}
-
-// find 返回 pre 到 suf 之间的文本
-func find(pre string, suf string, str string) string {
-	n := strings.Index(str, pre)
-	if n == -1 {
-		n = 0
-	} else {
-		n += len(pre)
-	}
-	str = str[n:]
-	m := strings.Index(str, suf)
-	if m == -1 {
-		m = len(str)
-	}
-	return str[:m]
+	info := gjson.ParseBytes(data[9 : len(data)-1]).Get("data.song.list.0")
+	msg = message.Music("qq", info.Get("songid").Int())
+	return
 }
 
 // md5str 返回字符串 MD5
@@ -234,17 +181,3 @@ func netGet(url string, header http.Header) []byte {
 	result, _ := io.ReadAll(res.Body)
 	return result
 }
-
-// netPost 返回请求数据
-func netPost(url string, data url.Values, header http.Header) []byte {
-	client := &http.Client{}
-	request, _ := http.NewRequest("POST", url, strings.NewReader(data.Encode()))
-	request.Header = header
-	res, err := client.Do(request)
-	if err != nil {
-		return nil
-	}
-	defer res.Body.Close()
-	result, _ := io.ReadAll(res.Body)
-	return result
-}

plugin/nativesetu/main.go

@@ -13,8 +13,6 @@ import (
 	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/file"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 var (
@@ -22,7 +20,7 @@ var (
 )
 
 func init() {
-	engine := control.Register("nativesetu", order.AcquirePrio(), &control.Options{
+	engine := control.Register("nativesetu", &control.Options{
 		DisableOnDefault: false,
 		Help: "本地涩图\n" +
 			"- 本地[xxx]\n" +
@@ -39,7 +37,7 @@ func init() {
 		b, err := os.ReadFile(cfgfile)
 		if err == nil {
 			setupath = helper.BytesToString(b)
-			logrus.Println("[nsetu] set setu dir to", setupath)
+			logrus.Infoln("[nsetu] set setu dir to", setupath)
 		}
 	}
 
@@ -51,7 +49,7 @@ func init() {
 			err := ns.db.Pick(imgtype, sc)
 			ns.mu.RUnlock()
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 			} else {
 				p := "file:///" + setupath + "/" + sc.Path
 				if ctx.Event.GroupID != 0 {
@@ -71,7 +69,7 @@ func init() {
 			if err == nil {
 				ctx.SendChain(message.Text("成功！"))
 			} else {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 			}
 		})
 	engine.OnRegex(`^设置本地setu绝对路径(.*)$`, zero.SuperUserPermission).SetBlock(true).
@@ -81,7 +79,7 @@ func init() {
 			if err == nil {
 				ctx.SendChain(message.Text("成功！"))
 			} else {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 			}
 		})
 	engine.OnFullMatch("刷新所有本地setu", zero.SuperUserPermission).SetBlock(true).
@@ -90,7 +88,7 @@ func init() {
 			if err == nil {
 				ctx.SendChain(message.Text("成功！"))
 			} else {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 			}
 		})
 	engine.OnFullMatch("所有本地setu分类").SetBlock(true).

plugin/nativewife/main.go

@@ -16,14 +16,12 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
-	"github.com/FloatTech/zbputils/control/order"
-
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/file"
 )
 
 func init() {
-	engine := control.Register("nwife", order.AcquirePrio(), &control.Options{
+	engine := control.Register("nwife", &control.Options{
 		DisableOnDefault:  false,
 		Help:              "nativewife\n- 抽wife[@xxx]\n- 添加wife[名字][图片]\n- 删除wife[名字]\n- [让 | 不让]所有人均可添加wife",
 		PrivateDataFolder: "nwife",

plugin/nbnhhsh/nbnhhsh.go

@@ -11,12 +11,10 @@ import (
 	"github.com/tidwall/gjson"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 func init() {
-	control.Register("nbnhhsh", order.AcquirePrio(), &control.Options{
+	control.Register("nbnhhsh", &control.Options{
 		DisableOnDefault: false,
 		Help:             "拼音首字母释义工具\n- ?? [缩写]",
 	}).OnRegex(`^[?？]{1,2} ?([a-z0-9]+)$`).SetBlock(false).

plugin/novel/qianbi.go

@@ -11,7 +11,6 @@ import (
 	"strings"
 
 	"github.com/antchfx/htmlquery"
-	log "github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
@@ -20,8 +19,6 @@ import (
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/img/text"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -40,25 +37,35 @@ const (
 var gCurCookieJar *cookiejar.Jar
 
 func init() {
-	control.Register("novel", order.AcquirePrio(), &control.Options{
+	control.Register("novel", &control.Options{
 		DisableOnDefault: false,
 		Help:             "铅笔小说网搜索\n- 小说[xxx]",
 	}).OnRegex("^小说([\u4E00-\u9FA5A-Za-z0-9]{1,25})$").SetBlock(true).Limit(ctxext.LimitByUser).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SendChain(message.Text("少女祈祷中......"))
-			login(username, password)
+			err := login(username, password)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
 			searchKey := ctx.State["regex_matched"].([]string)[1]
-			searchHTML := search(searchKey)
+			searchHTML, err := search(searchKey)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
 			doc, err := htmlquery.Parse(strings.NewReader(searchHTML))
 			if err != nil {
-				log.Errorln("[novel]", err)
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
 			}
 			htmlTitle := htmlquery.InnerText(htmlquery.FindOne(doc, "/html/head/title"))
 			switch htmlTitle {
 			case websiteTitle:
 				list, err := htmlquery.QueryAll(doc, "//dl[@id='nr']")
 				if err != nil {
-					log.Errorln("[novel]", err)
+					ctx.SendChain(message.Text("ERROR:", err))
+					return
 				}
 				if len(list) != 0 {
 					txt := ""
@@ -81,10 +88,11 @@ func init() {
 					}
 					data, err := text.RenderToBase64(txt, text.FontFile, 400, 20)
 					if err != nil {
-						log.Println("err:", err)
+						ctx.SendChain(message.Text("ERROR:", err))
+						return
 					}
 					if id := ctx.SendChain(message.Image("base64://" + helper.BytesToString(data))); id.ID() == 0 {
-						ctx.SendChain(message.Text("ERROR: 可能被风控了"))
+						ctx.SendChain(message.Text("ERROR:可能被风控了"))
 					}
 				} else {
 					text := htmlquery.InnerText(htmlquery.FindOne(doc, "//div[@id='tipss']"))
@@ -116,38 +124,39 @@ func init() {
 		})
 }
 
-func login(username, password string) {
+func login(username, password string) (err error) {
 	gCurCookieJar, _ = cookiejar.New(nil)
 	client := &http.Client{
 		Jar: gCurCookieJar,
 	}
 	usernameData, err := ub.UTF82GBK(helper.StringToBytes(username))
 	if err != nil {
-		log.Errorln("[novel]", err)
+		return
 	}
 	usernameGbk := helper.BytesToString(usernameData)
 	passwordData, err := ub.UTF82GBK(helper.StringToBytes(password))
 	if err != nil {
-		log.Errorln("[novel]", err)
+		return
 	}
 	passwordGbk := helper.BytesToString(passwordData)
 	loginReq, err := http.NewRequest("POST", loginURL, strings.NewReader(fmt.Sprintf("username=%s&password=%s&usecookie=315360000&action=login&submit=%s", url.QueryEscape(usernameGbk), url.QueryEscape(passwordGbk), submit)))
 	if err != nil {
-		log.Errorln("[novel]", err)
+		return
 	}
 	loginReq.Header.Set("Content-Type", "application/x-www-form-urlencoded")
 	loginReq.Header.Set("User-Agent", ua)
 	loginResp, err := client.Do(loginReq)
 	if err != nil {
-		log.Errorln("[novel]", err)
+		return
 	}
-	defer loginResp.Body.Close()
+	_ = loginResp.Body.Close()
+	return
 }
 
-func search(searchKey string) (searchHTML string) {
+func search(searchKey string) (searchHTML string, err error) {
 	searchKeyData, err := ub.UTF82GBK(helper.StringToBytes(searchKey))
 	if err != nil {
-		log.Errorln("[novel]", err)
+		return
 	}
 	searchKeyGbk := helper.BytesToString(searchKeyData)
 	client := &http.Client{
@@ -155,23 +164,23 @@ func search(searchKey string) (searchHTML string) {
 	}
 	searchReq, err := http.NewRequest("POST", searchURL, strings.NewReader(fmt.Sprintf("searchkey=%s&searchtype=all", url.QueryEscape(searchKeyGbk))))
 	if err != nil {
-		log.Errorln("[novel]", err)
+		return
 	}
 	searchReq.Header.Set("Content-Type", "application/x-www-form-urlencoded")
 	searchReq.Header.Set("User-Agent", ua)
 	searchResp, err := client.Do(searchReq)
 	if err != nil {
-		log.Errorln("[novel]", err)
+		return
 	}
-	defer searchResp.Body.Close()
 	searchData, err := io.ReadAll(searchResp.Body)
+	_ = searchResp.Body.Close()
 	if err != nil {
-		log.Errorf("[novel] get response for url=%s got error=%s\n", searchURL, err.Error())
+		return
 	}
 	searchData, err = ub.GBK2UTF8(searchData)
 	if err != nil {
-		log.Errorln("[novel]", err)
+		return
 	}
 	searchHTML = helper.BytesToString(searchData)
-	return searchHTML
+	return searchHTML, nil
 }

plugin/nsfw/main.go

@@ -8,12 +8,12 @@ import (
 	"github.com/FloatTech/zbputils/process"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
+const hso = "https://gchat.qpic.cn/gchatpic_new//--4234EDEC5F147A4C319A41149D7E0EA9/0"
+
 func init() {
-	engine := control.Register("nsfw", order.AcquirePrio(), &control.Options{
+	engine := control.Register("nsfw", &control.Options{
 		DisableOnDefault: false,
 		Help:             "nsfw图片识别\n- nsfw打分[图片]",
 	}).ApplySingle(ctxext.DefaultSingle)
@@ -23,34 +23,33 @@ func init() {
 			url := ctx.State["image_url"].([]string)
 			if len(url) > 0 {
 				ctx.SendChain(message.Text("少女祈祷中..."))
-				p, err := nsfw.Classify(url...)
+				p, err := nsfw.Classify(url[0])
 				if err != nil {
 					ctx.SendChain(message.Text("ERROR:", err))
 					return
 				}
-				ctx.Send(message.ReplyWithMessage(ctx.Event.MessageID, message.Text(judge(p[0]))))
+				ctx.Send(message.ReplyWithMessage(ctx.Event.MessageID, message.Text(judge(p))))
 			}
 		})
-	en := control.Register("nsfwauto", order.AcquirePrio(), &control.Options{
+	control.Register("nsfwauto", &control.Options{
 		DisableOnDefault: true,
 		Help:             "nsfw图片自动识别\n- 当图片属于非 neutral 类别时自动发送评价",
-	})
-	en.OnMessage(zero.IsPicExists).SetBlock(false).
+	}).OnMessage(zero.HasPicture).SetBlock(false).
 		Handle(func(ctx *zero.Ctx) {
 			url := ctx.State["image_url"].([]string)
 			if len(url) > 0 {
 				process.SleepAbout1sTo2s()
-				p, err := nsfw.Classify(url...)
+				p, err := nsfw.Classify(url[0])
 				if err != nil {
 					return
 				}
 				process.SleepAbout1sTo2s()
-				autojudge(ctx, p[0])
+				autojudge(ctx, p)
 			}
 		})
 }
 
-func judge(p nsfw.Picture) string {
+func judge(p *nsfw.Picture) string {
 	if p.Neutral > 0.3 {
 		return "普通哦"
 	}
@@ -72,7 +71,7 @@ func judge(p nsfw.Picture) string {
 	return c
 }
 
-func autojudge(ctx *zero.Ctx, p nsfw.Picture) {
+func autojudge(ctx *zero.Ctx, p *nsfw.Picture) {
 	if p.Neutral > 0.3 {
 		return
 	}
@@ -96,6 +95,6 @@ func autojudge(ctx *zero.Ctx, p nsfw.Picture) {
 		i++
 	}
 	if i > 0 {
-		ctx.Send(message.ReplyWithMessage(ctx.Event.MessageID, message.Text(c)))
+		ctx.Send(message.ReplyWithMessage(ctx.Event.MessageID, message.Text(c, "\n"), message.Image(hso)))
 	}
 }

plugin/omikuji/sensou.go

@@ -3,75 +3,71 @@ package omikuji
 
 import (
 	"fmt"
-	"math/rand"
-	"strconv"
-	"time"
 
-	log "github.com/sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
-	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/img/text"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const bed = "https://gitcode.net/u011570312/senso-ji-omikuji/-/raw/main/%d_%d.jpg"
 
 func init() { // 插件主体
-	engine := control.Register("omikuji", order.AcquirePrio(), &control.Options{
+	engine := control.Register("omikuji", &control.Options{
 		DisableOnDefault: false,
 		Help: "浅草寺求签\n" +
 			"- 求签 | 占卜\n- 解签",
 		PublicDataFolder: "Omikuji",
 	}).ApplySingle(ctxext.DefaultSingle)
 
-	go func() {
-		dbpath := engine.DataFolder()
-		db.DBPath = dbpath + "kuji.db"
-		_, _ = file.GetLazyData(db.DBPath, false, true)
-		err := db.Create("kuji", &kuji{})
-		if err != nil {
-			panic(err)
-		}
-		n, err := db.Count("kuji")
-		if err != nil {
-			panic(err)
-		}
-		log.Printf("[kuji]读取%d条签文", n)
-	}()
-
 	engine.OnFullMatchGroup([]string{"求签", "占卜"}).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			miku := bangoToday(ctx.Event.UserID)
+			i := ctxext.RandSenderPerDayN(ctx, 100) + 1
 			ctx.SendChain(
 				message.At(ctx.Event.UserID),
-				message.Image(fmt.Sprintf(bed, miku, 0)),
-				message.Image(fmt.Sprintf(bed, miku, 1)),
+				message.Image(fmt.Sprintf(bed, i, 0)),
+				message.Image(fmt.Sprintf(bed, i, 1)),
 			)
 		})
-	engine.OnFullMatchGroup([]string{"解签"}).SetBlock(true).
-		Handle(func(ctx *zero.Ctx) {
-			kujiBytes, err := text.RenderToBase64(getKujiByBango(bangoToday(ctx.Event.UserID)), text.FontFile, 400, 20)
+	engine.OnFullMatch("解签", ctxext.DoOnceOnSuccess(
+		func(ctx *zero.Ctx) bool {
+			db.DBPath = engine.DataFolder() + "kuji.db"
+			_, err := engine.GetLazyData("kuji.db", true)
 			if err != nil {
-				log.Errorln("[omikuji]:", err)
+				ctx.SendChain(message.Text("ERROR:", err))
+				return false
+			}
+			err = db.Create("kuji", &kuji{})
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return false
+			}
+			n, err := db.Count("kuji")
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return false
+			}
+			logrus.Infof("[kuji]读取%d条签文", n)
+			return true
+		},
+	)).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			kujiBytes, err := text.RenderToBase64(
+				getKujiByBango(
+					uint8(ctxext.RandSenderPerDayN(ctx, 100)+1),
+				),
+				text.FontFile, 400, 20,
+			)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
 			}
 			if id := ctx.SendChain(message.At(ctx.Event.UserID), message.Image("base64://"+helper.BytesToString(kujiBytes))); id.ID() == 0 {
-				ctx.SendChain(message.Text("ERROR: 可能被风控了"))
+				ctx.SendChain(message.Text("ERROR:可能被风控了"))
 			}
 		})
 }
-
-func bangoToday(uid int64) uint8 {
-	today, err := strconv.ParseInt(time.Now().Format("20060102"), 10, 64)
-	if err != nil {
-		log.Errorln("string转化为int64格式有问题:", err)
-	}
-	seed := uid + today
-	r := rand.New(rand.NewSource(seed))
-	return uint8(r.Intn(100) + 1)
-}

plugin/qqwife/qqmapwife.go

@@ -0,0 +1,421 @@
+// Package qqwife 娶群友  基于“翻牌”和江林大佬的“群老婆”插件魔改作品
+package qqwife
+
+import (
+	"math/rand"
+	"sort"
+	"strconv"
+	"sync"
+	"time"
+
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+
+	"github.com/FloatTech/zbputils/binary"
+	control "github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/math"
+	"github.com/wdvxdr1123/ZeroBot/extension/rate"
+)
+
+//nolint: asciicheck
+type 婚姻登记 struct {
+	sync.Mutex
+	mp map[int64]map[int64]*userinfo
+}
+
+// 结婚证信息
+type userinfo struct {
+	target     int64  // 对象身份证号
+	username   string // 户主名称
+	targetname string // 对象名称
+}
+
+//nolint: asciicheck
+func 新登记处() (db 婚姻登记) {
+	db.mp = make(map[int64]map[int64]*userinfo, 64)
+	return
+}
+
+func (db *婚姻登记) 重置() {
+	db.Lock()
+	defer db.Unlock()
+	for k := range db.mp {
+		delete(db.mp, k)
+	}
+}
+
+func (db *婚姻登记) 离婚休妻(gid, wife int64) {
+	db.Lock()
+	defer db.Unlock()
+	delete(db.mp[gid], -wife)
+}
+
+func (db *婚姻登记) 离婚休夫(gid, husband int64) {
+	db.Lock()
+	defer db.Unlock()
+	delete(db.mp[gid], husband)
+}
+
+func (db *婚姻登记) 有登记(gid int64) (ok bool) {
+	db.Lock()
+	defer db.Unlock()
+	mp, ok := db.mp[gid]
+	if !ok {
+		return
+	}
+	for range mp {
+		return true
+	}
+	return
+}
+
+func (db *婚姻登记) 花名册(ctx *zero.Ctx, gid int64) string {
+	db.Lock()
+	defer db.Unlock()
+	mp, ok := db.mp[gid]
+	if !ok {
+		return "民政局的花名册出问题了额..."
+	}
+	return binary.BytesToString(binary.NewWriterF(func(w *binary.Writer) {
+		w.WriteString("群老公←———→群老婆\n-----------")
+		for uid, userinfo := range mp {
+			if uid > 0 {
+				_ = w.WriteByte('\n')
+				w.WriteString(userinfo.username)
+				w.WriteString(" & ")
+				w.WriteString(userinfo.targetname)
+			}
+		}
+	}))
+}
+
+func (db *婚姻登记) 查户口(gid, uid int64) (userinfo *userinfo, gender int, ok bool) {
+	db.Lock()
+	defer db.Unlock()
+	gender = 0
+	mp, ok := db.mp[gid]
+	if !ok {
+		return
+	}
+	userinfo, ok = mp[uid]
+	if !ok {
+		gender = 1
+		userinfo, ok = mp[-uid]
+	}
+	return
+}
+
+func (db *婚姻登记) 登记(gid, uid, target int64, username, targetname string) {
+	db.Lock()
+	defer db.Unlock()
+	_, ok := db.mp[gid]
+	if !ok {
+		db.mp[gid] = make(map[int64]*userinfo, 32)
+	}
+	// 填写夫妻信息
+	uidinfo := &userinfo{
+		target:     target,
+		username:   username,
+		targetname: targetname,
+	}
+	targetinfo := &userinfo{
+		target:     uid,
+		username:   targetname,
+		targetname: username,
+	}
+	// 民政局登记数据
+	db.mp[gid][uid] = uidinfo
+	db.mp[gid][-target] = targetinfo
+}
+
+var (
+	//nolint: asciicheck
+	民政局      = 新登记处()
+	skillCD  = rate.NewManager[string](time.Hour*24, 1)
+	lastdate time.Time
+	sendtext = [...][]string{
+		{ // 表白成功
+			"今天你向ta表白了，ta羞涩的点了点头同意了！\n",
+			"你对ta说“以我之名，冠你指间，一天相伴，一天相随”.ta捂着嘴点了点头\n\n",
+		},
+		{ // 表白失败
+			"今天你向ta表白了，ta毫无感情的拒绝了你",
+			"今天你向ta表白了，ta对你说“你是一个非常好的人”",
+			"今天你向ta表白了，ta给了你一个拥抱后擦肩而过",
+		},
+		{ // ntr成功
+			"你处心积虑的接近ta，ta最终选择跟随你\n",
+		},
+	}
+)
+
+func init() {
+	engine := control.Register("qqwife", &control.Options{
+		DisableOnDefault: false,
+		Help: "一群一天一夫一妻制群老婆\n（每天凌晨刷新CP）\n" +
+			"- 娶群友\n- 群老婆列表\n" +
+			"--------------------------------\n以下技能每人只能二选一\n   CD24H，不跨天刷新\n--------------------------------\n" +
+			"- (娶|嫁)@对方QQ\n- 当[对方Q号|@对方QQ]的小三\n",
+	})
+	engine.OnFullMatch("娶群友", zero.OnlyGroup).SetBlock(true).Limit(ctxext.LimitByUser).
+		Handle(func(ctx *zero.Ctx) {
+			if time.Now().Day() != lastdate.Day() {
+				民政局.重置()
+				// 更新时间
+				lastdate = time.Now()
+			}
+			gid := ctx.Event.GroupID
+			uid := ctx.Event.UserID
+			targetinfo, status, ok := 民政局.查户口(gid, uid)
+			if ok {
+				switch status {
+				case 0: // 娶过别人
+					ctx.SendChain(
+						message.At(uid),
+						message.Text("今天你的群老婆是"),
+						message.Image("http://q4.qlogo.cn/g?b=qq&nk="+strconv.FormatInt(targetinfo.target, 10)+"&s=640").Add("cache", 0),
+						message.Text(
+							"\n",
+							"[", targetinfo.targetname, "]",
+							"(", targetinfo.target, ")哒",
+						),
+					)
+				default: // 嫁给别人
+					ctx.SendChain(
+						message.At(uid),
+						message.Text("今天你的群老公是"),
+						message.Image("http://q4.qlogo.cn/g?b=qq&nk="+strconv.FormatInt(targetinfo.target, 10)+"&s=640").Add("cache", 0),
+						message.Text(
+							"\n",
+							"[", targetinfo.targetname, "]",
+							"(", targetinfo.target, ")哒",
+						),
+					)
+				}
+				return
+			}
+			// 无缓存获取群员列表
+			temp := ctx.GetThisGroupMemberListNoCache().Array()
+			sort.SliceStable(temp, func(i, j int) bool {
+				return temp[i].Get("last_sent_time").Int() < temp[j].Get("last_sent_time").Int()
+			})
+			temp = temp[math.Max(0, len(temp)-30):]
+			// 将已经娶过的人剔除
+			qqgrouplist := make([]int64, 0, len(temp))
+			for k := 0; k < len(temp); k++ {
+				usr := temp[k].Get("user_id").Int()
+				_, _, ok := 民政局.查户口(gid, usr)
+				if ok {
+					continue
+				}
+				qqgrouplist = append(qqgrouplist, usr)
+			}
+			// 没有人（只剩自己）的时候
+			if len(qqgrouplist) == 0 {
+				ctx.SendChain(message.Text("噢, 此时此刻你还是一只单身狗, 等待下一次情缘吧"))
+				return
+			}
+			// 随机抽娶
+			fiancee := qqgrouplist[rand.Intn(len(qqgrouplist))]
+			if fiancee == uid { // 如果是自己
+				ctx.SendChain(message.Text("噢, 此时此刻你还是一只单身狗, 等待下一次情缘吧"))
+				return
+			}
+			// 去民政局办证
+			民政局.登记(gid, uid, fiancee, ctx.CardOrNickName(uid), ctx.CardOrNickName(fiancee))
+			// 请大家吃席
+			ctx.SendChain(
+				message.At(uid),
+				message.Text("今天你的群老婆是"),
+				message.Image("http://q4.qlogo.cn/g?b=qq&nk="+strconv.FormatInt(fiancee, 10)+"&s=640").Add("cache", 0),
+				message.Text(
+					"\n",
+					"[", ctx.CardOrNickName(fiancee), "]",
+					"(", fiancee, ")哒",
+				),
+			)
+		})
+	// 单身技能
+	engine.OnRegex(`^(娶|嫁)\[CQ:at,qq=(\d+)\]`, zero.OnlyGroup, checkdog).SetBlock(true).Limit(cdcheck, iscding).
+		Handle(func(ctx *zero.Ctx) {
+			choice := ctx.State["regex_matched"].([]string)[1]
+			fiancee, _ := strconv.ParseInt(ctx.State["regex_matched"].([]string)[2], 10, 64)
+			uid := ctx.Event.UserID
+			if uid == fiancee { // 如果是自己
+				ctx.SendChain(message.Text("今日获得成就：自恋狂"))
+				return
+			}
+			if rand.Intn(2) == 1 { // 二分之一的概率表白成功
+				gid := ctx.Event.GroupID
+				// 去民政局登记
+				var choicetext string
+				switch choice {
+				case "娶":
+					民政局.登记(gid, uid, fiancee, ctx.CardOrNickName(uid), ctx.CardOrNickName(fiancee))
+					choicetext = "今天你的群老婆是"
+				default:
+					民政局.登记(gid, fiancee, uid, ctx.CardOrNickName(fiancee), ctx.CardOrNickName(uid))
+					choicetext = "今天你的群老公是"
+				}
+				// 请大家吃席
+				ctx.SendChain(
+					message.Text(sendtext[0][rand.Intn(len(sendtext[0]))]),
+					message.At(uid),
+					message.Text(choicetext),
+					message.Image("http://q4.qlogo.cn/g?b=qq&nk="+strconv.FormatInt(fiancee, 10)+"&s=640").Add("cache", 0),
+					message.Text(
+						"\n",
+						"[", ctx.CardOrNickName(fiancee), "]",
+						"(", fiancee, ")哒",
+					),
+				)
+				return
+			}
+			ctx.SendChain(message.Text(sendtext[1][rand.Intn(len(sendtext[1]))]))
+		})
+	// NTR技能
+	engine.OnRegex(`^当(\[CQ:at,qq=(\d+)\] |(\d+))的小三`, zero.OnlyGroup, checkcp).SetBlock(true).Limit(cdcheck, iscding).
+		Handle(func(ctx *zero.Ctx) {
+			fid := ctx.State["regex_matched"].([]string)
+			fiancee, _ := strconv.ParseInt(fid[2]+fid[3], 10, 64)
+			if rand.Intn(10)/4 != 0 { // 十分之三的概率NTR成功
+				ctx.SendChain(message.Text("你的ntr计划失败了"))
+				return
+			}
+			gid := ctx.Event.GroupID
+			uid := ctx.Event.UserID
+			// 判断target是老公还是老婆
+			var choicetext string
+			targetinfo, gender, _ := 民政局.查户口(gid, fiancee)
+			switch gender {
+			case 0:
+				// 让对象离婚
+				民政局.离婚休妻(gid, targetinfo.target)
+				// 和对象结婚登记
+				choicetext = "老公"
+				民政局.登记(gid, fiancee, uid, ctx.CardOrNickName(fiancee), ctx.CardOrNickName(uid))
+			default:
+				// 让对象离婚
+				民政局.离婚休夫(gid, targetinfo.target)
+				// 和对象结婚登记
+				choicetext = "老婆"
+				民政局.登记(gid, uid, fiancee, ctx.CardOrNickName(uid), ctx.CardOrNickName(fiancee))
+			}
+			// 输出结果
+			ctx.SendChain(
+				message.Text(sendtext[2][rand.Intn(len(sendtext[2]))]),
+				message.At(uid),
+				message.Text("今天你的群"+choicetext+"是"),
+				message.Image("http://q4.qlogo.cn/g?b=qq&nk="+strconv.FormatInt(fiancee, 10)+"&s=640").Add("cache", 0),
+				message.Text(
+					"\n",
+					"[", ctx.CardOrNickName(fiancee), "]",
+					"(", fiancee, ")哒",
+				),
+			)
+		})
+	engine.OnFullMatch("群老婆列表", zero.OnlyGroup).SetBlock(true).Limit(ctxext.LimitByUser).
+		Handle(func(ctx *zero.Ctx) {
+			if !民政局.有登记(ctx.Event.GroupID) {
+				ctx.SendChain(message.Text("你群并没有任何的CP额"))
+				return
+			}
+			ctx.SendChain(message.Text(民政局.花名册(ctx, ctx.Event.GroupID)))
+		})
+}
+
+// 以群号和昵称为限制
+func cdcheck(ctx *zero.Ctx) *rate.Limiter {
+	limitID := strconv.FormatInt(ctx.Event.GroupID, 10) + strconv.FormatInt(ctx.Event.UserID, 10)
+	return skillCD.Load(limitID)
+}
+func iscding(ctx *zero.Ctx) {
+	ctx.SendChain(message.Text("你的技能现在正在CD中"))
+}
+
+// 注入判断 是否为单身
+func checkdog(ctx *zero.Ctx) bool {
+	gid := ctx.Event.GroupID
+	if !民政局.有登记(gid) {
+		return true // 如果没有人登记，说明全是单身
+	}
+	fiancee, err := strconv.ParseInt(ctx.State["regex_matched"].([]string)[2], 10, 64)
+	if err != nil {
+		ctx.SendChain(message.Text("额，你的target好像不存在？"))
+		return false
+	}
+	// 获取用户信息
+	uid := ctx.Event.UserID
+	uidtarget, uidstatus, ok1 := 民政局.查户口(gid, uid)
+	_, fianceestatus, ok2 := 民政局.查户口(gid, fiancee)
+	if !ok1 && !ok2 { // 必须是两个单身
+		return true
+	}
+	if ok1 {
+		if uidtarget.target == fiancee { // 如果本就是一块
+			ctx.SendChain(message.Text("笨蛋~你们明明已经在一起了啊w"))
+			return false
+		}
+		switch uidstatus {
+		case 0: // 如果如为攻
+			ctx.SendChain(message.Text("笨蛋~你家里还有个吃白饭的w"))
+		default: // 如果为受
+			ctx.SendChain(message.Text("该是0就是0，当0有什么不好"))
+		}
+		return false
+	}
+	if ok2 {
+		switch fianceestatus {
+		case 0: // 如果如为攻
+			ctx.SendChain(message.Text("他有别的女人了，你该放下了"))
+		default: // 如果为受
+			ctx.SendChain(message.Text("这是一个纯爱的世界，拒绝NTR"))
+		}
+		return false
+	}
+	return true
+}
+
+// 注入判断 是否满足小三要求
+func checkcp(ctx *zero.Ctx) bool {
+	// 检查群内是否有人登记了
+	gid := ctx.Event.GroupID
+	if !民政局.有登记(gid) {
+		ctx.SendChain(message.Text("ta无法达成你当小三的条件"))
+		return false
+	}
+	// 检查target
+	fid := ctx.State["regex_matched"].([]string)
+	fiancee, err := strconv.ParseInt(fid[2]+fid[3], 10, 64)
+	if err != nil {
+		ctx.SendChain(message.Text("额，你的对象好像不存在?"))
+		return false
+	}
+	uid := ctx.Event.UserID
+	if fiancee == uid {
+		ctx.SendChain(message.Text("自我攻略?"))
+		return false
+	}
+	// 检查用户是否登记过
+	userinfo, uidstatus, ok := 民政局.查户口(gid, uid)
+	if ok {
+		if userinfo.target == fiancee { // 如果本就是一块
+			ctx.SendChain(message.Text("笨蛋~你们明明已经在一起了啊w"))
+			return false
+		}
+		switch uidstatus {
+		case 0: // 如果如为攻
+			ctx.SendChain(message.Text("抱歉，建国之后不支持后宫"))
+		default: // 如果为受
+			ctx.SendChain(message.Text("该是0就是0，当0有什么不好"))
+		}
+		return false
+	}
+	_, _, ok = 民政局.查户口(gid, fiancee)
+	if !ok {
+		ctx.SendChain(message.Text("ta无法达成你当小三的条件"))
+		return false
+	}
+	return true
+}

plugin/reborn/load.go

@@ -8,7 +8,7 @@ import (
 
 // load 加载rate数据
 func load(area *rate, jsonfile string) error {
-	data, err := file.GetLazyData(jsonfile, true, true)
+	data, err := file.GetLazyData(jsonfile, true)
 	if err != nil {
 		return err
 	}

plugin/reborn/main.go

@@ -5,41 +5,45 @@ import (
 	"fmt"
 	"math/rand"
 
-	control "github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
 	wr "github.com/mroth/weightedrand"
 	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 func init() {
-	en := control.Register("reborn", order.AcquirePrio(), &control.Options{
+	en := control.Register("reborn", &control.Options{
 		DisableOnDefault: false,
 		Help:             "投胎\n- reborn",
 		PublicDataFolder: "Reborn",
 	})
-	go func() {
-		datapath := en.DataFolder()
-		jsonfile := datapath + "rate.json"
-		area := make(rate, 226)
-		err := load(&area, jsonfile)
-		if err != nil {
-			panic(err)
-		}
-		choices := make([]wr.Choice, len(area))
-		for i, a := range area {
-			choices[i].Item = a.Name
-			choices[i].Weight = uint(a.Weight * 1e9)
-		}
-		areac, err = wr.NewChooser(choices...)
-		if err != nil {
-			panic(err)
-		}
-		logrus.Printf("[Reborn]读取%d个国家/地区", len(area))
-	}()
-	en.OnFullMatch("reborn").SetBlock(true).
+
+	en.OnFullMatch("reborn", ctxext.DoOnceOnSuccess(
+		func(ctx *zero.Ctx) bool {
+			datapath := en.DataFolder()
+			jsonfile := datapath + "rate.json"
+			area := make(rate, 226)
+			err := load(&area, jsonfile)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return false
+			}
+			choices := make([]wr.Choice, len(area))
+			for i, a := range area {
+				choices[i].Item = a.Name
+				choices[i].Weight = uint(a.Weight * 1e9)
+			}
+			areac, err = wr.NewChooser(choices...)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return false
+			}
+			logrus.Printf("[Reborn]读取%d个国家/地区", len(area))
+			return true
+		},
+	)).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			if rand.Int31() > 1<<27 {
 				ctx.SendChain(message.At(ctx.Event.UserID), message.Text(fmt.Sprintf("投胎成功！\n您出生在 %s, 是 %s。", randcoun(), randgen())))

plugin/runcode/code_runner.go

@@ -14,8 +14,6 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
-	"github.com/FloatTech/zbputils/control/order"
-
 	"github.com/tidwall/gjson"
 )
 
@@ -93,7 +91,7 @@ var (
 )
 
 func init() {
-	control.Register("runcode", order.AcquirePrio(), &control.Options{
+	control.Register("runcode", &control.Options{
 		DisableOnDefault: false,
 		Help: "在线代码运行: \n" +
 			">runcode [language] [code block]\n" +
@@ -132,7 +130,7 @@ func init() {
 						// 运行失败
 						ctx.SendChain(
 							message.Text("> ", ctx.Event.Sender.NickName, "\n"),
-							message.Text("ERROR: ", err),
+							message.Text("ERROR:", err),
 						)
 					} else {
 						// 运行成功

plugin/saucenao/searcher.go

@@ -3,6 +3,9 @@ package saucenao
 
 import (
 	"fmt"
+	"net/http"
+	"os"
+	"reflect"
 	"strconv"
 
 	"github.com/sirupsen/logrus"
@@ -11,23 +14,41 @@ import (
 
 	"github.com/FloatTech/AnimeAPI/ascii2d"
 	"github.com/FloatTech/AnimeAPI/pixiv"
-	"github.com/FloatTech/AnimeAPI/saucenao"
-	"github.com/FloatTech/AnimeAPI/yandex"
+	"github.com/jozsefsallai/gophersauce"
 
+	"github.com/FloatTech/zbputils/binary"
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/img/pool"
 )
 
+var (
+	saucenaocli *gophersauce.Client
+)
+
 func init() { // 插件主体
-	engine := control.Register("saucenao", order.AcquirePrio(), &control.Options{
+	engine := control.Register("saucenao", &control.Options{
 		DisableOnDefault: false,
 		Help: "搜图\n" +
 			"- 以图搜图 | 搜索图片 | 以图识图[图片]\n" +
 			"- 搜图[P站图片ID]",
+		PrivateDataFolder: "saucenao",
 	})
+	apikeyfile := engine.DataFolder() + "apikey.txt"
+	if file.IsExist(apikeyfile) {
+		key, err := os.ReadFile(apikeyfile)
+		if err != nil {
+			panic(err)
+		}
+		saucenaocli, err = gophersauce.NewClient(&gophersauce.Settings{
+			MaxResults: 1,
+			APIKey:     binary.BytesToString(key),
+		})
+		if err != nil {
+			panic(err)
+		}
+	}
 	// 根据 PID 搜图
 	engine.OnRegex(`^搜图(\d+)$`).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
@@ -36,7 +57,7 @@ func init() { // 插件主体
 			// 获取P站插图信息
 			illust, err := pixiv.Works(id)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
 			if illust.Pid > 0 {
@@ -66,15 +87,22 @@ func init() { // 插件主体
 					imgs = append(imgs, message.Image("file:///"+f))
 				}
 				txt := message.Text(
-					"标题：", illust.Title, "\n",
-					"插画ID：", illust.Pid, "\n",
-					"画师：", illust.UserName, "\n",
-					"画师ID：", illust.UserId, "\n",
-					"直链：", "https://pixivel.moe/detail?id=", illust.Pid,
+					"标题: ", illust.Title, "\n",
+					"插画ID: ", illust.Pid, "\n",
+					"画师: ", illust.UserName, "\n",
+					"画师ID: ", illust.UserId, "\n",
+					"直链: ", "https://pixivel.moe/detail?id=", illust.Pid,
 				)
 				if imgs != nil {
-					// 发送搜索结果
-					ctx.Send(append(imgs, message.Text("\n"), txt))
+					if zero.OnlyGroup(ctx) {
+						ctx.SendGroupForwardMessage(ctx.Event.GroupID, message.Message{
+							ctxext.FakeSenderForwardNode(ctx, txt),
+							ctxext.FakeSenderForwardNode(ctx, imgs...),
+						})
+					} else {
+						// 发送搜索结果
+						ctx.Send(append(imgs, message.Text("\n"), txt))
+					}
 				} else {
 					// 图片下载失败，仅发送文字结果
 					ctx.SendChain(txt)
@@ -87,46 +115,51 @@ func init() { // 插件主体
 	engine.OnKeywordGroup([]string{"以图搜图", "搜索图片", "以图识图"}, zero.OnlyGroup, zero.MustProvidePicture).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			// 开始搜索图片
-			ctx.SendChain(message.Text("少女祈祷中......"))
+			ctx.SendChain(message.Text("少女祈祷中..."))
 			for _, pic := range ctx.State["image_url"].([]string) {
-				fmt.Println(pic)
-				if result, err := saucenao.SauceNAO(pic); err != nil {
-					ctx.SendChain(message.Text("ERROR: ", err))
+				if saucenaocli != nil {
+					resp, err := saucenaocli.FromURL(pic)
+					if err == nil && resp.Count() > 0 {
+						result := resp.First()
+						s, err := strconv.ParseFloat(result.Header.Similarity, 64)
+						if err == nil {
+							rr := reflect.ValueOf(&result.Data).Elem()
+							b := binary.NewWriterF(func(w *binary.Writer) {
+								r := rr.Type()
+								for i := 0; i < r.NumField(); i++ {
+									if !rr.Field(i).IsZero() {
+										w.WriteString("\n")
+										w.WriteString(r.Field(i).Name)
+										w.WriteString(": ")
+										w.WriteString(fmt.Sprint(rr.Field(i).Interface()))
+									}
+								}
+							})
+							resp, err := http.Head(result.Header.Thumbnail)
+							msg := make(message.Message, 0, 3)
+							if s > 80.0 {
+								msg = append(msg, message.Text("我有把握是这个!"))
+							} else {
+								msg = append(msg, message.Text("也许是这个?"))
+							}
+							if err == nil && resp.StatusCode == http.StatusOK {
+								msg = append(msg, message.Image(result.Header.Thumbnail))
+							} else {
+								msg = append(msg, message.Image(pic))
+							}
+							msg = append(msg, message.Text("\n图源: ", result.Header.IndexName, binary.BytesToString(b)))
+							ctx.Send(msg)
+							if s > 80.0 {
+								continue
+							}
+						}
+					}
 				} else {
-					// 返回SauceNAO的结果
-					ctx.SendChain(
-						message.Text("我有把握是这个！"),
-						message.Image(result[0].Thumbnail),
-						message.Text(
-							"\n",
-							"相似度：", result[0].Similarity, "\n",
-							"标题：", result[0].Title, "\n",
-							"插画ID：", result[0].PixivID, "\n",
-							"画师：", result[0].MemberName, "\n",
-							"画师ID：", result[0].MemberID, "\n",
-							"直链：", "https://pixivel.moe/detail?id=", result[0].PixivID,
-						),
-					)
-					continue
+					ctx.SendChain(message.Text("请私聊发送 设置 saucenao api key [apikey] 以启用 saucenao 搜图, key 请前往 https://saucenao.com/user.php?page=search-api 获取"))
 				}
-				if result, err := yandex.Yandex(pic); err != nil {
-					ctx.SendChain(message.Text("ERROR: ", err))
-				} else {
-					ctx.SendChain(
-						message.Text("也许是这个？"),
-						message.Text(
-							"\n",
-							"标题：", result.Title, "\n",
-							"插画ID：", result.Pid, "\n",
-							"画师：", result.UserName, "\n",
-							"画师ID：", result.UserId, "\n",
-							"直链：", "https://pixivel.moe/detail?id=", result.Pid,
-						),
-					)
-				}
-				// 不论结果如何都执行 ascii2d 搜索
+				// ascii2d 搜索
 				if result, err := ascii2d.Ascii2d(pic); err != nil {
-					ctx.SendChain(message.Text("ERROR: ", err))
+					ctx.SendChain(message.Text("ERROR:", err))
 					continue
 				} else {
 					msg := message.Message{ctxext.FakeSenderForwardNode(ctx, message.Text("ascii2d搜图结果"))}
@@ -134,7 +167,7 @@ func init() { // 插件主体
 						msg = append(msg, ctxext.FakeSenderForwardNode(ctx,
 							message.Image(result[i].Thumb),
 							message.Text(fmt.Sprintf(
-								"标题：%s\n图源：%s\n画师：%s\n画师链接：%s\n图片链接：%s",
+								"标题: %s\n图源: %s\n画师: %s\n画师链接: %s\n图片链接: %s",
 								result[i].Name,
 								result[i].Type,
 								result[i].AuthNm,
@@ -147,9 +180,27 @@ func init() { // 插件主体
 						ctx.Event.GroupID,
 						msg,
 					).Get("message_id").Int(); id == 0 {
-						ctx.SendChain(message.Text("ERROR: 可能被风控了"))
+						ctx.SendChain(message.Text("ERROR:可能被风控了"))
 					}
 				}
 			}
 		})
+	engine.OnRegex(`^设置\s?saucenao\s?api\s?key\s?([0-9a-f]{40})$`, zero.SuperUserPermission, zero.OnlyPrivate).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			var err error
+			saucenaocli, err = gophersauce.NewClient(&gophersauce.Settings{
+				MaxResults: 1,
+				APIKey:     ctx.State["regex_matched"].([]string)[1],
+			})
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			err = os.WriteFile(apikeyfile, binary.StringToBytes(saucenaocli.APIKey), 0644)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			ctx.SendChain(message.Text("成功!"))
+		})
 }

plugin/scale/main.go

@@ -23,7 +23,6 @@ import (
 
 	"github.com/FloatTech/zbputils/binary"
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/img"
@@ -32,7 +31,7 @@ import (
 )
 
 func init() {
-	engine := control.Register("scale", order.AcquirePrio(), &control.Options{
+	engine := control.Register("scale", &control.Options{
 		DisableOnDefault:  false,
 		Help:              "叔叔的AI二次元图片放大\n- 放大图片[图片]",
 		PrivateDataFolder: "scale",
@@ -57,7 +56,7 @@ func init() {
 					ctx.SendChain(message.Text("ERROR:", err))
 					return
 				}
-				if p[0].Drawings < 0.1 || p[0].Neutral > 0.8 {
+				if p.Drawings < 0.1 || p.Neutral > 0.8 {
 					ctx.SendChain(message.Text("请发送二次元图片!"))
 					return
 				}
@@ -111,7 +110,7 @@ func init() {
 }
 
 func getPara(ctx *zero.Ctx) bool {
-	next := zero.NewFutureEvent("message", 999, false, zero.CheckUser(ctx.Event.UserID))
+	next := zero.NewFutureEvent("message", 999, false, ctx.CheckSession())
 	recv, cancel := next.Repeat()
 	i := 0
 	paras := [2]int{}
@@ -119,9 +118,10 @@ func getPara(ctx *zero.Ctx) bool {
 	for {
 		select {
 		case <-time.After(time.Second * 120):
+			cancel()
 			return false
-		case e := <-recv:
-			msg := e.Message.ExtractPlainText()
+		case c := <-recv:
+			msg := c.Event.Message.ExtractPlainText()
 			num, err := strconv.Atoi(msg)
 			if err != nil {
 				ctx.SendChain(message.Text("请输入数字!"))

plugin/score/model.go

@@ -65,7 +65,7 @@ func (sdb *scoredb) Close() error {
 // GetScoreByUID 取得分数
 func (sdb *scoredb) GetScoreByUID(uid int64) (s scoretable) {
 	db := (*gorm.DB)(sdb)
-	db.Debug().Model(&scoretable{}).FirstOrCreate(&s, "uid = ? ", uid)
+	db.Model(&scoretable{}).FirstOrCreate(&s, "uid = ? ", uid)
 	return s
 }
 
@@ -76,13 +76,13 @@ func (sdb *scoredb) InsertOrUpdateScoreByUID(uid int64, score int) (err error) {
 		UID:   uid,
 		Score: score,
 	}
-	if err = db.Debug().Model(&scoretable{}).First(&s, "uid = ? ", uid).Error; err != nil {
+	if err = db.Model(&scoretable{}).First(&s, "uid = ? ", uid).Error; err != nil {
 		// error handling...
 		if gorm.IsRecordNotFoundError(err) {
-			err = db.Debug().Model(&scoretable{}).Create(&s).Error // newUser not user
+			err = db.Model(&scoretable{}).Create(&s).Error // newUser not user
 		}
 	} else {
-		err = db.Debug().Model(&scoretable{}).Where("uid = ? ", uid).Update(
+		err = db.Model(&scoretable{}).Where("uid = ? ", uid).Update(
 			map[string]interface{}{
 				"score": score,
 			}).Error
@@ -93,7 +93,7 @@ func (sdb *scoredb) InsertOrUpdateScoreByUID(uid int64, score int) (err error) {
 // GetSignInByUID 取得签到次数
 func (sdb *scoredb) GetSignInByUID(uid int64) (si signintable) {
 	db := (*gorm.DB)(sdb)
-	db.Debug().Model(&signintable{}).FirstOrCreate(&si, "uid = ? ", uid)
+	db.Model(&signintable{}).FirstOrCreate(&si, "uid = ? ", uid)
 	return si
 }
 
@@ -104,16 +104,22 @@ func (sdb *scoredb) InsertOrUpdateSignInCountByUID(uid int64, count int) (err er
 		UID:   uid,
 		Count: count,
 	}
-	if err = db.Debug().Model(&signintable{}).First(&si, "uid = ? ", uid).Error; err != nil {
+	if err = db.Model(&signintable{}).First(&si, "uid = ? ", uid).Error; err != nil {
 		// error handling...
 		if gorm.IsRecordNotFoundError(err) {
-			db.Debug().Model(&signintable{}).Create(&si) // newUser not user
+			db.Model(&signintable{}).Create(&si) // newUser not user
 		}
 	} else {
-		err = db.Debug().Model(&signintable{}).Where("uid = ? ", uid).Update(
+		err = db.Model(&signintable{}).Where("uid = ? ", uid).Update(
 			map[string]interface{}{
 				"count": count,
 			}).Error
 	}
 	return
 }
+
+func (sdb *scoredb) GetScoreRankByTopN(n int) (st []scoretable, err error) {
+	db := (*gorm.DB)(sdb)
+	err = db.Model(&scoretable{}).Order("score desc").Limit(n).Find(&st).Error
+	return
+}

plugin/score/sign_in.go

@@ -8,8 +8,10 @@ import (
 	"time"
 
 	"github.com/fogleman/gg"
+	"github.com/golang/freetype"
 	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
+	"github.com/wcharczuk/go-chart/v2"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
@@ -19,12 +21,10 @@ import (
 	"github.com/FloatTech/zbputils/img/text"
 	"github.com/FloatTech/zbputils/img/writer"
 	"github.com/FloatTech/zbputils/web"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
-	backgroundURL = "https://iw233.cn/API/pc.php?type=json"
+	backgroundURL = "https://mirlkoi.ifast3.vipnps.vip/api.php?sort=pc&type=json"
 	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
@@ -35,28 +35,19 @@ const (
 var levelArray = [...]int{0, 1, 2, 5, 10, 20, 35, 55, 75, 100, 120}
 
 func init() {
-	engine := control.Register("score", order.AcquirePrio(), &control.Options{
+	engine := control.Register("score", &control.Options{
 		DisableOnDefault:  false,
-		Help:              "签到得分\n- 签到\n- 获得签到背景[@xxx] | 获得签到背景",
+		Help:              "签到得分\n- 签到\n- 获得签到背景[@xxx] | 获得签到背景\n- 查看分数排名",
 		PrivateDataFolder: "score",
 	})
 	cachePath := engine.DataFolder() + "cache/"
 	go func() {
-		os.RemoveAll(cachePath)
+		_ = os.RemoveAll(cachePath)
 		err := os.MkdirAll(cachePath, 0755)
 		if err != nil {
 			panic(err)
 		}
-		_, err = file.GetLazyData(text.BoldFontFile, false, true)
-		if err != nil {
-			panic(err)
-		}
-		_, err = file.GetLazyData(text.FontFile, false, true)
-		if err != nil {
-			panic(err)
-		}
 		sdb = initialize(engine.DataFolder() + "score.db")
-		log.Println("[score]加载score数据库")
 	}()
 	engine.OnFullMatch("签到", zero.OnlyGroup).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
@@ -65,11 +56,10 @@ func init() {
 			today := now.Format("20060102")
 			si := sdb.GetSignInByUID(uid)
 			siUpdateTimeStr := si.UpdatedAt.Format("20060102")
-			if siUpdateTimeStr != today {
-				_ = sdb.InsertOrUpdateSignInCountByUID(uid, 0)
-			}
-
 			drawedFile := cachePath + strconv.FormatInt(uid, 10) + today + "signin.png"
+
+			picFile := cachePath + strconv.FormatInt(uid, 10) + today + ".png"
+
 			if si.Count >= signinMax && siUpdateTimeStr == today {
 				ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("今天你已经签到过了！"))
 				if file.IsExist(drawedFile) {
@@ -77,17 +67,21 @@ func init() {
 				}
 				return
 			}
-
-			picFile := cachePath + strconv.FormatInt(uid, 10) + today + ".png"
-			initPic(picFile)
-
-			_ = sdb.InsertOrUpdateSignInCountByUID(uid, si.Count+1)
-
+			err := initPic(picFile)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
 			back, err := gg.LoadImage(picFile)
 			if err != nil {
 				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
+			if siUpdateTimeStr != today {
+				_ = sdb.InsertOrUpdateSignInCountByUID(uid, 0)
+			}
+
+			_ = sdb.InsertOrUpdateSignInCountByUID(uid, si.Count+1)
 
 			// 避免图片过大，最大 1280*720
 			back = img.Limit(back, 1280, 720)
@@ -99,6 +93,11 @@ func init() {
 
 			monthWord := now.Format("01/02")
 			hourWord := getHourWord(now)
+			_, err = file.GetLazyData(text.BoldFontFile, true)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
 			if err = canvas.LoadFontFace(text.BoldFontFile, float64(back.Bounds().Size().X)*0.1); err != nil {
 				ctx.SendChain(message.Text("ERROR:", err))
 				return
@@ -107,6 +106,11 @@ func init() {
 			canvas.DrawString(hourWord, float64(back.Bounds().Size().X)*0.1, float64(back.Bounds().Size().Y)*1.2)
 			canvas.DrawString(monthWord, float64(back.Bounds().Size().X)*0.6, float64(back.Bounds().Size().Y)*1.2)
 			nickName := ctx.CardOrNickName(uid)
+			_, err = file.GetLazyData(text.FontFile, true)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
 			if err = canvas.LoadFontFace(text.FontFile, float64(back.Bounds().Size().X)*0.04); err != nil {
 				ctx.SendChain(message.Text("ERROR:", err))
 				return
@@ -170,6 +174,71 @@ func init() {
 			}
 			ctx.SendChain(message.Image("file:///" + file.BOTPATH + "/" + picFile))
 		})
+	engine.OnFullMatch("查看分数排名", zero.OnlyGroup).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			today := time.Now().Format("20060102")
+			drawedFile := cachePath + today + "scoreRank.png"
+			if file.IsExist(drawedFile) {
+				ctx.SendChain(message.Image("file:///" + file.BOTPATH + "/" + drawedFile))
+				return
+			}
+			st, err := sdb.GetScoreRankByTopN(10)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			if len(st) == 0 {
+				ctx.SendChain(message.Text("ERROR:目前还没有人签到过"))
+				return
+			}
+			_, err = file.GetLazyData(text.FontFile, true)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			b, err := os.ReadFile(text.FontFile)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			font, err := freetype.ParseFont(b)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			bars := make([]chart.Value, len(st))
+			for i, v := range st {
+				bars[i] = chart.Value{
+					Value: float64(v.Score),
+					Label: ctx.CardOrNickName(v.UID),
+				}
+			}
+			graph := chart.BarChart{
+				Font:  font,
+				Title: "饼干排名",
+				Background: chart.Style{
+					Padding: chart.Box{
+						Top: 40,
+					},
+				},
+				Height:   500,
+				BarWidth: 50,
+				Bars:     bars,
+			}
+			f, err := os.Create(drawedFile)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			err = graph.Render(chart.PNG, f)
+			_ = f.Close()
+			if err != nil {
+				_ = os.Remove(drawedFile)
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			ctx.SendChain(message.Image("file:///" + file.BOTPATH + "/" + drawedFile))
+		})
 }
 
 func getHourWord(t time.Time) string {
@@ -200,20 +269,21 @@ func getLevel(count int) int {
 	return -1
 }
 
-func initPic(picFile string) {
+func initPic(picFile string) error {
 	if file.IsNotExist(picFile) {
 		data, err := web.RequestDataWith(web.NewDefaultClient(), backgroundURL, "GET", referer, ua)
 		if err != nil {
-			log.Errorln("[score]", err)
+			return err
 		}
 		picURL := gjson.Get(string(data), "pic").String()
 		data, err = web.RequestDataWith(web.NewDefaultClient(), picURL, "GET", "", ua)
 		if err != nil {
-			log.Errorln("[score]", err)
+			return err
 		}
 		err = os.WriteFile(picFile, data, 0666)
 		if err != nil {
-			log.Errorln("[score]", err)
+			return err
 		}
 	}
+	return nil
 }

plugin/setutime/setu_geter.go

@@ -18,8 +18,6 @@ import (
 	"github.com/FloatTech/zbputils/process"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 // Pools 图片缓冲池
@@ -51,7 +49,7 @@ var pool = &imgpool{
 }
 
 func init() { // 插件主体
-	engine := control.Register("setutime", order.AcquirePrio(), &control.Options{
+	engine := control.Register("setutime", &control.Options{
 		DisableOnDefault: false,
 		Help: "涩图\n" +
 			"- 来份[涩图/二次元/风景/车万]\n" +
@@ -61,22 +59,25 @@ func init() { // 插件主体
 		PublicDataFolder: "SetuTime",
 	})
 
-	go func() {
+	getdb := ctxext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool {
 		// 如果数据库不存在则下载
 		pool.db.DBPath = engine.DataFolder() + "SetuTime.db"
-		_, _ = fileutil.GetLazyData(pool.db.DBPath, false, false)
+		_, _ = engine.GetLazyData("SetuTime.db", false)
 		err := pool.db.Open()
 		if err != nil {
-			panic(err)
+			ctx.SendChain(message.Text("ERROR:", err))
+			return false
 		}
 		for _, imgtype := range pool.List() {
 			if err := pool.db.Create(imgtype, &pixiv.Illust{}); err != nil {
-				panic(err)
+				ctx.SendChain(message.Text("ERROR:", err))
+				return false
 			}
 		}
-	}()
+		return true
+	})
 
-	engine.OnRegex(`^来份(.*)$`, ctxext.FirstValueInList(pool)).SetBlock(true).Limit(ctxext.LimitByUser).
+	engine.OnRegex(`^来份(.+)$`, getdb, ctxext.FirstValueInList(pool)).SetBlock(true).Limit(ctxext.LimitByUser).
 		Handle(func(ctx *zero.Ctx) {
 			var imgtype = ctx.State["regex_matched"].([]string)[1]
 			// 补充池子
@@ -86,17 +87,17 @@ func init() { // 插件主体
 				ctx.SendChain(message.Text("INFO: 正在填充弹药......"))
 				time.Sleep(time.Second * 10)
 				if pool.size(imgtype) == 0 {
-					ctx.SendChain(message.Text("ERROR: 等待填充，请稍后再试......"))
+					ctx.SendChain(message.Text("ERROR:等待填充，请稍后再试......"))
 					return
 				}
 			}
 			// 从缓冲池里抽一张
 			if id := ctx.SendChain(*pool.pop(imgtype)); id.ID() == 0 {
-				ctx.SendChain(message.Text("ERROR: 可能被风控了"))
+				ctx.SendChain(message.Text("ERROR:可能被风控了"))
 			}
 		})
 
-	engine.OnRegex(`^添加(.*?)(\d+)$`, zero.SuperUserPermission).SetBlock(true).
+	engine.OnRegex(`^添加\s*([^0-9\s]+)\s*(\d+)$`, zero.SuperUserPermission, getdb).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			var (
 				imgtype = ctx.State["regex_matched"].([]string)[1]
@@ -110,7 +111,7 @@ func init() { // 插件主体
 			ctx.SendChain(message.Text("成功向分类", imgtype, "添加图片", id))
 		})
 
-	engine.OnRegex(`^删除(.*?)(\d+)$`, ctxext.FirstValueInList(pool), zero.SuperUserPermission).SetBlock(true).
+	engine.OnRegex(`^删除\s*([^0-9\s]+)\s*(\d+)$`, getdb, ctxext.FirstValueInList(pool), zero.SuperUserPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			var (
 				imgtype = ctx.State["regex_matched"].([]string)[1]
@@ -118,14 +119,14 @@ func init() { // 插件主体
 			)
 			// 查询数据库
 			if err := pool.remove(imgtype, id); err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
 			ctx.SendChain(message.Text("删除成功"))
 		})
 
 	// 查询数据库涩图数量
-	engine.OnFullMatchGroup([]string{">setu status"}).SetBlock(true).
+	engine.OnFullMatch(">setu status", getdb).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			state := []string{"[SetuTime]"}
 			pool.dbmu.RLock()
@@ -159,7 +160,7 @@ func (p *imgpool) push(ctx *zero.Ctx, imgtype string, illust *pixiv.Illust) {
 		if fileutil.IsNotExist(f) {
 			// 下载图片
 			if err := illust.DownloadToCache(0); err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
 		}
@@ -197,7 +198,7 @@ func (p *imgpool) fill(ctx *zero.Ctx, imgtype string) {
 		illust := &pixiv.Illust{}
 		// 查询出一张图片
 		if err := p.db.Pick(imgtype, illust); err != nil {
-			ctx.SendChain(message.Text("ERROR: ", err))
+			ctx.SendChain(message.Text("ERROR:", err))
 			continue
 		}
 		// 向缓冲池添加一张图片

plugin/shadiao/caihongpi.go

@@ -1,21 +0,0 @@
-package shadiao
-
-import (
-	zero "github.com/wdvxdr1123/ZeroBot"
-	"github.com/wdvxdr1123/ZeroBot/message"
-	"github.com/wdvxdr1123/ZeroBot/utils/helper"
-
-	"github.com/FloatTech/zbputils/ctxext"
-	"github.com/FloatTech/zbputils/web"
-)
-
-func init() {
-	engine.OnFullMatch("哄我").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
-		data, err := web.RequestDataWith(web.NewDefaultClient(), chpURL, "GET", chpReferer, ua)
-		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
-			return
-		}
-		ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(helper.BytesToString(data)))
-	})
-}

plugin/shadiao/dujitang.go

@@ -1,21 +0,0 @@
-package shadiao
-
-import (
-	zero "github.com/wdvxdr1123/ZeroBot"
-	"github.com/wdvxdr1123/ZeroBot/message"
-	"github.com/wdvxdr1123/ZeroBot/utils/helper"
-
-	"github.com/FloatTech/zbputils/ctxext"
-	"github.com/FloatTech/zbputils/web"
-)
-
-func init() {
-	engine.OnFullMatch("来碗毒鸡汤").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
-		data, err := web.RequestDataWith(web.NewDefaultClient(), duURL, "GET", duReferer, ua)
-		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
-			return
-		}
-		ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(helper.BytesToString(data)))
-	})
-}

plugin/shadiao/ergofabulous.go

@@ -0,0 +1,24 @@
+package shadiao
+
+import (
+	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/antchfx/htmlquery"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+)
+
+func init() {
+	engine.OnFullMatch("马丁路德骂我").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
+		doc, err := htmlquery.LoadURL(ergofabulousURL)
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR:", err))
+			return
+		}
+		node, err := htmlquery.Query(doc, "//main[@role=\"main\"]/p[@class=\"larger\"]/text()")
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR:", err))
+			return
+		}
+		ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(node.Data))
+	})
+}

plugin/shadiao/pengyouquan.go

@@ -1,21 +0,0 @@
-package shadiao
-
-import (
-	zero "github.com/wdvxdr1123/ZeroBot"
-	"github.com/wdvxdr1123/ZeroBot/message"
-	"github.com/wdvxdr1123/ZeroBot/utils/helper"
-
-	"github.com/FloatTech/zbputils/ctxext"
-	"github.com/FloatTech/zbputils/web"
-)
-
-func init() {
-	engine.OnFullMatch("发个朋友圈").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
-		data, err := web.RequestDataWith(web.NewDefaultClient(), pyqURL, "GET", pyqReferer, ua)
-		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
-			return
-		}
-		ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(helper.BytesToString(data)))
-	})
-}

plugin/shadiao/shadiao.go

@@ -3,29 +3,44 @@ package shadiao
 
 import (
 	control "github.com/FloatTech/zbputils/control"
-
-	"github.com/FloatTech/zbputils/control/order"
+	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/web"
+	"github.com/tidwall/gjson"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
 )
 
 const (
-	chpURL          = "https://chp.shadiao.app/api.php"
-	duURL           = "https://du.shadiao.app/api.php"
-	pyqURL          = "https://pyq.shadiao.app/api.php"
+	chpURL          = "https://api.shadiao.app/chp"
+	duURL           = "https://api.shadiao.app/du"
+	pyqURL          = "https://api.shadiao.app/pyq"
 	yduanziURL      = "http://www.yduanzi.com/duanzi/getduanzi"
 	chayiURL        = "https://api.lovelive.tools/api/SweetNothings/Web/0"
 	ganhaiURL       = "https://api.lovelive.tools/api/SweetNothings/Web/1"
+	ergofabulousURL = "https://ergofabulous.org/luther/?"
 	ua              = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.110 Safari/537.36"
-	chpReferer      = "https://chp.shadiao.app/"
-	duReferer       = "https://du.shadiao.app/"
-	pyqReferer      = "https://pyq.shadiao.app/"
+	sdReferer       = "https://api.shadiao.app/"
 	yduanziReferer  = "http://www.yduanzi.com/?utm_source=shadiao.app"
 	loveliveReferer = "https://lovelive.tools/"
 )
 
 var (
-	engine = control.Register("shadiao", order.AcquirePrio(), &control.Options{
+	engine = control.Register("shadiao", &control.Options{
 		DisableOnDefault: false,
 		Help: "沙雕app\n" +
-			"- 哄我\n- 渣我\n- 来碗绿茶\n- 发个朋友圈\n- 来碗毒鸡汤\n- 讲个段子",
+			"- 哄我\n- 渣我\n- 来碗绿茶\n- 发个朋友圈\n- 来碗毒鸡汤\n- 讲个段子\n- 马丁路德骂我\n",
 	})
+	sdMap = map[string]string{"哄我": chpURL, "来碗毒鸡汤": duURL, "发个朋友圈": pyqURL}
 )
+
+func init() {
+	engine.OnFullMatchGroup([]string{"哄我", "来碗毒鸡汤", "发个朋友圈"}).SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
+		requestURL := sdMap[ctx.State["matched"].(string)]
+		data, err := web.RequestDataWith(web.NewDefaultClient(), requestURL, "GET", sdReferer, ua)
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR:", err))
+			return
+		}
+		ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(gjson.GetBytes(data, "data.text").String()))
+	})
+}

plugin/shindan/shindan.go

@@ -3,20 +3,17 @@ package shindan
 
 import (
 	"github.com/FloatTech/AnimeAPI/shindanmaker"
-	log "github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
-	"github.com/FloatTech/zbputils/control/order"
-
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/img/text"
 )
 
 func init() {
-	engine := control.Register("shindan", order.AcquirePrio(), &control.Options{
+	engine := control.Register("shindan", &control.Options{
 		DisableOnDefault: false,
 		Help: "shindan\n" +
 			"- 今天是什么少女[@xxx]\n" +
@@ -24,33 +21,53 @@ func init() {
 			"- 卖萌[@xxx]\n" +
 			"- 抽老婆[@xxx]",
 	})
-	engine.OnPrefix("异世界转生", number(587874)).SetBlock(true).Limit(ctxext.LimitByUser).Handle(handle)
-	engine.OnPrefix("今天是什么少女", number(162207)).SetBlock(true).Limit(ctxext.LimitByUser).Handle(handle)
-	engine.OnPrefix("卖萌", number(360578)).SetBlock(true).Limit(ctxext.LimitByUser).Handle(handle)
-	engine.OnPrefix("抽老婆", number(1075116)).SetBlock(true).Limit(ctxext.LimitByUser).Handle(handle)
+	engine.OnPrefix("异世界转生", number(587874)).SetBlock(true).Limit(ctxext.LimitByUser).Handle(handlepic)
+	engine.OnPrefix("今天是什么少女", number(162207)).SetBlock(true).Limit(ctxext.LimitByUser).Handle(handlepic)
+	engine.OnPrefix("卖萌", number(360578)).SetBlock(true).Limit(ctxext.LimitByUser).Handle(handletxt)
+	engine.OnPrefix("抽老婆", number(1075116)).SetBlock(true).Limit(ctxext.LimitByUser).Handle(handlecq)
+	engine.OnPrefix("黄油角色", number(1115465)).SetBlock(true).Limit(ctxext.LimitByUser).Handle(handlepic)
 }
 
-// shindanmaker 处理函数
-func handle(ctx *zero.Ctx) {
+func handletxt(ctx *zero.Ctx) {
 	// 获取名字
 	name := ctx.NickName()
 	// 调用接口
 	txt, err := shindanmaker.Shindanmaker(ctx.State["id"].(int64), name)
 	if err != nil {
-		ctx.SendChain(message.Text("ERROR: ", err))
+		ctx.SendChain(message.Text("ERROR:", err))
+		return
 	}
-	// TODO: 可注入
-	switch ctx.State["id"].(int64) {
-	case 587874, 162207:
-		data, err := text.RenderToBase64(txt, text.FontFile, 400, 20)
-		if err != nil {
-			log.Errorln("[shindan]:", err)
-		}
-		if id := ctx.SendChain(message.Image("base64://" + helper.BytesToString(data))); id.ID() == 0 {
-			ctx.SendChain(message.Text("ERROR: 可能被风控了"))
-		}
-	default:
-		ctx.Send(txt)
+	ctx.SendChain(message.Text(txt))
+}
+
+func handlecq(ctx *zero.Ctx) {
+	// 获取名字
+	name := ctx.NickName()
+	// 调用接口
+	txt, err := shindanmaker.Shindanmaker(ctx.State["id"].(int64), name)
+	if err != nil {
+		ctx.SendChain(message.Text("ERROR:", err))
+		return
+	}
+	ctx.Send(txt)
+}
+
+func handlepic(ctx *zero.Ctx) {
+	// 获取名字
+	name := ctx.NickName()
+	// 调用接口
+	txt, err := shindanmaker.Shindanmaker(ctx.State["id"].(int64), name)
+	if err != nil {
+		ctx.SendChain(message.Text("ERROR:", err))
+		return
+	}
+	data, err := text.RenderToBase64(txt, text.FontFile, 400, 20)
+	if err != nil {
+		ctx.SendChain(message.Text("ERROR:", err))
+		return
+	}
+	if id := ctx.SendChain(message.Image("base64://" + helper.BytesToString(data))); id.ID() == 0 {
+		ctx.SendChain(message.Text("ERROR:可能被风控了"))
 	}
 }
 

plugin/sleep_manage/model.go

@@ -68,20 +68,20 @@ func (sdb *sleepdb) sleep(gid, uid int64) (position int, awakeTime time.Duration
 		UserID:    uid,
 		SleepTime: now,
 	}
-	if err := db.Debug().Model(&SleepManage{}).Where("group_id = ? and user_id = ?", gid, uid).First(&st).Error; err != nil {
+	if err := db.Model(&SleepManage{}).Where("group_id = ? and user_id = ?", gid, uid).First(&st).Error; err != nil {
 		// error handling...
 		if gorm.IsRecordNotFoundError(err) {
-			db.Debug().Model(&SleepManage{}).Create(&st) // newUser not user
+			db.Model(&SleepManage{}).Create(&st) // newUser not user
 		}
 	} else {
-		log.Println("sleeptime为", st)
+		log.Debugln("sleeptime为", st)
 		awakeTime = now.Sub(st.SleepTime)
-		db.Debug().Model(&SleepManage{}).Where("group_id = ? and user_id = ?", gid, uid).Update(
+		db.Model(&SleepManage{}).Where("group_id = ? and user_id = ?", gid, uid).Update(
 			map[string]interface{}{
 				"sleep_time": now,
 			})
 	}
-	db.Debug().Model(&SleepManage{}).Where("group_id = ? and sleep_time <= ? and sleep_time >= ?", gid, now, today).Count(&position)
+	db.Model(&SleepManage{}).Where("group_id = ? and sleep_time <= ? and sleep_time >= ?", gid, now, today).Count(&position)
 	return position, awakeTime
 }
 
@@ -95,19 +95,19 @@ func (sdb *sleepdb) getUp(gid, uid int64) (position int, sleepTime time.Duration
 		UserID:    uid,
 		SleepTime: now,
 	}
-	if err := db.Debug().Model(&SleepManage{}).Where("group_id = ? and user_id = ?", gid, uid).First(&st).Error; err != nil {
+	if err := db.Model(&SleepManage{}).Where("group_id = ? and user_id = ?", gid, uid).First(&st).Error; err != nil {
 		// error handling...
 		if gorm.IsRecordNotFoundError(err) {
-			db.Debug().Model(&SleepManage{}).Create(&st) // newUser not user
+			db.Model(&SleepManage{}).Create(&st) // newUser not user
 		}
 	} else {
-		log.Println("sleeptime为", st)
+		log.Debugln("sleeptime为", st)
 		sleepTime = now.Sub(st.SleepTime)
-		db.Debug().Model(&SleepManage{}).Where("group_id = ? and user_id = ?", gid, uid).Update(
+		db.Model(&SleepManage{}).Where("group_id = ? and user_id = ?", gid, uid).Update(
 			map[string]interface{}{
 				"sleep_time": now,
 			})
 	}
-	db.Debug().Model(&SleepManage{}).Where("group_id = ? and sleep_time <= ? and sleep_time >= ?", gid, now, today).Count(&position)
+	db.Model(&SleepManage{}).Where("group_id = ? and sleep_time <= ? and sleep_time >= ?", gid, now, today).Count(&position)
 	return position, sleepTime
 }

plugin/sleep_manage/sleep_manage.go

@@ -10,24 +10,21 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"
 
 	control "github.com/FloatTech/zbputils/control"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 func init() {
-	engine := control.Register("sleepmanage", order.AcquirePrio(), &control.Options{
+	engine := control.Register("sleepmanage", &control.Options{
 		DisableOnDefault:  false,
 		Help:              "sleepmanage\n- 早安\n- 晚安",
 		PrivateDataFolder: "sleep",
 	})
 	go func() {
 		sdb = initialize(engine.DataFolder() + "manage.db")
-		log.Println("[sleepmanage]加载sleepmanage数据库")
 	}()
 	engine.OnFullMatch("早安", isMorning, zero.OnlyGroup).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			position, getUpTime := sdb.getUp(ctx.Event.GroupID, ctx.Event.UserID)
-			log.Println(position, getUpTime)
+			log.Debugln(position, getUpTime)
 			hour, minute, second := timeDuration(getUpTime)
 			if (hour == 0 && minute == 0 && second == 0) || hour >= 24 {
 				ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(fmt.Sprintf("早安成功！你是今天第%d个起床的", position)))
@@ -38,7 +35,7 @@ func init() {
 	engine.OnFullMatch("晚安", isEvening, zero.OnlyGroup).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			position, sleepTime := sdb.sleep(ctx.Event.GroupID, ctx.Event.UserID)
-			log.Println(position, sleepTime)
+			log.Debugln(position, sleepTime)
 			hour, minute, second := timeDuration(sleepTime)
 			if (hour == 0 && minute == 0 && second == 0) || hour >= 24 {
 				ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(fmt.Sprintf("晚安成功！你是今天第%d个睡觉的", position)))

plugin/tarot/tarot.go

@@ -0,0 +1,164 @@
+// Package tarot 塔罗牌
+package tarot
+
+import (
+	"encoding/json"
+	"fmt"
+	"math/rand"
+	"strconv"
+	"strings"
+
+	"github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/sirupsen/logrus"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+)
+
+const bed = "https://gitcode.net/shudorcl/zbp-tarot/-/raw/master/"
+
+type cardInfo struct {
+	Description        string `json:"description"`
+	ReverseDescription string `json:"reverseDescription"`
+	ImgURL             string `json:"imgUrl"`
+}
+type card struct {
+	Name     string `json:"name"`
+	cardInfo `json:"info"`
+}
+type cardSet = map[string]card
+
+var cardMap = make(cardSet, 30)
+var infoMap = make(map[string]cardInfo, 30)
+
+// var cardName = make([]string, 22)
+
+func init() {
+	engine := control.Register("tarot", &control.Options{
+		DisableOnDefault: false,
+		Help: "塔罗牌\n" +
+			"- 抽塔罗牌\n" +
+			"- 抽n张塔罗牌\n" +
+			"- 解塔罗牌[牌名]",
+		PublicDataFolder: "Tarot",
+	}).ApplySingle(ctxext.DefaultSingle)
+
+	engine.OnRegex(`^抽(\d{1,2}张)?塔罗牌$`, ctxext.DoOnceOnSuccess(
+		func(ctx *zero.Ctx) bool {
+			data, err := engine.GetLazyData("tarots.json", true)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return false
+			}
+			err = json.Unmarshal(data, &cardMap)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return false
+			}
+			logrus.Infof("[tarot]读取%d张塔罗牌", len(cardMap))
+			return true
+		},
+	)).SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
+		match := ctx.State["regex_matched"].([]string)[1]
+		n := 1
+		reasons := [...]string{"您抽到的是~\n", "锵锵锵，塔罗牌的预言是~\n", "诶，让我看看您抽到了~\n"}
+		position := [...]string{"正位", "逆位"}
+		reverse := [...]string{"", "Reverse"}
+		if match != "" {
+			var err error
+			n, err = strconv.Atoi(match[:len(match)-3])
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			if n <= 0 {
+				ctx.SendChain(message.Text("ERROR:张数必须为正"))
+				return
+			}
+			if n > 1 && !zero.OnlyGroup(ctx) {
+				ctx.SendChain(message.Text("ERROR:抽取多张仅支持群聊"))
+				return
+			}
+			if n > 20 {
+				ctx.SendChain(message.Text("ERROR:抽取张数过多"))
+				return
+			}
+		}
+		if n == 1 {
+			i := rand.Intn(22)
+			p := rand.Intn(2)
+			card := cardMap[(strconv.Itoa(i))]
+			name := card.Name
+			if id := ctx.SendChain(
+				message.Text(reasons[rand.Intn(len(reasons))], position[p], " 的 ", name, "\n"),
+				message.Image(fmt.Sprintf(bed+"MajorArcana%s/%d.png", reverse[p], i))); id.ID() == 0 {
+				ctx.SendChain(message.Text("ERROR:可能被风控了"))
+			}
+			return
+		}
+		msg := make([]message.MessageSegment, n)
+		randomIntMap := make(map[int]int, 30)
+		for i := range msg {
+			j := rand.Intn(22)
+			_, ok := randomIntMap[j]
+			for ok {
+				j = rand.Intn(22)
+				_, ok = randomIntMap[j]
+			}
+			randomIntMap[j] = 0
+			p := rand.Intn(2)
+			card := cardMap[(strconv.Itoa(j))]
+			name := card.Name
+			tarotMsg := []message.MessageSegment{
+				message.Text(reasons[rand.Intn(len(reasons))], position[p], " 的 ", name, "\n"),
+				message.Image(fmt.Sprintf(bed+"MajorArcana%s/%d.png", reverse[p], j))}
+			msg[i] = ctxext.FakeSenderForwardNode(ctx, tarotMsg...)
+		}
+		ctx.SendGroupForwardMessage(ctx.Event.GroupID, msg)
+	})
+
+	engine.OnRegex(`^解塔罗牌\s?(.*)`, ctxext.DoOnceOnSuccess(
+		func(ctx *zero.Ctx) bool {
+			if len(cardMap) > 0 {
+				for _, card := range cardMap {
+					infoMapKey := strings.Split(card.Name, "(")[0]
+					infoMap[infoMapKey] = card.cardInfo
+					// 可以拿来显示大阿尔卡纳列表
+					// cardName = append(cardName, infoMapKey)
+				}
+				return true
+			}
+			tempMap := make(cardSet, 30)
+			data, err := engine.GetLazyData("tarots.json", true)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return false
+			}
+			err = json.Unmarshal(data, &tempMap)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return false
+			}
+
+			for _, card := range tempMap {
+				infoMapKey := strings.Split(card.Name, "(")[0]
+				infoMap[infoMapKey] = card.cardInfo
+				// 可以拿来显示大阿尔卡纳列表
+				// cardName = append(cardName, infoMapKey)
+			}
+			return true
+		},
+	)).SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
+		match := ctx.State["regex_matched"].([]string)[1]
+		info, ok := infoMap[match]
+		if ok {
+			ctx.SendChain(
+				message.Image(bed+info.ImgURL),
+				message.Text("\n", match, "的含义是~"),
+				message.Text("\n正位:", info.Description),
+				message.Text("\n逆位:", info.ReverseDescription))
+		} else {
+			ctx.SendChain(message.Text("没有找到", match, "噢~"))
+		}
+	})
+}

plugin/thesaurus/chat.go

@@ -6,24 +6,21 @@ import (
 	"math/rand"
 
 	control "github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/file"
 	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 type kimo = map[string]*[]string
 
 func init() {
-	engine := control.Register("thesaurus", order.AcquirePrio(), &control.Options{
+	engine := control.Register("thesaurus", &control.Options{
 		DisableOnDefault: false,
 		Help:             "thesaurus\n- 词典匹配回复",
 		PublicDataFolder: "Chat",
 	})
 	go func() {
-		data, err := file.GetLazyData(engine.DataFolder()+"kimoi.json", true, false)
+		data, err := engine.GetLazyData("kimoi.json", false)
 		if err != nil {
 			panic(err)
 		}

plugin/tiangou/tiangou.go

@@ -4,9 +4,7 @@ package tiangou
 import (
 	sql "github.com/FloatTech/sqlite"
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/ctxext"
-	"github.com/FloatTech/zbputils/file"
 	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
@@ -20,29 +18,35 @@ type tiangou struct {
 var db = &sql.Sqlite{}
 
 func init() {
-	en := control.Register("tiangou", order.AcquirePrio(), &control.Options{
+	en := control.Register("tiangou", &control.Options{
 		DisableOnDefault: false,
 		Help: "舔狗日记\n" +
 			"- 舔狗日记",
 		PublicDataFolder: "Tiangou",
 	})
 
-	go func() {
-		dbpath := en.DataFolder()
-		db.DBPath = dbpath + "tiangou.db"
-		_, err := file.GetLazyData(db.DBPath, false, true)
-		if err != nil {
-			panic(err)
-		}
-		err = db.Create("tiangou", &tiangou{})
-		if err != nil {
-			panic(err)
-		}
-		c, _ := db.Count("tiangou")
-		logrus.Infoln("[tiangou]加载", c, "条舔狗日记")
-	}()
-
-	en.OnFullMatch("舔狗日记").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
+	en.OnFullMatch("舔狗日记", ctxext.DoOnceOnSuccess(
+		func(ctx *zero.Ctx) bool {
+			db.DBPath = en.DataFolder() + "tiangou.db"
+			_, err := en.GetLazyData("tiangou.db", true)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return false
+			}
+			err = db.Create("tiangou", &tiangou{})
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return false
+			}
+			c, err := db.Count("tiangou")
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return false
+			}
+			logrus.Infoln("[tiangou]加载", c, "条舔狗日记")
+			return true
+		},
+	)).SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
 		var t tiangou
 		err := db.Pick("tiangou", &t)
 		if err != nil {

plugin/tracemoe/moe.go

@@ -2,14 +2,10 @@
 package tracemoe
 
 import (
-	"fmt"
-
 	control "github.com/FloatTech/zbputils/control"
 	trmoe "github.com/fumiama/gotracemoe"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 var (
@@ -17,7 +13,7 @@ var (
 )
 
 func init() { // 插件主体
-	engine := control.Register("tracemoe", order.AcquirePrio(), &control.Options{
+	engine := control.Register("tracemoe", &control.Options{
 		DisableOnDefault: false,
 		Help:             "tracemoe\n- 搜番 | 搜索番剧[图片]",
 	})
@@ -27,9 +23,8 @@ func init() { // 插件主体
 			// 开始搜索图片
 			ctx.SendChain(message.Text("少女祈祷中......"))
 			for _, pic := range ctx.State["image_url"].([]string) {
-				fmt.Println(pic)
 				if result, err := moe.Search(pic, true, true); err != nil {
-					ctx.SendChain(message.Text("ERROR: ", err))
+					ctx.SendChain(message.Text("ERROR:", err))
 				} else if len(result.Result) > 0 {
 					r := result.Result[0]
 					hint := "我有把握是这个！"

plugin/translation/tl.go

@@ -2,33 +2,26 @@
 package translation
 
 import (
-	"github.com/tidwall/gjson"
-	zero "github.com/wdvxdr1123/ZeroBot"
-	"github.com/wdvxdr1123/ZeroBot/message"
-
+	"github.com/FloatTech/AnimeAPI/tl"
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
-	"github.com/FloatTech/zbputils/process"
-	"github.com/FloatTech/zbputils/web"
-
-	"github.com/FloatTech/zbputils/control/order"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
 )
 
 func init() {
-	control.Register("translation", order.AcquirePrio(), &control.Options{
+	control.Register("translation", &control.Options{
 		DisableOnDefault: false,
 		Help: "翻译\n" +
 			">TL 你好",
 	}).OnRegex(`^>TL\s(-.{1,10}? )?(.*)$`).SetBlock(true).Limit(ctxext.LimitByUser).
 		Handle(func(ctx *zero.Ctx) {
 			msg := []string{ctx.State["regex_matched"].([]string)[2]}
-			data, err := web.GetData("https://api.cloolc.club/fanyi?data=" + msg[0])
+			data, err := tl.Translate(msg[0])
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("Error:", data))
+				return
 			}
-			info := gjson.ParseBytes(data)
-			repo := info.Get("data.0")
-			process.SleepAbout1sTo2s()
-			ctx.SendChain(message.Text(repo.Get("value.0")))
+			ctx.SendChain(message.Text(data))
 		})
 }

plugin/vtb_quotation/model/model.go

@@ -95,55 +95,52 @@ func (ThirdCategory) TableName() string {
 }
 
 // GetAllFirstCategoryMessage 取出所有vtb
-func (vdb *VtbDB) GetAllFirstCategoryMessage() string {
+func (vdb *VtbDB) GetAllFirstCategoryMessage() (string, error) {
 	db := (*gorm.DB)(vdb)
 	firstStepMessage := "请选择一个vtb并发送序号:\n"
 	var fcl []FirstCategory
-	err := db.Debug().Model(&FirstCategory{}).Find(&fcl).Error
+	err := db.Model(&FirstCategory{}).Find(&fcl).Error
 	if err != nil {
-		log.Errorln("[vtb/model]数据库读取错误", err)
-		return ""
+		return "", err
 	}
 	for _, v := range fcl {
 		firstStepMessage += strconv.FormatInt(v.FirstCategoryIndex, 10) + ". " + v.FirstCategoryName + "\n"
 	}
-	return firstStepMessage
+	return firstStepMessage, nil
 }
 
 // GetAllSecondCategoryMessageByFirstIndex 取得同一个vtb所有语录类别
-func (vdb *VtbDB) GetAllSecondCategoryMessageByFirstIndex(firstIndex int) string {
+func (vdb *VtbDB) GetAllSecondCategoryMessageByFirstIndex(firstIndex int) (string, error) {
 	db := (*gorm.DB)(vdb)
 	secondStepMessage := "请选择一个语录类别并发送序号:\n"
 	var scl []SecondCategory
 	var fc FirstCategory
 	db.Model(FirstCategory{}).Where("first_category_index = ?", firstIndex).First(&fc)
-	err := db.Debug().Model(&SecondCategory{}).Find(&scl, "first_category_uid = ?", fc.FirstCategoryUID).Error
+	err := db.Model(&SecondCategory{}).Find(&scl, "first_category_uid = ?", fc.FirstCategoryUID).Error
 	if err != nil || len(scl) == 0 {
-		log.Errorln("[vtb/model]数据库读取错误", err)
-		return ""
+		return "", err
 	}
 	for _, v := range scl {
 		secondStepMessage += strconv.FormatInt(v.SecondCategoryIndex, 10) + ". " + v.SecondCategoryName + "\n"
 	}
-	return secondStepMessage
+	return secondStepMessage, nil
 }
 
 // GetAllThirdCategoryMessageByFirstIndexAndSecondIndex 取得同一个vtb同个类别的所有语录
-func (vdb *VtbDB) GetAllThirdCategoryMessageByFirstIndexAndSecondIndex(firstIndex, secondIndex int) string {
+func (vdb *VtbDB) GetAllThirdCategoryMessageByFirstIndexAndSecondIndex(firstIndex, secondIndex int) (string, error) {
 	db := (*gorm.DB)(vdb)
 	thirdStepMessage := "请选择一个语录并发送序号:\n"
 	var fc FirstCategory
 	db.Model(FirstCategory{}).Where("first_category_index = ?", firstIndex).First(&fc)
 	var tcl []ThirdCategory
-	err := db.Debug().Model(&ThirdCategory{}).Find(&tcl, "first_category_uid = ? and second_category_index = ?", fc.FirstCategoryUID, secondIndex).Error
+	err := db.Model(&ThirdCategory{}).Find(&tcl, "first_category_uid = ? and second_category_index = ?", fc.FirstCategoryUID, secondIndex).Error
 	if err != nil || len(tcl) == 0 {
-		log.Errorln("[vtb/model]数据库读取错误", err)
-		return ""
+		return "", err
 	}
 	for _, v := range tcl {
 		thirdStepMessage = thirdStepMessage + strconv.FormatInt(v.ThirdCategoryIndex, 10) + ". " + v.ThirdCategoryName + "\n"
 	}
-	return thirdStepMessage
+	return thirdStepMessage, nil
 }
 
 // GetThirdCategory ...
@@ -182,39 +179,35 @@ func (vdb *VtbDB) Close() error {
 const vtbURL = "https://vtbkeyboard.moe/api/get_vtb_list"
 
 // GetVtbList ...
-func (vdb *VtbDB) GetVtbList() (uidList []string) {
+func (vdb *VtbDB) GetVtbList() (uidList []string, err error) {
 	db := (*gorm.DB)(vdb)
 	client := &http.Client{}
 	req, err := http.NewRequest("GET", vtbURL, nil)
 	if err != nil {
-		log.Errorln(err)
 		return
 	}
 	// 自定义Header
 	req.Header.Set("User-Agent", web.RandUA())
 	resp, err := client.Do(req)
 	if err != nil {
-		log.Errorln(err)
 		return
 	}
 
 	defer resp.Body.Close()
 	bytes, err := io.ReadAll(resp.Body)
 	if err != nil {
-		log.Errorln(err)
 		return
 	}
 
 	vtbListStr, err := strconv.Unquote(strings.ReplaceAll(strconv.Quote(string(bytes)), `\\u`, `\u`))
 	if err != nil {
-		log.Errorln(err)
 		return
 	}
 
 	count := gjson.Get(vtbListStr, "#").Int()
 	for i := int64(0); i < count; i++ {
 		item := gjson.Get(vtbListStr, strconv.FormatInt(i, 10))
-		log.Println(item)
+		log.Debugln(item)
 		fc := FirstCategory{
 			FirstCategoryIndex:       i,
 			FirstCategoryName:        item.Get("name").String(),
@@ -222,14 +215,14 @@ func (vdb *VtbDB) GetVtbList() (uidList []string) {
 			FirstCategoryIconPath:    item.Get("icon_path").String(),
 			FirstCategoryUID:         item.Get("uid").String(),
 		}
-		log.Println(fc)
+		log.Debugln(fc)
 
-		if err := db.Debug().Model(&FirstCategory{}).First(&fc, "first_category_uid = ?", fc.FirstCategoryUID).Error; err != nil {
+		if err := db.Model(&FirstCategory{}).First(&fc, "first_category_uid = ?", fc.FirstCategoryUID).Error; err != nil {
 			if gorm.IsRecordNotFoundError(err) {
-				db.Debug().Model(&FirstCategory{}).Create(&fc) // newUser not user
+				db.Model(&FirstCategory{}).Create(&fc) // newUser not user
 			}
 		} else {
-			db.Debug().Model(&FirstCategory{}).Where("first_category_uid = ?", fc.FirstCategoryUID).Update(
+			db.Model(&FirstCategory{}).Where("first_category_uid = ?", fc.FirstCategoryUID).Update(
 				map[string]interface{}{
 					"first_category_index":       i,
 					"first_category_name":        item.Get("name").String(),
@@ -240,45 +233,41 @@ func (vdb *VtbDB) GetVtbList() (uidList []string) {
 		uidList = append(uidList, fc.FirstCategoryUID)
 	}
 
-	return uidList
+	return
 }
 
 // StoreVtb ...
-func (vdb *VtbDB) StoreVtb(uid string) {
+func (vdb *VtbDB) StoreVtb(uid string) (err error) {
 	db := (*gorm.DB)(vdb)
 	vtbURL := "https://vtbkeyboard.moe/api/get_vtb_page?uid=" + uid
 	client := &http.Client{}
 	req, err := http.NewRequest("GET", vtbURL, nil)
 	if err != nil {
-		log.Errorln(err)
 		return
 	}
 	// 自定义Header
 	req.Header.Set("User-Agent", web.RandUA())
 	resp, err := client.Do(req)
 	if err != nil {
-		log.Errorln(err)
 		return
 	}
 
 	defer resp.Body.Close()
 	bytes, err := io.ReadAll(resp.Body)
 	if err != nil {
-		log.Errorln(err)
 		return
 	}
 
 	vtbStr, err := strconv.Unquote(strings.ReplaceAll(strconv.Quote(string(bytes)), `\\u`, `\u`))
 	if err != nil {
-		log.Errorln(err)
 		return
 	}
 
 	secondCount := gjson.Get(vtbStr, "data.voices.#").Int()
-	log.Println("二级品类一共有", secondCount)
+	log.Debugln("二级品类一共有", secondCount)
 	for secondIndex := int64(0); secondIndex < secondCount; secondIndex++ {
 		secondItem := gjson.Get(vtbStr, "data.voices."+strconv.FormatInt(secondIndex, 10))
-		log.Println(secondItem)
+		log.Debugln(secondItem)
 		sc := SecondCategory{
 			SecondCategoryName:        secondItem.Get("categoryName").String(),
 			SecondCategoryIndex:       secondIndex,
@@ -287,13 +276,13 @@ func (vdb *VtbDB) StoreVtb(uid string) {
 			FirstCategoryUID:          uid,
 		}
 
-		if err := db.Debug().Model(&SecondCategory{}).First(&sc, "first_category_uid = ? and second_category_index = ?", uid, secondIndex).Error; err != nil {
+		if err := db.Model(&SecondCategory{}).First(&sc, "first_category_uid = ? and second_category_index = ?", uid, secondIndex).Error; err != nil {
 			// error handling...
 			if gorm.IsRecordNotFoundError(err) {
-				db.Debug().Model(&SecondCategory{}).Create(&sc) // newUser not user
+				db.Model(&SecondCategory{}).Create(&sc) // newUser not user
 			}
 		} else {
-			db.Debug().Model(&SecondCategory{}).Where("first_category_uid = ? and second_category_index = ?", uid, secondIndex).Update(
+			db.Model(&SecondCategory{}).Where("first_category_uid = ? and second_category_index = ?", uid, secondIndex).Update(
 				map[string]interface{}{
 					"second_category_name":        secondItem.Get("categoryName").String(),
 					"second_category_author":      secondItem.Get("author").String(),
@@ -301,10 +290,10 @@ func (vdb *VtbDB) StoreVtb(uid string) {
 				})
 		}
 		thirdCount := secondItem.Get("voiceList.#").Int()
-		log.Println("三级品类一共有", thirdCount)
+		log.Debugln("三级品类一共有", thirdCount)
 		for thirdIndex := int64(0); thirdIndex < thirdCount; thirdIndex++ {
 			thirdItem := secondItem.Get("voiceList." + strconv.FormatInt(thirdIndex, 10))
-			log.Println(thirdItem)
+			log.Debugln(thirdItem)
 			tc := ThirdCategory{
 				ThirdCategoryName:        thirdItem.Get("name").String(),
 				ThirdCategoryIndex:       thirdIndex,
@@ -314,15 +303,15 @@ func (vdb *VtbDB) StoreVtb(uid string) {
 				ThirdCategoryPath:        thirdItem.Get("path").String(),
 				ThirdCategoryAuthor:      thirdItem.Get("author").String(),
 			}
-			log.Println(tc)
+			log.Debugln(tc)
 
-			if err := db.Debug().Model(&ThirdCategory{}).First(&tc, "first_category_uid = ? and second_category_index = ? and third_category_index = ?",
+			if err := db.Model(&ThirdCategory{}).First(&tc, "first_category_uid = ? and second_category_index = ? and third_category_index = ?",
 				uid, secondIndex, thirdIndex).Error; err != nil {
 				if gorm.IsRecordNotFoundError(err) {
-					db.Debug().Model(&ThirdCategory{}).Create(&tc) // newUser not user
+					db.Model(&ThirdCategory{}).Create(&tc) // newUser not user
 				}
 			} else {
-				db.Debug().Model(&ThirdCategory{}).Where("first_category_uid = ? and second_category_index = ? and third_category_index = ?",
+				db.Model(&ThirdCategory{}).Where("first_category_uid = ? and second_category_index = ? and third_category_index = ?",
 					uid, secondIndex, thirdIndex).Update(
 					map[string]interface{}{
 						"third_category_name":        thirdItem.Get("name").String(),
@@ -333,4 +322,5 @@ func (vdb *VtbDB) StoreVtb(uid string) {
 			}
 		}
 	}
+	return
 }

plugin/vtb_quotation/vtb_quotation.go

@@ -7,70 +7,75 @@ import (
 	"net/http"
 	"net/url"
 	"os"
+	"path"
 	"regexp"
 	"strconv"
 	"strings"
 	"time"
 
 	_ "github.com/fumiama/sqlite3" // use sql
-	log "github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
 	control "github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/img/text"
 	"github.com/FloatTech/zbputils/web"
 
-	"github.com/FloatTech/zbputils/control/order"
-
 	"github.com/FloatTech/ZeroBot-Plugin/plugin/vtb_quotation/model"
 )
 
-const regStr = ".*/(.*)"
-const recordRe = "(\\.mp3|\\.wav|\\.wma|\\.mpa|\\.ram|\\.ra|\\.aac|\\.aif|\\.m4a|\\.tsa)"
-
-var (
-	re = regexp.MustCompile(recordRe)
-)
+var reg = regexp.MustCompile(".*/(.*)")
 
 func init() {
-	engine := control.Register("vtbquotation", order.AcquirePrio(), &control.Options{
+	engine := control.Register("vtbquotation", &control.Options{
 		DisableOnDefault: false,
 		Help:             "vtbkeyboard.moe\n- vtb语录\n- 随机vtb\n- 更新vtb\n",
 		PublicDataFolder: "VtbQuotation",
 	})
 	dbfile := engine.DataFolder() + "vtb.db"
 	storePath := engine.DataFolder() + "store/"
-	go func() {
+	getdb := ctxext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool {
 		err := os.MkdirAll(storePath, 0755)
 		if err != nil {
-			panic(err)
+			ctx.SendChain(message.Text("ERROR:", err))
+			return false
 		}
-		_, _ = file.GetLazyData(dbfile, false, false)
-	}()
-	engine.OnFullMatch("vtb语录").SetBlock(true).
+		_, err = engine.GetLazyData("vtb.db", false)
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR:", err))
+			return false
+		}
+		return true
+	})
+
+	engine.OnFullMatch("vtb语录", getdb).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			var firstIndex int
-			var secondIndex int
-			var thirdIndex int
+			indexs := [3]int{}
 			echo, cancel := ctx.FutureEvent("message",
 				ctx.CheckSession()). // 只复读开启复读模式的人的消息
 				Repeat()             // 不断监听复读
 			db, err := model.Open(dbfile)
 			if err != nil {
-				log.Errorln("[vtb]:", err)
+				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
 			defer db.Close()
 			defer cancel()
-			firstStepImageBytes, err := text.RenderToBase64(db.GetAllFirstCategoryMessage(), text.FontFile, 400, 20)
+			r, err := db.GetAllFirstCategoryMessage()
 			if err != nil {
-				log.Errorln("[vtb]:", err)
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			firstStepImageBytes, err := text.RenderToBase64(r, text.FontFile, 400, 20)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
 			}
 			if id := ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Image("base64://"+helper.BytesToString(firstStepImageBytes))); id.ID() == 0 {
-				ctx.SendChain(message.Text("ERROR: 可能被风控了"))
+				ctx.SendChain(message.Text("ERROR:可能被风控了"))
 			}
 			// 步骤0，1，2，依次选择3个类别
 			step := 0
@@ -78,121 +83,128 @@ func init() {
 			errorCount := 0
 			for {
 				select {
-				case e := <-echo: // 接收到需要复读的消息
+				case c := <-echo: // 接收到需要复读的消息
 					// 错误次数达到3次，结束命令
 					if errorCount >= 3 {
-						ctx.SendChain(message.Reply(e.MessageID), message.Text("输入错误太多,请重新发指令"))
+						ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("输入错误太多,请重新发指令"))
 						return
 					}
+					msg := c.Event.Message.ExtractPlainText()
+					num, err := strconv.Atoi(msg)
+					if err != nil {
+						ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("请输入正确的序号，三次输入错误，指令可退出重输"))
+						errorCount++
+						continue
+					}
 					switch step {
 					case 0:
-						firstIndex, err = strconv.Atoi(e.RawMessage)
-						// log.Println(fmt.Sprintf("当前在第%d步", step))
-						// log.Println(fmt.Sprintf("firstIndex:%d,secondIndex:%d,thirdIndex:%d", firstIndex, secondIndex, thirdIndex))
+						indexs[0] = num
+						secondStepMessage, err := db.GetAllSecondCategoryMessageByFirstIndex(indexs[0])
 						if err != nil {
-							ctx.SendChain(message.Reply(e.MessageID), message.Text("请输入正确的序号,三次输入错误，指令可退出重输"))
-							errorCount++
-						} else {
-							secondStepMessage := db.GetAllSecondCategoryMessageByFirstIndex(firstIndex)
-							// log.Println(secondStepMessage)
-							if secondStepMessage == "" {
-								ctx.SendChain(message.Reply(e.MessageID), message.Text("你选择的序号没有内容，请重新选择，三次输入错误，指令可退出重输"))
-								firstStepImageBytes, err := text.RenderToBase64(db.GetAllFirstCategoryMessage(), text.FontFile, 400, 20)
-								if err != nil {
-									log.Errorln("[vtb]:", err)
-								}
-								if id := ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Image("base64://"+helper.BytesToString(firstStepImageBytes))); id.ID() == 0 {
-									ctx.SendChain(message.Text("ERROR: 可能被风控了"))
-								}
-								errorCount++
-							} else {
-								secondStepMessageBytes, err := text.RenderToBase64(secondStepMessage, text.FontFile, 400, 20)
-								if err != nil {
-									log.Errorln("[vtb]:", err)
-								}
-								if id := ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Image("base64://"+helper.BytesToString(secondStepMessageBytes))); id.ID() == 0 {
-									ctx.SendChain(message.Text("ERROR: 可能被风控了"))
-								}
-								step++
-							}
+							ctx.SendChain(message.Text("ERROR:", err))
+							return
 						}
-					case 1:
-						secondIndex, err = strconv.Atoi(e.RawMessage)
-						// log.Println(fmt.Sprintf("当前在第%d步", step))
-						// log.Println(fmt.Sprintf("firstIndex:%d,secondIndex:%d,thirdIndex:%d", firstIndex, secondIndex, thirdIndex))
-						if err != nil {
-							ctx.SendChain(message.Reply(e.MessageID), message.Text("请输入正确的序号，三次输入错误，指令可退出重输"))
+						if secondStepMessage == "" {
+							ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("你选择的序号没有内容，请重新选择，三次输入错误，指令可退出重输"))
+							r, err := db.GetAllFirstCategoryMessage()
+							if err != nil {
+								ctx.SendChain(message.Text("ERROR:", err))
+								return
+							}
+							firstStepImageBytes, err := text.RenderToBase64(r, text.FontFile, 400, 20)
+							if err != nil {
+								ctx.SendChain(message.Text("ERROR:", err))
+								return
+							}
+							if id := ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Image("base64://"+helper.BytesToString(firstStepImageBytes))); id.ID() == 0 {
+								ctx.SendChain(message.Text("ERROR:可能被风控了"))
+							}
 							errorCount++
 						} else {
-							thirdStepMessage := db.GetAllThirdCategoryMessageByFirstIndexAndSecondIndex(firstIndex, secondIndex)
-							// log.Println(thirdStepMessage)
-							if thirdStepMessage == "" {
-								ctx.SendChain(message.Reply(e.MessageID), message.Text("你选择的序号没有内容，请重新选择，三次输入错误，指令可退出重输"))
-								secondStepMessageBytes, err := text.RenderToBase64(db.GetAllSecondCategoryMessageByFirstIndex(firstIndex), text.FontFile, 400, 20)
-								if err != nil {
-									log.Errorln("[vtb]:", err)
-								}
-								if id := ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Image("base64://"+helper.BytesToString(secondStepMessageBytes))); id.ID() == 0 {
-									ctx.SendChain(message.Text("ERROR: 可能被风控了"))
-								}
-								errorCount++
-							} else {
-								thirdStepMessageBytes, err := text.RenderToBase64(thirdStepMessage, text.FontFile, 400, 20)
-								if err != nil {
-									log.Errorln("[vtb]:", err)
-								}
-								if id := ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Image("base64://"+helper.BytesToString(thirdStepMessageBytes))); id.ID() == 0 {
-									ctx.SendChain(message.Text("ERROR: 可能被风控了"))
-								}
-								step++
+							secondStepMessageBytes, err := text.RenderToBase64(secondStepMessage, text.FontFile, 400, 20)
+							if err != nil {
+								ctx.SendChain(message.Text("ERROR:", err))
+								return
 							}
+							if id := ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Image("base64://"+helper.BytesToString(secondStepMessageBytes))); id.ID() == 0 {
+								ctx.SendChain(message.Text("ERROR:可能被风控了"))
+							}
+							step++
+						}
+
+					case 1:
+						indexs[1] = num
+						thirdStepMessage, err := db.GetAllThirdCategoryMessageByFirstIndexAndSecondIndex(indexs[0], indexs[1])
+						if err != nil {
+							ctx.SendChain(message.Text("ERROR:", err))
+							return
+						}
+						if thirdStepMessage == "" {
+							ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("你选择的序号没有内容，请重新选择，三次输入错误，指令可退出重输"))
+							r, err := db.GetAllSecondCategoryMessageByFirstIndex(indexs[0])
+							if err != nil {
+								ctx.SendChain(message.Text("ERROR:", err))
+								return
+							}
+							secondStepMessageBytes, err := text.RenderToBase64(r, text.FontFile, 400, 20)
+							if err != nil {
+								ctx.SendChain(message.Text("ERROR:", err))
+								return
+							}
+							if id := ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Image("base64://"+helper.BytesToString(secondStepMessageBytes))); id.ID() == 0 {
+								ctx.SendChain(message.Text("ERROR:可能被风控了"))
+							}
+							errorCount++
+						} else {
+							thirdStepMessageBytes, err := text.RenderToBase64(thirdStepMessage, text.FontFile, 400, 20)
+							if err != nil {
+								ctx.SendChain(message.Text("ERROR:", err))
+								return
+							}
+							if id := ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Image("base64://"+helper.BytesToString(thirdStepMessageBytes))); id.ID() == 0 {
+								ctx.SendChain(message.Text("ERROR:可能被风控了"))
+							}
+							step++
 						}
 					case 2:
-						thirdIndex, err = strconv.Atoi(e.RawMessage)
-						// log.Println(fmt.Sprintf("当前在第%d步", step))
-						// log.Println(fmt.Sprintf("firstIndex:%d,secondIndex:%d,thirdIndex:%d", firstIndex, secondIndex, thirdIndex))
-						if err != nil {
-							ctx.SendChain(message.Reply(e.MessageID), message.Text("请输入正确的序号，三次输入错误，指令可退出重输"))
+						indexs[2] = num
+						tc := db.GetThirdCategory(indexs[0], indexs[1], indexs[2])
+						recURL := tc.ThirdCategoryPath
+						if recURL == "" {
+							ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("没有内容请重新选择，三次输入错误，指令可退出重输"))
+							r, err := db.GetAllFirstCategoryMessage()
+							if err != nil {
+								ctx.SendChain(message.Text("ERROR:", err))
+								return
+							}
+							firstStepImageBytes, err := text.RenderToBase64(r, text.FontFile, 400, 20)
+							if err != nil {
+								ctx.SendChain(message.Text("ERROR:", err))
+								return
+							}
+							if id := ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Image("base64://"+helper.BytesToString(firstStepImageBytes))); id.ID() == 0 {
+								ctx.SendChain(message.Text("ERROR:可能被风控了"))
+							}
 							errorCount++
+							step = 1
 						} else {
-							tc := db.GetThirdCategory(firstIndex, secondIndex, thirdIndex)
-							reg := regexp.MustCompile(regStr)
-							recURL := tc.ThirdCategoryPath
-							if recURL == "" {
-								ctx.SendChain(message.Reply(e.MessageID), message.Text("没有内容请重新选择，三次输入错误，指令可退出重输"))
-								firstStepImageBytes, err := text.RenderToBase64(db.GetAllFirstCategoryMessage(), text.FontFile, 400, 20)
-								if err != nil {
-									log.Errorln("[vtb]:", err)
-								}
-								if id := ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Image("base64://"+helper.BytesToString(firstStepImageBytes))); id.ID() == 0 {
-									ctx.SendChain(message.Text("ERROR: 可能被风控了"))
-								}
-								errorCount++
-								step = 1
-							} else {
-								if reg.MatchString(recURL) {
-									// log.Println(reg.FindStringSubmatch(recordUrl)[1])
-									// log.Println(url.QueryEscape(reg.FindStringSubmatch(recordUrl)[1]))
-									recURL = strings.ReplaceAll(recURL, reg.FindStringSubmatch(recURL)[1], url.QueryEscape(reg.FindStringSubmatch(recURL)[1]))
-									recURL = strings.ReplaceAll(recURL, "+", "%20")
-									// log.Println(recordUrl)
-								}
-								ctx.SendChain(message.Reply(e.MessageID), message.Text("请欣赏《"+tc.ThirdCategoryName+"》"))
-
-								if !re.MatchString(recURL) {
-									log.Errorln("[vtb]:文件格式不匹配")
-									return
-								}
-								format := re.FindStringSubmatch(recURL)[1]
-								recordFile := storePath + fmt.Sprintf("%d-%d-%d", firstIndex, secondIndex, thirdIndex) + format
-								if file.IsExist(recordFile) {
-									ctx.SendChain(message.Record("file:///" + file.BOTPATH + "/" + recordFile))
-									return
-								}
-								initRecord(recordFile, recURL)
+							if reg.MatchString(recURL) {
+								recURL = strings.ReplaceAll(recURL, reg.FindStringSubmatch(recURL)[1], url.QueryEscape(reg.FindStringSubmatch(recURL)[1]))
+								recURL = strings.ReplaceAll(recURL, "+", "%20")
+							}
+							ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("请欣赏《"+tc.ThirdCategoryName+"》"))
+							recordFile := storePath + fmt.Sprintf("%d-%d-%d", indexs[0], indexs[1], indexs[2]) + path.Ext(recURL)
+							if file.IsExist(recordFile) {
 								ctx.SendChain(message.Record("file:///" + file.BOTPATH + "/" + recordFile))
 								return
 							}
+							err = initRecord(recordFile, recURL)
+							if err != nil {
+								ctx.SendChain(message.Text("ERROR:", err))
+								return
+							}
+							ctx.SendChain(message.Record("file:///" + file.BOTPATH + "/" + recordFile))
+							return
 						}
 					default:
 						return
@@ -203,56 +215,64 @@ func init() {
 				}
 			}
 		})
-	engine.OnFullMatch("随机vtb").SetBlock(true).
+	engine.OnFullMatch("随机vtb", getdb).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			db, err := model.Open(dbfile)
 			if err != nil {
-				log.Errorln("[vtb]:", err)
+				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
+			defer db.Close()
 			tc := db.RandomVtb()
 			fc := db.GetFirstCategoryByFirstUID(tc.FirstCategoryUID)
 			if (tc != model.ThirdCategory{}) && (fc != model.FirstCategory{}) {
-				reg := regexp.MustCompile(regStr)
 				recURL := tc.ThirdCategoryPath
 				if reg.MatchString(recURL) {
 					recURL = strings.ReplaceAll(recURL, reg.FindStringSubmatch(recURL)[1], url.QueryEscape(reg.FindStringSubmatch(recURL)[1]))
 					recURL = strings.ReplaceAll(recURL, "+", "%20")
 				}
 				ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("请欣赏"+fc.FirstCategoryName+"的《"+tc.ThirdCategoryName+"》"))
-				if !re.MatchString(recURL) {
-					log.Errorln("[vtb]:文件格式不匹配")
-					return
-				}
-				format := re.FindStringSubmatch(recURL)[1]
-				recordFile := storePath + fmt.Sprintf("%d-%d-%d", fc.FirstCategoryIndex, tc.SecondCategoryIndex, tc.ThirdCategoryIndex) + format
+				recordFile := storePath + fmt.Sprintf("%d-%d-%d", fc.FirstCategoryIndex, tc.SecondCategoryIndex, tc.ThirdCategoryIndex) + path.Ext(recURL)
 				if file.IsExist(recordFile) {
 					ctx.SendChain(message.Record("file:///" + file.BOTPATH + "/" + recordFile))
 					return
 				}
-				initRecord(recordFile, recURL)
+				err = initRecord(recordFile, recURL)
+				if err != nil {
+					ctx.SendChain(message.Text("ERROR:", err))
+					return
+				}
 				ctx.SendChain(message.Record("file:///" + file.BOTPATH + "/" + recordFile))
 			}
-			db.Close()
 		})
-	engine.OnFullMatch("更新vtb", zero.SuperUserPermission).SetBlock(true).
+	engine.OnFullMatch("更新vtb", zero.SuperUserPermission, getdb).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.Send("少女祈祷中......")
 			db := model.Initialize(dbfile)
 			if db != nil {
-				for _, v := range db.GetVtbList() {
-					db.StoreVtb(v)
-				}
-				err := db.Close()
+				vl, err := db.GetVtbList()
 				if err != nil {
-					log.Errorln("[vtb/cron]", err)
+					ctx.SendChain(message.Text("ERROR:", err))
+					return
+				}
+				for _, v := range vl {
+					err = db.StoreVtb(v)
+					if err != nil {
+						ctx.SendChain(message.Text("ERROR:", err))
+						return
+					}
+				}
+				err = db.Close()
+				if err != nil {
+					ctx.SendChain(message.Text("ERROR:", err))
+					return
 				}
 			}
 			ctx.Send("vtb数据库已更新")
 		})
 }
 
-func initRecord(recordFile, recordURL string) {
+func initRecord(recordFile, recordURL string) error {
 	if file.IsNotExist(recordFile) {
 		client := web.NewTLS12Client()
 		req, _ := http.NewRequest("GET", recordURL, nil)
@@ -260,18 +280,17 @@ func initRecord(recordFile, recordURL string) {
 		req.Header.Set("User-Agent", "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:6.0) Gecko/20100101 Firefox/6.0")
 		resp, err := client.Do(req)
 		if err != nil {
-			log.Errorln("[vtb]:", err)
-			return
+			return err
 		}
 		defer resp.Body.Close()
 		data, err := io.ReadAll(resp.Body)
 		if err != nil {
-			log.Errorln("[vtb]:", err)
-			return
+			return err
 		}
 		err = os.WriteFile(recordFile, data, 0666)
 		if err != nil {
-			log.Errorln("[vtb]:", err)
+			return err
 		}
 	}
+	return nil
 }

plugin/wangyiyun/main.go

@@ -8,8 +8,6 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -19,7 +17,7 @@ const (
 )
 
 func init() {
-	control.Register("wangyiyun", order.AcquirePrio(), &control.Options{
+	control.Register("wangyiyun", &control.Options{
 		DisableOnDefault: false,
 		Help:             "wangyiyun \n- 来份网易云热评",
 	}).OnFullMatch("来份网易云热评").SetBlock(true).Limit(ctxext.LimitByUser).

plugin/word_count/word_count.go

@@ -0,0 +1,200 @@
+// Package wordcount 聊天热词
+package wordcount
+
+import (
+	"fmt"
+	"os"
+	"regexp"
+	"sort"
+	"strconv"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/FloatTech/zbputils/binary"
+	"github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/file"
+	"github.com/FloatTech/zbputils/img/text"
+	"github.com/golang/freetype"
+	"github.com/sirupsen/logrus"
+	"github.com/tidwall/gjson"
+	"github.com/wcharczuk/go-chart/v2"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+)
+
+var (
+	re        = regexp.MustCompile(`^[一-龥]+$`)
+	stopwords []string
+)
+
+func init() {
+	engine := control.Register("wordcount", &control.Options{
+		DisableOnDefault: false,
+		Help: "聊天热词\n" +
+			"- 热词 [群号] [消息数目]|热词 123456 1000",
+		PublicDataFolder: "WordCount",
+	})
+	cachePath := engine.DataFolder() + "cache/"
+	_ = os.RemoveAll(cachePath)
+	_ = os.MkdirAll(cachePath, 0755)
+	engine.OnRegex(`^热词\s?(\d*)\s?(\d*)$`, zero.OnlyGroup, ctxext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool {
+		_, err := engine.GetLazyData("stopwords.txt", false)
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR:", err))
+			return false
+		}
+		data, err := os.ReadFile(engine.DataFolder() + "stopwords.txt")
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR:", err))
+			return false
+		}
+		stopwords = strings.Split(strings.ReplaceAll(binary.BytesToString(data), "\r", ""), "\n")
+		sort.Strings(stopwords)
+		logrus.Infoln("[wordcount]加载", len(stopwords), "条停用词")
+		return true
+	})).Limit(ctxext.LimitByUser).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			_, err := file.GetLazyData(text.FontFile, true)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			b, err := os.ReadFile(text.FontFile)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			font, err := freetype.ParseFont(b)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+
+			ctx.SendChain(message.Text("少女祈祷中..."))
+			gid, _ := strconv.ParseInt(ctx.State["regex_matched"].([]string)[1], 10, 64)
+			p, _ := strconv.ParseInt(ctx.State["regex_matched"].([]string)[2], 10, 64)
+			if p > 10000 {
+				p = 10000
+			}
+			if p == 0 {
+				p = 1000
+			}
+			if gid == 0 {
+				gid = ctx.Event.GroupID
+			}
+			group := ctx.GetGroupInfo(gid, false)
+			if group.MemberCount == 0 {
+				ctx.SendChain(message.Text(zero.BotConfig.NickName[0], "未加入", group.Name, "(", gid, "),无法获得热词呢"))
+				return
+			}
+			today := time.Now().Format("20060102")
+			drawedFile := fmt.Sprintf("%s%d%s%dwordCount.png", cachePath, gid, today, p)
+			if file.IsExist(drawedFile) {
+				ctx.SendChain(message.Image("file:///" + file.BOTPATH + "/" + drawedFile))
+				return
+			}
+			messageMap := make(map[string]int, 256)
+			msghists := make(chan *gjson.Result, 256)
+			go func() {
+				h := ctx.GetLatestGroupMessageHistory(gid)
+				messageSeq := h.Get("messages.0.message_seq").Int()
+				msghists <- &h
+				for i := 1; i < int(p/20) && messageSeq != 0; i++ {
+					h := ctx.GetGroupMessageHistory(gid, messageSeq)
+					msghists <- &h
+					messageSeq = h.Get("messages.0.message_seq").Int()
+				}
+				close(msghists)
+			}()
+			var wg sync.WaitGroup
+			var mapmu sync.Mutex
+			for h := range msghists {
+				wg.Add(1)
+				go func(h *gjson.Result) {
+					for _, v := range h.Get("messages.#.message").Array() {
+						tex := strings.TrimSpace(message.ParseMessageFromString(v.Str).ExtractPlainText())
+						if tex == "" {
+							continue
+						}
+						for _, t := range ctx.GetWordSlices(tex).Get("slices").Array() {
+							tex := strings.TrimSpace(t.Str)
+							i := sort.SearchStrings(stopwords, tex)
+							if re.MatchString(tex) && (i >= len(stopwords) || stopwords[i] != tex) {
+								mapmu.Lock()
+								messageMap[tex]++
+								mapmu.Unlock()
+							}
+						}
+					}
+					wg.Done()
+				}(h)
+			}
+			wg.Wait()
+
+			wc := rankByWordCount(messageMap)
+			if len(wc) > 20 {
+				wc = wc[:20]
+			}
+			// 绘图
+			if len(wc) == 0 {
+				ctx.SendChain(message.Text("ERROR:历史消息为空或者无法获得历史消息"))
+				return
+			}
+			bars := make([]chart.Value, len(wc))
+			for i, v := range wc {
+				bars[i] = chart.Value{
+					Value: float64(v.Value),
+					Label: v.Key,
+				}
+			}
+			graph := chart.BarChart{
+				Font:  font,
+				Title: fmt.Sprintf("%s(%d)在%s号的%d条消息的热词top20", group.Name, gid, time.Now().Format("2006-01-02"), p),
+				Background: chart.Style{
+					Padding: chart.Box{
+						Top: 40,
+					},
+				},
+				Height:   500,
+				BarWidth: 25,
+				Bars:     bars,
+			}
+			f, err := os.Create(drawedFile)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			err = graph.Render(chart.PNG, f)
+			_ = f.Close()
+			if err != nil {
+				_ = os.Remove(drawedFile)
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			ctx.SendChain(message.Image("file:///" + file.BOTPATH + "/" + drawedFile))
+		})
+}
+
+func rankByWordCount(wordFrequencies map[string]int) pairlist {
+	pl := make(pairlist, len(wordFrequencies))
+	i := 0
+	for k, v := range wordFrequencies {
+		pl[i] = pair{k, v}
+		i++
+	}
+	sort.Sort(sort.Reverse(pl))
+	return pl
+}
+
+type pair struct {
+	Key   string
+	Value int
+}
+
+type pairlist []pair
+
+func (p pairlist) Len() int           { return len(p) }
+func (p pairlist) Less(i, j int) bool { return p[i].Value < p[j].Value }
+func (p pairlist) Swap(i, j int)      { p[i], p[j] = p[j], p[i] }

plugin/wordle/wordle.go

@@ -8,12 +8,15 @@ import (
 	"math/rand"
 	"sort"
 	"strings"
+	"sync"
+	"sync/atomic"
 	"time"
 
+	"github.com/FloatTech/AnimeAPI/tl"
+
+	"github.com/FloatTech/zbputils/binary"
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/ctxext"
-	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/img/writer"
 	"github.com/fogleman/gg"
 	zero "github.com/wdvxdr1123/ZeroBot"
@@ -56,15 +59,15 @@ type dictionary map[int]struct {
 var words = make(dictionary)
 
 func init() {
-	en := control.Register("wordle", order.AcquirePrio(), &control.Options{
+	en := control.Register("wordle", &control.Options{
 		DisableOnDefault: false,
 		Help: "猜单词\n" +
-			"- 个人猜单词" +
+			"- 个人猜单词\n" +
 			"- 团队猜单词",
 		PublicDataFolder: "Wordle",
 	}).ApplySingle(single.New(
-		single.WithKeyFn(func(ctx *zero.Ctx) interface{} { return ctx.Event.GroupID }),
-		single.WithPostFn(func(ctx *zero.Ctx) {
+		single.WithKeyFn(func(ctx *zero.Ctx) int64 { return ctx.Event.GroupID }),
+		single.WithPostFn[int64](func(ctx *zero.Ctx) {
 			ctx.Send(
 				message.ReplyWithMessage(ctx.Event.MessageID,
 					message.Text("已经有正在进行的游戏..."),
@@ -72,30 +75,61 @@ func init() {
 			)
 		}),
 	))
-	go func() {
-		for i := 5; i <= 7; i++ {
-			dc, err := file.GetLazyData(fmt.Sprintf("%scet-4_%d.txt", en.DataFolder(), i), true, true)
-			if err != nil {
-				panic(err)
+
+	en.OnRegex(`^(个人|团队)(五阶|六阶|七阶)?猜单词$`, zero.OnlyGroup, ctxext.DoOnceOnSuccess(
+		func(ctx *zero.Ctx) bool {
+			var errcnt uint32
+			var wg sync.WaitGroup
+			var mu sync.Mutex
+			for i := 5; i <= 7; i++ {
+				wg.Add(2)
+				go func(i int) {
+					defer wg.Done()
+					dc, err := en.GetLazyData(fmt.Sprintf("cet-4_%d.txt", i), true)
+					if err != nil {
+						atomic.AddUint32(&errcnt, 1)
+						return
+					}
+					c := strings.Split(binary.BytesToString(dc), "\n")
+					sort.Strings(c)
+					mu.Lock()
+					tmp := words[i]
+					tmp.cet4 = c
+					words[i] = tmp
+					mu.Unlock()
+				}(i)
+				go func(i int) {
+					defer wg.Done()
+					dd, err := en.GetLazyData(fmt.Sprintf("dict_%d.txt", i), true)
+					if err != nil {
+						atomic.AddUint32(&errcnt, 1)
+						return
+					}
+					d := strings.Split(binary.BytesToString(dd), "\n")
+					sort.Strings(d)
+					mu.Lock()
+					tmp := words[i]
+					tmp.dict = d
+					words[i] = tmp
+					mu.Unlock()
+				}(i)
 			}
-			c := strings.Split(string(dc), "\n")
-			sort.Strings(c)
-			dd, err := file.GetLazyData(fmt.Sprintf("%sdict_%d.txt", en.DataFolder(), i), true, true)
-			if err != nil {
-				panic(err)
+			wg.Wait()
+			if errcnt > 0 {
+				ctx.SendChain(message.Text("ERROR:下载字典时发生", errcnt, "个错误"))
+				return false
 			}
-			d := strings.Split(string(dd), "\n")
-			sort.Strings(d)
-			words[i] = struct {
-				dict []string
-				cet4 []string
-			}{d, c}
-		}
-	}()
-	en.OnRegex(`(个人|团队)(五阶|六阶|七阶)?猜单词`, zero.OnlyGroup).SetBlock(true).Limit(ctxext.LimitByUser).
+			return true
+		},
+	)).SetBlock(true).Limit(ctxext.LimitByUser).
 		Handle(func(ctx *zero.Ctx) {
 			class := classdict[ctx.State["regex_matched"].([]string)[2]]
 			target := words[class].cet4[rand.Intn(len(words[class].cet4))]
+			tt, err := tl.Translate(target)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
 			game := newWordleGame(target)
 			_, img, cl, _ := game("")
 			ctx.Send(
@@ -108,60 +142,69 @@ func init() {
 			var next *zero.FutureEvent
 			if ctx.State["regex_matched"].([]string)[1] == "个人" {
 				next = zero.NewFutureEvent("message", 999, false, zero.RegexRule(fmt.Sprintf(`^([A-Z]|[a-z]){%d}$`, class)),
-					zero.OnlyGroup, zero.CheckUser(ctx.Event.UserID))
+					zero.OnlyGroup, ctx.CheckSession())
 			} else {
 				next = zero.NewFutureEvent("message", 999, false, zero.RegexRule(fmt.Sprintf(`^([A-Z]|[a-z]){%d}$`, class)),
 					zero.OnlyGroup, zero.CheckGroup(ctx.Event.GroupID))
 			}
 			var win bool
-			var err error
 			recv, cancel := next.Repeat()
 			defer cancel()
+			tick := time.NewTimer(105 * time.Second)
+			after := time.NewTimer(120 * time.Second)
 			for {
 				select {
-				case <-time.After(time.Second * 120):
+				case <-tick.C:
+					ctx.SendChain(message.Text("猜单词，你还有15s作答时间"))
+				case <-after.C:
 					ctx.Send(
 						message.ReplyWithMessage(ctx.Event.MessageID,
-							message.Text("猜单词超时，游戏结束...答案是: ", target),
+							message.Text("猜单词超时，游戏结束...答案是: ", target, "(", tt, ")"),
 						),
 					)
 					return
-				case e := <-recv:
-					win, img, cl, err = game(e.Message.String())
+				case c := <-recv:
+					tick.Reset(105 * time.Second)
+					after.Reset(120 * time.Second)
+					win, img, cl, err = game(c.Event.Message.String())
 					switch {
 					case win:
+						tick.Stop()
+						after.Stop()
 						ctx.Send(
-							message.ReplyWithMessage(e.MessageID,
+							message.ReplyWithMessage(c.Event.MessageID,
 								message.ImageBytes(img),
-								message.Text("太棒了，你猜出来了！"),
+								message.Text("太棒了，你猜出来了！答案是: ", target, "(", tt, ")"),
 							),
 						)
 						cl()
 						return
 					case err == errTimesRunOut:
+						tick.Stop()
+						after.Stop()
 						ctx.Send(
-							message.ReplyWithMessage(e.MessageID,
+							message.ReplyWithMessage(c.Event.MessageID,
 								message.ImageBytes(img),
-								message.Text("游戏结束...答案是: ", target),
+								message.Text("游戏结束...答案是: ", target, "(", tt, ")"),
 							),
 						)
 						cl()
 						return
 					case err == errLengthNotEnough:
 						ctx.Send(
-							message.ReplyWithMessage(e.MessageID,
+							message.ReplyWithMessage(c.Event.MessageID,
 								message.Text("单词长度错误"),
 							),
 						)
 					case err == errUnknownWord:
 						ctx.Send(
-							message.ReplyWithMessage(e.MessageID,
+							message.ReplyWithMessage(c.Event.MessageID,
 								message.Text("你确定存在这样的单词吗？"),
 							),
 						)
 					default:
 						ctx.Send(
-							message.ReplyWithMessage(e.MessageID,
+							message.ReplyWithMessage(c.Event.MessageID,
 								message.ImageBytes(img),
 							),
 						)

plugin/wtf/main.go

@@ -9,12 +9,10 @@ import (
 	"github.com/FloatTech/zbputils/ctxext"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 func init() {
-	en := control.Register("wtf", order.AcquirePrio(), &control.Options{
+	en := control.Register("wtf", &control.Options{
 		DisableOnDefault: false,
 		Help:             "鬼东西\n- 鬼东西列表\n- 查询鬼东西[序号][@xxx]",
 	})
@@ -31,7 +29,7 @@ func init() {
 			// 调用接口
 			i, err := strconv.Atoi(ctx.State["regex_matched"].([]string)[1])
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
 			w := newWtf(i)
@@ -54,7 +52,7 @@ func init() {
 				text, err = w.predict(name)
 			}
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
 			// TODO: 可注入

plugin/ymgal/model.go

@@ -13,7 +13,6 @@ import (
 	"github.com/antchfx/htmlquery"
 	_ "github.com/fumiama/sqlite3" // import sql
 	"github.com/jinzhu/gorm"
-	log "github.com/sirupsen/logrus"
 )
 
 // gdb 得分数据库
@@ -39,22 +38,21 @@ func (ymgal) TableName() string {
 }
 
 // initialize 初始化ymgaldb数据库
-func initialize(dbpath string) *ymgaldb {
-	var err error
+func initialize(dbpath string) (db *ymgaldb, err error) {
 	if _, err = os.Stat(dbpath); err != nil || os.IsNotExist(err) {
 		// 生成文件
 		f, err := os.Create(dbpath)
 		if err != nil {
-			return nil
+			return nil, err
 		}
-		defer f.Close()
+		_ = f.Close()
 	}
 	gdb, err := gorm.Open("sqlite3", dbpath)
 	if err != nil {
-		panic(err)
+		return
 	}
 	gdb.AutoMigrate(&ymgal{})
-	return (*ymgaldb)(gdb)
+	return (*ymgaldb)(gdb), nil
 }
 
 func (gdb *ymgaldb) insertOrUpdateYmgalByID(id int64, title, pictureType, pictureDescription, pictureList string) (err error) {
@@ -66,12 +64,12 @@ func (gdb *ymgaldb) insertOrUpdateYmgalByID(id int64, title, pictureType, pictur
 		PictureDescription: pictureDescription,
 		PictureList:        pictureList,
 	}
-	if err = db.Debug().Model(&ymgal{}).First(&y, "id = ? ", id).Error; err != nil {
+	if err = db.Model(&ymgal{}).First(&y, "id = ? ", id).Error; err != nil {
 		if gorm.IsRecordNotFoundError(err) {
-			err = db.Debug().Model(&ymgal{}).Create(&y).Error // newUser not user
+			err = db.Model(&ymgal{}).Create(&y).Error // newUser not user
 		}
 	} else {
-		err = db.Debug().Model(&ymgal{}).Where("id = ? ", id).Update(map[string]interface{}{
+		err = db.Model(&ymgal{}).Where("id = ? ", id).Update(map[string]interface{}{
 			"title":               title,
 			"picture_type":        pictureType,
 			"picture_description": pictureDescription,
@@ -83,14 +81,14 @@ func (gdb *ymgaldb) insertOrUpdateYmgalByID(id int64, title, pictureType, pictur
 
 func (gdb *ymgaldb) getYmgalByID(id string) (y ymgal) {
 	db := (*gorm.DB)(gdb)
-	db.Debug().Model(&ymgal{}).Where("id = ?", id).Take(&y)
+	db.Model(&ymgal{}).Where("id = ?", id).Take(&y)
 	return
 }
 
 func (gdb *ymgaldb) randomYmgal(pictureType string) (y ymgal) {
 	db := (*gorm.DB)(gdb)
 	var count int
-	s := db.Debug().Model(&ymgal{}).Where("picture_type = ?", pictureType).Count(&count)
+	s := db.Model(&ymgal{}).Where("picture_type = ?", pictureType).Count(&count)
 	if count == 0 {
 		return
 	}
@@ -101,7 +99,7 @@ func (gdb *ymgaldb) randomYmgal(pictureType string) (y ymgal) {
 func (gdb *ymgaldb) getYmgalByKey(pictureType, key string) (y ymgal) {
 	db := (*gorm.DB)(gdb)
 	var count int
-	s := db.Debug().Model(&ymgal{}).Where("picture_type = ? and (picture_description like ? or title like ?) ", pictureType, "%"+key+"%", "%"+key+"%").Count(&count)
+	s := db.Model(&ymgal{}).Where("picture_type = ? and (picture_description like ? or title like ?) ", pictureType, "%"+key+"%", "%"+key+"%").Count(&count)
 	if count == 0 {
 		return
 	}
@@ -125,27 +123,27 @@ var (
 	emoticonIDList       []string
 )
 
-func initPageNumber() (maxCgPageNumber, maxEmoticonPageNumber int) {
+func initPageNumber() (maxCgPageNumber, maxEmoticonPageNumber int, err error) {
 	doc, err := htmlquery.LoadURL(cgURL + "1")
 	if err != nil {
-		log.Errorln("[ymgal]:", err)
+		return
 	}
 	maxCgPageNumber, err = strconv.Atoi(htmlquery.FindOne(doc, commonPageNumberExpr).Data)
 	if err != nil {
-		log.Errorln("[ymgal]:", err)
+		return
 	}
 	doc, err = htmlquery.LoadURL(emoticonURL + "1")
 	if err != nil {
-		log.Errorln("[ymgal]:", err)
+		return
 	}
 	maxEmoticonPageNumber, err = strconv.Atoi(htmlquery.FindOne(doc, commonPageNumberExpr).Data)
 	if err != nil {
-		log.Errorln("[ymgal]:", err)
+		return
 	}
 	return
 }
 
-func getPicID(pageNumber int, pictureType string) {
+func getPicID(pageNumber int, pictureType string) error {
 	var picURL string
 	if pictureType == cgType {
 		picURL = cgURL + strconv.Itoa(pageNumber)
@@ -154,7 +152,7 @@ func getPicID(pageNumber int, pictureType string) {
 	}
 	doc, err := htmlquery.LoadURL(picURL)
 	if err != nil {
-		log.Errorln("[ymgal]:", err)
+		return err
 	}
 	list := htmlquery.Find(doc, "//*[@id='picset-result-list']/ul/div/div[1]/a")
 	for i := 0; i < len(list); i++ {
@@ -166,16 +164,26 @@ func getPicID(pageNumber int, pictureType string) {
 			emoticonIDList = append(emoticonIDList, picID)
 		}
 	}
+	return nil
 }
 
-func updatePic() {
-	maxCgPageNumber, maxEmoticonPageNumber := initPageNumber()
+func updatePic() error {
+	maxCgPageNumber, maxEmoticonPageNumber, err := initPageNumber()
+	if err != nil {
+		return err
+	}
 	for i := 1; i <= maxCgPageNumber; i++ {
-		getPicID(i, cgType)
+		err = getPicID(i, cgType)
+		if err != nil {
+			return err
+		}
 		time.Sleep(time.Millisecond * 500)
 	}
 	for i := 1; i <= maxEmoticonPageNumber; i++ {
-		getPicID(i, emoticonType)
+		err = getPicID(i, emoticonType)
+		if err != nil {
+			return err
+		}
 		time.Sleep(time.Millisecond * 500)
 	}
 CGLOOP:
@@ -185,8 +193,11 @@ CGLOOP:
 		mu.RUnlock()
 		if y.PictureList == "" {
 			mu.Lock()
-			storeCgPic(cgIDList[i])
+			err = storeCgPic(cgIDList[i])
 			mu.Unlock()
+			if err != nil {
+				return err
+			}
 		} else {
 			break CGLOOP
 		}
@@ -199,24 +210,28 @@ EMOTICONLOOP:
 		mu.RUnlock()
 		if y.PictureList == "" {
 			mu.Lock()
-			storeEmoticonPic(emoticonIDList[i])
+			err = storeEmoticonPic(emoticonIDList[i])
 			mu.Unlock()
+			if err != nil {
+				return err
+			}
 		} else {
 			break EMOTICONLOOP
 		}
 		time.Sleep(time.Millisecond * 500)
 	}
+	return nil
 }
 
-func storeCgPic(picIDStr string) {
+func storeCgPic(picIDStr string) (err error) {
 	picID, err := strconv.ParseInt(picIDStr, 10, 64)
 	if err != nil {
-		log.Errorln("[ymgal]:", err)
+		return
 	}
 	pictureType := cgType
 	doc, err := htmlquery.LoadURL(webPicURL + picIDStr)
 	if err != nil {
-		log.Errorln("[ymgal]:", err)
+		return
 	}
 	title := htmlquery.FindOne(doc, "//meta[@name='name']").Attr[1].Val
 	pictureDescription := htmlquery.FindOne(doc, "//meta[@name='description']").Attr[1].Val
@@ -224,7 +239,7 @@ func storeCgPic(picIDStr string) {
 	re := regexp.MustCompile(reNumber)
 	pictureNumber, err := strconv.Atoi(re.FindString(pictureNumberStr))
 	if err != nil {
-		log.Errorln("[ymgal]:", err)
+		return
 	}
 	pictureList := ""
 	for i := 1; i <= pictureNumber; i++ {
@@ -236,20 +251,18 @@ func storeCgPic(picIDStr string) {
 		}
 	}
 	err = gdb.insertOrUpdateYmgalByID(picID, title, pictureType, pictureDescription, pictureList)
-	if err != nil {
-		log.Errorln("[ymgal]:", err)
-	}
+	return
 }
 
-func storeEmoticonPic(picIDStr string) {
+func storeEmoticonPic(picIDStr string) error {
 	picID, err := strconv.ParseInt(picIDStr, 10, 64)
 	if err != nil {
-		log.Errorln("[ymgal]:", err)
+		return err
 	}
 	pictureType := emoticonType
 	doc, err := htmlquery.LoadURL(webPicURL + picIDStr)
 	if err != nil {
-		log.Errorln("[ymgal]:", err)
+		return err
 	}
 	title := htmlquery.FindOne(doc, "//meta[@name='name']").Attr[1].Val
 	pictureDescription := htmlquery.FindOne(doc, "//meta[@name='description']").Attr[1].Val
@@ -257,7 +270,7 @@ func storeEmoticonPic(picIDStr string) {
 	re := regexp.MustCompile(reNumber)
 	pictureNumber, err := strconv.Atoi(re.FindString(pictureNumberStr))
 	if err != nil {
-		log.Errorln("[ymgal]:", err)
+		return err
 	}
 	pictureList := ""
 	for i := 1; i <= pictureNumber; i++ {
@@ -268,8 +281,5 @@ func storeEmoticonPic(picIDStr string) {
 			pictureList += "," + picURL
 		}
 	}
-	err = gdb.insertOrUpdateYmgalByID(picID, title, pictureType, pictureDescription, pictureList)
-	if err != nil {
-		log.Errorln("[ymgal]:", err)
-	}
+	return gdb.insertOrUpdateYmgalByID(picID, title, pictureType, pictureDescription, pictureList)
 }

plugin/ymgal/ymgal.go

@@ -5,25 +5,32 @@ import (
 	"strings"
 
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/ctxext"
-	"github.com/FloatTech/zbputils/file"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 )
 
 func init() {
-	engine := control.Register("ymgal", order.AcquirePrio(), &control.Options{
+	engine := control.Register("ymgal", &control.Options{
 		DisableOnDefault: false,
 		Help:             "月幕galgame\n- 随机galCG\n- 随机gal表情包\n- galCG[xxx]\n- gal表情包[xxx]\n- 更新gal\n",
 		PublicDataFolder: "Ymgal",
 	})
-	dbfile := engine.DataFolder() + "ymgal.db"
-	go func() {
-		_, _ = file.GetLazyData(dbfile, false, false)
-		gdb = initialize(dbfile)
-	}()
-	engine.OnRegex("^随机gal(CG|表情包)$").Limit(ctxext.LimitByUser).SetBlock(true).
+	getdb := ctxext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool {
+		dbfile := engine.DataFolder() + "ymgal.db"
+		_, err := engine.GetLazyData("ymgal.db", false)
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR:", err))
+			return false
+		}
+		gdb, err = initialize(dbfile)
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR:", err))
+			return false
+		}
+		return true
+	})
+	engine.OnRegex("^随机gal(CG|表情包)$", getdb).Limit(ctxext.LimitByUser).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.Send("少女祈祷中......")
 			pictureType := ctx.State["regex_matched"].([]string)[1]
@@ -35,7 +42,7 @@ func init() {
 			}
 			sendYmgal(y, ctx)
 		})
-	engine.OnRegex("^gal(CG|表情包)([一-龥ぁ-んァ-ヶA-Za-z0-9]{1,25})$").Limit(ctxext.LimitByUser).SetBlock(true).
+	engine.OnRegex("^gal(CG|表情包)([一-龥ぁ-んァ-ヶA-Za-z0-9]{1,25})$", getdb).Limit(ctxext.LimitByUser).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.Send("少女祈祷中......")
 			pictureType := ctx.State["regex_matched"].([]string)[1]
@@ -48,10 +55,14 @@ func init() {
 			}
 			sendYmgal(y, ctx)
 		})
-	engine.OnFullMatch("更新gal", zero.SuperUserPermission).SetBlock(true).Handle(
+	engine.OnFullMatch("更新gal", zero.SuperUserPermission, getdb).SetBlock(true).Handle(
 		func(ctx *zero.Ctx) {
 			ctx.Send("少女祈祷中......")
-			updatePic()
+			err := updatePic()
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
 			ctx.Send("ymgal数据库已更新")
 		})
 }
@@ -71,6 +82,6 @@ func sendYmgal(y ymgal, ctx *zero.Ctx) {
 	if id := ctx.SendGroupForwardMessage(
 		ctx.Event.GroupID,
 		m).Get("message_id").Int(); id == 0 {
-		ctx.SendChain(message.Text("ERROR: 可能被风控了"))
+		ctx.SendChain(message.Text("ERROR:可能被风控了"))
 	}
 }

plugin/zaobao/zaobao.go

@@ -12,8 +12,6 @@ import (
 	"github.com/FloatTech/zbputils/binary"
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/web"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -29,7 +27,7 @@ var (
 )
 
 func init() { // 插件主体
-	engine := control.Register("zaobao", order.AcquirePrio(), &control.Options{
+	engine := control.Register("zaobao", &control.Options{
 		DisableOnDefault: true,
 		Help: "易即今日公众号api的今日早报\n" +
 			"api早上8点更新，推荐定时在8点30后\n" +
@@ -51,7 +49,7 @@ func init() { // 插件主体
 func getdata() error { // 获取图片链接并且下载
 	mu.Lock()
 	defer mu.Unlock()
-	if picdata != nil && time.Since(pictime) <= time.Hour*20 {
+	if picdata != nil && time.Since(pictime) <= time.Hour*8 && time.Now().Day() == pictime.Day() {
 		return nil
 	}
 	data, err := web.RequestDataWith(web.NewDefaultClient(), api, "GET", "", ua)