fix: ImgFactory->Factory (#367)

* 🎨 改进代码样式

* fix: ImgFactory->Factory

* 🎨 改进代码样式

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

.github/workflows/nightly.yml

@@ -24,13 +24,13 @@ jobs:
             goarch: arm64
       fail-fast: true
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@master
       - name: Setup Go environment
-        uses: actions/setup-go@v2.1.3
+        uses: actions/setup-go@master
         with:
           go-version: 1.18
       - name: Cache downloaded module
-        uses: actions/cache@v2
+        uses: actions/cache@master
         with:
           path: |
             ~/.cache/go-build
@@ -48,7 +48,7 @@ jobs:
           export CGO_ENABLED=0
           go build -o "output/$BINARY_NAME" -trimpath -ldflags "$LD_FLAGS" .
       - name: Upload artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@master
         if: ${{ !github.head_ref }}
         with:
           name: ${{ matrix.goos }}_${{ matrix.goarch }}

.github/workflows/pull.yml

@@ -6,12 +6,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@master
         with:
           go-version: 1.18
 
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
+        uses: actions/checkout@master
 
       - name: golangci-lint
         uses: golangci/golangci-lint-action@master

.github/workflows/push.yml

@@ -6,12 +6,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@master
         with:
           go-version: 1.18
 
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
+        uses: actions/checkout@master
 
       - name: golangci-lint
         uses: golangci/golangci-lint-action@master

.github/workflows/release.yml

@@ -9,17 +9,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@master
         with:
           fetch-depth: 0
 
       - name: Set up Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@master
         with:
           go-version: '1.18'
 
       - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v2
+        uses: goreleaser/goreleaser-action@master
         with:
           version: latest
           args: release --rm-dist

.gitignore

@@ -5,4 +5,5 @@ plugins/*.dll
 .vscode
 go-zero*
 nohup.out
-zerobot
+zerobot
+ZeroBot-Plugin*

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,75 @@ module github.com/FloatTech/ZeroBot-Plugin
 go 1.18
 
 require (
-	github.com/FloatTech/AnimeAPI v1.3.2-0.20220326161751-d0d2797b91da
-	github.com/FloatTech/sqlite v0.2.1
-	github.com/FloatTech/zbputils v1.3.2-0.20220327052638-95033087f201
-	github.com/antchfx/htmlquery v1.2.4
+	github.com/FloatTech/AnimeAPI v1.5.0
+	github.com/FloatTech/sqlite v0.3.3
+	github.com/FloatTech/zbpctrl v1.4.1-0.20220715042842-93f081cb0133
+	github.com/FloatTech/zbputils v1.5.0
+	github.com/antchfx/htmlquery v1.2.5
 	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.4
+	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/lucas-clemente/quic-go v0.27.2
 	github.com/mroth/weightedrand v0.4.1
+	github.com/pkg/errors v0.8.1
 	github.com/pkumza/numcn v1.0.0
-	github.com/shirou/gopsutil/v3 v3.22.2
-	github.com/sirupsen/logrus v1.8.1
-	github.com/tidwall/gjson v1.14.0
-	github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220326160643-893d4e910785
-	golang.org/x/image v0.0.0-20220321031419-a8550c1d254a
+	github.com/shirou/gopsutil/v3 v3.22.3
+	github.com/sirupsen/logrus v1.9.0
+	github.com/tidwall/gjson v1.14.2
+	github.com/wcharczuk/go-chart/v2 v2.1.0
+	github.com/wdvxdr1123/ZeroBot v1.5.2-0.20220715040337-ef4327320c40
+	gitlab.com/gomidi/midi/v2 v2.0.17
+	golang.org/x/image v0.0.0-20220722155232-062f8c9fd539
 )
 
 require (
+	github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b // indirect
+	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/antchfx/xpath v1.2.1 // indirect
+	github.com/cheekybits/genny v1.0.0 // indirect
 	github.com/disintegration/imaging v1.6.2 // indirect
 	github.com/ericpauley/go-quantize v0.0.0-20200331213906-ae555eb2afa4 // indirect
+	github.com/fsnotify/fsnotify v1.4.9 // indirect
+	github.com/gabriel-vasile/mimetype v1.0.4 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
+	github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // 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/marten-seemann/qpack v0.2.1 // indirect
+	github.com/marten-seemann/qtls-go1-16 v0.1.5 // indirect
+	github.com/marten-seemann/qtls-go1-17 v0.1.2 // indirect
+	github.com/marten-seemann/qtls-go1-18 v0.1.2 // 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/nxadm/tail v1.4.8 // indirect
+	github.com/onsi/ginkgo v1.16.4 // 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-20220325203850-36772127a21f // indirect
+	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 // indirect
+	golang.org/x/mod v0.4.2 // indirect
+	golang.org/x/net v0.0.0-20220805013720-a33c5aa5df48 // indirect
+	golang.org/x/sys v0.0.0-20220804214406-8e32c043e418 // indirect
 	golang.org/x/text v0.3.7 // indirect
-	modernc.org/libc v1.14.12 // indirect
+	golang.org/x/tools v0.1.1 // indirect
+	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
+	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
+	modernc.org/libc v1.16.19 // indirect
 	modernc.org/mathutil v1.4.1 // indirect
-	modernc.org/memory v1.0.7 // indirect
+	modernc.org/memory v1.1.1 // indirect
 )

go.sum

@@ -1,17 +1,41 @@
-github.com/FloatTech/AnimeAPI v1.3.2-0.20220326161751-d0d2797b91da h1:KbJujP8k2/3BYRb+F292zLmDOV79uTOu/24n3fhIwRU=
-github.com/FloatTech/AnimeAPI v1.3.2-0.20220326161751-d0d2797b91da/go.mod h1:aC3EOKpb0R0VOdW9QIQCfqN6ZFymOfvCgzVY1/Fz3Og=
-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.20220327052638-95033087f201 h1:7x73xvsTmz7HWL4CjmX0jmfp2XAr2Hvpt2ay+DPOo6c=
-github.com/FloatTech/zbputils v1.3.2-0.20220327052638-95033087f201/go.mod h1:qZlHzG1s1giQrXaosjOAA2utGNaPZjwJsVZfBog2bhg=
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.31.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.37.0/go.mod h1:TS1dMSSfndXH133OKGwekG838Om/cQT0BUHV3HcBgoo=
+dmitri.shuralyov.com/app/changes v0.0.0-20180602232624-0a106ad413e3/go.mod h1:Yl+fi1br7+Rr3LqpNJf1/uxUdtRUV+Tnj0o93V2B9MU=
+dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU=
+dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4=
+dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU=
+git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/FloatTech/AnimeAPI v1.5.0 h1:/c/VyZc+YmOD6ZkWV30eXaoKyT+Nu2Sklz8W4J+sSQM=
+github.com/FloatTech/AnimeAPI v1.5.0/go.mod h1:zkT7ibEafp9Cg6UP1CeYFyetZ1g3eqgroMLaqKqLSgs=
+github.com/FloatTech/sqlite v0.3.3 h1:cSlpv+DcIehqaUG2YyjW0Twh396FoGsybpEpFZnX3Jg=
+github.com/FloatTech/sqlite v0.3.3/go.mod h1:i33d92OtR8jcp5fBUvQtospf27+MkfUxnGwnZ95E/dA=
+github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b h1:tvciXWq2nuvTbFeJGLDNIdRX3BI546D3O7k7vrVueZw=
+github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b/go.mod h1:fHZFWGquNXuHttu9dUYoKuNbm3dzLETnIOnm1muSfDs=
+github.com/FloatTech/zbpctrl v1.4.1-0.20220715042842-93f081cb0133 h1:nP9NI4I+vtwAbiU7wCJwjuzCzMZ/yJYg8h3667HGnv0=
+github.com/FloatTech/zbpctrl v1.4.1-0.20220715042842-93f081cb0133/go.mod h1:72BnjyBwQWUC8mqM9dPk5ZrjxXCilQCVp+jfgHATNdw=
+github.com/FloatTech/zbputils v1.5.0 h1:mfKZ+Ye+t8eArmgR4PzhhmdwvZM5VPjLfdikyhKffSE=
+github.com/FloatTech/zbputils v1.5.0/go.mod h1:Qet1L7sDLCkYectR0cwtTA9yDcW1n4/U1JvnAq2X18A=
 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=
-github.com/antchfx/htmlquery v1.2.4 h1:qLteofCMe/KGovBI6SQgmou2QNyedFUW+pE+BpeZ494=
-github.com/antchfx/htmlquery v1.2.4/go.mod h1:2xO6iu3EVWs7R2JYqBbp8YzG50gj/ofqs5/0VZoDZLc=
-github.com/antchfx/xpath v1.2.0 h1:mbwv7co+x0RwgeGAOHdrKy89GvHaGvxxBtPK0uF9Zr8=
-github.com/antchfx/xpath v1.2.0/go.mod h1:i54GszH55fYfBmoZXapTHN8T8tkcHfRgLyVwwqzXNcs=
+github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
+github.com/antchfx/htmlquery v1.2.5 h1:1lXnx46/1wtv1E/kzmH8vrfMuUKYgkdDBA9pIdMJnk4=
+github.com/antchfx/htmlquery v1.2.5/go.mod h1:2MCVBzYVafPBmKbrmwB9F5xdd+IEgRY61ci2oOsOQVw=
+github.com/antchfx/xpath v1.2.1 h1:qhp4EW6aCOVr5XIkT+l6LJ9ck/JsUH/yyauNgTQkBF8=
+github.com/antchfx/xpath v1.2.1/go.mod h1:i54GszH55fYfBmoZXapTHN8T8tkcHfRgLyVwwqzXNcs=
+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g=
+github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s=
+github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitfE=
+github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/corona10/goimagehash v1.0.3 h1:NZM518aKLmoNluluhfHGxT3LGOnrojrxhGn63DR/CZA=
 github.com/corona10/goimagehash v1.0.3/go.mod h1:VkvE0mLn84L4aF8vCb6mafVajEb6QYMHl2ZJLn0mOGI=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -26,169 +50,378 @@ github.com/ericpauley/go-quantize v0.0.0-20200331213906-ae555eb2afa4 h1:BBade+Jl
 github.com/ericpauley/go-quantize v0.0.0-20200331213906-ae555eb2afa4/go.mod h1:H7chHJglrhPPzetLdzBleF8d22WYOv7UM/lEKYiwlKM=
 github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 h1:Yzb9+7DPaBjB8zlTR87/ElzFsnQfuHnVUVqpZZIcV5Y=
 github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0=
+github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
 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/francoispqt/gojay v1.2.13/go.mod h1:ehT5mTG4ua4581f1++1WLG0vPdaA9HaiDsoyrBGkyDY=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
+github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 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.4 h1:UKx925X7cTsqsVWBlBLBs1v38epFT/q3AGjvyP5E0PM=
+github.com/fumiama/go-base16384 v1.5.4/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/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
+github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
 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=
 github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
+github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I=
+github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
+github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=
 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/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 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/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
+github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
+github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
 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/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.5/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/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
+github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
+github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
+github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 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/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY=
+github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE08qbEPm1M08qg=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
+github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU=
 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/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 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/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 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/lucas-clemente/quic-go v0.27.2 h1:zsMwwniyybb8B/UDNXRSYee7WpQJVOcjQEGgpw2ikXs=
+github.com/lucas-clemente/quic-go v0.27.2/go.mod h1:vXgO/11FBSKM+js1NxoaQ/bPtVFYfB7uxhfHXyMhl1A=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
+github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI=
+github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/marten-seemann/qpack v0.2.1 h1:jvTsT/HpCn2UZJdP+UUB53FfUUgeOyG5K1ns0OJOGVs=
+github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc=
+github.com/marten-seemann/qtls-go1-16 v0.1.5 h1:o9JrYPPco/Nukd/HpOHMHZoBDXQqoNtUCmny98/1uqQ=
+github.com/marten-seemann/qtls-go1-16 v0.1.5/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk=
+github.com/marten-seemann/qtls-go1-17 v0.1.2 h1:JADBlm0LYiVbuSySCHeY863dNkcpMmDR7s0bLKJeYlQ=
+github.com/marten-seemann/qtls-go1-17 v0.1.2/go.mod h1:C2ekUKcDdz9SDWxec1N/MvcXBpaX9l3Nx67XaR84L5s=
+github.com/marten-seemann/qtls-go1-18 v0.1.2 h1:JH6jmzbduz0ITVQ7ShevK10Av5+jBEKAHMntXmIV7kM=
+github.com/marten-seemann/qtls-go1-18 v0.1.2/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
 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/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 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/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo=
+github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM=
 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/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
+github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
+github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
 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/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
+github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
+github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E=
+github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc=
+github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
+github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
+github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
+github.com/onsi/gomega v1.13.0 h1:7lLHu94wT9Ij0o6EWWclhu0aOh32VxhkwEJvzuWPeak=
+github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY=
+github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8=
+github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 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/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
+github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 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/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
-github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
+github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
+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/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod h1:XhFIlyj5a1fBNx5aJTbKoIq0mNaPvOagO+HjB3EtxrY=
+github.com/shurcooL/events v0.0.0-20181021180414-410e4ca65f48/go.mod h1:5u70Mqkb5O5cxEA8nxTsgrgLehJeAw6Oc4Ab1c/P1HM=
+github.com/shurcooL/github_flavored_markdown v0.0.0-20181002035957-2122de532470/go.mod h1:2dOwnU2uBioM+SGy2aZoq1f/Sd1l9OkAeAUvjSyvgU0=
+github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk=
+github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ=
+github.com/shurcooL/gofontwoff v0.0.0-20180329035133-29b52fc0a18d/go.mod h1:05UtEgK5zq39gLST6uB0cf3NEHjETfB4Fgr3Gx5R9Vw=
+github.com/shurcooL/gopherjslib v0.0.0-20160914041154-feb6d3990c2c/go.mod h1:8d3azKNyqcHP1GaQE/c6dDgjkgSx2BZ4IoEi4F1reUI=
+github.com/shurcooL/highlight_diff v0.0.0-20170515013008-09bb4053de1b/go.mod h1:ZpfEhSmds4ytuByIcDnOLkTHGUI6KNqRNPDLHDk+mUU=
+github.com/shurcooL/highlight_go v0.0.0-20181028180052-98c3abbbae20/go.mod h1:UDKB5a1T23gOMUJrI+uSuH0VRDStOiUVSjBTRDVBVag=
+github.com/shurcooL/home v0.0.0-20181020052607-80b7ffcb30f9/go.mod h1:+rgNQw2P9ARFAs37qieuu7ohDNQ3gds9msbT2yn85sg=
+github.com/shurcooL/htmlg v0.0.0-20170918183704-d01228ac9e50/go.mod h1:zPn1wHpTIePGnXSHpsVPWEktKXHr6+SS6x/IKRb7cpw=
+github.com/shurcooL/httperror v0.0.0-20170206035902-86b7830d14cc/go.mod h1:aYMfkZ6DWSJPJ6c4Wwz3QtW22G7mf/PEgaB9k/ik5+Y=
+github.com/shurcooL/httpfs v0.0.0-20171119174359-809beceb2371/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg=
+github.com/shurcooL/httpgzip v0.0.0-20180522190206-b1c53ac65af9/go.mod h1:919LwcH0M7/W4fcZ0/jy0qGght1GIhqyS/EgWGH2j5Q=
+github.com/shurcooL/issues v0.0.0-20181008053335-6292fdc1e191/go.mod h1:e2qWDig5bLteJ4fwvDAc2NHzqFEthkqn7aOZAOpj+PQ=
+github.com/shurcooL/issuesapp v0.0.0-20180602232740-048589ce2241/go.mod h1:NPpHK2TI7iSaM0buivtFUc9offApnI0Alt/K8hcHy0I=
+github.com/shurcooL/notifications v0.0.0-20181007000457-627ab5aea122/go.mod h1:b5uSkrEVM1jQUspwbixRBhaIjIzL2xazXp6kntxYle0=
+github.com/shurcooL/octicon v0.0.0-20181028054416-fa4f57f9efb2/go.mod h1:eWdoE5JD4R5UVWDucdOPg1g2fqQRq78IQa9zlOV1vpQ=
+github.com/shurcooL/reactions v0.0.0-20181006231557-f2e0b4ca5b82/go.mod h1:TCR1lToEk4d2s07G3XGfz2QrgHXg4RJBvjrOozvoWfk=
+github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
+github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod h1:QJTqeLYEDaXHZDBsXlPCDqdhQuJkuw4NOtaxYe3xii4=
+github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod h1:hKmq5kWdCj2z2KEozexVbfEZIWiTjhE0+UjmZgPqehw=
+github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
+github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod h1:UdhH50NIW0fCiwBSr0co2m7BnFLdv4fQTgdqdJTHFeE=
+github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod h1:HuIsMU8RRBOtsCgI77wP899iHVBQpCmg4ErYMZB+2IA=
 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.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 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/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
+github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=
+github.com/tidwall/gjson v1.14.2 h1:6BBkirS0rAHjumnjHF6qgy5d2YAJ1TLIaFE2lzfOLqo=
+github.com/tidwall/gjson v1.14.2/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.20220326160643-893d4e910785 h1:alVsiLOu9H0GCriAkTMqn310izMNEzg9y1Z9FqAV1DY=
-github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220326160643-893d4e910785/go.mod h1:NwXIp7PgjV+kUALMXJ4v4/3QcsRSOodtjhLekuPXFog=
+github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU=
+github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM=
+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.20220715040337-ef4327320c40 h1:j+cmfkjc8WcBKiOsvMzcIgAuPhiTs7FBeiRn/QLVFhA=
+github.com/wdvxdr1123/ZeroBot v1.5.2-0.20220715040337-ef4327320c40/go.mod h1:LJ+VOf523i3IrykuLK53UEeWqnAclRL5d2wGT4sS4Zk=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=
 github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
+gitlab.com/gomidi/midi/v2 v2.0.17 h1:kf16wNwFFOskl0trvarOwMuZUQICdIGn37LP9QqIRuo=
+gitlab.com/gomidi/midi/v2 v2.0.17/go.mod h1:quTyMKSQ4Klevxu6gY4gy2USbeZra0fV5SalndmPfsY=
+go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA=
+go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE=
+golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw=
+golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 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-20200221231518-2aa609cf4a9d/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-20220321153916-2c7772ba3064 h1:S25/rfnfsMVgORT4/J61MJ7rdyseOZOyvLIrZEZ7s6s=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.0.0-20220321031419-a8550c1d254a h1:LnH9RNcpPv5Kzi15lXg42lYMPUf0x8CuPv1YnvBWZAg=
-golang.org/x/image v0.0.0-20220321031419-a8550c1d254a/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-20220722155232-062f8c9fd539 h1:/eM0PCrQI2xd471rI+snWuu251/+/jpBpZqir2mPdnU=
+golang.org/x/image v0.0.0-20220722155232-062f8c9fd539/go.mod h1:doUCurBvlfPMKfmIpRIywoHmhN3VyhnoFDbvIEWF4hY=
+golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
+golang.org/x/mod v0.4.2/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-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/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-20181029044818-c44066c5c816/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 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-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 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/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
+golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
+golang.org/x/net v0.0.0-20220805013720-a33c5aa5df48 h1:N9Vc/rorQUDes6B9CNdIxAn5jODGj2wzfrei2x4wNj4=
+golang.org/x/net v0.0.0-20220805013720-a33c5aa5df48/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/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/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/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-20190316082340-a2f829d7f35f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 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-20190904154756-749cb33beabd/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-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 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-20220325203850-36772127a21f h1:TrmogKRsSOxRMJbLYGrB4SBbW+LJcEllYBLME5Zk5pU=
-golang.org/x/sys v0.0.0-20220325203850-36772127a21f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220804214406-8e32c043e418 h1:9vYwv7OjYaky/tlAeD7C4oC9EsPTlaFl1H2jS++V+ME=
+golang.org/x/sys v0.0.0-20220804214406-8e32c043e418/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20181030000716-a0a13e073c7b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.1.1 h1:wGiQel/hW0NnEkJUk8lbzkX2gFJU6PFxf1v5OlCfuOs=
+golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 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=
+google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
+google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
+google.golang.org/api v0.1.0/go.mod h1:UGEZY7KEX120AnNLIHFMKIo4obdJhkp2tPbaPlQx13Y=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod h1:7Ep/1NZk928CDR8SjdVbjWNpdIf6nzjE3BTgJDr2Atg=
+google.golang.org/genproto v0.0.0-20190306203927-b5d61aea6440/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
+google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
+google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 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.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o=
+honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
 modernc.org/cc/v3 v3.33.6/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
 modernc.org/cc/v3 v3.33.9/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
@@ -206,7 +439,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 +480,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,12 +524,8 @@ 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/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.12 h1:pUBZTYoISfbb4pCf4PECENpbvwDBxeKc+/dS9LyOWFM=
-modernc.org/libc v1.14.12/go.mod h1:fJdoe23MHu2ruPQkFPPqCpToDi5cckzsbmkI6Ez0LqQ=
+modernc.org/libc v1.16.19 h1:S8flPn5ZeXx6iw/8yNa986hwTQDrY8RXU7tObZuAozo=
+modernc.org/libc v1.16.19/go.mod h1:p7Mg4+koNjc8jkqwcoFBJx7tXkpj00G77X7A72jXPXA=
 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=
@@ -310,9 +533,10 @@ 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/go.mod h1:B7OYswTRnfGg+4tDH1t1OeUNnsy2viGTdME4tzd+IjM=
-modernc.org/memory v1.0.6/go.mod h1:/0wo5ibyrQiaoUoH7f9D8dnglAmILJ5/cxZlRECf+Nw=
-modernc.org/memory v1.0.7 h1:UE3cxTRFa5tfUibAV7Jqq8P7zRY0OlJg+yWVIIaluEE=
-modernc.org/memory v1.0.7/go.mod h1:/0wo5ibyrQiaoUoH7f9D8dnglAmILJ5/cxZlRECf+Nw=
+modernc.org/memory v1.1.1 h1:bDOL0DIDLQv7bWhP3gMvIrnoFw+Eo6F7a2QK9HPDiFU=
+modernc.org/memory v1.1.1/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=
+sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck=
+sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0=

kanban/banner.go

@@ -10,13 +10,13 @@ import (
 var (
 	info = [...]string{
 		"* OneBot + ZeroBot + Golang",
-		"* Version 1.3.2 - 2022-03-13 13:21:15 +0800 CST",
+		"* Version 1.5.0-beta5 - 2022-07-22 15:39:17 +0800 CST",
 		"* Copyright © 2020 - 2022 FloatTech. All Rights Reserved.",
 		"* Project: https://github.com/FloatTech/ZeroBot-Plugin",
 	}
 	// Banner ...
 	Banner = strings.Join(info[:], "\n")
-	reg    = registry.NewRegReader("reilia.westeurope.cloudapp.azure.com:32664", "fumiama")
+	reg    = registry.NewRegReader("reilia.fumiama.top:32664", "fumiama")
 )
 
 // PrintBanner ...

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
@@ -23,8 +25,6 @@ import (
 	//                          vvvvvvvvvvvvvv                          //
 	//                               vvvv                               //
 
-	// webctrl "github.com/FloatTech/zbputils/control/web"           // web 后端控制
-
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/chat" // 基础词库
 
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/sleep_manage" // 统计睡眠时间
@@ -55,64 +55,68 @@ 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加解密
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/baidu"          // 百度一下
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/bilibili"       // 查询b站用户信息
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/bilibili_parse" // b站视频链接解析
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/book_review"    // 哀伤雪刃吧推书记录
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/cangtoushi"     // 藏头诗
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/choose"         // 选择困难症帮手
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/chouxianghua"   // 说抽象话
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/coser"          // 三次元小姐姐
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/cpstory"        // cp短打
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/danbooru"       // DeepDanbooru二次元图标签识别
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/diana"          // 嘉心糖发病
-	_ "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/image_finder"   // 关键字搜图
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/inject"         // 注入指令
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/jandan"         // 煎蛋网无聊图
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/juejuezi"       // 绝绝子生成器
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/lolicon"        // lolicon 随机图片
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/moyu"           // 摸鱼
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/moyu_calendar"  // 摸鱼人日历
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/music"          // 点歌
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/nativesetu"     // 本地涩图
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/nativewife"     // 本地老婆
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/nbnhhsh"        // 拼音首字母缩写释义工具
-	_ "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/reborn"         // 投胎
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/runcode"        // 在线运行代码
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/saucenao"       // 以图搜图
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/scale"          // 叔叔的AI二次元图片放大
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/score"          // 分数
-	_ "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/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/wordle"         // 猜单词
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/ymgal"          // 月幕galgame
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/zaobao"         // 早报
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/ai_false"      // 服务器监控
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/aiwife"        // 随机老婆
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/b14"           // base16384加解密
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/baidu"         // 百度一下
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/bilibili"      // b站相关
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/book_review"   // 哀伤雪刃吧推书记录
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/cangtoushi"    // 藏头诗
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/char_reverser" // 英文字符翻转
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/choose"        // 选择困难症帮手
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/chouxianghua"  // 说抽象话
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/coser"         // 三次元小姐姐
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/cpstory"       // cp短打
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/danbooru"      // DeepDanbooru二次元图标签识别
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/diana"         // 嘉心糖发病
+	_ "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/guessmusic"    // 猜歌
+	_ "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"        // 煎蛋网无聊图
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/juejuezi"      // 绝绝子生成器
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/lolicon"       // lolicon 随机图片
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/midicreate"    // 简易midi音乐制作
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/moyu"          // 摸鱼
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/moyu_calendar" // 摸鱼人日历
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/music"         // 点歌
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/nativesetu"    // 本地涩图
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/nativewife"    // 本地老婆
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/nbnhhsh"       // 拼音首字母缩写释义工具
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/nihongo"       // 日语语法学习
+	_ "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"      // 以图搜图
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/scale"         // 叔叔的AI二次元图片放大
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/score"         // 分数
+	_ "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/wtf"            // 鬼东西
-	// _ "github.com/FloatTech/ZeroBot-Plugin/plugin/bilibili_push"  // b站推送
 
 	//                               ^^^^                               //
 	//                          ^^^^^^^^^^^^^^                          //
@@ -156,31 +160,24 @@ import (
 	// -----------------------以上为内置依赖，勿动------------------------ //
 )
 
-var (
-	nicks  = []string{"ATRI", "atri", "亚托莉", "アトリ"}
-	token  *string
-	url    *string
-	adana  *string
-	prefix *string
-)
-
 func init() {
+	sus := make([]int64, 0, 16)
 	// 解析命令行参数
 	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:")
@@ -195,8 +192,58 @@ func init() {
 		}
 	}
 
-	// 启用 gui
-	// webctrl.InitGui(*g)
+	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)
+
+	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() {
@@ -210,15 +257,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

@@ -4,26 +4,39 @@ package aifalse
 import (
 	"fmt"
 	"math"
-	"os"
+	"strconv"
 	"time"
 
-	control "github.com/FloatTech/zbputils/control"
+	ctrl "github.com/FloatTech/zbpctrl"
+	"github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/shirou/gopsutil/v3/cpu"
 	"github.com/shirou/gopsutil/v3/disk"
 	"github.com/shirou/gopsutil/v3/mem"
-
-	"github.com/FloatTech/zbputils/control/order"
+	"github.com/sirupsen/logrus"
 
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 )
 
 func init() { // 插件主体
-	engine := control.Register("aifalse", order.AcquirePrio(), &control.Options{
+	engine := control.Register("aifalse", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
 		Help: "AIfalse\n" +
-			"- 查询计算机当前活跃度: [检查身体 | 自检 | 启动自检 | 系统状态]",
+			"- 查询计算机当前活跃度: [检查身体 | 自检 | 启动自检 | 系统状态]\n" +
+			"- 设置默认限速为每 m [分钟 | 秒] n 次触发",
 	})
+	c, ok := control.Lookup("aifalse")
+	if !ok {
+		panic("register aifalse error")
+	}
+	m := c.GetData(0)
+	n := (m >> 16) & 0xffff
+	m &= 0xffff
+	if m != 0 || n != 0 {
+		ctxext.SetDefaultLimiterManagerParam(time.Duration(m)*time.Second, int(n))
+		logrus.Infoln("设置默认限速为每", m, "秒触发", n, "次")
+	}
 	engine.OnFullMatchGroup([]string{"检查身体", "自检", "启动自检", "系统状态"}, zero.AdminPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SendChain(message.Text(
@@ -33,14 +46,41 @@ func init() { // 插件主体
 			),
 			)
 		})
-	engine.OnFullMatch("清理缓存", zero.SuperUserPermission).SetBlock(true).
+	engine.OnRegex(`^设置默认限速为每\s*(\d+)\s*(分钟|秒)\s*(\d+)\s*次触发$`, zero.SuperUserPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			err := os.RemoveAll("data/cache/*")
-			if err != nil {
-				ctx.SendChain(message.Text("错误: ", err.Error()))
-			} else {
-				ctx.SendChain(message.Text("成功!"))
+			c, ok := ctx.State["manager"].(*ctrl.Control[*zero.Ctx])
+			if !ok {
+				ctx.SendChain(message.Text("ERROR:no such plugin"))
+				return
 			}
+			m, err := strconv.ParseInt(ctx.State["regex_matched"].([]string)[1], 10, 64)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			if ctx.State["regex_matched"].([]string)[2] == "分钟" {
+				m *= 60
+			}
+			if m >= 65536 || m <= 0 {
+				ctx.SendChain(message.Text("ERROR:interval too big"))
+				return
+			}
+			n, err := strconv.ParseInt(ctx.State["regex_matched"].([]string)[3], 10, 64)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			if n >= 65536 || n <= 0 {
+				ctx.SendChain(message.Text("ERROR:burst too big"))
+				return
+			}
+			ctxext.SetDefaultLimiterManagerParam(time.Duration(m)*time.Second, int(n))
+			err = c.SetData(0, (m&0xffff)|((n<<16)&0xffff0000))
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			ctx.SendChain(message.Text("设置默认限速为每", m, "秒触发", n, "次"))
 		})
 }
 

plugin/ai_reply/ai_tts.go

@@ -1,7 +1,6 @@
 package aireply
 
 import (
-	"errors"
 	"regexp"
 	"strconv"
 	"sync"
@@ -15,28 +14,14 @@ import (
 	"github.com/FloatTech/AnimeAPI/tts"
 	"github.com/FloatTech/AnimeAPI/tts/baidutts"
 	"github.com/FloatTech/AnimeAPI/tts/mockingbird"
+	ctrl "github.com/FloatTech/zbpctrl"
 	"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,33 +38,57 @@ 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, &ctrl.Options[*zero.Ctx]{
 		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).
+	engine.OnRegex(`^设置语音模式(.*)$`, ctxext.ValueInList(func(ctx *zero.Ctx) string { return ctx.State["regex_matched"].([]string)[1] }, t)).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			param := ctx.State["regex_matched"].([]string)[1]
 			err := t.setSoundMode(ctx, param)
@@ -89,7 +98,7 @@ func init() {
 			}
 			ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("设置成功，当前模式为", param))
 		})
-	engine.OnRegex(`^设置默认语音模式(.*)$`, ctxext.FirstValueInList(t)).SetBlock(true).
+	engine.OnRegex(`^设置默认语音模式(.*)$`, ctxext.ValueInList(func(ctx *zero.Ctx) string { return ctx.State["regex_matched"].([]string)[1] }, t)).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			param := ctx.State["regex_matched"].([]string)[1]
 			t.setDefaultSoundMode(param)
@@ -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 {
@@ -116,10 +144,7 @@ func (t *ttsInstances) setSoundMode(ctx *zero.Ctx, name string) error {
 		}
 	}
 	t.RUnlock()
-	m, ok := control.Lookup(ttsServiceName)
-	if !ok {
-		return errors.New("no such plugin")
-	}
+	m := ctx.State["manager"].(*ctrl.Control[*zero.Ctx])
 	return m.SetData(gid, index)
 }
 
@@ -128,7 +153,7 @@ func (t *ttsInstances) getSoundMode(ctx *zero.Ctx) (name string) {
 	if gid == 0 {
 		gid = -ctx.Event.UserID
 	}
-	m, ok := control.Lookup(ttsServiceName)
+	m, ok := ctx.State["manager"].(*ctrl.Control[*zero.Ctx])
 	if ok {
 		t.RLock()
 		defer t.RUnlock()

plugin/ai_reply/main.go

@@ -6,12 +6,11 @@ import (
 	"time"
 
 	"github.com/FloatTech/AnimeAPI/aireply"
-	control "github.com/FloatTech/zbputils/control"
+	ctrl "github.com/FloatTech/zbpctrl"
+	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -21,7 +20,7 @@ const (
 var replyModes = [...]string{"青云客", "小爱"}
 
 func init() { // 插件主体
-	engine := control.Register(replyServiceName, order.AcquirePrio(), &control.Options{
+	engine := control.Register(replyServiceName, &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
 		Help: "人工智能回复\n" +
 			"- @Bot 任意文本(任意一句话回复)\n- 设置回复模式[青云客  |  小爱]\n- ",
@@ -69,7 +68,7 @@ func setReplyMode(ctx *zero.Ctx, name string) error {
 	if !ok {
 		return errors.New("no such mode")
 	}
-	m, ok := control.Lookup(replyServiceName)
+	m, ok := ctx.State["manager"].(*ctrl.Control[*zero.Ctx])
 	if !ok {
 		return errors.New("no such plugin")
 	}
@@ -81,7 +80,7 @@ func getReplyMode(ctx *zero.Ctx) (name string) {
 	if gid == 0 {
 		gid = -ctx.Event.UserID
 	}
-	m, ok := control.Lookup(replyServiceName)
+	m, ok := ctx.State["manager"].(*ctrl.Control[*zero.Ctx])
 	if ok {
 		index := m.GetData(gid)
 		if int(index) < len(replyModes) {

plugin/aiwife/non-existent.go

@@ -5,12 +5,11 @@ import (
 	"fmt"
 	"math/rand"
 
-	control "github.com/FloatTech/zbputils/control"
+	ctrl "github.com/FloatTech/zbpctrl"
+	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -18,7 +17,7 @@ const (
 )
 
 func init() { // 插件主体
-	control.Register("aiwife", order.AcquirePrio(), &control.Options{
+	control.Register("aiwife", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
 		Help: "AIWife\n" +
 			"- waifu | 随机waifu",

plugin/atri/atri.go

@@ -12,10 +12,9 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
-	control "github.com/FloatTech/zbputils/control"
+	ctrl "github.com/FloatTech/zbpctrl"
+	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/process"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -26,7 +25,7 @@ const (
 )
 
 func init() { // 插件主体
-	engine := control.Register(servicename, order.AcquirePrio(), &control.Options{
+	engine := control.Register(servicename, &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
 		Help: "本插件基于 ATRI ，为 Golang 移植版\n" +
 			"- ATRI醒醒\n- ATRI睡吧\n- 萝卜子\n- 喜欢 | 爱你 | 爱 | suki | daisuki | すき | 好き | 贴贴 | 老婆 | 亲一个 | mua\n" +
@@ -34,26 +33,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 +52,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 +158,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 +179,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 +194,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 +223,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 +232,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 +251,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

@@ -4,23 +4,22 @@ package b14coder
 import (
 	"unsafe"
 
-	control "github.com/FloatTech/zbputils/control"
+	ctrl "github.com/FloatTech/zbpctrl"
+	"github.com/FloatTech/zbputils/control"
 	base14 "github.com/fumiama/go-base16384"
 	tea "github.com/fumiama/gofastTEA"
 	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", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
 		Help: "base16384加解密\n" +
 			"- 加密xxx\n- 解密xxx\n- 用yyy加密xxx\n- 用yyy解密xxx",
 	})
-	en.OnRegex(`^加密\s?(.*)`).SetBlock(true).
+	en.OnRegex(`^加密\s*(.+)$`).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			str := ctx.State["regex_matched"].([]string)[1]
 			es := base14.EncodeString(str)
@@ -30,7 +29,7 @@ func init() {
 				ctx.SendChain(message.Text("加密失败!"))
 			}
 		})
-	en.OnRegex(`^解密\s?([一-踀]*[㴁-㴆]?)$`).SetBlock(true).
+	en.OnRegex(`^解密\s*([一-踀]+[㴁-㴆]?)$`).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			str := ctx.State["regex_matched"].([]string)[1]
 			es := base14.DecodeString(str)
@@ -40,7 +39,7 @@ func init() {
 				ctx.SendChain(message.Text("解密失败!"))
 			}
 		})
-	en.OnRegex(`^用(.*)加密\s?(.*)`).SetBlock(true).
+	en.OnRegex(`^用(.+)加密\s*(.+)$`).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			key, str := ctx.State["regex_matched"].([]string)[1], ctx.State["regex_matched"].([]string)[2]
 			t := getea(key)
@@ -51,7 +50,7 @@ func init() {
 				ctx.SendChain(message.Text("加密失败!"))
 			}
 		})
-	en.OnRegex(`^用(.*)解密\s?([一-踀]*[㴁-㴆]?)$`).SetBlock(true).
+	en.OnRegex(`^用(.+)解密\s*([一-踀]+[㴁-㴆]?)$`).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			key, str := ctx.State["regex_matched"].([]string)[1], ctx.State["regex_matched"].([]string)[2]
 			t := getea(key)

plugin/baidu/search.go

@@ -7,13 +7,13 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
+	ctrl "github.com/FloatTech/zbpctrl"
 	"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", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
 		Help: "baidu\n" +
 			"- 百度下[xxx]",

plugin/bilibili/api.go

@@ -0,0 +1,128 @@
+package bilibili
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"net/http"
+	"strconv"
+
+	"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\"")
+)
+
+// searchUser 查找b站用户
+func searchUser(keyword string) (r []searchResult, err error) {
+	data, err := web.GetData(fmt.Sprintf(searchUserURL, keyword))
+	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
+}
+
+// getVtbDetail 查找vtb信息
+func getVtbDetail(uid string) (result vtbDetail, err error) {
+	data, err := web.GetData(fmt.Sprintf(vtbDetailURL, uid))
+	if err != nil {
+		return
+	}
+	if err = json.Unmarshal(data, &result); err != nil {
+		return
+	}
+	return
+}
+
+// getMemberCard 获取b站个人详情
+func getMemberCard(uid interface{}) (result memberCard, err error) {
+	data, err := web.GetData(fmt.Sprintf(memberCardURL, uid))
+	if err != nil {
+		return
+	}
+	err = json.Unmarshal(binary.StringToBytes(gjson.ParseBytes(data).Get("card").Raw), &result)
+	if err != nil {
+		return
+	}
+	return
+}
+
+// getMedalwall 用b站uid获得牌子
+func getMedalwall(uid string) (result []medal, err error) {
+	client := &http.Client{}
+	req, err := http.NewRequest("GET", fmt.Sprintf(medalwallURL, uid), 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()
+	var md medalData
+	err = json.NewDecoder(res.Body).Decode(&md)
+	if err != nil {
+		return
+	}
+	if md.Code == -101 {
+		err = errNeedCookie
+		return
+	}
+	if md.Code != 0 {
+		err = errors.New(md.Message)
+	}
+	result = md.Data.List
+	return
+}
+
+// getArticleInfo 用id查专栏信息
+func getArticleInfo(id string) (card Card, err error) {
+	var data []byte
+	data, err = web.GetData(fmt.Sprintf(articleInfoURL, id))
+	if err != nil {
+		return
+	}
+	err = json.Unmarshal(binary.StringToBytes(gjson.ParseBytes(data).Get("data").Raw), &card)
+	return
+}
+
+// getLiveRoomInfo 用直播间id查直播间信息
+func getLiveRoomInfo(roomID string) (card roomCard, err error) {
+	var data []byte
+	data, err = web.GetData(fmt.Sprintf(liveRoomInfoURL, roomID))
+	if err != nil {
+		return
+	}
+	err = json.Unmarshal(binary.StringToBytes(gjson.ParseBytes(data).Get("data").Raw), &card)
+	return
+}
+
+// getVideoInfo 用av或bv查视频信息
+func getVideoInfo(id string) (card Card, err error) {
+	var data []byte
+	_, err = strconv.Atoi(id)
+	if err == nil {
+		data, err = web.GetData(fmt.Sprintf(videoInfoURL, id, ""))
+	} else {
+		data, err = web.GetData(fmt.Sprintf(videoInfoURL, "", id))
+	}
+	if err != nil {
+		return
+	}
+	err = json.Unmarshal(binary.StringToBytes(gjson.ParseBytes(data).Get("data").Raw), &card)
+	return
+}

plugin/bilibili/bilibili.go

@@ -0,0 +1,347 @@
+// Package bilibili 查询b站用户信息
+package bilibili
+
+import (
+	"encoding/binary"
+	"fmt"
+	"image"
+	"image/color"
+	"os"
+	"path"
+	"regexp"
+	"sort"
+	"strconv"
+	"time"
+
+	ctrl "github.com/FloatTech/zbpctrl"
+	"github.com/FloatTech/zbputils/control"
+	"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"
+)
+
+var re = regexp.MustCompile(`^\d+$`)
+
+// 查成分的
+func init() {
+	engine := control.Register("bilibili", &ctrl.Options[*zero.Ctx]{
+		DisableOnDefault: false,
+		Help: "bilibili\n" +
+			"- >vup info [xxx]\n" +
+			"- >user info [xxx]\n" +
+			"- 查成分 [xxx]\n" +
+			"- 设置b站cookie SESSDATA=82da790d,1663822823,06ecf*31\n" +
+			"- 更新vup",
+		PublicDataFolder: "Bilibili",
+	})
+	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})$`, getPara).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			id := ctx.State["uid"].(string)
+			card, err := getMemberCard(id)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			ctx.SendChain(message.Text(
+				"uid: ", card.Mid, "\n",
+				"name: ", card.Name, "\n",
+				"sex: ", card.Sex, "\n",
+				"sign: ", card.Sign, "\n",
+				"level: ", card.LevelInfo.CurrentLevel, "\n",
+				"birthday: ", card.Birthday,
+			))
+		})
+
+	engine.OnRegex(`^>vup info\s?(.{1,25})$`, getPara).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			id := ctx.State["uid"].(string)
+			// 获取详情
+			fo, err := getVtbDetail(id)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			ctx.SendChain(message.Text(
+				"b站id: ", 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 := getMemberCard(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 := getMedalwall(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 := searchUser(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 := searchUser(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/bilibili_parse.go

@@ -0,0 +1,105 @@
+package bilibili
+
+import (
+	"regexp"
+	"time"
+
+	ctrl "github.com/FloatTech/zbpctrl"
+	"github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+)
+
+var (
+	limit            = ctxext.NewLimiterManager(time.Second*10, 1)
+	searchVideo      = `bilibili.com\\?/video\\?/(?:av(\d+)|([bB][vV][0-9a-zA-Z]+))`
+	searchDynamic    = `(t.bilibili.com|m.bilibili.com\\?/dynamic)\\?/(\d+)`
+	searchArticle    = `bilibili.com\\?/read\\?/(?:cv|mobile\\?/)(\d+)`
+	searchLiveRoom   = `live.bilibili.com\\?/(\d+)`
+	searchVideoRe    = regexp.MustCompile(searchVideo)
+	searchDynamicRe  = regexp.MustCompile(searchDynamic)
+	searchArticleRe  = regexp.MustCompile(searchArticle)
+	searchLiveRoomRe = regexp.MustCompile(searchLiveRoom)
+)
+
+// 插件主体
+func init() {
+	en := control.Register("bilibiliparse", &ctrl.Options[*zero.Ctx]{
+		DisableOnDefault: false,
+		Help: "b站动态、专栏、视频、直播解析\n" +
+			"- t.bilibili.com/642277677329285174 | bilibili.com/read/cv17134450 | bilibili.com/video/BV13B4y1x7pS | live.bilibili.com/22603245 ",
+	})
+	en.OnRegex(`((b23|acg).tv|bili2233.cn)/[0-9a-zA-Z]+`).SetBlock(true).Limit(limit.LimitByGroup).
+		Handle(func(ctx *zero.Ctx) {
+			url := ctx.State["regex_matched"].([]string)[0]
+			realurl, err := getrealurl("https://" + url)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+			switch {
+			case searchVideoRe.MatchString(realurl):
+				ctx.State["regex_matched"] = searchVideoRe.FindStringSubmatch(realurl)
+				handleVideo(ctx)
+			case searchDynamicRe.MatchString(realurl):
+				ctx.State["regex_matched"] = searchDynamicRe.FindStringSubmatch(realurl)
+				handleDynamic(ctx)
+			case searchArticleRe.MatchString(realurl):
+				ctx.State["regex_matched"] = searchArticleRe.FindStringSubmatch(realurl)
+				handleArticle(ctx)
+			case searchLiveRoomRe.MatchString(realurl):
+				ctx.State["regex_matched"] = searchLiveRoomRe.FindStringSubmatch(realurl)
+				handleLive(ctx)
+			}
+		})
+	en.OnRegex(searchVideo).SetBlock(true).Limit(limit.LimitByGroup).Handle(handleVideo)
+	en.OnRegex(searchDynamic).SetBlock(true).Limit(limit.LimitByGroup).Handle(handleDynamic)
+	en.OnRegex(searchArticle).SetBlock(true).Limit(limit.LimitByGroup).Handle(handleArticle)
+	en.OnRegex(searchLiveRoom).SetBlock(true).Limit(limit.LimitByGroup).Handle(handleLive)
+}
+
+func handleVideo(ctx *zero.Ctx) {
+	id := ctx.State["regex_matched"].([]string)[1]
+	if id == "" {
+		id = ctx.State["regex_matched"].([]string)[2]
+	}
+	card, err := getVideoInfo(id)
+	if err != nil {
+		ctx.SendChain(message.Text("ERROR:", err))
+		return
+	}
+	msg, err := videoCard2msg(card)
+	if err != nil {
+		ctx.SendChain(message.Text("ERROR:", err))
+		return
+	}
+	ctx.SendChain(msg...)
+}
+
+func handleDynamic(ctx *zero.Ctx) {
+	msg, err := dynamicDetail(ctx.State["regex_matched"].([]string)[2])
+	if err != nil {
+		ctx.SendChain(message.Text("ERROR:", err))
+		return
+	}
+	ctx.SendChain(msg...)
+}
+
+func handleArticle(ctx *zero.Ctx) {
+	card, err := getArticleInfo(ctx.State["regex_matched"].([]string)[1])
+	if err != nil {
+		ctx.SendChain(message.Text("ERROR:", err))
+		return
+	}
+	ctx.SendChain(articleCard2msg(card, ctx.State["regex_matched"].([]string)[1])...)
+}
+
+func handleLive(ctx *zero.Ctx) {
+	card, err := getLiveRoomInfo(ctx.State["regex_matched"].([]string)[1])
+	if err != nil {
+		ctx.SendChain(message.Text("ERROR:", err))
+		return
+	}
+	ctx.SendChain(liveCard2msg(card)...)
+}

plugin/bilibili/card2msg.go

@@ -0,0 +1,233 @@
+package bilibili
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"time"
+
+	"github.com/FloatTech/zbputils/binary"
+	"github.com/FloatTech/zbputils/web"
+	"github.com/tidwall/gjson"
+	"github.com/wdvxdr1123/ZeroBot/message"
+)
+
+var (
+	typeMsg = map[int]string{
+		1:    "转发了动态",
+		2:    "有图营业",
+		4:    "无图营业",
+		8:    "投稿了视频",
+		16:   "投稿了短视频",
+		64:   "投稿了文章",
+		256:  "投稿了音频",
+		2048: "发布了简报",
+		4200: "发布了直播",
+		4308: "发布了直播",
+	}
+)
+
+// dynamicCard2msg cType=0时,处理DynCard字符串,cType=1, 2, 4, 8, 16, 64, 256, 2048, 4200, 4308时,处理Card字符串,cType为card类型
+func dynamicCard2msg(str string, cType int) (msg []message.MessageSegment, err error) {
+	var (
+		dynamicCard dynamicCard
+		card        Card
+		vote        Vote
+	)
+	msg = make([]message.MessageSegment, 0, 16)
+	// 初始化结构体
+	switch cType {
+	case 0:
+		err = json.Unmarshal(binary.StringToBytes(str), &dynamicCard)
+		if err != nil {
+			return
+		}
+		err = json.Unmarshal(binary.StringToBytes(dynamicCard.Card), &card)
+		if err != nil {
+			return
+		}
+		if dynamicCard.Extension.Vote != "" {
+			err = json.Unmarshal(binary.StringToBytes(dynamicCard.Extension.Vote), &vote)
+			if err != nil {
+				return
+			}
+		}
+		cType = dynamicCard.Desc.Type
+	case 1, 2, 4, 8, 16, 64, 256, 2048, 4200, 4308:
+		err = json.Unmarshal(binary.StringToBytes(str), &card)
+		if err != nil {
+			return
+		}
+	default:
+		err = errors.New("只有0, 1, 2, 4, 8, 16, 64, 256, 2048, 4200, 4308模式")
+		return
+	}
+	// 生成消息
+	switch cType {
+	case 1:
+		msg = append(msg, message.Text(card.User.Uname, typeMsg[cType], "\n",
+			card.Item.Content, "\n",
+			"转发的内容: \n"))
+		var originMsg []message.MessageSegment
+		originMsg, err = dynamicCard2msg(card.Origin, card.Item.OrigType)
+		if err != nil {
+			return
+		}
+		msg = append(msg, originMsg...)
+	case 2:
+		msg = append(msg, message.Text(card.User.Name, "在", time.Unix(int64(card.Item.UploadTime), 0).Format("2006-01-02 15:04:05"), typeMsg[cType], "\n",
+			card.Item.Description))
+		for i := 0; i < len(card.Item.Pictures); i++ {
+			msg = append(msg, message.Image(card.Item.Pictures[i].ImgSrc))
+		}
+	case 4:
+		msg = append(msg, message.Text(card.User.Uname, "在", time.Unix(int64(card.Item.Timestamp), 0).Format("2006-01-02 15:04:05"), typeMsg[cType], "\n",
+			card.Item.Content, "\n"))
+		if dynamicCard.Extension.Vote != "" {
+			msg = append(msg, message.Text("【投票】", vote.Desc, "\n",
+				"截止日期: ", time.Unix(int64(vote.Endtime), 0).Format("2006-01-02 15:04:05"), "\n",
+				"参与人数: ", humanNum(vote.JoinNum), "\n",
+				"投票选项( 最多选择", vote.ChoiceCnt, "项 )\n"))
+			for i := 0; i < len(vote.Options); i++ {
+				msg = append(msg, message.Text("- ", vote.Options[i].Idx, ". ", vote.Options[i].Desc, "\n"))
+				if vote.Options[i].ImgURL != "" {
+					msg = append(msg, message.Image(vote.Options[i].ImgURL))
+				}
+			}
+		}
+	case 8:
+		msg = append(msg, message.Text(card.Owner.Name, "在", time.Unix(int64(card.Pubdate), 0).Format("2006-01-02 15:04:05"), typeMsg[cType], "\n",
+			card.Title))
+		msg = append(msg, message.Image(card.Pic))
+		msg = append(msg, message.Text(card.Desc, "\n",
+			card.ShareSubtitle, "\n",
+			"视频链接: ", card.ShortLink, "\n"))
+	case 16:
+		msg = append(msg, message.Text(card.User.Name, "在", time.Unix(int64(card.Item.UploadTime), 0).Format("2006-01-02 15:04:05"), typeMsg[cType], "\n",
+			card.Item.Description))
+		msg = append(msg, message.Image(card.Item.Cover.Default))
+	case 64:
+		msg = append(msg, message.Text(card.Author.(map[string]interface{})["name"], "在", time.Unix(int64(card.PublishTime), 0).Format("2006-01-02 15:04:05"), typeMsg[cType], "\n",
+			card.Title, "\n",
+			card.Summary))
+		for i := 0; i < len(card.ImageUrls); i++ {
+			msg = append(msg, message.Image(card.ImageUrls[i]))
+		}
+		if card.ID != 0 {
+			msg = append(msg, message.Text("文章链接: https://www.bilibili.com/read/cv", card.ID, "\n"))
+		}
+	case 256:
+		msg = append(msg, message.Text(card.Upper, "在", time.Unix(int64(card.Ctime), 0).Format("2006-01-02 15:04:05"), typeMsg[cType], "\n",
+			card.Title))
+		msg = append(msg, message.Image(card.Cover))
+		msg = append(msg, message.Text(card.Intro, "\n"))
+		if card.ID != 0 {
+			msg = append(msg, message.Text("音频链接: https://www.bilibili.com/audio/au", card.ID, "\n"))
+		}
+
+	case 2048:
+		msg = append(msg, message.Text(card.User.Uname, typeMsg[cType], "\n",
+			card.Vest.Content, "\n",
+			card.Sketch.Title, "\n",
+			card.Sketch.DescText, "\n"))
+		msg = append(msg, message.Image(card.Sketch.CoverURL))
+		msg = append(msg, message.Text("分享链接: ", card.Sketch.TargetURL, "\n"))
+	case 4308:
+		if dynamicCard.Desc.UserProfile.Info.Uname != "" {
+			msg = append(msg, message.Text(dynamicCard.Desc.UserProfile.Info.Uname, typeMsg[cType], "\n"))
+		}
+		msg = append(msg, message.Image(card.LivePlayInfo.Cover))
+		msg = append(msg, message.Text("\n", card.LivePlayInfo.Title, "\n",
+			"房间号: ", card.LivePlayInfo.RoomID, "\n",
+			"分区: ", card.LivePlayInfo.ParentAreaName))
+		if card.LivePlayInfo.ParentAreaName != card.LivePlayInfo.AreaName {
+			msg = append(msg, message.Text("-", card.LivePlayInfo.AreaName))
+		}
+		if card.LivePlayInfo.LiveStatus == 0 {
+			msg = append(msg, message.Text("未开播 \n"))
+		} else {
+			msg = append(msg, message.Text("直播中 ", card.LivePlayInfo.WatchedShow, "\n"))
+		}
+		msg = append(msg, message.Text("直播链接: ", card.LivePlayInfo.Link))
+	default:
+		msg = append(msg, message.Text("动态id: ", dynamicCard.Desc.DynamicIDStr, "未知动态类型: ", cType, "\n"))
+	}
+	if dynamicCard.Desc.DynamicIDStr != "" {
+		msg = append(msg, message.Text("动态链接: ", tURL, dynamicCard.Desc.DynamicIDStr))
+	}
+	return
+}
+
+// dynamicDetail 用动态id查动态信息
+func dynamicDetail(dynamicIDStr string) (msg []message.MessageSegment, err error) {
+	var data []byte
+	data, err = web.GetData(fmt.Sprintf(dynamicDetailURL, dynamicIDStr))
+	if err != nil {
+		return
+	}
+	return dynamicCard2msg(gjson.ParseBytes(data).Get("data.card").Raw, 0)
+}
+
+// articleCard2msg 专栏转消息
+func articleCard2msg(card Card, defaultID string) (msg []message.MessageSegment) {
+	msg = make([]message.MessageSegment, 0, 16)
+	for i := 0; i < len(card.OriginImageUrls); i++ {
+		msg = append(msg, message.Image(card.OriginImageUrls[i]))
+	}
+	msg = append(msg, message.Text("\n", card.Title, "\n", "UP主: ", card.AuthorName, "\n",
+		"阅读: ", humanNum(card.Stats.View), " 评论: ", humanNum(card.Stats.Reply), "\n",
+		cvURL, defaultID))
+	return
+}
+
+// liveCard2msg 直播卡片转消息
+func liveCard2msg(card roomCard) (msg []message.MessageSegment) {
+	msg = make([]message.MessageSegment, 0, 16)
+	msg = append(msg, message.Image(card.RoomInfo.Keyframe))
+	msg = append(msg, message.Text("\n", card.RoomInfo.Title, "\n",
+		"主播: ", card.AnchorInfo.BaseInfo.Uname, "\n",
+		"房间号: ", card.RoomInfo.RoomID, "\n"))
+	if card.RoomInfo.ShortID != 0 {
+		msg = append(msg, message.Text("短号: ", card.RoomInfo.ShortID, "\n"))
+	}
+	msg = append(msg, message.Text("分区: ", card.RoomInfo.ParentAreaName))
+	if card.RoomInfo.ParentAreaName != card.RoomInfo.AreaName {
+		msg = append(msg, message.Text("-", card.RoomInfo.AreaName))
+	}
+	if card.RoomInfo.LiveStatus == 0 {
+		msg = append(msg, message.Text("未开播 \n"))
+	} else {
+		msg = append(msg, message.Text("直播中 ", humanNum(card.RoomInfo.Online), "人气\n"))
+	}
+	if card.RoomInfo.ShortID != 0 {
+		msg = append(msg, message.Text("直播间链接: ", lURL, card.RoomInfo.ShortID))
+	} else {
+		msg = append(msg, message.Text("直播间链接: ", lURL, card.RoomInfo.RoomID))
+	}
+
+	return
+}
+
+// videoCard2msg 视频卡片转消息
+func videoCard2msg(card Card) (msg []message.MessageSegment, err error) {
+	var mCard memberCard
+	msg = make([]message.MessageSegment, 0, 16)
+	mCard, err = getMemberCard(card.Owner.Mid)
+	if err != nil {
+		return
+	}
+	msg = append(msg, message.Text("标题: ", card.Title, "\n"))
+	if card.Rights.IsCooperation == 1 {
+		for i := 0; i < len(card.Staff); i++ {
+			msg = append(msg, message.Text(card.Staff[i].Title, ": ", card.Staff[i].Name, " 粉丝: ", humanNum(card.Staff[i].Follower), "\n"))
+		}
+	} else {
+		msg = append(msg, message.Text("UP主: ", card.Owner.Name, " 粉丝: ", humanNum(mCard.Fans), "\n"))
+	}
+	msg = append(msg, message.Text("播放: ", humanNum(card.Stat.View), " 弹幕: ", humanNum(card.Stat.Danmaku)))
+	msg = append(msg, message.Image(card.Pic))
+	msg = append(msg, message.Text("\n点赞: ", humanNum(card.Stat.Like), " 投币: ", humanNum(card.Stat.Coin), "\n",
+		"收藏: ", humanNum(card.Stat.Favorite), " 分享: ", humanNum(card.Stat.Share), "\n",
+		vURL, card.BvID))
+	return
+}

plugin/bilibili/card2msg_test.go

@@ -0,0 +1,82 @@
+package bilibili
+
+import (
+	"testing"
+)
+
+func TestArticleInfo(t *testing.T) {
+	card, err := getArticleInfo("17279244")
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log(articleCard2msg(card, "17279244"))
+
+}
+
+func TestDynamicDetail(t *testing.T) {
+	t.Log("cType = 1")
+	t.Log(dynamicDetail("642279068898689029"))
+
+	t.Log("cType = 2")
+	t.Log(dynamicDetail("642470680290394121"))
+
+	t.Log("cType = 2048")
+	t.Log(dynamicDetail("642277677329285174"))
+
+	t.Log("cType = 4")
+	t.Log(dynamicDetail("642154347357011968"))
+
+	t.Log("cType = 8")
+	t.Log(dynamicDetail("675892999274627104"))
+
+	t.Log("cType = 4308")
+	t.Log(dynamicDetail("668598718656675844"))
+
+	t.Log("cType = 64")
+	t.Log(dynamicDetail("675966082178088963"))
+
+	t.Log("cType = 256")
+	t.Log(dynamicDetail("599253048535707632"))
+
+	t.Log("cType = 4,投票类型")
+	t.Log(dynamicDetail("677231070435868704"))
+}
+
+func TestMemberCard(t *testing.T) {
+	card, err := getMemberCard(2)
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Logf("%+v\n", card)
+}
+
+func TestVideoInfo(t *testing.T) {
+	card, err := getVideoInfo("10007")
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log(videoCard2msg(card))
+	card, err = getVideoInfo("BV1xx411c7mD")
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log(videoCard2msg(card))
+	card, err = getVideoInfo("bv1xx411c7mD")
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log(videoCard2msg(card))
+	card, err = getVideoInfo("BV1mF411j7iU")
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log(videoCard2msg(card))
+}
+
+func TestLiveRoomInfo(t *testing.T) {
+	card, err := getLiveRoomInfo("83171")
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log(liveCard2msg(card))
+}

plugin/bilibili/info.go

@@ -1,65 +0,0 @@
-// Package bilibili 查询b站用户信息
-package bilibili
-
-import (
-	"io"
-	"net/http"
-
-	control "github.com/FloatTech/zbputils/control"
-	"github.com/tidwall/gjson"
-	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{
-	DisableOnDefault: false,
-	Help: "bilibili\n" +
-		"- >vup info [名字 | uid]\n" +
-		"- >user info [名字 | uid]",
-})
-
-// 查成分的
-func init() {
-	engine.OnRegex(`^>(?:user|vup)\s?info\s?(.{1,25})$`).SetBlock(true).
-		Handle(func(ctx *zero.Ctx) {
-			keyword := ctx.State["regex_matched"].([]string)[1]
-			rest, err := uid(keyword)
-			if err != nil {
-				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)
-			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
-				return
-			}
-			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"),
-			))
-		})
-}

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/types.go

@@ -0,0 +1,267 @@
+package bilibili
+
+const (
+	// tURL bilibili动态前缀
+	tURL = "https://t.bilibili.com/"
+	// dynamicDetailURL 当前动态信息,一个card
+	dynamicDetailURL = "https://api.vc.bilibili.com/dynamic_svr/v1/dynamic_svr/get_dynamic_detail?dynamic_id=%v"
+	// memberCardURL 个人信息
+	memberCardURL = "https://account.bilibili.com/api/member/getCardByMid?mid=%v"
+	// articleInfoURL 查看专栏信息
+	articleInfoURL = "https://api.bilibili.com/x/article/viewinfo?id=%v"
+	// cvURL b站专栏前缀
+	cvURL = "https://www.bilibili.com/read/cv"
+	// liveRoomInfoURL 查看直播间信息
+	liveRoomInfoURL = "https://api.live.bilibili.com/xlive/web-room/v1/index/getInfoByRoom?room_id=%v"
+	// lURL b站直播间前缀
+	lURL = "https://live.bilibili.com/"
+	// videoInfoURL 查看视频信息
+	videoInfoURL = "https://api.bilibili.com/x/web-interface/view?aid=%v&bvid=%v"
+	// vURL 视频网址前缀
+	vURL = "https://www.bilibili.com/video/"
+	// searchUserURL 查找b站用户
+	searchUserURL = "http://api.bilibili.com/x/web-interface/search/type?search_type=bili_user&keyword=%v"
+	// vtbDetailURL 查找vtb信息
+	vtbDetailURL = "https://api.vtbs.moe/v1/detail/%v"
+	// medalwallURL 查找牌子
+	medalwallURL = "https://api.live.bilibili.com/xlive/web-ucenter/user/MedalWall?target_id=%v"
+)
+
+// dynamicCard 总动态结构体,包括desc,card
+type dynamicCard struct {
+	Desc      Desc   `json:"desc"`
+	Card      string `json:"card"`
+	Extension struct {
+		VoteCfg struct {
+			VoteID  int    `json:"vote_id"`
+			Desc    string `json:"desc"`
+			JoinNum int    `json:"join_num"`
+		} `json:"vote_cfg"`
+		Vote string `json:"vote"`
+	} `json:"extension"`
+}
+
+// Card 卡片结构体
+type Card struct {
+	Item struct {
+		Content     string `json:"content"`
+		UploadTime  int    `json:"upload_time"`
+		Description string `json:"description"`
+		Pictures    []struct {
+			ImgSrc string `json:"img_src"`
+		} `json:"pictures"`
+		Timestamp int `json:"timestamp"`
+		Cover     struct {
+			Default string `json:"default"`
+		} `json:"cover"`
+		OrigType int `json:"orig_type"`
+	} `json:"item"`
+	AID             interface{} `json:"aid"`
+	BvID            interface{} `json:"bvid"`
+	Dynamic         interface{} `json:"dynamic"`
+	Pic             string      `json:"pic"`
+	Title           string      `json:"title"`
+	ID              int         `json:"id"`
+	Summary         string      `json:"summary"`
+	ImageUrls       []string    `json:"image_urls"`
+	OriginImageUrls []string    `json:"origin_image_urls"`
+	Sketch          struct {
+		Title     string `json:"title"`
+		DescText  string `json:"desc_text"`
+		CoverURL  string `json:"cover_url"`
+		TargetURL string `json:"target_url"`
+	} `json:"sketch"`
+	Stat struct {
+		Aid      int `json:"aid"`
+		View     int `json:"view"`
+		Danmaku  int `json:"danmaku"`
+		Reply    int `json:"reply"`
+		Favorite int `json:"favorite"`
+		Coin     int `json:"coin"`
+		Share    int `json:"share"`
+		Like     int `json:"like"`
+	} `json:"stat"`
+	Stats struct {
+		Aid      int `json:"aid"`
+		View     int `json:"view"`
+		Danmaku  int `json:"danmaku"`
+		Reply    int `json:"reply"`
+		Favorite int `json:"favorite"`
+		Coin     int `json:"coin"`
+		Share    int `json:"share"`
+		Like     int `json:"like"`
+	} `json:"stats"`
+	Owner struct {
+		Name    string `json:"name"`
+		Pubdate int    `json:"pubdate"`
+		Mid     int    `json:"mid"`
+	} `json:"owner"`
+	Cover        string      `json:"cover"`
+	ShortID      interface{} `json:"short_id"`
+	LivePlayInfo struct {
+		ParentAreaName string `json:"parent_area_name"`
+		AreaName       string `json:"area_name"`
+		Cover          string `json:"cover"`
+		Link           string `json:"link"`
+		Online         int    `json:"online"`
+		RoomID         int    `json:"room_id"`
+		LiveStatus     int    `json:"live_status"`
+		WatchedShow    string `json:"watched_show"`
+		Title          string `json:"title"`
+	} `json:"live_play_info"`
+	Intro      string      `json:"intro"`
+	Schema     string      `json:"schema"`
+	Author     interface{} `json:"author"`
+	AuthorName string      `json:"author_name"`
+	PlayCnt    int         `json:"play_cnt"`
+	ReplyCnt   int         `json:"reply_cnt"`
+	TypeInfo   string      `json:"type_info"`
+	User       struct {
+		Name  string `json:"name"`
+		Uname string `json:"uname"`
+	} `json:"user"`
+	Desc          string `json:"desc"`
+	ShareSubtitle string `json:"share_subtitle"`
+	ShortLink     string `json:"short_link"`
+	PublishTime   int    `json:"publish_time"`
+	BannerURL     string `json:"banner_url"`
+	Ctime         int    `json:"ctime"`
+	Vest          struct {
+		Content string `json:"content"`
+	} `json:"vest"`
+	Upper   string `json:"upper"`
+	Origin  string `json:"origin"`
+	Pubdate int    `json:"pubdate"`
+	Rights  struct {
+		IsCooperation int `json:"is_cooperation"`
+	} `json:"rights"`
+	Staff []struct {
+		Title    string `json:"title"`
+		Name     string `json:"name"`
+		Follower int    `json:"follower"`
+	} `json:"staff"`
+}
+
+// Desc 描述结构体
+type Desc struct {
+	Type         int    `json:"type"`
+	DynamicIDStr string `json:"dynamic_id_str"`
+	OrigType     int    `json:"orig_type"`
+	Timestamp    int    `json:"timestamp"`
+	Origin       struct {
+		DynamicIDStr string `json:"dynamic_id_str"`
+	} `json:"origin"`
+	UserProfile struct {
+		Info struct {
+			Uname string `json:"uname"`
+		} `json:"info"`
+	} `json:"user_profile"`
+}
+
+// Vote 投票结构体
+type Vote struct {
+	ChoiceCnt int    `json:"choice_cnt"`
+	Desc      string `json:"desc"`
+	Endtime   int    `json:"endtime"`
+	JoinNum   int    `json:"join_num"`
+	Options   []struct {
+		Idx    int    `json:"idx"`
+		Desc   string `json:"desc"`
+		ImgURL string `json:"img_url"`
+	} `json:"options"`
+}
+
+// memberCard 个人信息卡片
+type memberCard struct {
+	Mid        string  `json:"mid"`
+	Name       string  `json:"name"`
+	Sex        string  `json:"sex"`
+	Face       string  `json:"face"`
+	Coins      float64 `json:"coins"`
+	Regtime    int64   `json:"regtime"`
+	Birthday   string  `json:"birthday"`
+	Sign       string  `json:"sign"`
+	Attentions []int64 `json:"attentions"`
+	Fans       int     `json:"fans"`
+	Friend     int     `json:"friend"`
+	Attention  int     `json:"attention"`
+	LevelInfo  struct {
+		CurrentLevel int `json:"current_level"`
+	} `json:"level_info"`
+}
+
+// roomCard 直播间卡片
+type roomCard struct {
+	RoomInfo struct {
+		RoomID         int    `json:"room_id"`
+		ShortID        int    `json:"short_id"`
+		Title          string `json:"title"`
+		LiveStatus     int    `json:"live_status"`
+		AreaName       string `json:"area_name"`
+		ParentAreaName string `json:"parent_area_name"`
+		Keyframe       string `json:"keyframe"`
+		Online         int    `json:"online"`
+	} `json:"room_info"`
+	AnchorInfo struct {
+		BaseInfo struct {
+			Uname string `json:"uname"`
+		} `json:"base_info"`
+	} `json:"anchor_info"`
+}
+
+// searchResult 查找b站用户结果
+type searchResult struct {
+	Mid    int64  `json:"mid"`
+	Uname  string `json:"uname"`
+	Gender int64  `json:"gender"`
+	Usign  string `json:"usign"`
+	Level  int64  `json:"level"`
+}
+
+// medalData 牌子接口返回结构体
+type medalData struct {
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+	Data    struct {
+		List []medal `json:"list"`
+	} `json:"data"`
+}
+
+// medalInfo b站牌子信息
+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
+}
+
+// vtb信息
+type vtbDetail 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"`
+}

plugin/bilibili/util.go

@@ -0,0 +1,25 @@
+package bilibili
+
+import (
+	"net/http"
+	"strconv"
+)
+
+// humanNum 格式化人数
+func humanNum(res int) string {
+	if res/10000 != 0 {
+		return strconv.FormatFloat(float64(res)/10000, 'f', 2, 64) + "万"
+	}
+	return strconv.Itoa(res)
+}
+
+// getrealurl 获取跳转后的链接
+func getrealurl(url string) (realurl string, err error) {
+	data, err := http.Head(url)
+	if err != nil {
+		return
+	}
+	_ = data.Body.Close()
+	realurl = data.Request.URL.String()
+	return
+}

plugin/bilibili_parse/bilibili_parse.go

@@ -1,72 +0,0 @@
-// Package bilibiliparse b站视频链接解析
-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 (
-	bilibiliRe = "https://www.bilibili.com/video/av[0-9]+|https://www.bilibili.com/video/BV[0-9a-zA-Z]+|https://b23.tv/[0-9a-zA-Z]+|https://www.bilibili.com/video/bv[0-9a-zA-Z]+"
-	validRe    = "https://www.bilibili.com/video/(BV[0-9a-zA-Z]+)"
-)
-
-func init() {
-	engine := control.Register("bilibiliparse", order.AcquirePrio(), &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",
-	})
-
-	engine.OnRegex(bilibiliRe).SetBlock(true).Handle(func(ctx *zero.Ctx) {
-		bilibiliURL := ctx.State["regex_matched"].([]string)[0]
-		m := parseURL(bilibiliURL)
-		if len(m) != 0 {
-			ctx.Send(m)
-		}
-	})
-}
-
-func parseURL(bilibiliURL string) (m message.Message) {
-	doc, err := htmlquery.LoadURL(bilibiliURL)
-	if err != nil {
-		log.Errorln("[bilibiliparse]:访问的链接为", bilibiliURL, ",错误为", err)
-	}
-	videoURL := htmlquery.FindOne(doc, "/html/head/meta[@itemprop='url']").Attr[2].Val
-	re := regexp.MustCompile(validRe)
-	if !re.MatchString(videoURL) {
-		return
-	}
-	bv := re.FindStringSubmatch(videoURL)[1]
-	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
-	m = append(m, message.Text(view+dm+"\n"))
-	t := htmlquery.FindOne(doc, "//*[@id='viewbox_report']/div/span[3]/text()").Data
-	m = append(m, message.Text(t))
-	image := htmlquery.FindOne(doc, "/html/head/meta[@itemprop='image']").Attr[2].Val
-	m = append(m, message.Image(image))
-	like := htmlquery.FindOne(doc, "//*[@id='arc_toolbar_report']/div[1]/span[@class='like']/text()").Data
-	coin := htmlquery.FindOne(doc, "//*[@id='arc_toolbar_report']/div[1]/span[@class='coin']/text()").Data
-	m = append(m, message.Text("\n点赞：", strings.TrimSpace(like)+"，投币：", strings.TrimSpace(coin)+"\n"))
-	collect := htmlquery.FindOne(doc, "//*[@id='arc_toolbar_report']/div[1]/span[@class='collect']/text()").Data
-	share := htmlquery.FindOne(doc, "//*[@id='arc_toolbar_report']/div[1]/span[@class='share']/text()").Data
-	m = append(m, message.Text("收藏：", strings.TrimSpace(collect)+"，分享：", strings.TrimSpace(share)+"\n"))
-	m = append(m, message.Text(bv))
-	return
-}

plugin/bilibili_push/bilibili_push.go

@@ -1,562 +0,0 @@
-// Package bilibilipush b站推送
-package bilibilipush
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"strconv"
-	"time"
-
-	log "github.com/sirupsen/logrus"
-	"github.com/tidwall/gjson"
-	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/img/text"
-	"github.com/FloatTech/zbputils/web"
-)
-
-const (
-	ua             = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.107 Safari/537.36"
-	referer        = "https://www.bilibili.com/"
-	infoURL        = "https://api.bilibili.com/x/space/acc/info?mid=%d"
-	userDynamicURL = "https://api.vc.bilibili.com/dynamic_svr/v1/dynamic_svr/space_history?host_uid=%d&offset_dynamic_id=0&need_top=0"
-	liveListURL    = "https://api.live.bilibili.com/room/v1/Room/get_status_info_by_uids"
-	tURL           = "https://t.bilibili.com/"
-	liveURL        = "https://live.bilibili.com/"
-	serviceName    = "bilibilipush"
-)
-
-// bdb bilibili推送数据库
-var bdb *bilibilipushdb
-
-var (
-	lastTime = map[int64]int64{}
-	typeMsg  = map[int64]string{
-		1:   "转发了一条动态",
-		2:   "有图营业",
-		4:   "无图营业",
-		8:   "发布了新投稿",
-		16:  "发布了短视频",
-		64:  "发布了新专栏",
-		256: "发布了新音频",
-	}
-	liveStatus  = map[int64]int{}
-	uidErrorMsg = map[int]string{
-		0:    "输入的uid有效",
-		-400: "uid不存在，注意uid不是房间号",
-		-402: "uid不存在，注意uid不是房间号",
-		-412: "操作过于频繁IP暂时被风控，请半小时后再尝试",
-	}
-	upMap = map[int64]string{}
-)
-
-func init() {
-	go bilibiliPushDaily()
-	en := control.Register(serviceName, order.AcquirePrio(), &control.Options{
-		DisableOnDefault: false,
-		Help: "bilibilipush\n" +
-			"- 添加订阅[uid]\n" +
-			"- 取消订阅[uid]\n" +
-			"- 取消动态订阅[uid]\n" +
-			"- 取消直播订阅[uid]\n" +
-			"- 推送列表",
-		PrivateDataFolder: serviceName,
-	})
-
-	// 加载数据库
-	go func() {
-		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) {
-		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)
-			if status != 0 {
-				msg, ok := uidErrorMsg[status]
-				if !ok {
-					msg = "未知错误，请私聊反馈给" + zero.BotConfig.NickName[0]
-				}
-				ctx.SendChain(message.Text(msg))
-				return
-			}
-		}
-		gid := ctx.Event.GroupID
-		if gid == 0 {
-			gid = -ctx.Event.UserID
-		}
-		if err := subscribe(buid, gid); err != nil {
-			log.Errorln("[bilibilipush]:", err)
-		} else {
-			ctx.SendChain(message.Text("已添加" + name + "的订阅"))
-		}
-	})
-	en.OnRegex(`^取消订阅\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)
-			if status != 0 {
-				msg, ok := uidErrorMsg[status]
-				if !ok {
-					msg = "未知错误，请私聊反馈给" + zero.BotConfig.NickName[0]
-				}
-				ctx.SendChain(message.Text(msg))
-				return
-			}
-		}
-		gid := ctx.Event.GroupID
-		if gid == 0 {
-			gid = -ctx.Event.UserID
-		}
-		if err := unsubscribe(buid, gid); err != nil {
-			log.Errorln("[bilibilipush]:", err)
-		} else {
-			ctx.SendChain(message.Text("已取消" + name + "的订阅"))
-		}
-	})
-	en.OnRegex(`^取消动态订阅\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)
-			if status != 0 {
-				msg, ok := uidErrorMsg[status]
-				if !ok {
-					msg = "未知错误，请私聊反馈给" + zero.BotConfig.NickName[0]
-				}
-				ctx.SendChain(message.Text(msg))
-				return
-			}
-		}
-		gid := ctx.Event.GroupID
-		if gid == 0 {
-			gid = -ctx.Event.UserID
-		}
-		if err := unsubscribeDynamic(buid, gid); err != nil {
-			log.Errorln("[bilibilipush]:", err)
-		} else {
-			ctx.SendChain(message.Text("已取消" + name + "的动态订阅"))
-		}
-	})
-	en.OnRegex(`^取消直播订阅\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)
-			if status != 0 {
-				msg, ok := uidErrorMsg[status]
-				if !ok {
-					msg = "未知错误，请私聊反馈给" + zero.BotConfig.NickName[0]
-				}
-				ctx.SendChain(message.Text(msg))
-				return
-			}
-		}
-		gid := ctx.Event.GroupID
-		if gid == 0 {
-			gid = -ctx.Event.UserID
-		}
-		if err := unsubscribeLive(buid, gid); err != nil {
-			log.Errorln("[bilibilipush]:", err)
-		} else {
-			ctx.SendChain(message.Text("已取消" + name + "的直播订阅"))
-		}
-	})
-	en.OnFullMatch("推送列表", 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 := "--------推送列表--------"
-		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 {
-				msg += "●"
-			} else {
-				msg += "○"
-			}
-			msg += " 直播："
-			if v.LiveDisable == 0 {
-				msg += "●"
-			} else {
-				msg += "○"
-			}
-			msg += " up主：" + upMap[v.BilibiliUID]
-		}
-		data, err := text.RenderToBase64(msg, text.FontFile, 600, 20)
-		if err != nil {
-			log.Errorln("[bilibilipush]:", err)
-		}
-		if id := ctx.SendChain(message.Image("base64://" + binary.BytesToString(data))); id.ID() == 0 {
-			ctx.SendChain(message.Text("ERROR:可能被风控了"))
-		}
-	})
-}
-
-func bilibiliPushDaily() {
-	t := time.NewTicker(time.Second * 10)
-	defer t.Stop()
-	for range t.C {
-		log.Println("-----bilibilipush拉取推送信息-----")
-		sendDynamic()
-		sendLive()
-	}
-}
-
-func checkBuid(buid int64) (status int, name string) {
-	data, err := web.RequestDataWith(web.NewDefaultClient(), fmt.Sprintf(infoURL, buid), "GET", referer, ua)
-	if err != nil {
-		log.Errorln("[bilibilipush]:", err)
-	}
-	status = int(gjson.Get(binary.BytesToString(data), "code").Int())
-	name = gjson.Get(binary.BytesToString(data), "data.name").String()
-	if status == 0 {
-		bdb.insertBilibiliUp(buid, name)
-		upMap[buid] = name
-	}
-	return
-}
-
-// subscribe 订阅
-func subscribe(buid, groupid int64) (err error) {
-	bpMap := map[string]interface{}{
-		"bilibili_uid":    buid,
-		"group_id":        groupid,
-		"live_disable":    0,
-		"dynamic_disable": 0,
-	}
-	err = bdb.insertOrUpdateLiveAndDynamic(bpMap)
-	return
-}
-
-// unsubscribe 取消订阅
-func unsubscribe(buid, groupid int64) (err error) {
-	bpMap := map[string]interface{}{
-		"bilibili_uid":    buid,
-		"group_id":        groupid,
-		"live_disable":    1,
-		"dynamic_disable": 1,
-	}
-	err = bdb.insertOrUpdateLiveAndDynamic(bpMap)
-	return
-}
-
-func unsubscribeDynamic(buid, groupid int64) (err error) {
-	bpMap := map[string]interface{}{
-		"bilibili_uid":    buid,
-		"group_id":        groupid,
-		"dynamic_disable": 1,
-	}
-	err = bdb.insertOrUpdateLiveAndDynamic(bpMap)
-	return
-}
-
-func unsubscribeLive(buid, groupid int64) (err error) {
-	bpMap := map[string]interface{}{
-		"bilibili_uid": buid,
-		"group_id":     groupid,
-		"live_disable": 1,
-	}
-	err = bdb.insertOrUpdateLiveAndDynamic(bpMap)
-	return
-}
-
-func getUserDynamicCard(buid int64) (cardList []gjson.Result) {
-	data, err := web.RequestDataWith(web.NewDefaultClient(), fmt.Sprintf(userDynamicURL, buid), "GET", referer, ua)
-	if err != nil {
-		log.Errorln("[bilibilipush]:", err)
-	}
-	cardList = gjson.Get(binary.BytesToString(data), "data.cards").Array()
-	return
-}
-
-func getLiveList(uids ...int64) string {
-	m := make(map[string]interface{})
-	m["uids"] = uids
-	b, _ := json.Marshal(m)
-	client := &http.Client{}
-	// 提交请求
-	request, err := http.NewRequest("POST", liveListURL, bytes.NewBuffer(b))
-	if err != nil {
-		log.Errorln("[bilibilipush]:", 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)
-}
-
-func sendDynamic() {
-	uids := bdb.getAllBuidByDynamic()
-	for _, buid := range uids {
-		cardList := getUserDynamicCard(buid)
-		if len(cardList) == 0 {
-			return
-		}
-		t, ok := lastTime[buid]
-		if !ok {
-			lastTime[buid] = cardList[0].Get("desc.timestamp").Int()
-			return
-		}
-		for i := len(cardList) - 1; i >= 0; i-- {
-			ct := cardList[i].Get("desc.timestamp").Int()
-			if ct > t && ct > time.Now().Unix()-600 {
-				lastTime[buid] = ct
-				m, ok := control.Lookup(serviceName)
-				if ok {
-					groupList := bdb.getAllGroupByBuidAndDynamic(buid)
-					var msg []message.MessageSegment
-					cType := cardList[i].Get("desc.type").Int()
-					cardStr := cardList[i].Get("card").String()
-					switch cType {
-					case 0:
-						cName := cardList[i].Get("desc.user_profile.info.uname").String()
-						cTime := time.Unix(cardList[i].Get("desc.timestamp").Int(), 0).Format("2006-01-02 15:04:05")
-						msg = append(msg, message.Text(cName+"在"+cTime+typeMsg[cType]+"\n"))
-					case 1:
-						cName := gjson.Get(cardStr, "user.uname").String()
-						msg = append(msg, message.Text(cName+typeMsg[cType]+"\n"))
-						cContent := gjson.Get(cardStr, "item.content").String()
-						msg = append(msg, message.Text(cContent+"\n"))
-						msg = append(msg, message.Text("转发的内容：\n"))
-						cOrigType := gjson.Get(cardStr, "item.orig_type").Int()
-						cOrigin := gjson.Get(cardStr, "origin").String()
-						switch cOrigType {
-						case 1:
-							cName := gjson.Get(cOrigin, "user.uname").String()
-							msg = append(msg, message.Text(cName+typeMsg[cOrigType]+"\n"))
-						case 2:
-							cName := gjson.Get(cOrigin, "user.name").String()
-							cUploadTime := time.Unix(gjson.Get(cOrigin, "item.upload_time").Int(), 0).Format("2006-01-02 15:04:05")
-							msg = append(msg, message.Text(cName+"在"+cUploadTime+typeMsg[cOrigType]+"\n"))
-							cDescription := gjson.Get(cOrigin, "item.description")
-							msg = append(msg, message.Text(cDescription))
-							if gjson.Get(cOrigin, "item.pictures.#").Int() != 0 {
-								gjson.Get(cOrigin, "item.pictures").ForEach(func(_, v gjson.Result) bool {
-									msg = append(msg, message.Image(v.Get("img_src").String()))
-									return true
-								})
-							}
-						case 4:
-							cName := gjson.Get(cOrigin, "user.uname").String()
-							cTimestamp := time.Unix(gjson.Get(cOrigin, "item.timestamp").Int(), 0).Format("2006-01-02 15:04:05")
-							msg = append(msg, message.Text(cName+"在"+cTimestamp+typeMsg[cOrigType]+"\n"))
-							cContent := gjson.Get(cOrigin, "item.content").String()
-							msg = append(msg, message.Text(cContent+"\n"))
-						case 8:
-							cName := gjson.Get(cOrigin, "owner.name").String()
-							cTime := time.Unix(gjson.Get(cOrigin, "pubdate").Int(), 0).Format("2006-01-02 15:04:05")
-							msg = append(msg, message.Text(cName+"在"+cTime+typeMsg[cOrigType]+"\n"))
-							cTitle := gjson.Get(cOrigin, "title").String()
-							msg = append(msg, message.Text(cTitle))
-							cPic := gjson.Get(cOrigin, "pic").String()
-							msg = append(msg, message.Image(cPic))
-							cDesc := gjson.Get(cOrigin, "desc").String()
-							msg = append(msg, message.Text(cDesc+"\n"))
-							cShareSubtitle := gjson.Get(cOrigin, "share_subtitle").String()
-							msg = append(msg, message.Text(cShareSubtitle+"\n"))
-							cShortLink := gjson.Get(cOrigin, "short_link").String()
-							msg = append(msg, message.Text("视频链接："+cShortLink+"\n"))
-						case 16:
-							cName := gjson.Get(cOrigin, "user.name").String()
-							cUploadTime := gjson.Get(cOrigin, "item.upload_time").String()
-							msg = append(msg, message.Text(cName+"在"+cUploadTime+typeMsg[cOrigType]+"\n"))
-							cDescription := gjson.Get(cOrigin, "item.description")
-							msg = append(msg, message.Text(cDescription))
-							cCover := gjson.Get(cOrigin, "item.cover.default").String()
-							msg = append(msg, message.Image(cCover))
-						case 64:
-							cName := gjson.Get(cOrigin, "author.name").String()
-							cPublishTime := time.Unix(gjson.Get(cOrigin, "publish_time").Int(), 0).Format("2006-01-02 15:04:05")
-							msg = append(msg, message.Text(cName+"在"+cPublishTime+typeMsg[cOrigType]+"\n"))
-							cTitle := gjson.Get(cOrigin, "title").String()
-							msg = append(msg, message.Text(cTitle+"\n"))
-							cSummary := gjson.Get(cOrigin, "summary").String()
-							msg = append(msg, message.Text(cSummary))
-							cBannerURL := gjson.Get(cOrigin, "banner_url").String()
-							msg = append(msg, message.Image(cBannerURL))
-						case 256:
-							cUpper := gjson.Get(cOrigin, "upper").String()
-							cTime := time.UnixMilli(gjson.Get(cOrigin, "ctime").Int()).Format("2006-01-02 15:04:05")
-							msg = append(msg, message.Text(cUpper+"在"+cTime+typeMsg[cOrigType]+"\n"))
-							cTitle := gjson.Get(cOrigin, "title").String()
-							msg = append(msg, message.Text(cTitle))
-							cCover := gjson.Get(cOrigin, "cover").String()
-							msg = append(msg, message.Image(cCover))
-						default:
-							msg = append(msg, message.Text("未知动态类型"+strconv.FormatInt(cOrigType, 10)+"\n"))
-						}
-					case 2:
-						cName := gjson.Get(cardStr, "user.name").String()
-						cUploadTime := time.Unix(gjson.Get(cardStr, "item.upload_time").Int(), 0).Format("2006-01-02 15:04:05")
-						msg = append(msg, message.Text(cName+"在"+cUploadTime+typeMsg[cType]+"\n"))
-						cDescription := gjson.Get(cardStr, "item.description")
-						msg = append(msg, message.Text(cDescription))
-						if gjson.Get(cardStr, "item.pictures.#").Int() != 0 {
-							gjson.Get(cardStr, "item.pictures").ForEach(func(_, v gjson.Result) bool {
-								msg = append(msg, message.Image(v.Get("img_src").String()))
-								return true
-							})
-						}
-					case 4:
-						cName := gjson.Get(cardStr, "user.uname").String()
-						cTimestamp := time.Unix(gjson.Get(cardStr, "item.timestamp").Int(), 0).Format("2006-01-02 15:04:05")
-						msg = append(msg, message.Text(cName+"在"+cTimestamp+typeMsg[cType]+"\n"))
-						cContent := gjson.Get(cardStr, "item.content").String()
-						msg = append(msg, message.Text(cContent+"\n"))
-					case 8:
-						cName := gjson.Get(cardStr, "owner.name").String()
-						cTime := time.Unix(gjson.Get(cardStr, "ctime").Int(), 0).Format("2006-01-02 15:04:05")
-						msg = append(msg, message.Text(cName+"在"+cTime+typeMsg[cType]+"\n"))
-						cTitle := gjson.Get(cardStr, "title").String()
-						msg = append(msg, message.Text(cTitle))
-						cPic := gjson.Get(cardStr, "pic").String()
-						msg = append(msg, message.Image(cPic))
-						cDesc := gjson.Get(cardStr, "desc").String()
-						msg = append(msg, message.Text(cDesc+"\n"))
-						cShareSubtitle := gjson.Get(cardStr, "share_subtitle").String()
-						msg = append(msg, message.Text(cShareSubtitle+"\n"))
-						cShortLink := gjson.Get(cardStr, "short_link").String()
-						msg = append(msg, message.Text("视频链接："+cShortLink+"\n"))
-					case 16:
-						cName := gjson.Get(cardStr, "user.name").String()
-						cUploadTime := gjson.Get(cardStr, "item.upload_time").String()
-						msg = append(msg, message.Text(cName+"在"+cUploadTime+typeMsg[cType]+"\n"))
-						cDescription := gjson.Get(cardStr, "item.description")
-						msg = append(msg, message.Text(cDescription))
-						cCover := gjson.Get(cardStr, "item.cover.default").String()
-						msg = append(msg, message.Image(cCover))
-					case 64:
-						cName := gjson.Get(cardStr, "author.name").String()
-						cPublishTime := time.Unix(gjson.Get(cardStr, "publish_time").Int(), 0).Format("2006-01-02 15:04:05")
-						msg = append(msg, message.Text(cName+"在"+cPublishTime+typeMsg[cType]+"\n"))
-						cTitle := gjson.Get(cardStr, "title").String()
-						msg = append(msg, message.Text(cTitle+"\n"))
-						cSummary := gjson.Get(cardStr, "summary").String()
-						msg = append(msg, message.Text(cSummary))
-						cBannerURL := gjson.Get(cardStr, "banner_url").String()
-						msg = append(msg, message.Image(cBannerURL))
-					case 256:
-						cUpper := gjson.Get(cardStr, "upper").String()
-						cTime := time.UnixMilli(gjson.Get(cardStr, "ctime").Int()).Format("2006-01-02 15:04:05")
-						msg = append(msg, message.Text(cUpper+"在"+cTime+typeMsg[cType]+"\n"))
-						cTitle := gjson.Get(cardStr, "title").String()
-						msg = append(msg, message.Text(cTitle))
-						cCover := gjson.Get(cardStr, "cover").String()
-						msg = append(msg, message.Image(cCover))
-					default:
-						msg = append(msg, message.Text("未知动态类型"+strconv.FormatInt(cType, 10)+"\n"))
-					}
-					cID := cardList[i].Get("desc.dynamic_id").String()
-					msg = append(msg, message.Text("动态链接：", tURL+cID))
-
-					zero.RangeBot(func(id int64, ctx *zero.Ctx) bool {
-						for _, gid := range groupList {
-							if m.IsEnabledIn(gid) {
-								switch {
-								case gid > 0:
-									ctx.SendGroupMessage(gid, msg)
-								case gid < 0:
-									ctx.SendPrivateMessage(-gid, msg)
-								default:
-									log.Errorln("[bilibilipush]:gid为0")
-								}
-							}
-						}
-						return true
-					})
-				}
-			}
-		}
-	}
-}
-
-func sendLive() {
-	uids := bdb.getAllBuidByLive()
-	gjson.Get(getLiveList(uids...), "data").ForEach(func(key, value gjson.Result) bool {
-		newStatus := int(value.Get("live_status").Int())
-		if newStatus == 2 {
-			newStatus = 0
-		}
-		if _, ok := liveStatus[key.Int()]; !ok {
-			liveStatus[key.Int()] = newStatus
-			return true
-		}
-		oldStatus := liveStatus[key.Int()]
-		if newStatus != oldStatus && newStatus == 1 {
-			liveStatus[key.Int()] = newStatus
-			m, ok := control.Lookup(serviceName)
-			if ok {
-				groupList := bdb.getAllGroupByBuidAndLive(key.Int())
-				roomID := value.Get("short_id").Int()
-				if roomID == 0 {
-					roomID = value.Get("room_id").Int()
-				}
-				lURL := liveURL + strconv.FormatInt(roomID, 10)
-				lName := value.Get("uname").String()
-				lTitle := value.Get("title").String()
-				lCover := value.Get("cover_from_user").String()
-				if lCover == "" {
-					lCover = value.Get("keyframe").String()
-				}
-				var msg []message.MessageSegment
-				msg = append(msg, message.Text(lName+" 正在直播：\n"))
-				msg = append(msg, message.Text(lTitle))
-				msg = append(msg, message.Image(lCover))
-				msg = append(msg, message.Text("直播链接：", lURL))
-				zero.RangeBot(func(id int64, ctx *zero.Ctx) bool {
-					for _, gid := range groupList {
-						if m.IsEnabledIn(gid) {
-							switch {
-							case gid > 0:
-								ctx.SendGroupMessage(gid, msg)
-							case gid < 0:
-								ctx.SendPrivateMessage(-gid, msg)
-							default:
-								log.Errorln("[bilibilipush]:gid为0")
-							}
-						}
-					}
-					return true
-				})
-			}
-		} else if newStatus != oldStatus {
-			liveStatus[key.Int()] = newStatus
-		}
-		return true
-	})
-}

plugin/bilibili_push/model.go

@@ -1,144 +0,0 @@
-package bilibilipush
-
-import (
-	"encoding/json"
-	"os"
-
-	_ "github.com/fumiama/sqlite3" // import sql
-	"github.com/jinzhu/gorm"
-)
-
-// bilibilipushdb bili推送数据库
-type bilibilipushdb gorm.DB
-
-type bilibilipush struct {
-	ID             int64 `gorm:"column:id;primary_key" json:"id"`
-	BilibiliUID    int64 `gorm:"column:bilibili_uid;index:idx_buid_gid" json:"bilibili_uid"`
-	GroupID        int64 `gorm:"column:group_id;index:idx_buid_gid" json:"group_id"`
-	LiveDisable    int64 `gorm:"column:live_disable;default:0" json:"live_disable"`
-	DynamicDisable int64 `gorm:"column:dynamic_disable;default:0" json:"dynamic_disable"`
-}
-
-// TableName ...
-func (bilibilipush) TableName() string {
-	return "bilibili_push"
-}
-
-type bilibiliup struct {
-	BilibiliUID int64  `gorm:"column:bilibili_uid;primary_key"`
-	Name        string `gorm:"column:name"`
-}
-
-// TableName ...
-func (bilibiliup) TableName() string {
-	return "bilibili_up"
-}
-
-// initialize 初始化ScoreDB数据库
-func initialize(dbpath string) *bilibilipushdb {
-	var err error
-	if _, err = os.Stat(dbpath); err != nil || os.IsNotExist(err) {
-		// 生成文件
-		f, err := os.Create(dbpath)
-		if err != nil {
-			return nil
-		}
-		defer f.Close()
-	}
-	gdb, err := gorm.Open("sqlite3", dbpath)
-	if err != nil {
-		panic(err)
-	}
-	gdb.AutoMigrate(&bilibilipush{}).AutoMigrate(&bilibiliup{})
-	return (*bilibilipushdb)(gdb)
-}
-
-// insertOrUpdateLiveAndDynamic 插入或更新数据库
-func (bdb *bilibilipushdb) insertOrUpdateLiveAndDynamic(bpMap map[string]interface{}) (err error) {
-	db := (*gorm.DB)(bdb)
-	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 gorm.IsRecordNotFoundError(err) {
-			err = db.Debug().Model(&bilibilipush{}).Create(&bp).Error
-		}
-	} else {
-		err = db.Debug().Model(&bilibilipush{}).Where("bilibili_uid = ? and group_id = ?", bp.BilibiliUID, bp.GroupID).Update(bpMap).Error
-	}
-	return
-}
-
-func (bdb *bilibilipushdb) getAllBuidByLive() (buidList []int64) {
-	db := (*gorm.DB)(bdb)
-	var bpl []bilibilipush
-	db.Debug().Model(&bilibilipush{}).Find(&bpl, "live_disable = 0")
-	temp := make(map[int64]bool)
-	for _, v := range bpl {
-		_, ok := temp[v.BilibiliUID]
-		if !ok {
-			buidList = append(buidList, v.BilibiliUID)
-			temp[v.BilibiliUID] = true
-		}
-	}
-	return
-}
-
-func (bdb *bilibilipushdb) getAllBuidByDynamic() (buidList []int64) {
-	db := (*gorm.DB)(bdb)
-	var bpl []bilibilipush
-	db.Debug().Model(&bilibilipush{}).Find(&bpl, "dynamic_disable = 0")
-	temp := make(map[int64]bool)
-	for _, v := range bpl {
-		_, ok := temp[v.BilibiliUID]
-		if !ok {
-			buidList = append(buidList, v.BilibiliUID)
-			temp[v.BilibiliUID] = true
-		}
-	}
-	return
-}
-
-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)
-	for _, v := range bpl {
-		groupList = append(groupList, v.GroupID)
-	}
-	return
-}
-
-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)
-	for _, v := range bpl {
-		groupList = append(groupList, v.GroupID)
-	}
-	return
-}
-
-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)
-	return
-}
-
-func (bdb *bilibilipushdb) insertBilibiliUp(buid int64, name string) {
-	db := (*gorm.DB)(bdb)
-	bu := bilibiliup{
-		BilibiliUID: buid,
-		Name:        name,
-	}
-	db.Debug().Model(&bilibiliup{}).Create(bu)
-}
-
-func (bdb *bilibilipushdb) updateAllUp() {
-	db := (*gorm.DB)(bdb)
-	var bul []bilibiliup
-	db.Debug().Model(&bilibiliup{}).Find(&bul)
-	for _, v := range bul {
-		upMap[v.BilibiliUID] = v.Name
-	}
-}

plugin/book_review/book_review.go

@@ -2,59 +2,70 @@
 package bookreview
 
 import (
+	"time"
+
 	log "github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
+	ctrl "github.com/FloatTech/zbpctrl"
 	"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", &ctrl.Options[*zero.Ctx]{
 		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)
-		err := db.Create("bookreview", &book{})
+		_, _ = engine.GetLazyData("bookreview.db", true)
+		err := db.Open(time.Hour * 24)
 		if err != nil {
-			panic(err)
+			ctx.SendChain(message.Text("ERROR:", err))
+			return false
+		}
+		err = db.Create("bookreview", &book{})
+		if err != nil {
+			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:可能被风控了"))
 			}
 		})
 
-	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:可能被风控了"))

plugin/cangtoushi/cangtoushi.go

@@ -9,14 +9,12 @@ import (
 	"net/url"
 	"strings"
 
-	control "github.com/FloatTech/zbputils/control"
+	ctrl "github.com/FloatTech/zbpctrl"
+	"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 +30,110 @@ var (
 )
 
 func init() {
-	engine := control.Register("cangtoushi", order.AcquirePrio(), &control.Options{
+	engine := control.Register("cangtoushi", &ctrl.Options[*zero.Ctx]{
 		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/char_reverser/init.go

@@ -0,0 +1,111 @@
+// Package charreverser 英文字符反转
+package charreverser
+
+import (
+	"regexp"
+	"strings"
+
+	ctrl "github.com/FloatTech/zbpctrl"
+	"github.com/FloatTech/zbputils/control"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+)
+
+const commandRegex = `[A-z]{1}([A-z]|\s)+[A-z]{1}` // 命令正则表达式
+
+var (
+	charMap = map[rune]rune{
+		'a': 'ɐ',
+		'b': 'q',
+		'c': 'ɔ',
+		'd': 'p',
+		'e': 'ǝ',
+		'f': 'ɟ',
+		'g': 'ƃ',
+		'h': 'ɥ',
+		'i': 'ᴉ',
+		'j': 'ɾ',
+		'k': 'ʞ',
+		'l': 'l',
+		'm': 'ɯ',
+		'n': 'u',
+		'o': 'o',
+		'p': 'd',
+		'q': 'b',
+		'r': 'ɹ',
+		's': 's',
+		't': 'ʇ',
+		'u': 'n',
+		'v': 'ʌ',
+		'w': 'ʍ',
+		'x': 'x',
+		'y': 'ʎ',
+		'z': 'z',
+		'A': '∀',
+		'B': 'ᗺ',
+		'C': 'Ɔ',
+		'D': 'ᗡ',
+		'E': 'Ǝ',
+		'F': 'Ⅎ',
+		'G': '⅁',
+		'H': 'H',
+		'I': 'I',
+		'J': 'ſ',
+		'K': 'ʞ',
+		'L': '˥',
+		'M': 'W',
+		'N': 'N',
+		'O': 'O',
+		'P': 'Ԁ',
+		'Q': 'Ò',
+		'R': 'ᴚ',
+		'S': 'S',
+		'T': '⏊',
+		'U': '∩',
+		'V': 'Λ',
+		'W': 'M',
+		'X': 'X',
+		'Y': '⅄',
+		'Z': 'Z',
+	}
+
+	compiledRegex = regexp.MustCompile(commandRegex)
+)
+
+func init() {
+	// 初始化engine
+	engine := control.Register(
+		"charreverser",
+		&ctrl.Options[*zero.Ctx]{
+			DisableOnDefault: false,
+			Help:             "字符翻转\n -翻转 <英文字符串>",
+		},
+	)
+	// 处理字符翻转指令
+	engine.OnRegex(`翻转( )+[A-z]{1}([A-z]|\s)+[A-z]{1}`).SetBlock(true).Handle(
+		func(ctx *zero.Ctx) {
+			// 获取需要翻转的字符串
+			results := compiledRegex.FindAllString(ctx.MessageString(), -1)
+			str := results[0]
+
+			// 将字符顺序翻转
+			var tempBuilder strings.Builder
+			for i := len(str) - 1; i >= 0; i-- {
+				tempBuilder.WriteByte(str[i])
+			}
+
+			// 翻转字符字形
+			var reversedStrBuilder strings.Builder
+			for _, char := range tempBuilder.String() {
+				if char != ' ' {
+					reversedStrBuilder.WriteRune(charMap[char])
+				} else {
+					reversedStrBuilder.WriteRune(' ')
+				}
+			}
+
+			// 发送翻转后的字符串
+			ctx.SendChain(message.Text(reversedStrBuilder.String()))
+		},
+	)
+}

plugin/chat/chat.go

@@ -6,17 +6,16 @@ import (
 	"strconv"
 	"time"
 
-	control "github.com/FloatTech/zbputils/control"
+	ctrl "github.com/FloatTech/zbpctrl"
+	"github.com/FloatTech/zbputils/control"
 	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", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
 		Help:             "chat\n- [BOT名字]\n- [戳一戳BOT]\n- 空调开\n- 空调关\n- 群温度\n- 设置温度[正整数]",
 	})

plugin/choose/choose.go

@@ -6,15 +6,14 @@ import (
 	"strconv"
 	"strings"
 
-	control "github.com/FloatTech/zbputils/control"
+	ctrl "github.com/FloatTech/zbpctrl"
+	"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", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
 		Help: "choose\n" +
 			"- 选择可口可乐还是百事可乐\n" +

plugin/chouxianghua/chouxianghua.go

@@ -2,39 +2,48 @@
 package chouxianghua
 
 import (
+	"time"
+
 	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
+	ctrl "github.com/FloatTech/zbpctrl"
 	"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", &ctrl.Options[*zero.Ctx]{
 		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.Open(time.Hour * 24)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return false
+			}
+			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,27 +2,28 @@
 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"
 
-	control "github.com/FloatTech/zbputils/control"
+	ctrl "github.com/FloatTech/zbpctrl"
+	"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", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
 		Help:             "三次元小姐姐\n- coser",
 	}).ApplySingle(ctxext.DefaultSingle).OnFullMatch("coser", zero.OnlyGroup).SetBlock(true).Limit(ctxext.LimitByGroup).
@@ -30,12 +31,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 +50,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

@@ -3,42 +3,49 @@ package cpstory
 
 import (
 	"strings"
+	"time"
 
 	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
-	control "github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/file"
+	ctrl "github.com/FloatTech/zbpctrl"
+	"github.com/FloatTech/zbputils/control"
+	"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", &ctrl.Options[*zero.Ctx]{
 		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)
-		err := db.Create("cp_story", &cpstory{})
+		_, _ = engine.GetLazyData("cp.db", true)
+		err := db.Open(time.Hour * 24)
 		if err != nil {
-			panic(err)
+			ctx.SendChain(message.Text("ERROR:", err))
+			return false
+		}
+		err = db.Create("cp_story", &cpstory{})
+		if err != nil {
+			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 +55,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

@@ -2,16 +2,16 @@
 package curse
 
 import (
+	"time"
+
 	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
-	control "github.com/FloatTech/zbputils/control"
+	ctrl "github.com/FloatTech/zbpctrl"
+	"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 +20,51 @@ const (
 )
 
 func init() {
-	engine := control.Register("curse", order.AcquirePrio(), &control.Options{
+	engine := control.Register("curse", &ctrl.Options[*zero.Ctx]{
 		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.Open(time.Hour * 24)
+		if err != nil {
+			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,17 @@ import (
 	"encoding/hex"
 
 	"github.com/FloatTech/AnimeAPI/danbooru"
-	"github.com/FloatTech/AnimeAPI/saucenao"
+	ctrl "github.com/FloatTech/zbpctrl"
 	"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", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
 		Help: "二次元图片标签识别\n" +
 			"- 鉴赏图片[图片]",
@@ -32,14 +30,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

@@ -5,14 +5,14 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
-	control "github.com/FloatTech/zbputils/control"
-
-	"github.com/FloatTech/zbputils/control/order"
+	ctrl "github.com/FloatTech/zbpctrl"
+	"github.com/FloatTech/zbputils/control"
+	"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", &ctrl.Options[*zero.Ctx]{
 	DisableOnDefault: false,
 	Help: "嘉然\n" +
 		"- 小作文\n" +
@@ -23,26 +23,29 @@ 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 {

plugin/diana/data/text.go

@@ -4,6 +4,7 @@ package data
 import (
 	"crypto/md5"
 	"encoding/binary"
+	"time"
 
 	sql "github.com/FloatTech/sqlite"
 	binutils "github.com/FloatTech/zbputils/binary"
@@ -19,18 +20,26 @@ 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.Open(time.Hour * 24)
+	if err != nil {
+		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

@@ -5,22 +5,23 @@ import (
 	"strconv"
 	"strings"
 	"sync"
+	"time"
 
+	ctrl "github.com/FloatTech/zbpctrl"
 	"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", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault:  false,
 		Help:              "漂流瓶\n- (在群xxx)丢漂流瓶(到频道xxx) [消息]\n- (从频道xxx)捡漂流瓶\n- @BOT 创建频道 xxx\n- 跳入(频道)海中\n- 注：不显式限制时，私聊发送可在所有群抽到，群聊发送仅可在本群抽到，默认频道为 global",
 		PrivateDataFolder: "driftbottle",
 	})
 	sea.DBPath = en.DataFolder() + "sea.db"
-	err := sea.Open()
+	err := sea.Open(time.Hour * 24)
 	if err != nil {
 		panic(err)
 	}

plugin/emojimix/mix.go

@@ -6,8 +6,8 @@ import (
 	"net/http"
 	"strconv"
 
+	ctrl "github.com/FloatTech/zbpctrl"
 	"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 +17,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", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
 		Help: "合成emoji\n" +
 			"- [emoji][emoji]",

plugin/epidemic/epidemic.go

@@ -7,21 +7,22 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
-	"github.com/FloatTech/zbputils/binary"
+	ctrl "github.com/FloatTech/zbpctrl"
 	"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,8 +35,8 @@ type epidemic struct {
 type area struct {
 	Name  string `json:"name"`
 	Today struct {
-		Confirm int `json:"confirm"`
-		Wzzadd  int `json:"wzz_add"`
+		Confirm int         `json:"confirm"`
+		Wzzadd  interface{} `json:"wzz_add"`
 	} `json:"today"`
 	Total struct {
 		NowConfirm int    `json:"nowConfirm"`
@@ -49,7 +50,7 @@ type area struct {
 }
 
 func init() {
-	engine := control.Register(servicename, order.AcquirePrio(), &control.Options{
+	engine := control.Register(servicename, &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
 		Help: "城市疫情查询\n" +
 			"- xxx疫情\n",
@@ -117,11 +118,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

@@ -2,9 +2,9 @@
 package font
 
 import (
+	ctrl "github.com/FloatTech/zbpctrl"
 	"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/img/text"
 	zero "github.com/wdvxdr1123/ZeroBot"
@@ -12,7 +12,7 @@ import (
 )
 
 func init() {
-	control.Register("font", order.AcquirePrio(), &control.Options{
+	control.Register("font", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
 		Help:             "渲染任意文字到图片\n- (用[终末体|终末变体|紫罗兰体|樱酥体|Consolas体|苹方体])渲染文字xxx",
 	}).OnRegex(`^(用.+)?渲染文字([\s\S]+)$`).SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
@@ -30,6 +30,7 @@ func init() {
 		case "用Consolas体":
 			fnt = text.ConsolasFontFile
 		case "用苹方体":
+			fallthrough
 		default:
 			fnt = text.FontFile
 		}

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"
@@ -19,14 +17,13 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
-	control "github.com/FloatTech/zbputils/control"
+	ctrl "github.com/FloatTech/zbpctrl"
+	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/file"
 	"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 +39,7 @@ const (
 
 var (
 	// 底图类型列表
-	table = [...]string{"车万", "DC4", "爱因斯坦", "星空列车", "樱云之恋", "富婆妹", "李清歌", "公主连结", "原神", "明日方舟", "碧蓝航线", "碧蓝幻想", "战双", "阴阳师", "赛马娘", "东方归言录"}
+	table = [...]string{"车万", "DC4", "爱因斯坦", "星空列车", "樱云之恋", "富婆妹", "李清歌", "公主连结", "原神", "明日方舟", "碧蓝航线", "碧蓝幻想", "战双", "阴阳师", "赛马娘", "东方归言录", "奇异恩典", "夏日口袋", "ASoul"}
 	// 映射底图与 index
 	index = make(map[string]uint8)
 	// 签文
@@ -51,35 +48,21 @@ var (
 
 func init() {
 	// 插件主体
-	en := control.Register("fortune", order.AcquirePrio(), &control.Options{
+	en := control.Register("fortune", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
 		Help: "每日运势: \n" +
 			"- 运势 | 抽签\n" +
-			"- 设置底图[车万 | DC4 | 爱因斯坦 | 星空列车 | 樱云之恋 | 富婆妹 | 李清歌 | 公主连结 | 原神 | 明日方舟 | 碧蓝航线 | 碧蓝幻想 | 战双 | 阴阳师 | 赛马娘 | 东方归言录]",
+			"- 设置底图[车万 | DC4 | 爱因斯坦 | 星空列车 | 樱云之恋 | 富婆妹 | 李清歌 | 公主连结 | 原神 | 明日方舟 | 碧蓝航线 | 碧蓝幻想 | 战双 | 阴阳师 | 赛马娘 | 东方归言录 | 奇异恩典 | 夏日口袋 | ASoul]",
 		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
@@ -89,7 +72,7 @@ func init() {
 			}
 			i, ok := index[ctx.State["regex_matched"].([]string)[1]]
 			if ok {
-				c, ok := control.Lookup("fortune")
+				c, ok := ctx.State["manager"].(*ctrl.Control[*zero.Ctx])
 				if ok {
 					err := c.SetData(gid, int64(i)&0xff)
 					if err != nil {
@@ -104,7 +87,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
+		},
+	)).Limit(ctxext.LimitByGroup).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			// 获取该群背景类型，默认车万
 			kind := "车万"
@@ -114,7 +116,7 @@ func init() {
 				gid = -ctx.Event.UserID
 			}
 			logrus.Debugln("[fortune]gid:", ctx.Event.GroupID, "uid:", ctx.Event.UserID)
-			c, ok := control.Lookup("fortune")
+			c, ok := ctx.State["manager"].(*ctrl.Control[*zero.Ctx])
 			if ok {
 				v := uint8(c.GetData(gid) & 0xff)
 				if int(v) < len(table) {
@@ -123,25 +125,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))
 				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))
 				return
 			}
 
 			// 随机获取签文
-			title, text := randtext(seed)
+			randtextindex := ctxext.RandSenderPerDayN(ctx.Event.UserID, 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[:])
 
@@ -163,18 +162,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.Event.UserID, len(reader.File))]
 	f, err := file.Open()
 	if err != nil {
 		return
@@ -185,16 +182,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

@@ -3,17 +3,16 @@ package funny
 
 import (
 	"strings"
+	"time"
 
 	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
 	sql "github.com/FloatTech/sqlite"
-	control "github.com/FloatTech/zbputils/control"
+	ctrl "github.com/FloatTech/zbpctrl"
+	"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 +23,38 @@ type joke struct {
 var db = &sql.Sqlite{}
 
 func init() {
-	en := control.Register("funny", order.AcquirePrio(), &control.Options{
+	en := control.Register("funny", &ctrl.Options[*zero.Ctx]{
 		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.Open(time.Hour * 24)
+		if err != nil {
+			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,13 @@ import (
 	"image/jpeg"
 	"image/png"
 	"math/rand"
+	"regexp"
 	"strings"
 	"sync/atomic"
 
+	ctrl "github.com/FloatTech/zbpctrl"
 	"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,30 +30,19 @@ 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", &ctrl.Options[*zero.Ctx]{
 		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")
+			c, ok := ctx.State["manager"].(*ctrl.Control[*zero.Ctx])
 			if !ok {
 				ctx.SendChain(message.Text("找不到服务!"))
 				return
@@ -77,9 +66,24 @@ 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")
+			c, ok := ctx.State["manager"].(*ctrl.Control[*zero.Ctx])
 			if !ok {
 				ctx.SendChain(message.Text("找不到服务!"))
 				return
@@ -89,18 +93,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) // 抽到 三 , 四, 五星武器
@@ -143,18 +153,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:
@@ -208,12 +218,16 @@ func randnums(nums int, store storage) (rgba *image.RGBA, err error) {
 
 	if fiveN > 0 { // 按顺序加入
 		he(fiveN, 5, starN5, fivebg) // 五星角色
+		str += reply(fives, 1, str)
+		replyMode = true
 	}
 	if fourN > 0 {
 		he(fourN, 3, starN4, fourbg) // 四星角色
 	}
 	if fiveN2 > 0 {
 		he(fiveN2, 4, starN5, fivebg) // 五星武器
+		str += reply(fiveArms, 2, str)
+		replyMode = true
 	}
 	if fourN2 > 0 {
 		he(fourN2, 2, starN4, fourbg) // 四星武器
@@ -254,7 +268,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 +278,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 +288,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 +298,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 +308,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 +355,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/anto_july/imagematerials
 
 ## 触发方式
 1. [指令词]+[qq号] 如：爬123456
@@ -29,3 +29,62 @@
 - [x] 浮雕
 - [x] 打码
 - [x] 负片
+- [x] 旋转45
+- [x] 变形100 100  
+- [x] 亲 
+- [x] 娶|结婚申请|结婚登记
+- [x] 像只 
+- [x] 阿尼亚喜欢
+- [x] 我永远喜欢|永远喜欢  
+- [x] 像样的亲亲 
+- [x] 国旗
+- [x] 不要靠近
+- [x] 万能表情|空白表情
+- [x] 采访
+- [x] 需要|你可能需要
+- [x] 这像画吗
+- [x] 小画家
+- [x] 完美
+- [x] 玩游戏 (应该使用透视变换)
+- [x] 出警
+- [x] 警察
+- [x] 舔|舔屏|prpr (应该使用透视变换)
+- [x] 安全感
+- [x] 精神支柱
+- [x] 想什么
+- [x] 墙纸
+- [x] 为什么at我
+- [x] 交个朋友          
+- [x] 打工人|继续干活     
+- [x] 兑换券
+- [ ] 捂脸 (使用了透视变换, 需要研究矩阵变换)
+- [x] 注意力涣散 
+- [x] 垃圾桶|垃圾
+- [x] 锤
+- [x] 啾啾
+- [x] 2敲
+- [x] 听音乐
+- [ ] 群青 (需要mask)
+- [ ] 加载中 (需要mask)
+- [x] 永远爱你 (未加闪光)
+- [ ] 关注 (处理文字麻烦)
+- [x] 2拍
+- [x] 顶
+- [x] 捣
+- [x] 打拳 (未加闪光)
+- [ ] 复读 (处理文字麻烦)
+- [x] 滚 
+- [x] 吸 
+- [x] 扔
+- [x] 捶
+- [x] 紧贴
+- [ ] 膜拜 (使用了透视变换, 需要研究矩阵变换)
+- [ ] 小天使 (摆)
+- [ ] 一直 (摆)
+- [x] 转 
+- [ ] 问问 (摆)
+- [ ] 典中典 (摆)
+- [ ] 震惊 (摆)
+- [ ] 哈哈镜 (摆)
+- [ ] 对称 (猎奇, 不整)
+- [ ] 远离 (摆)

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/m0_60838134/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/m0_60838134/imagematerials/-/raw/main/`+name, target, true)
 		if err != nil {
 			return "", err
 		}
@@ -73,8 +73,8 @@ func newContext(user int64) *context {
 	return c
 }
 
-func loadFirstFrames(paths []string, size int) (imgs []*img.ImgFactory, err error) {
-	imgs = make([]*img.ImgFactory, size)
+func loadFirstFrames(paths []string, size int) (imgs []*img.Factory, err error) {
+	imgs = make([]*img.Factory, size)
 	for i := range imgs {
 		imgs[i], err = img.LoadFirstFrame(paths[i], 0, 0)
 		if err != nil {

plugin/gif/gif.go

@@ -2,14 +2,17 @@ package gif
 
 import (
 	"image"
+	"image/color"
 	"sync"
 
 	"github.com/FloatTech/zbputils/img"
 	"github.com/FloatTech/zbputils/img/writer"
+	"github.com/fogleman/gg"
 )
 
-// A摸
-func (cc *context) A摸() (string, error) {
+// mo 摸
+func mo(cc *context, value ...string) (string, error) {
+	_ = value
 	var wg sync.WaitGroup
 	var err error
 	var m sync.Mutex
@@ -44,8 +47,9 @@ func (cc *context) A摸() (string, error) {
 	return "file:///" + name, writer.SaveGIF2Path(name, img.MergeGif(1, mo))
 }
 
-// A搓
-func (cc *context) A搓() (string, error) {
+// cuo 搓
+func cuo(cc *context, value ...string) (string, error) {
+	_ = value
 	var wg sync.WaitGroup
 	var err error
 	var m sync.Mutex
@@ -84,8 +88,9 @@ func (cc *context) A搓() (string, error) {
 	return "file:///" + name, writer.SaveGIF2Path(name, img.MergeGif(5, cuo))
 }
 
-// A敲
-func (cc *context) A敲() (string, error) {
+// qiao 敲
+func qiao(cc *context, value ...string) (string, error) {
+	_ = value
 	var wg sync.WaitGroup
 	var err error
 	var m sync.Mutex
@@ -117,8 +122,9 @@ func (cc *context) A敲() (string, error) {
 	return "file:///" + name, writer.SaveGIF2Path(name, img.MergeGif(1, qiao))
 }
 
-// A吃
-func (cc *context) A吃() (string, error) {
+// chi 吃
+func chi(cc *context, value ...string) (string, error) {
+	_ = value
 	var wg sync.WaitGroup
 	var err error
 	var m sync.Mutex
@@ -151,8 +157,9 @@ func (cc *context) A吃() (string, error) {
 	return "file:///" + name, writer.SaveGIF2Path(name, img.MergeGif(1, chi))
 }
 
-// A蹭
-func (cc *context) A蹭() (string, error) {
+// ceng 蹭
+func ceng(cc *context, value ...string) (string, error) {
+	_ = value
 	var wg sync.WaitGroup
 	var err error
 	var m sync.Mutex
@@ -192,8 +199,9 @@ func (cc *context) A蹭() (string, error) {
 	return "file:///" + name, writer.SaveGIF2Path(name, img.MergeGif(8, ceng))
 }
 
-// A啃
-func (cc *context) A啃() (string, error) {
+// ken 啃
+func ken(cc *context, value ...string) (string, error) {
+	_ = value
 	var wg sync.WaitGroup
 	var err error
 	var m sync.Mutex
@@ -239,8 +247,9 @@ func (cc *context) A啃() (string, error) {
 	return "file:///" + name, writer.SaveGIF2Path(name, img.MergeGif(7, ken))
 }
 
-// A拍
-func (cc *context) A拍() (string, error) {
+// pai 拍
+func pai(cc *context, value ...string) (string, error) {
+	_ = value
 	var wg sync.WaitGroup
 	var err error
 	var m sync.Mutex
@@ -272,8 +281,9 @@ func (cc *context) A拍() (string, error) {
 	return "file:///" + name, writer.SaveGIF2Path(name, img.MergeGif(1, pai))
 }
 
-// A冲
-func (cc *context) A冲() (string, error) {
+// xqe 冲
+func xqe(cc *context, value ...string) (string, error) {
+	_ = value
 	var wg sync.WaitGroup
 	var err error
 	var m sync.Mutex
@@ -305,8 +315,9 @@ func (cc *context) A冲() (string, error) {
 	return "file:///" + name, writer.SaveGIF2Path(name, img.MergeGif(1, chong))
 }
 
-// A丢
-func (cc *context) A丢() (string, error) {
+// diu 丢
+func diu(cc *context, value ...string) (string, error) {
+	_ = value
 	var wg sync.WaitGroup
 	var err error
 	var m sync.Mutex
@@ -343,3 +354,805 @@ func (cc *context) A丢() (string, error) {
 	}
 	return "file:///" + name, writer.SaveGIF2Path(name, img.MergeGif(7, diu))
 }
+
+// kiss 亲
+func kiss(cc *context, value ...string) (string, error) {
+	_ = value
+	var wg sync.WaitGroup
+	var err error
+	var m sync.Mutex
+	piclen := 13
+	name := cc.usrdir + "Kiss.gif"
+	c := dlrange("kiss", piclen, &wg, func(e error) {
+		m.Lock()
+		err = e
+		m.Unlock()
+	})
+	if err != nil {
+		return "", err
+	}
+	wg.Wait()
+	tou, err := cc.getLogo(0, 0)
+	if err != nil {
+		return "", err
+	}
+	tou2, err := cc.getLogo2(0, 0)
+	if err != nil {
+		return "", err
+	}
+	userLocs := [][]int{{58, 90}, {62, 95}, {42, 100}, {50, 100}, {56, 100}, {18, 120}, {28, 110}, {54, 100}, {46, 100}, {60, 100}, {35, 115}, {20, 120}, {40, 96}}
+	selfLocs := [][]int{{92, 64}, {135, 40}, {84, 105}, {80, 110}, {155, 82}, {60, 96}, {50, 80}, {98, 55}, {35, 65}, {38, 100}, {70, 80}, {84, 65}, {75, 65}}
+	imgs, err := loadFirstFrames(c, piclen)
+	if err != nil {
+		return "", err
+	}
+	kiss := make([]*image.NRGBA, piclen)
+	for i := 0; i < piclen; i++ {
+		kiss[i] = imgs[i].InsertUp(tou, 50, 50, userLocs[i][0], userLocs[i][1]).
+			InsertUp(tou2, 40, 40, selfLocs[i][0], selfLocs[i][1]).Im
+	}
+	return "file:///" + name, writer.SaveGIF2Path(name, img.MergeGif(7, kiss))
+}
+
+// garbage 垃圾 垃圾桶
+func garbage(cc *context, value ...string) (string, error) {
+	_ = value
+	var wg sync.WaitGroup
+	var err error
+	var m sync.Mutex
+	piclen := 25
+	name := cc.usrdir + "Garbage.gif"
+	c := dlrange("garbage", piclen, &wg, func(e error) {
+		m.Lock()
+		err = e
+		m.Unlock()
+	})
+	if err != nil {
+		return "", err
+	}
+	wg.Wait()
+	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 79, 79)
+	if err != nil {
+		return "", err
+	}
+	locs := [][]int{{39, 40}, {39, 40}, {39, 40}, {39, 30}, {39, 30}, {39, 32}, {39, 32}, {39, 32}, {39, 32}, {39, 32}, {39, 32}, {39, 32}, {39, 32}, {39, 32}, {39, 32}, {39, 30}, {39, 27}, {39, 32}, {37, 49}, {37, 64}, {37, 67}, {37, 67}, {39, 69}, {37, 70}, {37, 70}}
+	imgs, err := loadFirstFrames(c, piclen)
+	if err != nil {
+		return "", err
+	}
+	garbage := make([]*image.NRGBA, piclen)
+	for i := 0; i < piclen; i++ {
+		garbage[i] = imgs[i].InsertBottom(im.Im, 0, 0, locs[i][0], locs[i][1]).Im
+	}
+	return "file:///" + name, writer.SaveGIF2Path(name, img.MergeGif(7, garbage))
+}
+
+// thump 捶
+func thump(cc *context, value ...string) (string, error) {
+	_ = value
+	var wg sync.WaitGroup
+	var err error
+	var m sync.Mutex
+	piclen := 4
+	name := cc.usrdir + "Thump.gif"
+	c := dlrange("thump", piclen, &wg, func(e error) {
+		m.Lock()
+		err = e
+		m.Unlock()
+	})
+	if err != nil {
+		return "", err
+	}
+	wg.Wait()
+	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 0, 0)
+	if err != nil {
+		return "", err
+	}
+	locs := [][]int{{65, 128, 77, 72}, {67, 128, 73, 72}, {54, 139, 94, 61}, {57, 135, 86, 65}}
+	imgs, err := loadFirstFrames(c, piclen)
+	if err != nil {
+		return "", err
+	}
+	thump := make([]*image.NRGBA, piclen)
+	for i := 0; i < piclen; i++ {
+		thump[i] = imgs[i].InsertBottom(im.Im, locs[i][2], locs[i][3], locs[i][0], locs[i][1]).Im
+	}
+	return "file:///" + name, writer.SaveGIF2Path(name, img.MergeGif(7, thump))
+}
+
+// jiujiu 啾啾
+func jiujiu(cc *context, value ...string) (string, error) {
+	_ = value
+	var wg sync.WaitGroup
+	var err error
+	var m sync.Mutex
+	piclen := 8
+	name := cc.usrdir + "Jiujiu.gif"
+	c := dlrange("jiujiu", piclen, &wg, func(e error) {
+		m.Lock()
+		err = e
+		m.Unlock()
+	})
+	if err != nil {
+		return "", err
+	}
+	wg.Wait()
+	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 75, 51)
+	if err != nil {
+		return "", err
+	}
+	imgs, err := loadFirstFrames(c, piclen)
+	if err != nil {
+		return "", err
+	}
+	jiujiu := make([]*image.NRGBA, piclen)
+	for i := 0; i < piclen; i++ {
+		jiujiu[i] = imgs[i].InsertBottom(im.Im, 0, 0, 0, 0).Im
+	}
+	return "file:///" + name, writer.SaveGIF2Path(name, img.MergeGif(7, jiujiu))
+}
+
+// knock 2敲
+func knock(cc *context, value ...string) (string, error) {
+	_ = value
+	var wg sync.WaitGroup
+	var err error
+	var m sync.Mutex
+	piclen := 8
+	name := cc.usrdir + "Knock.gif"
+	c := dlrange("knock", piclen, &wg, func(e error) {
+		m.Lock()
+		err = e
+		m.Unlock()
+	})
+	if err != nil {
+		return "", err
+	}
+	wg.Wait()
+	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 0, 0)
+	if err != nil {
+		return "", err
+	}
+	locs := [][]int{{60, 308, 210, 195}, {60, 308, 210, 198}, {45, 330, 250, 172}, {58, 320, 218, 180}, {60, 310, 215, 193}, {40, 320, 250, 285}, {48, 308, 226, 192}, {51, 301, 223, 200}}
+	imgs, err := loadFirstFrames(c, piclen)
+	if err != nil {
+		return "", err
+	}
+	knock := make([]*image.NRGBA, piclen)
+	for i := 0; i < piclen; i++ {
+		knock[i] = imgs[i].InsertBottom(im.Im, locs[i][2], locs[i][3], locs[i][0], locs[i][1]).Im
+	}
+	return "file:///" + name, writer.SaveGIF2Path(name, img.MergeGif(7, knock))
+}
+
+// 听音乐 listenMusic
+func listenMusic(cc *context, value ...string) (string, error) {
+	_ = value
+	var wg sync.WaitGroup
+	var err error
+	var m sync.Mutex
+	piclen := 1
+	name := cc.usrdir + "ListenMusic.gif"
+	c := dlrange("listen_music", piclen, &wg, func(e error) {
+		m.Lock()
+		err = e
+		m.Unlock()
+	})
+	if err != nil {
+		return "", err
+	}
+	wg.Wait()
+	face, err := cc.getLogo(0, 0)
+	if err != nil {
+		return "", err
+	}
+	imgs, err := loadFirstFrames(c, piclen)
+	if err != nil {
+		return "", err
+	}
+	listenmusic := make([]*image.NRGBA, 36)
+	for i := 0; i < 36; i++ {
+		listenmusic[i] = imgs[0].InsertBottomC(img.Rotate(face, float64(-i*10), 215, 215).Im, 0, 0, 207, 207).Im
+	}
+	return "file:///" + name, writer.SaveGIF2Path(name, img.MergeGif(7, listenmusic))
+}
+
+// loveYou 永远爱你
+func loveYou(cc *context, value ...string) (string, error) {
+	_ = value
+	var wg sync.WaitGroup
+	var err error
+	var m sync.Mutex
+	piclen := 2
+	name := cc.usrdir + "LoveYou.gif"
+	c := dlrange("love_you", piclen, &wg, func(e error) {
+		m.Lock()
+		err = e
+		m.Unlock()
+	})
+	if err != nil {
+		return "", err
+	}
+	wg.Wait()
+	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 0, 0)
+	if err != nil {
+		return "", err
+	}
+	locs := [][]int{{68, 65, 70, 70}, {63, 59, 80, 80}}
+	imgs, err := loadFirstFrames(c, piclen)
+	if err != nil {
+		return "", err
+	}
+	loveyou := make([]*image.NRGBA, piclen)
+	for i := 0; i < piclen; i++ {
+		loveyou[i] = imgs[i].InsertBottom(im.Im, locs[i][2], locs[i][3], locs[i][0], locs[i][1]).Im
+	}
+	return "file:///" + name, writer.SaveGIF2Path(name, img.MergeGif(7, loveyou))
+}
+
+// pat 2拍
+func pat(cc *context, value ...string) (string, error) {
+	_ = value
+	var wg sync.WaitGroup
+	var err error
+	var m sync.Mutex
+	piclen := 10
+	name := cc.usrdir + "Pat.gif"
+	c := dlrange("pat", piclen, &wg, func(e error) {
+		m.Lock()
+		err = e
+		m.Unlock()
+	})
+	if err != nil {
+		return "", err
+	}
+	wg.Wait()
+	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 0, 0)
+	if err != nil {
+		return "", err
+	}
+	locs := [][]int{{11, 73, 106, 100}, {8, 79, 112, 96}}
+	imgs, err := loadFirstFrames(c, piclen)
+	if err != nil {
+		return "", err
+	}
+	p := make([]*image.NRGBA, piclen)
+	for i := 0; i < piclen; i++ {
+		if i == 2 {
+			p[i] = imgs[i].InsertBottom(im.Im, locs[1][2], locs[1][3], locs[1][0], locs[1][1]).Im
+		} else {
+			p[i] = imgs[i].InsertBottom(im.Im, locs[0][2], locs[0][3], locs[0][0], locs[0][1]).Im
+		}
+	}
+	seq := []int{0, 1, 2, 3, 1, 2, 3, 0, 1, 2, 3, 0, 0, 1, 2, 3, 0, 0, 0, 0, 4, 5, 5, 5, 6, 7, 8, 9}
+	pat := make([]*image.NRGBA, len(seq))
+	for i := 0; i < len(pat); i++ {
+		pat[i] = p[seq[i]]
+	}
+	return "file:///" + name, writer.SaveGIF2Path(name, img.MergeGif(7, pat))
+}
+
+// jackUp 顶
+func jackUp(cc *context, value ...string) (string, error) {
+	_ = value
+	var wg sync.WaitGroup
+	var err error
+	var m sync.Mutex
+	piclen := 23
+	name := cc.usrdir + "JackUp.gif"
+	c := dlrange("play", piclen, &wg, func(e error) {
+		m.Lock()
+		err = e
+		m.Unlock()
+	})
+	if err != nil {
+		return "", err
+	}
+	wg.Wait()
+	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 0, 0)
+	if err != nil {
+		return "", err
+	}
+	locs := [][]int{{180, 60, 100, 100}, {184, 75, 100, 100}, {183, 98, 100, 100}, {179, 118, 110, 100}, {156, 194, 150, 48}, {178, 136, 122, 69}, {175, 66, 122, 85}, {170, 42, 130, 96}, {175, 34, 118, 95}, {179, 35, 110, 93}, {180, 54, 102, 93}, {183, 58, 97, 92}, {174, 35, 120, 94}, {179, 35, 109, 93}, {181, 54, 101, 92}, {182, 59, 98, 92}, {183, 71, 90, 96}, {180, 131, 92, 101}}
+	imgs, err := loadFirstFrames(c, piclen)
+	if err != nil {
+		return "", err
+	}
+	p := make([]*image.NRGBA, piclen)
+	for i := 0; i < piclen; i++ {
+		if i < len(locs) {
+			p[i] = imgs[i].InsertBottom(im.Im, locs[i][2], locs[i][3], locs[i][0], locs[i][1]).Im
+		} else {
+			p[i] = imgs[i].Im
+		}
+	}
+	play := make([]*image.NRGBA, 0, 16)
+	play = append(play, p[0:12]...)
+	play = append(play, p[0:12]...)
+	play = append(play, p[0:8]...)
+	play = append(play, p[12:18]...)
+	play = append(play, p[18:23]...)
+	return "file:///" + name, writer.SaveGIF2Path(name, img.MergeGif(7, play))
+}
+
+// pound 捣
+func pound(cc *context, value ...string) (string, error) {
+	_ = value
+	var wg sync.WaitGroup
+	var err error
+	var m sync.Mutex
+	piclen := 8
+	name := cc.usrdir + "Pound.gif"
+	c := dlrange("pound", piclen, &wg, func(e error) {
+		m.Lock()
+		err = e
+		m.Unlock()
+	})
+	if err != nil {
+		return "", err
+	}
+	wg.Wait()
+	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 0, 0)
+	if err != nil {
+		return "", err
+	}
+	locs := [][]int{{135, 240, 138, 47}, {135, 240, 138, 47}, {150, 190, 105, 95}, {150, 190, 105, 95}, {148, 188, 106, 98}, {146, 196, 110, 88}, {145, 223, 112, 61}, {145, 223, 112, 61}}
+	imgs, err := loadFirstFrames(c, piclen)
+	if err != nil {
+		return "", err
+	}
+	pound := make([]*image.NRGBA, piclen)
+	for i := 0; i < piclen; i++ {
+		pound[i] = imgs[i].InsertBottom(im.Im, locs[i][2], locs[i][3], locs[i][0], locs[i][1]).Im
+	}
+	return "file:///" + name, writer.SaveGIF2Path(name, img.MergeGif(7, pound))
+}
+
+// punch 打拳
+func punch(cc *context, value ...string) (string, error) {
+	_ = value
+	var wg sync.WaitGroup
+	var err error
+	var m sync.Mutex
+	piclen := 13
+	name := cc.usrdir + "Punch.gif"
+	c := dlrange("punch", piclen, &wg, func(e error) {
+		m.Lock()
+		err = e
+		m.Unlock()
+	})
+	if err != nil {
+		return "", err
+	}
+	wg.Wait()
+	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 260, 260)
+	if err != nil {
+		return "", err
+	}
+	locs := [][]int{{-50, 20}, {-40, 10}, {-30, 0}, {-20, -10}, {-10, -10}, {0, 0}, {10, 10}, {20, 20}, {10, 10}, {0, 0}, {-10, -10}, {10, 0}, {-30, 10}}
+	imgs, err := loadFirstFrames(c, piclen)
+	if err != nil {
+		return "", err
+	}
+	punch := make([]*image.NRGBA, piclen)
+	for i := 0; i < piclen; i++ {
+		punch[i] = imgs[i].InsertBottom(im.Im, 0, 0, locs[i][0], locs[i][1]-15).Im
+	}
+	return "file:///" + name, writer.SaveGIF2Path(name, img.MergeGif(7, punch))
+}
+
+// roll 滚
+func roll(cc *context, value ...string) (string, error) {
+	_ = value
+	var wg sync.WaitGroup
+	var err error
+	var m sync.Mutex
+	piclen := 8
+	name := cc.usrdir + "roll.gif"
+	c := dlrange("roll", piclen, &wg, func(e error) {
+		m.Lock()
+		err = e
+		m.Unlock()
+	})
+	if err != nil {
+		return "", err
+	}
+	wg.Wait()
+	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 210, 210)
+	if err != nil {
+		return "", err
+	}
+	locs := [][]int{{87, 77, 0}, {96, 85, -45}, {92, 79, -90}, {92, 78, -135}, {92, 75, -180}, {92, 75, -225}, {93, 76, -270}, {90, 80, -315}}
+	imgs, err := loadFirstFrames(c, piclen)
+	if err != nil {
+		return "", err
+	}
+	roll := make([]*image.NRGBA, piclen)
+	for i := 0; i < piclen; i++ {
+		roll[i] = imgs[i].InsertBottomC(img.Rotate(im.Im, float64(locs[i][2]), 0, 0).Im, 0, 0, locs[i][0]+105, locs[i][1]+105).Im
+	}
+	return "file:///" + name, writer.SaveGIF2Path(name, img.MergeGif(7, roll))
+}
+
+// suck 吸 嗦
+func suck(cc *context, value ...string) (string, error) {
+	_ = value
+	var wg sync.WaitGroup
+	var err error
+	var m sync.Mutex
+	piclen := 12
+	name := cc.usrdir + "Suck.gif"
+	c := dlrange("suck", piclen, &wg, func(e error) {
+		m.Lock()
+		err = e
+		m.Unlock()
+	})
+	if err != nil {
+		return "", err
+	}
+	wg.Wait()
+	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 0, 0)
+	if err != nil {
+		return "", err
+	}
+	locs := [][]int{{82, 100, 130, 119}, {82, 94, 126, 125}, {82, 120, 128, 99}, {81, 164, 132, 55}, {79, 163, 132, 55}, {82, 140, 127, 79}, {83, 152, 125, 67}, {75, 157, 140, 62}, {72, 165, 144, 54}, {80, 132, 128, 87}, {81, 127, 127, 92}, {79, 111, 132, 108}}
+	imgs, err := loadFirstFrames(c, piclen)
+	if err != nil {
+		return "", err
+	}
+	suck := make([]*image.NRGBA, piclen)
+	for i := 0; i < piclen; i++ {
+		suck[i] = imgs[i].InsertBottom(im.Im, locs[i][2], locs[i][3], locs[i][0], locs[i][1]).Im
+	}
+	return "file:///" + name, writer.SaveGIF2Path(name, img.MergeGif(7, suck))
+}
+
+// hammer 锤
+func hammer(cc *context, value ...string) (string, error) {
+	_ = value
+	var wg sync.WaitGroup
+	var err error
+	var m sync.Mutex
+	piclen := 7
+	name := cc.usrdir + "Hammer.gif"
+	c := dlrange("hammer", piclen, &wg, func(e error) {
+		m.Lock()
+		err = e
+		m.Unlock()
+	})
+	if err != nil {
+		return "", err
+	}
+	wg.Wait()
+	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 0, 0)
+	if err != nil {
+		return "", err
+	}
+	locs := [][]int{{62, 143, 158, 113}, {52, 177, 173, 105}, {42, 192, 192, 92}, {46, 182, 184, 100}, {54, 169, 174, 110}, {69, 128, 144, 135}, {65, 130, 152, 124}}
+	imgs, err := loadFirstFrames(c, piclen)
+	if err != nil {
+		return "", err
+	}
+	hammer := make([]*image.NRGBA, piclen)
+	for i := 0; i < piclen; i++ {
+		hammer[i] = imgs[i].InsertBottom(im.Im, locs[i][2], locs[i][3], locs[i][0], locs[i][1]).Im
+	}
+	return "file:///" + name, writer.SaveGIF2Path(name, img.MergeGif(7, hammer))
+}
+
+// tightly 紧贴 紧紧贴着
+func tightly(cc *context, value ...string) (string, error) {
+	_ = value
+	var wg sync.WaitGroup
+	var err error
+	var m sync.Mutex
+	piclen := 20
+	name := cc.usrdir + "Tightly.gif"
+	c := dlrange("tightly", piclen, &wg, func(e error) {
+		m.Lock()
+		err = e
+		m.Unlock()
+	})
+	if err != nil {
+		return "", err
+	}
+	wg.Wait()
+	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 0, 0)
+	if err != nil {
+		return "", err
+	}
+	locs := [][]int{{39, 169, 267, 141}, {40, 167, 264, 143}, {38, 174, 270, 135}, {40, 167, 264, 143}, {38, 174, 270, 135}, {40, 167, 264, 143}, {38, 174, 270, 135}, {40, 167, 264, 143}, {38, 174, 270, 135}, {28, 176, 293, 134}, {5, 215, 333, 96}, {10, 210, 321, 102}, {3, 210, 330, 104}, {4, 210, 328, 102}, {4, 212, 328, 100}, {4, 212, 328, 100}, {4, 212, 328, 100}, {4, 212, 328, 100}, {4, 212, 328, 100}, {29, 195, 285, 120}}
+	imgs, err := loadFirstFrames(c, piclen)
+	if err != nil {
+		return "", err
+	}
+	tightly := make([]*image.NRGBA, piclen)
+	for i := 0; i < piclen; i++ {
+		tightly[i] = imgs[i].InsertBottom(im.Im, locs[i][2], locs[i][3], locs[i][0], locs[i][1]).Im
+	}
+	return "file:///" + name, writer.SaveGIF2Path(name, img.MergeGif(7, tightly))
+}
+
+// turn 转
+func turn(cc *context, value ...string) (string, error) {
+	_ = value
+	name := cc.usrdir + "Turn.gif"
+	face, err := cc.getLogo(0, 0)
+	if err != nil {
+		return "", err
+	}
+	canvas := gg.NewContext(250, 250)
+	canvas.SetColor(color.White)
+	canvas.DrawRectangle(0, 0, 250, 250)
+	canvas.Fill()
+	turn := make([]*image.NRGBA, 36)
+	for i := 0; i < 36; i++ {
+		turn[i] = img.Size(canvas.Image(), 0, 0).InsertUpC(img.Rotate(face, float64(10*i), 250, 250).Im, 0, 0, 125, 125).Im
+	}
+	return "file:///" + name, writer.SaveGIF2Path(name, img.MergeGif(7, turn))
+}
+
+// taiguan 抬棺
+func taiguan(cc *context, value ...string) (string, error) {
+	_ = value
+	_ = value
+	var wg sync.WaitGroup
+	var err error
+	var m sync.Mutex
+	name := cc.usrdir + "taiguan.gif"
+	c := dlrange("taiguan", 20, &wg, func(e error) {
+		m.Lock()
+		err = e
+		m.Unlock()
+	})
+	if err != nil {
+		return "", err
+	}
+	tou, err := cc.getLogo(0, 0)
+	if err != nil {
+		return "", err
+	}
+	wg.Wait()
+	if err != nil {
+		return "", err
+	}
+	imgs, err := loadFirstFrames(c, 20)
+	if err != nil {
+		return "", err
+	}
+	taiguan := []*image.NRGBA{
+		imgs[0].InsertUp(tou, 85, 85, 180, 65).Im,
+		imgs[1].InsertUp(tou, 85, 85, 180, 65).Im,
+		imgs[2].InsertUp(tou, 85, 85, 180, 65).Im,
+		imgs[3].InsertUp(tou, 85, 85, 180, 65).Im,
+		imgs[4].InsertUp(tou, 85, 85, 177, 65).Im,
+		imgs[5].InsertUp(tou, 85, 85, 175, 65).Im,
+		imgs[6].InsertUp(tou, 85, 85, 173, 65).Im,
+		imgs[7].InsertUp(tou, 85, 85, 171, 65).Im,
+		imgs[8].InsertUp(tou, 85, 85, 170, 65).Im,
+		imgs[9].InsertUp(tou, 85, 85, 170, 65).Im,
+		imgs[10].InsertUp(tou, 85, 85, 170, 65).Im,
+		imgs[11].InsertUp(tou, 85, 85, 170, 65).Im,
+		imgs[12].InsertUp(tou, 85, 85, 170, 65).Im,
+		imgs[13].InsertUp(tou, 85, 85, 170, 65).Im,
+		imgs[14].InsertUp(tou, 85, 85, 170, 65).Im,
+		imgs[15].InsertUp(tou, 85, 85, 170, 65).Im,
+		imgs[16].InsertUp(tou, 85, 85, 170, 65).Im,
+		imgs[17].InsertUp(tou, 85, 85, 170, 65).Im,
+		imgs[18].InsertUp(tou, 85, 85, 170, 65).Im,
+		imgs[19].InsertUp(tou, 85, 85, 175, 65).Im,
+	}
+	return "file:///" + name, writer.SaveGIF2Path(name, img.MergeGif(7, taiguan))
+}
+
+// zou 揍
+func zou(cc *context, value ...string) (string, error) {
+	_ = value
+	var wg sync.WaitGroup
+	var err error
+	var m sync.Mutex
+	name := cc.usrdir + "zou.gif"
+	c := dlrange("zou", 3, &wg, func(e error) {
+		m.Lock()
+		err = e
+		m.Unlock()
+	})
+	if err != nil {
+		return "", err
+	}
+	tou, err := cc.getLogo(100, 100)
+	if err != nil {
+		return "", err
+	}
+	tou2, err := cc.getLogo2(100, 100)
+	if err != nil {
+		return "", err
+	}
+	wg.Wait()
+	if err != nil {
+		return "", err
+	}
+	imgs, err := loadFirstFrames(c, 3)
+	if err != nil {
+		return "", err
+	}
+	zou := []*image.NRGBA{
+		imgs[0].InsertUp(tou, 40, 40, 98, 138).InsertUp(tou2, 55, 55, 100, 45).Im,
+		imgs[1].InsertUp(tou, 40, 40, 98, 138).InsertUp(tou2, 55, 55, 101, 45).Im,
+		imgs[2].InsertUp(tou, 40, 40, 89, 140).InsertUp(tou2, 55, 55, 99, 40).Im,
+	}
+	return "file:///" + name, writer.SaveGIF2Path(name, img.MergeGif(8, zou))
+}
+
+// ci 吞
+func ci(cc *context, value ...string) (string, error) {
+	_ = value
+	var wg sync.WaitGroup
+	var err error
+	var m sync.Mutex
+	name := cc.usrdir + "ci.gif"
+	c := dlrange("ci", 26, &wg, func(e error) {
+		m.Lock()
+		err = e
+		m.Unlock()
+	})
+	if err != nil {
+		return "", err
+	}
+	tou, err := cc.getLogo(100, 100)
+	if err != nil {
+		return "", err
+	}
+	wg.Wait()
+	if err != nil {
+		return "", err
+	}
+	imgs, err := loadFirstFrames(c, 26)
+	if err != nil {
+		return "", err
+	}
+	ci := []*image.NRGBA{
+		imgs[0].InsertBottom(tou, 25, 25, 25, 57).Im,
+		imgs[1].InsertBottom(tou, 25, 25, 27, 58).Im,
+		imgs[2].InsertBottom(tou, 25, 25, 28, 57).Im,
+		imgs[3].InsertBottom(tou, 25, 25, 30, 57).Im,
+		imgs[4].InsertBottom(tou, 25, 25, 30, 58).Im,
+		imgs[5].InsertBottom(tou, 25, 25, 30, 59).Im,
+		imgs[6].Im,
+		imgs[7].Im,
+		imgs[8].Im,
+		imgs[9].Im,
+		imgs[10].Im,
+		imgs[11].Im,
+		imgs[12].Im,
+		imgs[13].Im,
+		imgs[14].Im,
+		imgs[15].Im,
+		imgs[16].Im,
+		imgs[17].Im,
+		imgs[18].Im,
+		imgs[19].Im,
+		imgs[20].Im,
+		imgs[21].Im,
+		imgs[22].Im,
+		imgs[23].Im,
+		imgs[24].Im,
+		imgs[25].Im,
+	}
+	return "file:///" + name, writer.SaveGIF2Path(name, img.MergeGif(7, ci))
+}
+
+// worship 膜拜
+func worship(cc *context, value ...string) (string, error) {
+	_ = value
+	_ = value
+	var wg sync.WaitGroup
+	var err error
+	var m sync.Mutex
+	name := cc.usrdir + "worship.gif"
+	c := dlrange("worship", 9, &wg, func(e error) {
+		m.Lock()
+		err = e
+		m.Unlock()
+	})
+	if err != nil {
+		return "", err
+	}
+	face, err := gg.LoadImage(cc.headimgsdir[0])
+	if err != nil {
+		return "", err
+	}
+	wg.Wait()
+	if err != nil {
+		return "", err
+	}
+	imgs, err := loadFirstFrames(c, 9)
+	if err != nil {
+		return "", err
+	}
+	worship := []*image.NRGBA{
+		imgs[0].InsertBottom(face, 140, 140, 0, 0).Im,
+		imgs[1].InsertBottom(face, 140, 140, 0, 0).Im,
+		imgs[2].InsertBottom(face, 140, 140, 0, 0).Im,
+		imgs[3].InsertBottom(face, 140, 140, 0, 0).Im,
+		imgs[4].InsertBottom(face, 140, 140, 0, 0).Im,
+		imgs[5].InsertBottom(face, 140, 140, 0, 0).Im,
+		imgs[6].InsertBottom(face, 140, 140, 0, 0).Im,
+		imgs[7].InsertBottom(face, 140, 140, 0, 0).Im,
+		imgs[8].InsertBottom(face, 140, 140, 0, 0).Im,
+	}
+	return "file:///" + name, writer.SaveGIF2Path(name, img.MergeGif(7, worship))
+}
+
+// 2ceng 2蹭
+func ceng2(cc *context, value ...string) (string, error) {
+	_ = value
+	var wg sync.WaitGroup
+	var err error
+	var m sync.Mutex
+	name := cc.usrdir + "ceng2.gif"
+	c := dlrange("ceng2", 4, &wg, func(e error) {
+		m.Lock()
+		err = e
+		m.Unlock()
+	})
+	if err != nil {
+		return "", err
+	}
+	tou, err := cc.getLogo(100, 100)
+	if err != nil {
+		return "", err
+	}
+	wg.Wait()
+	if err != nil {
+		return "", err
+	}
+	imgs, err := loadFirstFrames(c, 4)
+	if err != nil {
+		return "", err
+	}
+	ceng2 := []*image.NRGBA{
+		imgs[0].InsertBottom(tou, 175, 175, 78, 263).Im,
+		imgs[1].InsertBottom(tou, 175, 175, 78, 263).Im,
+		imgs[2].InsertBottom(tou, 175, 175, 78, 263).Im,
+		imgs[3].InsertBottom(tou, 175, 175, 78, 263).Im,
+	}
+	return "file:///" + name, writer.SaveGIF2Path(name, img.MergeGif(7, ceng2))
+}
+
+// dun 炖
+func dun(cc *context, value ...string) (string, error) {
+	_ = value
+	var wg sync.WaitGroup
+	var err error
+	var m sync.Mutex
+	name := cc.usrdir + "dun.gif"
+	c := dlrange("dun", 5, &wg, func(e error) {
+		m.Lock()
+		err = e
+		m.Unlock()
+	})
+	if err != nil {
+		return "", err
+	}
+	tou, err := cc.getLogo(100, 100)
+	if err != nil {
+		return "", err
+	}
+	wg.Wait()
+	if err != nil {
+		return "", err
+	}
+	imgs, err := loadFirstFrames(c, 5)
+	if err != nil {
+		return "", err
+	}
+	dun := []*image.NRGBA{
+		imgs[0].InsertBottom(tou, 80, 80, 85, 45).Im,
+		imgs[1].InsertBottom(tou, 80, 80, 85, 45).Im,
+		imgs[2].InsertBottom(tou, 80, 80, 85, 45).Im,
+		imgs[3].InsertBottom(tou, 80, 80, 85, 45).Im,
+		imgs[4].InsertBottom(tou, 80, 80, 85, 45).Im,
+	}
+	return "file:///" + name, writer.SaveGIF2Path(name, img.MergeGif(7, dun))
+}

plugin/gif/run.go

@@ -2,33 +2,129 @@
 package gif
 
 import (
-	"reflect"
 	"strconv"
 	"strings"
 
-	control "github.com/FloatTech/zbputils/control"
+	ctrl "github.com/FloatTech/zbpctrl"
+	"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"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 var (
-	cmds = []string{"搓", "冲", "摸", "拍", "丢", "吃", "敲", "啃", "蹭", "爬", "撕",
-		"灰度", "上翻", "下翻", "左翻", "右翻", "反色", "浮雕", "打码", "负片"}
+	cmd      = make([]string, 0)
 	datapath string
+	cmdMap   = map[string]func(cc *context, args ...string) (string, error){
+		"炖":      dun,
+		"2蹭":     ceng2,
+		"诶嘿":     eihei,
+		"膜拜":     worship,
+		"吞":      ci,
+		"揍":      zou,
+		"给我变":    bian,
+		"玩一下":    van,
+		"不要看":    neko,
+		"小天使":    xiaotianshi,
+		"你的":     youer,
+		"我老婆":    nowife,
+		"远离":     yuanli,
+		"抬棺":     taiguan,
+		"搓":      cuo,
+		"冲":      xqe,
+		"摸":      mo,
+		"拍":      pai,
+		"丢":      diu,
+		"吃":      chi,
+		"敲":      qiao,
+		"啃":      ken,
+		"蹭":      ceng,
+		"爬":      pa,
+		"撕":      si,
+		"灰度":     grayscale,
+		"上翻":     flipV,
+		"下翻":     flipV,
+		"左翻":     flipH,
+		"右翻":     flipH,
+		"反色":     invert,
+		"浮雕":     convolve3x3,
+		"打码":     blur,
+		"负片":     invertAndGrayscale,
+		"旋转":     rotate,
+		"变形":     deformation,
+		"亲":      kiss,
+		"结婚申请":   marriage,
+		"结婚登记":   marriage,
+		"阿尼亚喜欢":  anyasuki,
+		"像只":     alike,
+		"我永远喜欢":  alwaysLike,
+		"永远喜欢":   alwaysLike,
+		"像样的亲亲":  decentKiss,
+		"国旗":     chinaFlag,
+		"不要靠近":   dontTouch,
+		"万能表情":   universal,
+		"空白表情":   universal,
+		"采访":     interview,
+		"需要":     need,
+		"你可能需要":  need,
+		"这像画吗":   paint,
+		"小画家":    painter,
+		"完美":     perfect,
+		"玩游戏":    playGame,
+		"出警":     police,
+		"警察":     police1,
+		"舔":      prpr,
+		"舔屏":     prpr,
+		"prpr":   prpr,
+		"安全感":    safeSense,
+		"精神支柱":   support,
+		"想什么":    thinkwhat,
+		"墙纸":     wallpaper,
+		"为什么at我": whyatme,
+		"交个朋友":   makeFriend,
+		"打工人":    backToWork,
+		"继续干活":   backToWork,
+		"兑换券":    coupon,
+		"注意力涣散":  distracted,
+		"垃圾桶":    garbage,
+		"垃圾":     garbage,
+		"捶":      thump,
+		"啾啾":     jiujiu,
+		"2敲":     knock,
+		"听音乐":    listenMusic,
+		"永远爱你":   loveYou,
+		"2拍":     pat,
+		"顶":      jackUp,
+		"捣":      pound,
+		"打拳":     punch,
+		"滚":      roll,
+		"吸":      suck,
+		"嗦":      suck,
+		"扔":      throw,
+		"锤":      hammer,
+		"紧贴":     tightly,
+		"紧紧贴着":   tightly,
+		"转":      turn,
+	}
 )
 
 func init() { // 插件主体
-	en := control.Register("gif", order.AcquirePrio(), &control.Options{
-		DisableOnDefault:  false,
-		Help:              "制图\n- " + strings.Join(cmds, "\n- "),
+	for k := range cmdMap {
+		cmd = append(cmd, k)
+	}
+	en := control.Register("gif", &ctrl.Options[*zero.Ctx]{
+		DisableOnDefault: false,
+		Help: "制图\n- 搓\n- 冲\n- 摸\n- 拍\n- 丢\n- 吃\n- 敲\n- 啃\n- 蹭\n- 爬\n- 撕\n- 灰度\n- 上翻|下翻\n" +
+			"- 左翻|右翻\n- 反色\n- 浮雕\n- 打码\n- 负片\n- 旋转 45\n- 变形 100 100\n- 亲\n- 结婚申请|结婚登记\n- 阿尼亚喜欢\n- 像只\n" +
+			"- 我永远喜欢|永远喜欢\n- 像样的亲亲\n- 国旗\n- 不要靠近\n- 万能表情|空白表情\n- 采访\n- 需要|你可能需要\n- 这像画吗\n- 小画家\n" +
+			"- 完美\n- 玩游戏\n- 出警\n- 警察\n- 舔|舔屏|prpr\n- 安全感\n- 精神支柱\n- 想什么\n- 墙纸\n- 为什么at我\n- 交个朋友\n- 打工人|继续干活\n" +
+			"- 兑换券\n- 注意力涣散\n- 垃圾桶|垃圾\n- 捶\n- 啾啾\n- 2敲\n- 听音乐\n- 永远爱你\n- 2拍\n- 顶\n- 捣\n- 打拳\n- 滚\n- 吸|嗦\n- 扔\n" +
+			"- 锤\n- 紧贴|紧紧贴着\n- 转\n",
 		PrivateDataFolder: "gif",
 	}).ApplySingle(ctxext.DefaultSingle)
 	datapath = file.BOTPATH + "/" + en.DataFolder()
-	en.OnRegex(`^(` + strings.Join(cmds, "|") + `)\D*?(\[CQ:(image\,file=([0-9a-zA-Z]{32}).*|at.+?(\d{5,11}))\].*|(\d+))$`).
+	en.OnRegex(`^(` + strings.Join(cmd, "|") + `)[\s\S]*?(\[CQ:(image\,file=([0-9a-zA-Z]{32}).*|at.+?(\d{5,11}))\].*|(\d+))$`).
 		SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		c := newContext(ctx.Event.UserID)
 		list := ctx.State["regex_matched"].([]string)
@@ -37,16 +133,8 @@ func init() { // 插件主体
 			ctx.SendChain(message.Text("ERROR:", err))
 			return
 		}
-		var picurl string
-		if len([]rune(list[1])) == 1 {
-			r := reflect.ValueOf(c).MethodByName("A" + list[1]).Call(nil)
-			picurl = r[0].String()
-			if !r[1].IsNil() {
-				err = r[1].Interface().(error)
-			}
-		} else {
-			picurl, err = c.other(list[1]) // "灰度", "上翻", "下翻", "左翻", "右翻", "反色", "倒放", "浮雕", "打码", "负片"
-		}
+		argslist := strings.Split(strings.TrimSuffix(strings.TrimPrefix(list[0], list[1]), list[2]), " ")
+		picurl, err := cmdMap[list[1]](c, argslist...)
 		if err != nil {
 			ctx.SendChain(message.Text("ERROR:", err))
 			return

plugin/github/repo_searcher.go

@@ -9,17 +9,16 @@ import (
 	"net/url"
 	"strings"
 
-	control "github.com/FloatTech/zbputils/control"
+	ctrl "github.com/FloatTech/zbpctrl"
+	"github.com/FloatTech/zbputils/control"
 	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", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
 		Help: "GitHub仓库搜索\n" +
 			"- >github [xxx]\n" +
@@ -62,9 +61,9 @@ func init() { // 插件主体
 						"Star/Fork/Issue: ",
 						repo.Get("watchers").Int(), "/", repo.Get("forks").Int(), "/", repo.Get("open_issues").Int(), "\n",
 						"Language: ",
-						notnull(repo.Get("language").Str, "None"), "\n",
+						notnull(repo.Get("language").Str), "\n",
 						"License: ",
-						notnull(strings.ToUpper(repo.Get("license.key").Str), "None"), "\n",
+						notnull(strings.ToUpper(repo.Get("license.key").Str)), "\n",
 						"Last pushed: ",
 						repo.Get("pushed_at").Str, "\n",
 						"Jump: ",
@@ -80,9 +79,9 @@ func init() { // 插件主体
 						"Star/Fork/Issue: ",
 						repo.Get("watchers").Int(), "/", repo.Get("forks").Int(), "/", repo.Get("open_issues").Int(), "\n",
 						"Language: ",
-						notnull(repo.Get("language").Str, "None"), "\n",
+						notnull(repo.Get("language").Str), "\n",
 						"License: ",
-						notnull(strings.ToUpper(repo.Get("license.key").Str), "None"), "\n",
+						notnull(strings.ToUpper(repo.Get("license.key").Str)), "\n",
 						"Last pushed: ",
 						repo.Get("pushed_at").Str, "\n",
 						"Jump: ",
@@ -98,9 +97,9 @@ func init() { // 插件主体
 
 // notnull 如果传入文本为空，则返回默认值
 
-func notnull(text, defstr string) string {
+func notnull(text string) string {
 	if text == "" {
-		return defstr
+		return "None"
 	}
 	return text
 }

plugin/guessmusic/main.go

@@ -0,0 +1,802 @@
+// Package guessmusic 基于zbp的猜歌插件
+package guessmusic
+
+import (
+	"bytes"
+	"encoding/json"
+	"io/fs"
+	"io/ioutil"
+	"math/rand"
+	"net/http"
+	"net/url"
+	"os"
+	"os/exec"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/sirupsen/logrus"
+	"github.com/wdvxdr1123/ZeroBot/utils/helper"
+
+	"github.com/pkg/errors"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+
+	ctrl "github.com/FloatTech/zbpctrl"
+	"github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/file"
+	"github.com/FloatTech/zbputils/web"
+	"github.com/wdvxdr1123/ZeroBot/extension/single"
+
+	// 图片输出
+
+	"github.com/FloatTech/zbputils/img/text"
+)
+
+const (
+	ua = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36 Edg/87.0.664.66"
+)
+
+var (
+	catlist       = make(map[string]int64, 100)
+	filelist      []string
+	musictypelist = "mp3;MP3;wav;WAV;amr;AMR;3gp;3GP;3gpp;3GPP;acc;ACC"
+	cuttime       = [...]string{"00:00:05", "00:00:30", "00:01:00"} // 音乐切割时间点，可自行调节时间（时：分：秒）
+	cfg           config
+)
+
+func init() { // 插件主体
+	engine := control.Register("guessmusic", &ctrl.Options[*zero.Ctx]{
+		DisableOnDefault: false,
+		Help: "猜歌插件（该插件依赖ffmpeg）\n" +
+			"------bot主人指令------\n" +
+			"- 设置猜歌缓存歌库路径 [绝对路径]\n" +
+			"- 设置猜歌[本地/Api] [true/false]\n" +
+			"- 登录网易云\n" +
+			"- 添加歌单 [网易云歌单ID] [歌单名称]\n" +
+			"- 删除歌单 [网易云歌单ID/API歌单名称]\n" +
+			"注：\n1.不登陆也能用，API有几率返回400\n" +
+			"2.[歌单名称]可为空，默认原标题\n" +
+			"------公 用 指 令------\n" +
+			"- 获取歌单列表\n" +
+			"- [网易云歌单ID/API歌单名称]歌单信息\n" +
+			"- [个人/团队]猜歌\n" +
+			"注：默认歌库为网易云ACG动画榜\n" +
+			"可在后面添加[-歌单名称]进行指定歌单猜歌\n" +
+			"歌单的歌曲命名规则为:\n歌名 - 歌手 - 其他(歌曲出处之类)",
+		PrivateDataFolder: "guessmusic",
+	}).ApplySingle(single.New(
+		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("已经有正在进行的游戏..."),
+				),
+			)
+		}),
+	))
+	cachePath := engine.DataFolder() + "cache/"
+	err := os.MkdirAll(cachePath, 0755)
+	if err != nil {
+		panic(err)
+	}
+	cfgFile := engine.DataFolder() + "config.json"
+	if file.IsExist(cfgFile) {
+		reader, err := os.Open(cfgFile)
+		if err == nil {
+			err = json.NewDecoder(reader).Decode(&cfg)
+			if err != nil {
+				panic(err)
+			}
+		} else {
+			panic(err)
+		}
+		err = reader.Close()
+		if err != nil {
+			panic(err)
+		}
+	} else {
+		var plist = []listRaw{
+			{
+				Name: "动画榜",
+				ID:   3001835560,
+			},
+		}
+		cfg = config{ // 默认 config
+			MusicPath: file.BOTPATH + "/data/guessmusic/music/", // 绝对路径，歌库根目录,通过指令进行更改
+			Local:     true,                                     // 是否使用本地音乐库
+			API:       true,                                     // 是否使用 Api
+			Cookie:    "",
+			Playlist:  plist,
+		}
+		err = saveConfig(cfgFile)
+		if err != nil {
+			panic(err)
+		}
+	}
+	err = getcatlist(cfg.MusicPath)
+	if err != nil {
+		logrus.Infof("[guessmusic2]无法获取歌单列表,[error]：%s", err)
+	}
+	engine.OnRegex(`^设置猜歌(缓存歌库路径|本地|Api)\s*(.*)$`, func(ctx *zero.Ctx) bool {
+		if !zero.SuperUserPermission(ctx) {
+			ctx.SendChain(message.Text("只有bot主人可以设置！"))
+			return false
+		}
+		return true
+	}).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			option := ctx.State["regex_matched"].([]string)[1]
+			value := ctx.State["regex_matched"].([]string)[2]
+			switch option {
+			case "缓存歌库路径":
+				if value == "" {
+					ctx.SendChain(message.Text("请输入正确的路径!"))
+					return
+				}
+				musicPath := strings.ReplaceAll(value, "\\", "/")
+				if !strings.HasSuffix(musicPath, "/") {
+					musicPath += "/"
+				}
+				err = os.MkdirAll(cfg.MusicPath, 0755)
+				if err != nil {
+					ctx.SendChain(message.Text("[生成文件夹错误]ERROR:", err))
+					return
+				}
+				cfg.MusicPath = musicPath
+			case "本地":
+				choice, err := strconv.ParseBool(value)
+				if err != nil {
+					ctx.SendChain(message.Text("ERROR:", err))
+					return
+				}
+				cfg.Local = choice
+			case "Api":
+				choice, err := strconv.ParseBool(value)
+				if err != nil {
+					ctx.SendChain(message.Text("ERROR:", err))
+					return
+				}
+				cfg.API = choice
+			}
+			err = saveConfig(cfgFile)
+			if err == nil {
+				ctx.SendChain(message.Text("成功！"))
+			} else {
+				ctx.SendChain(message.Text("ERROR:", err))
+			}
+		})
+	engine.OnFullMatch("登录网易云", zero.SuperUserPermission, func(ctx *zero.Ctx) bool {
+		if !zero.OnlyPrivate(ctx) {
+			ctx.SendChain(message.Text("为了保护登录过程，请bot主人私聊。"))
+			return false
+		}
+		return true
+	}).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			keyURL := "https://music.cyrilstudio.top/login/qr/key"
+			data, err := web.GetData(keyURL)
+			if err != nil {
+				ctx.SendChain(message.Text("获取网易云key失败, ERROR:", err))
+				return
+			}
+			var keyInfo keyInfo
+			err = json.Unmarshal(data, &keyInfo)
+			if err != nil {
+				ctx.SendChain(message.Text("解析网易云key失败, ERROR:", err))
+				return
+			}
+			qrURL := "https://music.cyrilstudio.top/login/qr/create?key=" + keyInfo.Data.Unikey + "&qrimg=1"
+			data, err = web.GetData(qrURL)
+			if err != nil {
+				ctx.SendChain(message.Text("获取网易云二维码失败, ERROR:", err))
+				return
+			}
+			var qrInfo qrInfo
+			err = json.Unmarshal(data, &qrInfo)
+			if err != nil {
+				ctx.SendChain(message.Text("解析网易云二维码失败, ERROR:", err))
+				return
+			}
+			ctx.SendChain(message.Text("[请使用手机APP扫描二维码或者进入网页扫码登录]\n", qrInfo.Data.Qrurl),
+				message.Image("base64://"+strings.ReplaceAll(qrInfo.Data.Qrimg, "data:image/png;base64,", "")),
+				message.Text("二维码有效时间为6分钟,登陆后请耐心等待结果，获取cookie过程有些漫长。"))
+			i := 0
+			for range time.NewTicker(10 * time.Second).C {
+				apiURL := "https://music.cyrilstudio.top/login/qr/check?key=" + url.QueryEscape(keyInfo.Data.Unikey)
+				referer := "https://music.cyrilstudio.top"
+				data, err := web.RequestDataWith(web.NewDefaultClient(), apiURL, "GET", referer, ua)
+				if err != nil {
+					ctx.SendChain(message.Text("无法获取登录状态, ERROR:", err))
+					return
+				}
+				var cookiesInfo cookyInfo
+				err = json.Unmarshal(data, &cookiesInfo)
+				if err != nil {
+					ctx.SendChain(message.Text("解析登录状态失败, ERROR:", err))
+					return
+				}
+				switch cookiesInfo.Code {
+				case 803:
+					cfg.Cookie = cookiesInfo.Cookie
+					err = saveConfig(cfgFile)
+					if err == nil {
+						ctx.SendChain(message.Text("成功！"))
+					} else {
+						ctx.SendChain(message.Text("ERROR:", err))
+					}
+					return
+				case 801:
+					i++
+					if i%6 == 0 { // 每1分钟才提醒一次,减少提示(380/60=6次)
+						ctx.SendChain(message.Text("状态：", cookiesInfo.Message))
+					}
+					continue
+				case 800:
+					ctx.SendChain(message.Text("状态：", cookiesInfo.Message))
+					return
+				default:
+					ctx.SendChain(message.Text("状态：", cookiesInfo.Message))
+					continue
+				}
+			}
+		})
+	engine.OnRegex(`^添加歌单\s?(\d+)(\s(.*))?$`, zero.SuperUserPermission).SetBlock(true).Limit(ctxext.LimitByGroup).
+		Handle(func(ctx *zero.Ctx) {
+			listID := ctx.State["regex_matched"].([]string)[1]
+			listName := ctx.State["regex_matched"].([]string)[3]
+			ctx.SendChain(message.Text("正在校验歌单信息，请稍等"))
+			// 是否存在该歌单
+			apiURL := "https://music.cyrilstudio.top/playlist/detail?id=" + listID + "&cookie=" + cfg.Cookie
+			referer := "https://music.cyrilstudio.top"
+			data, err := web.RequestDataWith(web.NewDefaultClient(), apiURL, "GET", referer, ua)
+			if err != nil {
+				ctx.SendChain(message.Text("无法连接歌单,[error]", err))
+				return
+			}
+			var parsed topList
+			err = json.Unmarshal(data, &parsed)
+			if err != nil {
+				ctx.SendChain(message.Text("无法解析歌单ID内容,[error]", err))
+				return
+			}
+			// 是否有权限访问歌单列表内容
+			apiURL = "https://music.cyrilstudio.top/playlist/track/all?id=" + listID + "&cookie=" + cfg.Cookie
+			referer = "https://music.163.com/"
+			data, err = web.RequestDataWith(web.NewDefaultClient(), apiURL, "GET", referer, ua)
+			if err != nil {
+				ctx.SendChain(message.Text("无法获取歌单列表\n ERROR:", err))
+				return
+			}
+			var musiclist topMusicInfo
+			err = json.Unmarshal(data, &musiclist)
+			if err != nil {
+				ctx.SendChain(message.Text("你的cookie在API中无权访问该歌单\n该歌单有可能是用户私人歌单"))
+				return
+			}
+			// 获取列表名字
+			if listName == "" {
+				listName = parsed.Playlist.Name
+			}
+			playID, _ := strconv.ParseInt(listID, 10, 64)
+			catlist[listName] = playID
+			cfg.Playlist = append(cfg.Playlist, listRaw{
+				Name: listName,
+				ID:   playID,
+			})
+			err = saveConfig(cfgFile)
+			if err == nil {
+				ctx.SendChain(message.Text("成功！"))
+			} else {
+				ctx.SendChain(message.Text("ERROR:", err))
+			}
+		})
+	engine.OnRegex(`^删除歌单\s?(.*)$`, zero.SuperUserPermission).SetBlock(true).Limit(ctxext.LimitByGroup).
+		Handle(func(ctx *zero.Ctx) {
+			delList := ctx.State["regex_matched"].([]string)[1]
+			var playlist []listRaw
+			var newCatList = make(map[string]int64)
+			var ok = false
+			for name, musicID := range catlist {
+				if delList == name || delList == strconv.FormatInt(musicID, 10) {
+					ok = true
+					continue
+				}
+				newCatList[name] = musicID
+				playlist = append(playlist, listRaw{
+					Name: name,
+					ID:   musicID,
+				})
+			}
+			if !ok {
+				ctx.SendChain(message.Text("目标歌单未找到，请确认是否正确"))
+				return
+			}
+			catlist = newCatList
+			cfg.Playlist = playlist
+			err = saveConfig(cfgFile)
+			if err == nil {
+				ctx.SendChain(message.Text("成功！"))
+			} else {
+				ctx.SendChain(message.Text("ERROR:", err))
+			}
+		})
+	engine.OnFullMatch("获取歌单列表").SetBlock(true).Limit(ctxext.LimitByGroup).
+		Handle(func(ctx *zero.Ctx) {
+			var msg []string
+			// 获取网易云歌单列表
+			if cfg.API {
+				catlist = make(map[string]int64, 100)
+				msg = append(msg, "当前添加的API歌单含有以下：\n")
+				for i, listInfo := range cfg.Playlist {
+					catlist[listInfo.Name] = listInfo.ID
+					msg = append(msg, strconv.Itoa(i)+":"+listInfo.Name)
+					if i%3 == 2 {
+						msg = append(msg, "\n")
+					}
+				}
+			}
+			// 获取本地歌单列表*/
+			if cfg.Local {
+				err = os.MkdirAll(cfg.MusicPath, 0755)
+				if err == nil {
+					files, err := ioutil.ReadDir(cfg.MusicPath)
+					if err == nil {
+						if len(files) == 0 {
+							ctx.SendChain(message.Text("缓存目录没有读取到任何歌单"))
+							filelist = nil
+						} else {
+							msg = append(msg, "\n当前本地歌单含有以下：\n")
+							i := 0
+							for _, name := range files {
+								if !name.IsDir() {
+									continue
+								}
+								filelist[i] = strconv.Itoa(i) + ":" + name.Name()
+								msg = append(msg, filelist[i])
+								if i%3 == 2 {
+									msg = append(msg, "\n")
+								}
+								i++
+							}
+						}
+					} else {
+						ctx.SendChain(message.Text("[读取本地列表错误]ERROR:", err))
+					}
+				} else {
+					ctx.SendChain(message.Text("[生成文件夹错误]ERROR:", err))
+				}
+			}
+			if msg == nil {
+				ctx.SendChain(message.Text("本地和API均未开启！"))
+				return
+			}
+			msgs, err := text.RenderToBase64(strings.Join(msg, "    "), text.FontFile, 400, 20)
+			if err != nil {
+				ctx.SendChain(message.Text("生成列表图片失败，请重试"))
+				return
+			}
+			if id := ctx.SendChain(message.Image("base64://" + helper.BytesToString(msgs))); id.ID() == 0 {
+				ctx.SendChain(message.Text("ERROR: 可能被风控了"))
+			}
+		})
+	engine.OnSuffix("歌单信息").SetBlock(true).Limit(ctxext.LimitByGroup).
+		Handle(func(ctx *zero.Ctx) {
+			list := ctx.State["args"].(string)
+			if list == "" {
+				ctx.SendChain(message.Text("请输入歌单ID或者API歌单名称\n歌单ID为(网页/分享)链接的“playlist”后面的第一串数字"))
+				return
+			}
+			var listIDStr string
+			for listName, listID := range catlist {
+				if list == listName || list == strconv.FormatInt(listID, 10) {
+					listIDStr = strconv.FormatInt(listID, 10)
+					break
+				}
+			}
+			if listIDStr == "" {
+				_, err := strconv.ParseInt(list, 10, 64)
+				if err != nil {
+					ctx.SendChain(message.Text("仅支持歌单ID查询"))
+					return
+				}
+				listIDStr = list
+			}
+			apiURL := "https://music.cyrilstudio.top/playlist/detail?id=" + listIDStr + "&cookie=" + cfg.Cookie
+			referer := "https://music.cyrilstudio.top"
+			data, err := web.RequestDataWith(web.NewDefaultClient(), apiURL, "GET", referer, ua)
+			if err != nil {
+				ctx.SendChain(message.Text("无法连接歌单,[error]", err))
+				return
+			}
+			var parsed topList
+			err = json.Unmarshal(data, &parsed)
+			if err != nil {
+				ctx.SendChain(message.Text("无法解析歌单ID内容,[error]", err))
+				return
+			}
+			ctx.SendChain(
+				message.Image(parsed.Playlist.CoverImgURL),
+				message.Text(
+					"歌单名称：", parsed.Playlist.Name,
+					"\n歌单ID：", parsed.Playlist.ID,
+					"\n创建人：", parsed.Playlist.Creator.Nickname,
+					"\n创建时间：", time.Unix(parsed.Playlist.CreateTime/1000, 0).Format("2006-01-02"),
+					"\n标签：", strings.Join(parsed.Playlist.Tags, ";"),
+					"\n歌曲数量：", parsed.Playlist.TrackCount,
+					"\n歌单简介:\n", parsed.Playlist.Description,
+					"\n更新时间：", time.Unix(parsed.Playlist.UpdateTime/1000, 0).Format("2006-01-02"),
+				))
+		})
+	engine.OnRegex(`^(个人|团队)猜歌(-(.*))?$`, zero.OnlyGroup).SetBlock(true).Limit(ctxext.LimitByGroup).
+		Handle(func(ctx *zero.Ctx) {
+			mode := ctx.State["regex_matched"].([]string)[3]
+			if mode == "" {
+				mode = "动画榜"
+				catlist[mode] = 3001835560
+			}
+			_, ok := catlist[mode]
+			// 如果本地和API不存在该歌单
+			if !strings.Contains(strings.Join(filelist, " "), mode) && !ok {
+				ctx.SendChain(message.Text("歌单名称错误，可以发送“获取歌单列表”获取歌单名称"))
+				return
+			}
+			gid := strconv.FormatInt(ctx.Event.GroupID, 10)
+			ctx.SendChain(message.Text("正在准备歌曲,请稍等\n回答“-[歌曲信息(歌名歌手等)|提示|取消]”\n一共3段语音，6次机会"))
+			// 随机抽歌
+			musicName, pathOfMusic, err := musicLottery(mode, cfg.MusicPath)
+			if err != nil {
+				ctx.SendChain(message.Text(err))
+				return
+			}
+			// 解析歌曲信息
+			music := strings.Split(musicName, ".")
+			// 获取音乐后缀
+			musictype := music[len(music)-1]
+			if !strings.Contains(musictypelist, musictype) {
+				ctx.SendChain(message.Text("抽取到了本地歌曲：\n",
+					musicName, "\n该歌曲不是音乐后缀，请联系bot主人修改"))
+				return
+			}
+			// 获取音乐信息
+			musicInfo := strings.Split(strings.ReplaceAll(musicName, "."+musictype, ""), " - ")
+			infoNum := len(musicInfo)
+			if infoNum == 1 {
+				ctx.SendChain(message.Text("抽取到了本地歌曲：\n",
+					musicName, "\n该歌曲命名不符合命名规则，请联系bot主人修改"))
+				return
+			}
+			answerString := "歌名:" + musicInfo[0] + "\n歌手:" + musicInfo[1]
+			musicAlia := ""
+			if infoNum > 2 {
+				musicAlia = musicInfo[2]
+				answerString += "\n其他信息:\n" + strings.ReplaceAll(musicAlia, "&", "\n")
+			}
+			// 切割音频，生成3个10秒的音频
+			outputPath := cachePath + gid + "/"
+			err = cutMusic(musicName, pathOfMusic, outputPath)
+			if err != nil {
+				ctx.SendChain(message.Text(err))
+				return
+			}
+			// 进行猜歌环节
+			ctx.SendChain(message.Record("file:///" + file.BOTPATH + "/" + outputPath + "0.wav"))
+			var next *zero.FutureEvent
+			if ctx.State["regex_matched"].([]string)[1] == "个人" {
+				next = zero.NewFutureEvent("message", 999, false, zero.OnlyGroup, zero.RegexRule(`^-\S{1,}`), ctx.CheckSession())
+			} else {
+				next = zero.NewFutureEvent("message", 999, false, zero.OnlyGroup, zero.RegexRule(`^-\S{1,}`), zero.CheckGroup(ctx.Event.GroupID))
+			}
+			var musicCount = 0  // 音频数量
+			var answerCount = 0 // 问答次数
+			recv, cancel := next.Repeat()
+			defer cancel()
+			wait := time.NewTimer(40 * time.Second)
+			tick := time.NewTimer(105 * time.Second)
+			after := time.NewTimer(120 * time.Second)
+			for {
+				select {
+				case <-tick.C:
+					ctx.SendChain(message.Text("猜歌游戏，你还有15s作答时间"))
+				case <-after.C:
+					ctx.Send(message.ReplyWithMessage(ctx.Event.MessageID,
+						message.Text("时间超时，猜歌结束，公布答案：\n", answerString)))
+					return
+				case <-wait.C:
+					wait.Reset(40 * time.Second)
+					musicCount++
+					if musicCount > 2 {
+						wait.Stop()
+						continue
+					}
+					ctx.SendChain(
+						message.Text("好像有些难度呢，再听这段音频，要仔细听哦"),
+					)
+					ctx.SendChain(message.Record("file:///" + file.BOTPATH + "/" + outputPath + strconv.Itoa(musicCount) + ".wav"))
+				case c := <-recv:
+					wait.Reset(40 * time.Second)
+					tick.Reset(105 * time.Second)
+					after.Reset(120 * time.Second)
+					answer := strings.Replace(c.Event.Message.String(), "-", "", 1)
+					switch {
+					case answer == "取消":
+						if c.Event.UserID == ctx.Event.UserID {
+							wait.Stop()
+							tick.Stop()
+							after.Stop()
+							ctx.Send(message.ReplyWithMessage(ctx.Event.MessageID,
+								message.Text("游戏已取消，猜歌答案是\n", answerString)))
+							return
+						}
+						ctx.Send(
+							message.ReplyWithMessage(c.Event.MessageID,
+								message.Text("你无权限取消"),
+							),
+						)
+					case answer == "提示":
+						musicCount++
+						if musicCount > 2 {
+							wait.Stop()
+							ctx.Send(
+								message.ReplyWithMessage(c.Event.MessageID,
+									message.Text("已经没有提示了哦"),
+								),
+							)
+							continue
+						}
+						wait.Reset(40 * time.Second)
+						ctx.Send(
+							message.ReplyWithMessage(c.Event.MessageID,
+								message.Text("再听这段音频，要仔细听哦"),
+							),
+						)
+						ctx.SendChain(message.Record("file:///" + file.BOTPATH + "/" + outputPath + strconv.Itoa(musicCount) + ".wav"))
+					case strings.Contains(musicInfo[0], answer) || strings.EqualFold(musicInfo[0], answer):
+						wait.Stop()
+						tick.Stop()
+						after.Stop()
+						ctx.Send(message.ReplyWithMessage(c.Event.MessageID,
+							message.Text("太棒了，你猜对歌曲名了！答案是\n", answerString)))
+						return
+					case strings.Contains(musicInfo[1], answer) || strings.EqualFold(musicInfo[1], answer):
+						wait.Stop()
+						tick.Stop()
+						after.Stop()
+						ctx.Send(message.ReplyWithMessage(c.Event.MessageID,
+							message.Text("太棒了，你猜对歌手名了！答案是\n", answerString)))
+						return
+					case strings.Contains(musicAlia, answer) || strings.EqualFold(musicAlia, answer):
+						wait.Stop()
+						tick.Stop()
+						after.Stop()
+						ctx.Send(message.ReplyWithMessage(c.Event.MessageID,
+							message.Text("太棒了，你猜对出处了！答案是\n", answerString)))
+						return
+					default:
+						musicCount++
+						switch {
+						case musicCount > 2 && answerCount < 6:
+							wait.Stop()
+							answerCount++
+							ctx.Send(
+								message.ReplyWithMessage(c.Event.MessageID,
+									message.Text("答案不对哦，加油啊~"),
+								),
+							)
+						case musicCount > 2:
+							wait.Stop()
+							tick.Stop()
+							after.Stop()
+							ctx.Send(message.ReplyWithMessage(c.Event.MessageID,
+								message.Text("次数到了，没能猜出来。答案是\n", answerString)))
+							return
+						default:
+							wait.Reset(40 * time.Second)
+							answerCount++
+							ctx.Send(
+								message.ReplyWithMessage(c.Event.MessageID,
+									message.Text("答案不对，再听这段音频，要仔细听哦"),
+								),
+							)
+							ctx.SendChain(message.Record("file:///" + file.BOTPATH + "/" + outputPath + strconv.Itoa(musicCount) + ".wav"))
+						}
+					}
+				}
+			}
+		})
+}
+
+func saveConfig(cfgFile string) (err error) {
+	if reader, err := os.Create(cfgFile); err == nil {
+		err = json.NewEncoder(reader).Encode(&cfg)
+		if err != nil {
+			return err
+		}
+	} else {
+		return err
+	}
+	return nil
+}
+
+func getcatlist(pathOfMusic string) error {
+	catlist = make(map[string]int64, 100)
+	for _, listInfo := range cfg.Playlist {
+		catlist[listInfo.Name] = listInfo.ID
+	}
+	err := os.MkdirAll(pathOfMusic, 0755)
+	if err != nil {
+		err = errors.Errorf("[生成文件夹错误]ERROR:%s", err)
+		return err
+	}
+	files, err := ioutil.ReadDir(pathOfMusic)
+	if err != nil {
+		err = errors.Errorf("[读取本地列表错误]ERROR:%s", err)
+		return err
+	}
+	for i, name := range files {
+		filelist = append(filelist, strconv.Itoa(i)+":"+name.Name())
+	}
+	return nil
+}
+
+// 随机抽取音乐
+func musicLottery(mode, musicPath string) (musicName, pathOfMusic string, err error) {
+	pathOfMusic = musicPath + mode + "/"
+	err = os.MkdirAll(pathOfMusic, 0755)
+	if err != nil {
+		err = errors.Errorf("[生成文件夹错误]ERROR:%s", err)
+		return
+	}
+	files, err := ioutil.ReadDir(pathOfMusic)
+	if err != nil {
+		err = errors.Errorf("[读取本地列表错误]ERROR:%s", err)
+		return
+	}
+	listID, ok := catlist[mode]
+	listIDstr := strconv.FormatInt(listID, 10)
+	if cfg.Local && cfg.API {
+		switch {
+		case len(files) == 0:
+			if !ok {
+				// 如果歌单是本地歌单
+				err = errors.New("本地歌单数据为0")
+				return
+			}
+			// 如果没有任何本地就下载歌曲
+			musicName, err = getListMusic(listIDstr, pathOfMusic)
+			if err != nil {
+				err = errors.Errorf("[本地数据为0，歌曲下载错误]ERROR:%s", err)
+				return
+			}
+		case rand.Intn(2) == 0 || !ok:
+			// 1/2概率抽本地或者歌单只有本地有时
+			musicName = getLocalMusic(files)
+		default:
+			musicName, err = getListMusic(listIDstr, pathOfMusic)
+			if err != nil {
+				// 如果下载失败就从本地抽一个歌曲
+				musicName = getLocalMusic(files)
+				err = nil
+			}
+		}
+		return
+	}
+	if cfg.Local {
+		if len(files) == 0 {
+			err = errors.New("[本地数据为0，未开启API数据]")
+			return
+		}
+		musicName = getLocalMusic(files)
+		return
+	}
+	if cfg.API && ok {
+		musicName, err = getListMusic(listIDstr, pathOfMusic)
+		if err != nil {
+			err = errors.Errorf("[获取API失败，未开启本地数据] ERROR:%s", err)
+			return
+		}
+		return
+	}
+	err = errors.New("[请确认本地和API设置已开启或歌单存在]")
+	return
+}
+
+func getLocalMusic(files []fs.FileInfo) (musicName string) {
+	if len(files) > 1 {
+		musicName = files[rand.Intn(len(files))].Name()
+	} else {
+		musicName = files[0].Name()
+	}
+	return
+}
+
+// 下载网易云歌单音乐
+func getListMusic(listID, pathOfMusic string) (musicName string, err error) {
+	apiURL := "https://music.cyrilstudio.top/playlist/track/all?id=" + listID + "&cookie=" + cfg.Cookie
+	referer := "https://music.163.com/"
+	data, err := web.RequestDataWith(web.NewDefaultClient(), apiURL, "GET", referer, ua)
+	if err != nil {
+		err = errors.Errorf("无法获取歌单列表\n ERROR: %s", err)
+		return
+	}
+	var parsed topMusicInfo
+	err = json.Unmarshal(data, &parsed)
+	if err != nil {
+		err = errors.Errorf("无法读取歌单列表\n ERROR: %s", err)
+		return
+	}
+	listlen := len(parsed.Songs)
+	randidx := rand.Intn(listlen)
+	// 将"/"符号去除，不然无法生成文件
+	name := strings.ReplaceAll(parsed.Songs[randidx].Name, "/", "·")
+	musicID := parsed.Songs[randidx].ID
+	artistName := ""
+	for i, ARInfo := range parsed.Songs[randidx].Ar {
+		if i != 0 {
+			artistName += "&" + ARInfo.Name
+		} else {
+			artistName += ARInfo.Name
+		}
+	}
+	cource := ""
+	if parsed.Songs[randidx].Alia != nil {
+		cource = strings.Join(parsed.Songs[randidx].Alia, "&")
+		// 将"/"符号去除，不然无法下载
+		cource = strings.ReplaceAll(cource, "/", "&")
+	}
+	if name == "" || musicID == 0 {
+		err = errors.New("无法获API取歌曲信息")
+		return
+	}
+	musicURL := "http://music.163.com/song/media/outer/url?id=" + strconv.Itoa(musicID)
+	response, err := http.Head(musicURL)
+	if err != nil {
+		err = errors.Errorf("下载音乐失败, ERROR: %s", err)
+		return
+	}
+	_ = response.Body.Close()
+	if response.StatusCode != 200 {
+		err = errors.Errorf("下载音乐失败, Status Code: %d", response.StatusCode)
+		return
+	}
+	if cource != "" {
+		musicName = name + " - " + artistName + " - " + cource + ".mp3"
+	} else {
+		musicName = name + " - " + artistName + ".mp3"
+	}
+	downMusic := pathOfMusic + musicName
+	if file.IsNotExist(downMusic) {
+		data, err = web.GetData(musicURL)
+		if err != nil {
+			return
+		}
+		err = os.WriteFile(downMusic, data, 0666)
+		if err != nil {
+			return
+		}
+	}
+	return
+}
+
+// 切割音乐成三个10s音频
+func cutMusic(musicName, pathOfMusic, outputPath string) (err error) {
+	err = os.MkdirAll(outputPath, 0755)
+	if err != nil {
+		err = errors.Errorf("[生成歌曲目录错误]ERROR:%s", err)
+		return
+	}
+	var stderr bytes.Buffer
+	cmdArguments := []string{"-y", "-i", pathOfMusic + musicName,
+		"-ss", cuttime[0], "-t", "10", file.BOTPATH + "/" + outputPath + "0.wav",
+		"-ss", cuttime[1], "-t", "10", file.BOTPATH + "/" + outputPath + "1.wav",
+		"-ss", cuttime[2], "-t", "10", file.BOTPATH + "/" + outputPath + "2.wav", "-hide_banner"}
+	cmd := exec.Command("ffmpeg", cmdArguments...)
+	cmd.Stderr = &stderr
+	err = cmd.Run()
+	if err != nil {
+		err = errors.Errorf("[生成歌曲错误]ERROR:%s", stderr.String())
+		return
+	}
+	return
+}

plugin/guessmusic/struct.go

@@ -0,0 +1,406 @@
+package guessmusic
+
+type listRaw struct {
+	Name string `json:"name"`
+	ID   int64  `json:"id"`
+}
+
+type config struct {
+	MusicPath string    `json:"musicPath"`
+	Local     bool      `json:"local"`
+	API       bool      `json:"api"`
+	Cookie    string    `json:"cookie"`
+	Playlist  []listRaw `json:"playlist"`
+}
+
+type keyInfo struct {
+	Data struct {
+		Code   int    `json:"code"`
+		Unikey string `json:"unikey"`
+	} `json:"data"`
+	Code int `json:"code"`
+}
+type cookyInfo struct {
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+	Cookie  string `json:"cookie"`
+}
+type qrInfo struct {
+	Code int `json:"code"`
+	Data struct {
+		Qrurl string `json:"qrurl"`
+		Qrimg string `json:"qrimg"`
+	} `json:"data"`
+}
+type topList struct {
+	Code          int         `json:"code"`
+	RelatedVideos interface{} `json:"relatedVideos"`
+	Playlist      struct {
+		ID                    int64       `json:"id"`
+		Name                  string      `json:"name"`
+		CoverImgID            int64       `json:"coverImgId"`
+		CoverImgURL           string      `json:"coverImgUrl"`
+		CoverImgIDStr         string      `json:"coverImgId_str"`
+		AdType                int         `json:"adType"`
+		UserID                int         `json:"userId"`
+		CreateTime            int64       `json:"createTime"`
+		Status                int         `json:"status"`
+		OpRecommend           bool        `json:"opRecommend"`
+		HighQuality           bool        `json:"highQuality"`
+		NewImported           bool        `json:"newImported"`
+		UpdateTime            int64       `json:"updateTime"`
+		TrackCount            int         `json:"trackCount"`
+		SpecialType           int         `json:"specialType"`
+		Privacy               int         `json:"privacy"`
+		TrackUpdateTime       int64       `json:"trackUpdateTime"`
+		CommentThreadID       string      `json:"commentThreadId"`
+		PlayCount             int         `json:"playCount"`
+		TrackNumberUpdateTime int64       `json:"trackNumberUpdateTime"`
+		SubscribedCount       int         `json:"subscribedCount"`
+		CloudTrackCount       int         `json:"cloudTrackCount"`
+		Ordered               bool        `json:"ordered"`
+		Description           string      `json:"description"`
+		Tags                  []string    `json:"tags"`
+		UpdateFrequency       interface{} `json:"updateFrequency"`
+		BackgroundCoverID     int         `json:"backgroundCoverId"`
+		BackgroundCoverURL    interface{} `json:"backgroundCoverUrl"`
+		TitleImage            int         `json:"titleImage"`
+		TitleImageURL         interface{} `json:"titleImageUrl"`
+		EnglishTitle          interface{} `json:"englishTitle"`
+		OfficialPlaylistType  interface{} `json:"officialPlaylistType"`
+		Subscribers           []struct {
+			DefaultAvatar       bool        `json:"defaultAvatar"`
+			Province            int         `json:"province"`
+			AuthStatus          int         `json:"authStatus"`
+			Followed            bool        `json:"followed"`
+			AvatarURL           string      `json:"avatarUrl"`
+			AccountStatus       int         `json:"accountStatus"`
+			Gender              int         `json:"gender"`
+			City                int         `json:"city"`
+			Birthday            int         `json:"birthday"`
+			UserID              int         `json:"userId"`
+			UserType            int         `json:"userType"`
+			Nickname            string      `json:"nickname"`
+			Signature           string      `json:"signature"`
+			Description         string      `json:"description"`
+			DetailDescription   string      `json:"detailDescription"`
+			AvatarImgID         int64       `json:"avatarImgId"`
+			BackgroundImgID     int64       `json:"backgroundImgId"`
+			BackgroundURL       string      `json:"backgroundUrl"`
+			Authority           int         `json:"authority"`
+			Mutual              bool        `json:"mutual"`
+			ExpertTags          interface{} `json:"expertTags"`
+			Experts             interface{} `json:"experts"`
+			DjStatus            int         `json:"djStatus"`
+			VipType             int         `json:"vipType"`
+			RemarkName          interface{} `json:"remarkName"`
+			AuthenticationTypes int         `json:"authenticationTypes"`
+			AvatarDetail        interface{} `json:"avatarDetail"`
+			Anchor              bool        `json:"anchor"`
+			BackgroundImgIDStr  string      `json:"backgroundImgIdStr"`
+			AvatarImgIDStr      string      `json:"avatarImgIdStr"`
+			AvatarImgIDString   string      `json:"AvatarImgIDString"`
+		} `json:"subscribers"`
+		Subscribed interface{} `json:"subscribed"`
+		Creator    struct {
+			DefaultAvatar       bool        `json:"defaultAvatar"`
+			Province            int         `json:"province"`
+			AuthStatus          int         `json:"authStatus"`
+			Followed            bool        `json:"followed"`
+			AvatarURL           string      `json:"avatarUrl"`
+			AccountStatus       int         `json:"accountStatus"`
+			Gender              int         `json:"gender"`
+			City                int         `json:"city"`
+			Birthday            int         `json:"birthday"`
+			UserID              int         `json:"userId"`
+			UserType            int         `json:"userType"`
+			Nickname            string      `json:"nickname"`
+			Signature           string      `json:"signature"`
+			Description         string      `json:"description"`
+			DetailDescription   string      `json:"detailDescription"`
+			AvatarImgID         int64       `json:"avatarImgId"`
+			BackgroundImgID     int64       `json:"backgroundImgId"`
+			BackgroundURL       string      `json:"backgroundUrl"`
+			Authority           int         `json:"authority"`
+			Mutual              bool        `json:"mutual"`
+			ExpertTags          interface{} `json:"expertTags"`
+			Experts             interface{} `json:"experts"`
+			DjStatus            int         `json:"djStatus"`
+			VipType             int         `json:"vipType"`
+			RemarkName          interface{} `json:"remarkName"`
+			AuthenticationTypes int         `json:"authenticationTypes"`
+			AvatarDetail        struct {
+				UserType        int    `json:"userType"`
+				IdentityLevel   int    `json:"identityLevel"`
+				IdentityIconURL string `json:"identityIconUrl"`
+			} `json:"avatarDetail"`
+			Anchor             bool   `json:"anchor"`
+			BackgroundImgIDStr string `json:"backgroundImgIdStr"`
+			AvatarImgIDStr     string `json:"avatarImgIdStr"`
+			AvatarImgIDString  string `json:"AvatarImgIDString"`
+		} `json:"creator"`
+		Tracks []struct {
+			Name string `json:"name"`
+			ID   int    `json:"id"`
+			Pst  int    `json:"pst"`
+			T    int    `json:"t"`
+			Ar   []struct {
+				ID    int           `json:"id"`
+				Name  string        `json:"name"`
+				Tns   []interface{} `json:"tns"`
+				Alias []interface{} `json:"alias"`
+			} `json:"ar"`
+			Alia []string    `json:"alia"`
+			Pop  int         `json:"pop"`
+			St   int         `json:"st"`
+			Rt   string      `json:"rt"`
+			Fee  int         `json:"fee"`
+			V    int         `json:"v"`
+			Crbt interface{} `json:"crbt"`
+			Cf   string      `json:"cf"`
+			Al   struct {
+				ID     int           `json:"id"`
+				Name   string        `json:"name"`
+				PicURL string        `json:"picUrl"`
+				Tns    []interface{} `json:"tns"`
+				PicStr string        `json:"pic_str"`
+				Pic    int64         `json:"pic"`
+			} `json:"al"`
+			Dt int `json:"dt"`
+			H  struct {
+				Br   int     `json:"br"`
+				Fid  int     `json:"fid"`
+				Size int     `json:"size"`
+				Vd   float64 `json:"vd"`
+				Sr   int     `json:"sr"`
+			} `json:"h"`
+			M struct {
+				Br   int     `json:"br"`
+				Fid  int     `json:"fid"`
+				Size int     `json:"size"`
+				Vd   float64 `json:"vd"`
+				Sr   int     `json:"sr"`
+			} `json:"m"`
+			L struct {
+				Br   int     `json:"br"`
+				Fid  int     `json:"fid"`
+				Size int     `json:"size"`
+				Vd   float64 `json:"vd"`
+				Sr   int     `json:"sr"`
+			} `json:"l"`
+			Sq                   interface{}   `json:"sq"`
+			Hr                   interface{}   `json:"hr"`
+			A                    interface{}   `json:"a"`
+			Cd                   string        `json:"cd"`
+			No                   int           `json:"no"`
+			RtURL                interface{}   `json:"rtUrl"`
+			Ftype                int           `json:"ftype"`
+			RtUrls               []interface{} `json:"rtUrls"`
+			DjID                 int           `json:"djId"`
+			Copyright            int           `json:"copyright"`
+			SID                  int           `json:"s_id"`
+			Mark                 int           `json:"mark"`
+			OriginCoverType      int           `json:"originCoverType"`
+			OriginSongSimpleData interface{}   `json:"originSongSimpleData"`
+			TagPicList           interface{}   `json:"tagPicList"`
+			ResourceState        bool          `json:"resourceState"`
+			Version              int           `json:"version"`
+			SongJumpInfo         interface{}   `json:"songJumpInfo"`
+			EntertainmentTags    interface{}   `json:"entertainmentTags"`
+			Single               int           `json:"single"`
+			NoCopyrightRcmd      interface{}   `json:"noCopyrightRcmd"`
+			Alg                  interface{}   `json:"alg"`
+			Rtype                int           `json:"rtype"`
+			Rurl                 interface{}   `json:"rurl"`
+			Mst                  int           `json:"mst"`
+			Cp                   int           `json:"cp"`
+			Mv                   int           `json:"mv"`
+			PublishTime          int64         `json:"publishTime"`
+			Tns                  []string      `json:"tns,omitempty"`
+		} `json:"tracks"`
+		VideoIds interface{} `json:"videoIds"`
+		Videos   interface{} `json:"videos"`
+		TrackIds []struct {
+			ID         int         `json:"id"`
+			V          int         `json:"v"`
+			T          int         `json:"t"`
+			At         int64       `json:"at"`
+			Alg        interface{} `json:"alg"`
+			UID        int         `json:"uid"`
+			RcmdReason string      `json:"rcmdReason"`
+			Sc         interface{} `json:"sc"`
+			Lr         int         `json:"lr,omitempty"`
+		} `json:"trackIds"`
+		ShareCount         int         `json:"shareCount"`
+		CommentCount       int         `json:"commentCount"`
+		RemixVideo         interface{} `json:"remixVideo"`
+		SharedUsers        interface{} `json:"sharedUsers"`
+		HistorySharedUsers interface{} `json:"historySharedUsers"`
+		GradeStatus        string      `json:"gradeStatus"`
+		Score              interface{} `json:"score"`
+		AlgTags            interface{} `json:"algTags"`
+	} `json:"playlist"`
+	Urls       interface{} `json:"urls"`
+	Privileges []struct {
+		ID                 int         `json:"id"`
+		Fee                int         `json:"fee"`
+		Payed              int         `json:"payed"`
+		RealPayed          int         `json:"realPayed"`
+		St                 int         `json:"st"`
+		Pl                 int         `json:"pl"`
+		Dl                 int         `json:"dl"`
+		Sp                 int         `json:"sp"`
+		Cp                 int         `json:"cp"`
+		Subp               int         `json:"subp"`
+		Cs                 bool        `json:"cs"`
+		Maxbr              int         `json:"maxbr"`
+		Fl                 int         `json:"fl"`
+		Pc                 interface{} `json:"pc"`
+		Toast              bool        `json:"toast"`
+		Flag               int         `json:"flag"`
+		PaidBigBang        bool        `json:"paidBigBang"`
+		PreSell            bool        `json:"preSell"`
+		PlayMaxbr          int         `json:"playMaxbr"`
+		DownloadMaxbr      int         `json:"downloadMaxbr"`
+		MaxBrLevel         string      `json:"maxBrLevel"`
+		PlayMaxBrLevel     string      `json:"playMaxBrLevel"`
+		DownloadMaxBrLevel string      `json:"downloadMaxBrLevel"`
+		PlLevel            string      `json:"plLevel"`
+		DlLevel            string      `json:"dlLevel"`
+		FlLevel            string      `json:"flLevel"`
+		Rscl               int         `json:"rscl"`
+		FreeTrialPrivilege struct {
+			ResConsumable  bool        `json:"resConsumable"`
+			UserConsumable bool        `json:"userConsumable"`
+			ListenType     interface{} `json:"listenType"`
+		} `json:"freeTrialPrivilege"`
+		ChargeInfoList []struct {
+			Rate          int         `json:"rate"`
+			ChargeURL     interface{} `json:"chargeUrl"`
+			ChargeMessage interface{} `json:"chargeMessage"`
+			ChargeType    int         `json:"chargeType"`
+		} `json:"chargeInfoList"`
+	} `json:"privileges"`
+	SharedPrivilege interface{} `json:"sharedPrivilege"`
+	ResEntrance     interface{} `json:"resEntrance"`
+}
+
+type topMusicInfo struct {
+	Songs []struct {
+		Name string `json:"name"`
+		ID   int    `json:"id"`
+		Pst  int    `json:"pst"`
+		T    int    `json:"t"`
+		Ar   []struct {
+			ID    int           `json:"id"`
+			Name  string        `json:"name"`
+			Tns   []interface{} `json:"tns"`
+			Alias []interface{} `json:"alias"`
+		} `json:"ar"`
+		Alia []string    `json:"alia"`
+		Pop  int         `json:"pop"`
+		St   int         `json:"st"`
+		Rt   string      `json:"rt"`
+		Fee  int         `json:"fee"`
+		V    int         `json:"v"`
+		Crbt interface{} `json:"crbt"`
+		Cf   string      `json:"cf"`
+		Al   struct {
+			ID     int           `json:"id"`
+			Name   string        `json:"name"`
+			PicURL string        `json:"picUrl"`
+			Tns    []interface{} `json:"tns"`
+			PicStr string        `json:"pic_str"`
+			Pic    int64         `json:"pic"`
+		} `json:"al"`
+		Dt int `json:"dt"`
+		H  struct {
+			Br   int     `json:"br"`
+			Fid  int     `json:"fid"`
+			Size int     `json:"size"`
+			Vd   float32 `json:"vd"`
+			Sr   int     `json:"sr"`
+		} `json:"h"`
+		M struct {
+			Br   int     `json:"br"`
+			Fid  int     `json:"fid"`
+			Size int     `json:"size"`
+			Vd   float32 `json:"vd"`
+			Sr   int     `json:"sr"`
+		} `json:"m"`
+		L struct {
+			Br   int     `json:"br"`
+			Fid  int     `json:"fid"`
+			Size int     `json:"size"`
+			Vd   float32 `json:"vd"`
+			Sr   int     `json:"sr"`
+		} `json:"l"`
+		Sq                   interface{}   `json:"sq"`
+		Hr                   interface{}   `json:"hr"`
+		A                    interface{}   `json:"a"`
+		Cd                   string        `json:"cd"`
+		No                   int           `json:"no"`
+		RtURL                interface{}   `json:"rtUrl"`
+		Ftype                int           `json:"ftype"`
+		RtUrls               []interface{} `json:"rtUrls"`
+		DjID                 int           `json:"djId"`
+		Copyright            int           `json:"copyright"`
+		SID                  int           `json:"s_id"`
+		Mark                 int           `json:"mark"`
+		OriginCoverType      int           `json:"originCoverType"`
+		OriginSongSimpleData interface{}   `json:"originSongSimpleData"`
+		TagPicList           interface{}   `json:"tagPicList"`
+		ResourceState        bool          `json:"resourceState"`
+		Version              int           `json:"version"`
+		SongJumpInfo         interface{}   `json:"songJumpInfo"`
+		EntertainmentTags    interface{}   `json:"entertainmentTags"`
+		AwardTags            interface{}   `json:"awardTags"`
+		Single               int           `json:"single"`
+		NoCopyrightRcmd      interface{}   `json:"noCopyrightRcmd"`
+		Rtype                int           `json:"rtype"`
+		Rurl                 interface{}   `json:"rurl"`
+		Mst                  int           `json:"mst"`
+		Cp                   int           `json:"cp"`
+		Mv                   int           `json:"mv"`
+		PublishTime          int64         `json:"publishTime"`
+		Tns                  []string      `json:"tns,omitempty"`
+	} `json:"songs"`
+	Privileges []struct {
+		ID                 int    `json:"id"`
+		Fee                int    `json:"fee"`
+		Payed              int    `json:"payed"`
+		St                 int    `json:"st"`
+		Pl                 int    `json:"pl"`
+		Dl                 int    `json:"dl"`
+		Sp                 int    `json:"sp"`
+		Cp                 int    `json:"cp"`
+		Subp               int    `json:"subp"`
+		Cs                 bool   `json:"cs"`
+		Maxbr              int    `json:"maxbr"`
+		Fl                 int    `json:"fl"`
+		Toast              bool   `json:"toast"`
+		Flag               int    `json:"flag"`
+		PreSell            bool   `json:"preSell"`
+		PlayMaxbr          int    `json:"playMaxbr"`
+		DownloadMaxbr      int    `json:"downloadMaxbr"`
+		MaxBrLevel         string `json:"maxBrLevel"`
+		PlayMaxBrLevel     string `json:"playMaxBrLevel"`
+		DownloadMaxBrLevel string `json:"downloadMaxBrLevel"`
+		PlLevel            string `json:"plLevel"`
+		DlLevel            string `json:"dlLevel"`
+		FlLevel            string `json:"flLevel"`
+		Rscl               int    `json:"rscl"`
+		FreeTrialPrivilege struct {
+			ResConsumable  bool        `json:"resConsumable"`
+			UserConsumable bool        `json:"userConsumable"`
+			ListenType     interface{} `json:"listenType"`
+		} `json:"freeTrialPrivilege"`
+		ChargeInfoList []struct {
+			Rate          int         `json:"rate"`
+			ChargeURL     interface{} `json:"chargeUrl"`
+			ChargeMessage interface{} `json:"chargeMessage"`
+			ChargeType    int         `json:"chargeType"`
+		} `json:"chargeInfoList"`
+	} `json:"privileges"`
+	Code int `json:"code"`
+}

plugin/hs/run.go

@@ -2,7 +2,6 @@
 package hs
 
 import (
-	"fmt"
 	"os"
 	"strconv"
 	"strings"
@@ -12,12 +11,11 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
-	control "github.com/FloatTech/zbputils/control"
+	ctrl "github.com/FloatTech/zbpctrl"
+	"github.com/FloatTech/zbputils/control"
 	"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 +41,7 @@ const (
 )
 
 func init() {
-	engine := control.Register("hs", order.AcquirePrio(), &control.Options{
+	engine := control.Register("hs", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
 		Help: "炉石\n" +
 			"- 搜卡[xxxx]\n" +
@@ -89,7 +87,6 @@ func init() {
 	// 卡组
 	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,123 @@
+// Package hyaku 百人一首
+package hyaku
+
+import (
+	"encoding/csv"
+	"fmt"
+	"math/rand"
+	"os"
+	"reflect"
+	"strconv"
+	"unsafe"
+
+	ctrl "github.com/FloatTech/zbpctrl"
+	"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", &ctrl.Options[*zero.Ctx]{
+		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

@@ -5,37 +5,64 @@ import (
 	"encoding/json"
 	"errors"
 	"math/rand"
+	"net/http"
 	"net/url"
+	"reflect"
+	"regexp"
 	"strings"
 
+	"github.com/lucas-clemente/quic-go/http3"
+
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
 	"github.com/FloatTech/AnimeAPI/pixiv"
 
+	ctrl "github.com/FloatTech/zbpctrl"
+	"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/img/pool"
 	"github.com/FloatTech/zbputils/web"
 )
 
 type resultjson struct {
-	Data struct {
+	Error   bool   `json:"error"`
+	Message string `json:"message"`
+	Data    struct {
 		Illusts []struct {
 			ID          int64  `json:"id"`
 			Title       string `json:"title"`
 			AltTitle    string `json:"altTitle"`
 			Description string `json:"description"`
-			Sanity      int    `json:"sanity"`
+			Type        int64  `json:"type"`
+			CreateDate  string `json:"createDate"`
+			UploadDate  string `json:"uploadDate"`
+			Sanity      int64  `json:"sanity"`
+			Width       int64  `json:"width"`
+			Height      int64  `json:"height"`
+			PageCount   int64  `json:"pageCount"`
+			Tags        []struct {
+				Name        string `json:"name"`
+				Translation string `json:"translation"`
+			} `json:"tags"`
+			Statistic struct {
+				Bookmarks int64 `json:"bookmarks"`
+				Likes     int64 `json:"likes"`
+				Comments  int64 `json:"comments"`
+				Views     int64 `json:"views"`
+			} `json:"statistic"`
+			Image string `json:"image"`
 		} `json:"illusts"`
+		Scores  []float64 `json:"scores"`
+		HasNext bool      `json:"has_next"`
 	} `json:"data"`
-	Error   bool   `json:"error"`
-	Message string `json:"message"`
 }
 
+var hrefre = regexp.MustCompile(`<a href=".*">`)
+
 func init() {
-	control.Register("imgfinder", order.AcquirePrio(), &control.Options{
+	control.Register("imgfinder", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
 		Help: "关键字搜图\n" +
 			"- 来张 [xxx]",
@@ -48,7 +75,8 @@ func init() {
 				return
 			}
 			rannum := rand.Intn(len(soutujson.Data.Illusts))
-			illust, err := pixiv.Works(soutujson.Data.Illusts[rannum].ID)
+			il := soutujson.Data.Illusts[rannum]
+			illust, err := pixiv.Works(il.ID)
 			if err != nil {
 				ctx.SendChain(message.Text("ERROR:", err))
 				return
@@ -60,7 +88,18 @@ func init() {
 			err = pool.SendImageFromPool(n, f, func() error {
 				// 下载图片
 				return illust.DownloadToCache(0)
-			}, ctxext.SendFakeForwardToGroup(ctx), ctxext.GetFirstMessageInForward(ctx))
+			}, ctxext.SendFakeForwardToGroup(ctx,
+				message.Text(
+					il.Width, "x", il.Height, "\n",
+					"标题: ", il.Title, "\n",
+					"副标题: ", il.AltTitle, "\n",
+					"ID: ", il.ID, "\n",
+					"画师: ", illust.UserName, " (", illust.UserId, ")", "\n",
+					"分级:", il.Sanity, "\n",
+					hrefre.ReplaceAllString(strings.ReplaceAll(strings.ReplaceAll(il.Description, "<br />", "\n"), "</a>", ""), ""),
+					printtags(reflect.ValueOf(&il.Tags)),
+				),
+			), ctxext.GetFirstMessageInForward(ctx))
 			if err != nil {
 				ctx.SendChain(message.Text("ERROR:", err))
 				return
@@ -70,7 +109,13 @@ 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")
+	var data []byte
+	data, err = web.RequestDataWith(&http.Client{Transport: &http3.RoundTripper{}},
+		"https://api.pixivel.moe/v2/pixiv/illust/search/"+url.QueryEscape(keyword)+"?page=0",
+		"GET",
+		"https://pixivel.moe/",
+		"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.61 Safari/537.36",
+	)
 	if err != nil {
 		return
 	}
@@ -80,3 +125,21 @@ func soutuapi(keyword string) (r resultjson, err error) {
 	}
 	return
 }
+
+func printtags(r reflect.Value) string {
+	tags := r.Elem()
+	s := binary.BytesToString(binary.NewWriterF(func(w *binary.Writer) {
+		for i := 0; i < tags.Len(); i++ {
+			_ = w.WriteByte('\n')
+			tag := tags.Index(i)
+			_ = w.WriteByte('#')
+			w.WriteString(tag.Field(0).String())
+			if !tag.Field(1).IsZero() {
+				w.WriteString(" (")
+				w.WriteString(tag.Field(1).String())
+				w.WriteString(")")
+			}
+		}
+	}))
+	return s
+}

plugin/inject/main.go

@@ -2,14 +2,14 @@
 package inject
 
 import (
+	ctrl "github.com/FloatTech/zbpctrl"
 	"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", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
 		Help: "注入指令\n" +
 			"- run[CQ码]",

plugin/jandan/jandan.go

@@ -6,16 +6,16 @@ import (
 	"hash/crc64"
 	"regexp"
 	"strconv"
+	"time"
 
+	ctrl "github.com/FloatTech/zbpctrl"
 	"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 +23,35 @@ const (
 )
 
 func init() {
-	engine := control.Register("jandan", order.AcquirePrio(), &control.Options{
+	engine := control.Register("jandan", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
 		Help:             "煎蛋网无聊图\n- 来份[屌|弔|吊]图\n- 更新[屌|弔|吊]图\n",
 		PublicDataFolder: "Jandan",
 	})
 
-	go func() {
-		dbpath := engine.DataFolder()
-		db.DBPath = dbpath + "pics.db"
-		_, _ = file.GetLazyData(db.DBPath, false, false)
-		err := db.Create("picture", &picture{})
+	getdb := ctxext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool {
+		db.DBPath = engine.DataFolder() + "pics.db"
+		_, _ = engine.GetLazyData("pics.db", false)
+		err := db.Open(time.Hour * 24)
 		if err != nil {
-			panic(err)
+			ctx.SendChain(message.Text("ERROR:", err))
+			return false
+		}
+		err = db.Create("picture", &picture{})
+		if err != nil {
+			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.OnRegex(`来份[屌|弔|吊]图`).SetBlock(true).
+	engine.OnRegex(`来份[屌|弔|吊]图`, getdb).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			u, err := getRandomPicture()
 			if err != nil {
@@ -54,7 +61,7 @@ func init() {
 			ctx.SendChain(message.Image(u))
 		})
 
-	engine.OnRegex(`更新[屌|弔|吊]图`, zero.SuperUserPermission).SetBlock(true).
+	engine.OnRegex(`更新[屌|弔|吊]图`, zero.SuperUserPermission, getdb).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.Send("少女更新中...")
 			webpageURL := api
@@ -71,7 +78,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

@@ -7,15 +7,13 @@ import (
 	"net/http"
 	"strings"
 
-	control "github.com/FloatTech/zbputils/control"
+	ctrl "github.com/FloatTech/zbpctrl"
+	"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 +23,7 @@ const (
 )
 
 func init() {
-	control.Register("juejuezi", order.AcquirePrio(), &control.Options{
+	control.Register("juejuezi", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
 		Help: "绝绝子生成器\n" +
 			"- 喝奶茶绝绝子 | 绝绝子吃饭",
@@ -37,14 +35,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 +57,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"
 
@@ -9,14 +10,13 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
-	control "github.com/FloatTech/zbputils/control"
+	ctrl "github.com/FloatTech/zbpctrl"
+	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/img/pool"
 	"github.com/FloatTech/zbputils/math"
 	"github.com/FloatTech/zbputils/process"
 	"github.com/FloatTech/zbputils/web"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -25,18 +25,30 @@ 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", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
 		Help: "lolicon\n" +
-			"- 来份萝莉",
-	}).ApplySingle(ctxext.DefaultSingle).OnFullMatch("来份萝莉").SetBlock(true).
+			"- 来份萝莉\n" +
+			"- 设置随机图片地址[http...]",
+	}).ApplySingle(ctxext.DefaultSingle)
+	en.OnFullMatch("来份萝莉").Limit(ctxext.LimitByGroup).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))
@@ -69,6 +81,7 @@ func init() {
 			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 +89,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

@@ -14,13 +14,12 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"
 
 	sql "github.com/FloatTech/sqlite"
-	control "github.com/FloatTech/zbputils/control"
+	ctrl "github.com/FloatTech/zbpctrl"
+	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
 	"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,7 +47,7 @@ const (
 		"- 取消在\"cron\"的提醒\n" +
 		"- 列出所有提醒\n" +
 		"- 翻牌\n" +
-		"- 设置欢迎语XXX 可选添加 [{at}] [{nickname}] [{avatar}] [{id}] {at}可在发送时艾特被欢迎者 {nickname}是被欢迎者名字 {avatar}是被欢迎者头像 {id}是被欢迎者QQ号\n" +
+		"- 设置欢迎语XXX 可选添加 [{at}] [{nickname}] [{avatar}] [{uid}] [{gid}] [{groupname}] {at}可在发送时艾特被欢迎者 {nickname}是被欢迎者名字 {avatar}是被欢迎者头像 {uid}是被欢迎者QQ号 {gid}是当前群群号 {groupname} 是当前群群名\n" +
 		"- 测试欢迎语\n" +
 		"- 设置告别辞 参数同设置欢迎语\n" +
 		"- 测试告别辞\n" +
@@ -61,7 +60,7 @@ var (
 )
 
 func init() { // 插件主体
-	engine := control.Register("manager", order.AcquirePrio(), &control.Options{
+	engine := control.Register("manager", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault:  false,
 		Help:              hint,
 		PrivateDataFolder: "manager",
@@ -69,8 +68,12 @@ func init() { // 插件主体
 
 	go func() {
 		db.DBPath = engine.DataFolder() + "config.db"
+		err := db.Open(time.Hour * 24)
+		if err != nil {
+			panic(err)
+		}
 		clock = timer.NewClock(db)
-		err := db.Create("welcome", &welcome{})
+		err = db.Create("welcome", &welcome{})
 		if err != nil {
 			panic(err)
 		}
@@ -351,11 +354,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()
 			})
@@ -391,7 +390,7 @@ func init() { // 插件主体
 				} else {
 					ctx.SendChain(message.Text("欢迎~"))
 				}
-				c, ok := control.Lookup("manager")
+				c, ok := ctx.State["manager"].(*ctrl.Control[*zero.Ctx])
 				if ok {
 					enable := c.GetData(ctx.Event.GroupID)&1 == 1
 					if enable {
@@ -449,9 +448,11 @@ func init() { // 插件主体
 	// 设置欢迎语
 	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 {
@@ -474,9 +475,11 @@ func init() { // 插件主体
 	// 设置告别辞
 	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:   ctx.State["regex_matched"].([]string)[1],
+				Msg:   farewellstring,
 			}
 			err := db.Insert("farewell", w)
 			if err == nil {
@@ -501,7 +504,7 @@ func init() { // 插件主体
 	engine.OnRegex(`^(.*)入群验证$`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			option := ctx.State["regex_matched"].([]string)[1]
-			c, ok := control.Lookup("manager")
+			c, ok := ctx.State["manager"].(*ctrl.Control[*zero.Ctx])
 			if ok {
 				data := c.GetData(ctx.Event.GroupID)
 				switch option {
@@ -526,7 +529,7 @@ func init() { // 插件主体
 	engine.OnRegex(`^(.*)gist加群自动审批$`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			option := ctx.State["regex_matched"].([]string)[1]
-			c, ok := control.Lookup("manager")
+			c, ok := ctx.State["manager"].(*ctrl.Control[*zero.Ctx])
 			if ok {
 				data := c.GetData(ctx.Event.GroupID)
 				switch option {
@@ -554,7 +557,7 @@ func init() { // 插件主体
 		/*if ctx.Event.RequestType == "friend" {
 			ctx.SetFriendAddRequest(ctx.Event.Flag, true, "")
 		}*/
-		c, ok := control.Lookup("manager")
+		c, ok := ctx.State["manager"].(*ctrl.Control[*zero.Ctx])
 		if ok && c.GetData(ctx.Event.GroupID)&0x10 == 0x10 && ctx.Event.RequestType == "group" && ctx.Event.SubType == "add" {
 			// gist 文件名是群号的 ascii 编码的 md5
 			// gist 内容是当前 uinx 时间戳，在 10 分钟内视为有效
@@ -566,7 +569,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, "")
@@ -581,13 +584,17 @@ func init() { // 插件主体
 
 // 传入 ctx 和 welcome格式string 返回cq格式string  使用方法:welcometocq(ctx,w.Msg)
 func welcometocq(ctx *zero.Ctx, welcome string) string {
-	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]"
-	id := strconv.FormatInt(ctx.Event.UserID, 10)
-	nickname := ctx.CardOrNickName(ctx.Event.UserID)
+	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, "{id}", id)
+	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

@@ -60,7 +60,7 @@ func (c *Clock) RegisterTimer(ts *Timer, save, isinit bool) bool {
 	if t != ts && ok { // 避免重复注册定时器
 		t.SetEn(false)
 	}
-	logrus.Println("[群管]注册计时器", key)
+	logrus.Infoln("[群管]注册计时器", key)
 	if ts.Cron != "" {
 		var ctx *zero.Ctx
 		if isinit {

plugin/midicreate/midicreate.go

@@ -0,0 +1,539 @@
+// Package midicreate 简易midi音乐制作
+package midicreate
+
+import (
+	"bytes"
+	"fmt"
+	"math"
+	"math/rand"
+	"os"
+	"os/exec"
+	"path"
+	"path/filepath"
+	"strconv"
+	"strings"
+	"time"
+
+	ctrl "github.com/FloatTech/zbpctrl"
+	"github.com/FloatTech/zbputils/binary"
+	"github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/file"
+	"github.com/FloatTech/zbputils/web"
+	"github.com/pkg/errors"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+	"gitlab.com/gomidi/midi/v2"
+	"gitlab.com/gomidi/midi/v2/smf"
+)
+
+func init() {
+	engine := control.Register("midicreate", &ctrl.Options[*zero.Ctx]{
+		DisableOnDefault: false,
+		Help: "midi音乐制作, 该插件需要安装timidity, linux安装脚本可参考https://gitcode.net/anto_july/midi/-/raw/master/timidity.sh, windows安装脚本可参考https://gitcode.net/anto_july/midi/-/raw/master/timidity.bat?inline=false, windows需要管理员模式运行\n" +
+			"- midi制作 CCGGAAGR FFEEDDCR GGFFEEDR GGFFEEDR CCGGAAGR FFEEDDCR\n" +
+			"- 个人听音练习\n" +
+			"- 团队听音练习\n" +
+			"- *.mid (midi 转 txt)\n" +
+			"- midi制作*.txt (txt 转 midi)\n" +
+			"- 设置音色40 (0~127)",
+		PrivateDataFolder: "midicreate",
+	})
+	cachePath := engine.DataFolder() + "cache/"
+	_ = os.RemoveAll(cachePath)
+	err := os.MkdirAll(cachePath, 0755)
+	if err != nil {
+		panic(err)
+	}
+	engine.OnPrefix("midi制作").SetBlock(true).Limit(ctxext.LimitByUser).
+		Handle(func(ctx *zero.Ctx) {
+			uid := ctx.Event.UserID
+			input := ctx.State["args"].(string)
+			midiFile := cachePath + strconv.FormatInt(uid, 10) + time.Now().Format("20060102150405") + "_midicreate.mid"
+			cmidiFile, err := str2music(ctx, input, midiFile)
+			if err != nil {
+				if file.IsExist(midiFile) {
+					ctx.UploadThisGroupFile(file.BOTPATH+"/"+midiFile, filepath.Base(midiFile), "")
+					return
+				}
+				ctx.SendChain(message.Text("ERROR:无法转换midi文件,", err))
+				return
+			}
+			ctx.SendChain(message.Record("file:///" + file.BOTPATH + "/" + cmidiFile))
+		})
+	engine.OnRegex("^(个人|团队)听音练习$", zero.OnlyGroup).SetBlock(true).Limit(ctxext.LimitByUser).
+		Handle(func(ctx *zero.Ctx) {
+			uid := ctx.Event.UserID
+			ctx.SendChain(message.Text("欢迎来到听音练习, 一共有5个问题, 每个问题1分"))
+			var mode int
+			var next *zero.FutureEvent
+			var maxErrorCount int
+			if ctx.State["regex_matched"].([]string)[1] == "个人" {
+				mode = 0
+				next = zero.NewFutureEvent("message", 999, false, zero.RegexRule(`^[A-G][b|#]?\d{0,2}$`),
+					zero.OnlyGroup, ctx.CheckSession())
+				maxErrorCount = 3
+			} else {
+				mode = 1
+				next = zero.NewFutureEvent("message", 999, false, zero.RegexRule(`^[A-G][b|#]?\d{0,2}$`),
+					zero.OnlyGroup, zero.CheckGroup(ctx.Event.GroupID))
+				maxErrorCount = 10
+			}
+			recv, cancel := next.Repeat()
+			defer cancel()
+
+			score := make(map[int64]float64)
+			round := 1
+			maxRound := 6
+			errorCount := 0
+			target := uint8(55 + rand.Intn(34))
+			answer := name(target) + strconv.Itoa(int(target/12))
+			midiFile := cachePath + strconv.FormatInt(uid, 10) + time.Now().Format("20060102150405") + "_midicreate.mid"
+			cmidiFile, err := str2music(ctx, answer, midiFile)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:听音练习结束, 无法转换midi文件, ", err))
+				return
+			}
+			time.Sleep(time.Millisecond * 500)
+			ctx.SendChain(message.Record("file:///" + file.BOTPATH + "/" + cmidiFile))
+			ctx.Send(
+				message.ReplyWithMessage(ctx.Event.MessageID,
+					message.Text("判断上面的音频, 输入音符, 例如C#6"),
+				),
+			)
+			tick := time.NewTimer(45 * time.Second)
+			after := time.NewTimer(60 * time.Second)
+			for {
+				select {
+				case <-tick.C:
+					ctx.SendChain(message.Text("听音练习, 你还有15s作答时间"))
+				case <-after.C:
+					var text string
+					for k, v := range score {
+						text += fmt.Sprintf("%s: %.1f\n", ctx.CardOrNickName(k), v)
+					}
+					ctx.Send(
+						message.ReplyWithMessage(ctx.Event.MessageID,
+							message.Text("听音练习超时, 练习结束...答案是: ", answer, "\n所得分数如下:\n", text),
+						),
+					)
+					return
+				case c := <-recv:
+					tick.Reset(45 * time.Second)
+					after.Reset(60 * time.Second)
+					n := processOne(c.Event.Message.String())
+					if n != target {
+						errorCount++
+					}
+					if errorCount == maxErrorCount || n == target {
+						if n == target {
+							ctx.Send(
+								message.ReplyWithMessage(c.Event.MessageID,
+									message.Text("恭喜你回答正确, 答案是: ", answer),
+								),
+							)
+						} else if errorCount == maxErrorCount {
+							ctx.Send(
+								message.ReplyWithMessage(c.Event.MessageID,
+									message.Text("你的回答是: "),
+								),
+							)
+							midiFile = cachePath + strconv.FormatInt(uid, 10) + time.Now().Format("20060102150405") + "_midicreate.mid"
+							cmidiFile, err = str2music(ctx, c.Event.Message.String(), midiFile)
+							if err != nil {
+								ctx.SendChain(message.Text("ERROR: can't convert midi file,", err))
+								return
+							}
+							time.Sleep(time.Millisecond * 500)
+							ctx.SendChain(message.Record("file:///" + file.BOTPATH + "/" + cmidiFile))
+							ctx.Send(
+								message.ReplyWithMessage(c.Event.MessageID,
+									message.Text("回答错误, 答案是: ", answer, ", 错误次数已达3次, 进入下一关"),
+								),
+							)
+						}
+						// 统计分数
+						if mode == 0 {
+							switch errorCount {
+							case 0:
+								score[c.Event.UserID] += 1.0
+							case 1:
+								score[c.Event.UserID] += 0.5
+							case 2:
+								score[c.Event.UserID] += 0.2
+							}
+						} else if mode == 1 {
+							if errorCount != maxErrorCount {
+								score[c.Event.UserID] += 1.0
+							}
+						}
+						// 下一关
+						round++
+						if round != maxRound {
+							errorCount = 0
+							target = uint8(55 + rand.Intn(34))
+							answer = name(target) + strconv.Itoa(int(target/12))
+							midiFile = cachePath + strconv.FormatInt(uid, 10) + time.Now().Format("20060102150405") + "_midicreate.mid"
+							cmidiFile, err = str2music(ctx, answer, midiFile)
+							if err != nil {
+								ctx.SendChain(message.Text("ERROR:听音练习结束, 无法转换midi文件, ", err))
+								return
+							}
+							time.Sleep(time.Millisecond * 500)
+							ctx.SendChain(message.Record("file:///" + file.BOTPATH + "/" + cmidiFile))
+							ctx.Send(
+								message.ReplyWithMessage(c.Event.MessageID,
+									message.Text("判断上面的音频, 输入音符, 例如C#6"),
+								),
+							)
+						}
+					} else if n != target {
+						ctx.Send(
+							message.ReplyWithMessage(c.Event.MessageID,
+								message.Text("你的回答是: "),
+							),
+						)
+						time.Sleep(time.Millisecond * 500)
+						midiFile = cachePath + strconv.FormatInt(uid, 10) + time.Now().Format("20060102150405") + "_midicreate.mid"
+						cmidiFile, err = str2music(ctx, c.Event.Message.String(), midiFile)
+						if err != nil {
+							ctx.SendChain(message.Text("ERROR: can't convert midi file,", err))
+							return
+						}
+						time.Sleep(time.Millisecond * 500)
+						ctx.SendChain(message.Record("file:///" + file.BOTPATH + "/" + cmidiFile))
+						ctx.Send(
+							message.ReplyWithMessage(c.Event.MessageID,
+								message.Text("回答错误, 错误次数为", errorCount, ", 请继续回答"),
+							),
+						)
+					}
+					if round == maxRound {
+						var text string
+						for k, v := range score {
+							text += fmt.Sprintf("%s: %.1f\n", ctx.CardOrNickName(k), v)
+						}
+						ctx.Send(
+							message.ReplyWithMessage(c.Event.MessageID,
+								message.Text("回答完毕, 所得分数如下:\n", text),
+							),
+						)
+						return
+					}
+				}
+			}
+		})
+	engine.On("notice/group_upload", func(ctx *zero.Ctx) bool {
+		return path.Ext(ctx.Event.File.Name) == ".mid"
+	}).SetBlock(false).Limit(ctxext.LimitByGroup).
+		Handle(func(ctx *zero.Ctx) {
+			fileURL := ctx.GetThisGroupFileUrl(ctx.Event.File.BusID, ctx.Event.File.ID)
+			data, err := web.GetData(fileURL)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			s, err := smf.ReadFrom(bytes.NewReader(data))
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			for i := 0; i < int(s.NumTracks()); i++ {
+				midStr := mid2txt(data, i)
+				if err != nil {
+					ctx.SendChain(message.Text("ERROR:", err))
+					return
+				}
+				fileName := strings.ReplaceAll(cachePath+"/"+ctx.Event.File.Name, ".mid", fmt.Sprintf("-%d.txt", i))
+				_ = os.WriteFile(fileName, binary.StringToBytes(midStr), 0666)
+				ctx.UploadThisGroupFile(file.BOTPATH+"/"+fileName, filepath.Base(fileName), "")
+			}
+		})
+	engine.On("notice/group_upload", func(ctx *zero.Ctx) bool {
+		return path.Ext(ctx.Event.File.Name) == ".txt" && strings.Contains(ctx.Event.File.Name, "midi制作")
+	}).SetBlock(false).Limit(ctxext.LimitByGroup).
+		Handle(func(ctx *zero.Ctx) {
+			fileURL := ctx.GetThisGroupFileUrl(ctx.Event.File.BusID, ctx.Event.File.ID)
+			data, err := web.GetData(fileURL)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			uid := ctx.Event.UserID
+			midiFile := cachePath + strconv.FormatInt(uid, 10) + time.Now().Format("20060102150405") + "_midicreate.mid"
+			cmidiFile, err := str2music(ctx, binary.BytesToString(data), midiFile)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:无法转换midi文件,", err))
+				return
+			}
+			ctx.SendChain(message.Record("file:///" + file.BOTPATH + "/" + cmidiFile))
+		})
+	engine.OnPrefix("设置音色").SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			param := ctx.State["args"].(string)
+			timbre, err := strconv.Atoi(param)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+			}
+			err = setTimbreMode(ctx, int64(timbre))
+			if err != nil {
+				ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(err))
+				return
+			}
+			ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("成功"))
+		})
+}
+
+var (
+	noteMap = map[string]uint8{
+		"C":  60,
+		"Db": 61,
+		"D":  62,
+		"Eb": 63,
+		"E":  64,
+		"F":  65,
+		"Gb": 66,
+		"G":  67,
+		"Ab": 68,
+		"A":  69,
+		"Bb": 70,
+		"B":  71,
+	}
+)
+
+func str2music(ctx *zero.Ctx, input, midiFile string) (cmidiFile string, err error) {
+	err = mkMidi(ctx, midiFile, input)
+	if err != nil {
+		return
+	}
+	cmidiFile = strings.ReplaceAll(midiFile, ".mid", ".wav")
+	cmd := exec.Command("timidity", file.BOTPATH+"/"+midiFile, "-Ow", "-o", file.BOTPATH+"/"+cmidiFile)
+	err = cmd.Run()
+	return
+}
+
+func mkMidi(ctx *zero.Ctx, filePath, input string) error {
+	if file.IsExist(filePath) {
+		return nil
+	}
+	var (
+		clock smf.MetricTicks
+		tr    smf.Track
+	)
+
+	tr.Add(0, smf.MetaMeter(4, 4))
+	tr.Add(0, smf.MetaTempo(72))
+	tr.Add(0, smf.MetaInstrument("Violin"))
+	timbre := getTimbreMode(ctx)
+	tr.Add(0, midi.ProgramChange(0, uint8(timbre)))
+
+	k := strings.ReplaceAll(input, " ", "")
+
+	var (
+		base        uint8
+		level       uint8
+		delay       uint32
+		sleepFlag   bool
+		lengthBytes = make([]byte, 0)
+	)
+
+	for i := 0; i < len(k); {
+		base = 0
+		level = 0
+		sleepFlag = false
+		lengthBytes = lengthBytes[:0]
+		for {
+			switch {
+			case k[i] == 'R':
+				sleepFlag = true
+				i++
+			case k[i] >= 'A' && k[i] <= 'G':
+				base = noteMap[k[i:i+1]] % 12
+				i++
+			case k[i] == 'b':
+				base--
+				i++
+			case k[i] == '#':
+				base++
+				i++
+			case k[i] >= '0' && k[i] <= '9':
+				level = level*10 + k[i] - '0'
+				i++
+			case k[i] == '<':
+				i++
+				for i < len(k) && (k[i] == '-' || (k[i] >= '0' && k[i] <= '9')) {
+					lengthBytes = append(lengthBytes, k[i])
+					i++
+				}
+			default:
+				return errors.Errorf("无法解析第%d个位置的%c字符", i, k[i])
+			}
+			if i >= len(k) || (k[i] >= 'A' && k[i] <= 'G') || k[i] == 'R' {
+				break
+			}
+		}
+		length, _ := strconv.Atoi(string(lengthBytes))
+		if sleepFlag {
+			if length >= 0 {
+				delay = clock.Ticks4th() * (1 << length)
+			} else {
+				delay = clock.Ticks4th() / (1 << -length)
+			}
+			continue
+		}
+		if level == 0 {
+			level = 5
+		}
+		tr.Add(delay, midi.NoteOn(0, o(base, level), 120))
+		if length >= 0 {
+			tr.Add(clock.Ticks4th()*(1<<length), midi.NoteOff(0, o(base, level)))
+		} else {
+			tr.Add(clock.Ticks4th()/(1<<-length), midi.NoteOff(0, o(base, level)))
+		}
+		delay = 0
+	}
+	tr.Close(0)
+
+	s := smf.New()
+	s.TimeFormat = clock
+	err := s.Add(tr)
+	if err != nil {
+		return err
+	}
+	f, err := os.Create(filePath)
+	if err != nil {
+		return err
+	}
+	_, err = s.WriteTo(f)
+	f.Close()
+	return err
+}
+
+func o(base uint8, oct uint8) uint8 {
+	if oct > 10 {
+		oct = 10
+	}
+
+	if oct == 0 {
+		return base
+	}
+
+	res := base + 12*oct
+	if res > 127 {
+		res -= 12
+	}
+
+	return res
+}
+
+func name(n uint8) string {
+	for k, v := range noteMap {
+		if v%12 == n%12 {
+			return k
+		}
+	}
+	return ""
+}
+
+func processOne(note string) uint8 {
+	k := strings.ReplaceAll(note, " ", "")
+	var (
+		base  uint8
+		level uint8
+	)
+	for i := 0; i < len(k); i++ {
+		switch {
+		case k[i] >= 'A' && k[i] <= 'G':
+			base = noteMap[k[i:i+1]] % 12
+		case k[i] == 'b':
+			base--
+		case k[i] == '#':
+			base++
+		case k[i] >= '0' && k[i] <= '9':
+			level = level*10 + k[i] - '0'
+		}
+	}
+	if level == 0 {
+		level = 5
+	}
+	return o(base, level)
+}
+
+func mid2txt(midBytes []byte, trackNo int) (midStr string) {
+	var (
+		absTicksStart float64
+		absTicksEnd   float64
+		startNote     byte
+		endNote       byte
+		defaultMetric = 960.0
+	)
+	_ = smf.ReadTracksFrom(bytes.NewReader(midBytes), trackNo).
+		Do(
+			func(te smf.TrackEvent) {
+				if !te.Message.IsMeta() {
+					b := te.Message.Bytes()
+					if te.Message.Is(midi.NoteOnMsg) && b[2] > 0 {
+						absTicksStart = float64(te.AbsTicks)
+						startNote = b[1]
+					}
+					if te.Message.Is(midi.NoteOffMsg) || (te.Message.Is(midi.NoteOnMsg) && b[2] == 0x00) {
+						absTicksEnd = float64(te.AbsTicks)
+						endNote = b[1]
+						if startNote == endNote {
+							sign := name(b[1])
+							level := b[1] / 12
+							length := (absTicksEnd - absTicksStart) / defaultMetric
+							midStr += sign
+							if level != 5 {
+								midStr += strconv.Itoa(int(level))
+							}
+							pow := int(math.Round(math.Log2(length)))
+							if pow >= -4 && pow != 0 {
+								midStr += "<" + strconv.Itoa(pow)
+							}
+							startNote = 0
+							endNote = 0
+						}
+					}
+					if (te.Message.Is(midi.NoteOnMsg) && b[2] > 0) && absTicksStart > absTicksEnd {
+						length := (absTicksStart - absTicksEnd) / defaultMetric
+						pow := int(math.Round(math.Log2(length)))
+						if pow == 0 {
+							midStr += "R"
+						} else if pow >= -4 {
+							midStr += "R<" + strconv.Itoa(pow)
+						}
+					}
+				}
+			},
+		)
+	return
+}
+
+func setTimbreMode(ctx *zero.Ctx, timbre int64) error {
+	gid := ctx.Event.GroupID
+	if gid == 0 {
+		gid = -ctx.Event.UserID
+	}
+	if timbre < 0 || timbre > 127 {
+		return errors.New("音色应该在0~127之间")
+	}
+	m, ok := ctx.State["manager"].(*ctrl.Control[*zero.Ctx])
+	if !ok {
+		return errors.New("no such plugin")
+	}
+	return m.SetData(gid, timbre)
+}
+
+func getTimbreMode(ctx *zero.Ctx) (index int64) {
+	gid := ctx.Event.GroupID
+	if gid == 0 {
+		gid = -ctx.Event.UserID
+	}
+	m, ok := ctx.State["manager"].(*ctrl.Control[*zero.Ctx])
+	if ok {
+		index := m.GetData(gid)
+		return index
+	}
+	return 40
+}

plugin/moyu/holiday_test.go

@@ -8,7 +8,7 @@ import (
 	reg "github.com/fumiama/go-registry"
 )
 
-var sr = reg.NewRegedit("reilia.westeurope.cloudapp.azure.com:32664", "fumiama", "--")
+var sr = reg.NewRegedit("reilia.fumiama.top:32664", "fumiama", "--")
 
 func TestGetHoliday(t *testing.T) {
 	registry.Connect()
@@ -31,15 +31,15 @@ func TestSetHoliday(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	err = SetHoliday("清明节", 1, 2022, 4, 3)
+	err = SetHoliday("清明节", 1, 2023, 4, 5)
 	if err != nil {
 		t.Fatal(err)
 	}
-	err = SetHoliday("劳动节", 1, 2022, 4, 30)
+	err = SetHoliday("劳动节", 1, 2023, 5, 1)
 	if err != nil {
 		t.Fatal(err)
 	}
-	err = SetHoliday("端午节", 1, 2022, 6, 3)
+	err = SetHoliday("端午节", 1, 2023, 6, 22)
 	if err != nil {
 		t.Fatal(err)
 	}

plugin/moyu/nowork.go

@@ -21,7 +21,7 @@ func NewHoliday(name string, dur, year int, month time.Month, day int) *Holiday
 	return &Holiday{name: name, date: time.Date(year, month, day, 0, 0, 0, 0, time.Local), dur: time.Duration(dur) * time.Hour * 24}
 }
 
-var registry = reg.NewRegReader("reilia.westeurope.cloudapp.azure.com:32664", "fumiama")
+var registry = reg.NewRegReader("reilia.fumiama.top:32664", "fumiama")
 
 // GetHoliday 从 reg 服务器获取节日
 func GetHoliday(name string) *Holiday {

plugin/moyu/run.go

@@ -5,11 +5,10 @@ import (
 	"sync"
 	"time"
 
-	control "github.com/FloatTech/zbputils/control"
+	ctrl "github.com/FloatTech/zbpctrl"
+	"github.com/FloatTech/zbputils/control"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 var (
@@ -19,7 +18,7 @@ var (
 )
 
 func init() { // 插件主体
-	control.Register("moyu", order.AcquirePrio(), &control.Options{
+	control.Register("moyu", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: true,
 		Help: "moyu\n" +
 			"- /启用 moyu\n" +

plugin/moyu_calendar/calendar.go

@@ -2,31 +2,15 @@
 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"
+	ctrl "github.com/FloatTech/zbpctrl"
+	"github.com/FloatTech/zbputils/control"
+	"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", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: true,
 		Help: "摸鱼人日历\n" +
 			"- /启用 moyucalendar\n" +
@@ -35,159 +19,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))
 				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,18 @@ import (
 	"strings"
 	"time"
 
-	control "github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/web"
+
+	ctrl "github.com/FloatTech/zbpctrl"
+	"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", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
 		Help: "点歌\n" +
 			"- 点歌[xxx]\n" +
@@ -136,81 +137,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://music.cyrilstudio.top/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 +182,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/data.go

@@ -7,6 +7,7 @@ import (
 	"os"
 	"strings"
 	"sync"
+	"time"
 
 	"github.com/corona10/goimagehash"
 	"github.com/sirupsen/logrus"
@@ -32,7 +33,7 @@ type nsetu struct {
 
 func (n *nsetu) List() (l []string) {
 	if file.IsExist(n.db.DBPath) {
-		err := n.db.Open()
+		err := n.db.Open(time.Hour * 24)
 		if err == nil {
 			l, err = n.db.ListTables()
 		}
@@ -77,7 +78,8 @@ func (n *nsetu) scanclass(root fs.FS, path, clsn string) error {
 		return err
 	}
 	n.mu.Lock()
-	_ = n.db.Truncate(clsn)
+	_ = n.db.Drop(clsn)
+	_ = n.db.Create(clsn, &setuclass{})
 	n.mu.Unlock()
 	for _, d := range ds {
 		nm := d.Name()

plugin/nativesetu/main.go

@@ -10,11 +10,10 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
+	ctrl "github.com/FloatTech/zbpctrl"
 	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/file"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 var (
@@ -22,7 +21,7 @@ var (
 )
 
 func init() {
-	engine := control.Register("nativesetu", order.AcquirePrio(), &control.Options{
+	engine := control.Register("nativesetu", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
 		Help: "本地涩图\n" +
 			"- 本地[xxx]\n" +
@@ -39,11 +38,11 @@ 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)
 		}
 	}
 
-	engine.OnRegex(`^本地(.*)$`, ctxext.FirstValueInList(ns)).SetBlock(true).
+	engine.OnRegex(`^本地(.*)$`, ctxext.ValueInList(func(ctx *zero.Ctx) string { return ctx.State["regex_matched"].([]string)[1] }, ns)).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			imgtype := ctx.State["regex_matched"].([]string)[1]
 			sc := new(setuclass)
@@ -64,7 +63,7 @@ func init() {
 				ctx.SendChain(message.Text(imgtype, ": ", sc.Name, "\n"), message.Image(p))
 			}
 		})
-	engine.OnRegex(`^刷新本地(.*)$`, ctxext.FirstValueInList(ns), zero.SuperUserPermission).SetBlock(true).
+	engine.OnRegex(`^刷新本地(.*)$`, ctxext.ValueInList(func(ctx *zero.Ctx) string { return ctx.State["regex_matched"].([]string)[1] }, ns), zero.SuperUserPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			imgtype := ctx.State["regex_matched"].([]string)[1]
 			err := ns.scanclass(os.DirFS(setupath), imgtype, imgtype)

plugin/nativewife/main.go

@@ -16,14 +16,13 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
-	"github.com/FloatTech/zbputils/control/order"
-
-	control "github.com/FloatTech/zbputils/control"
+	ctrl "github.com/FloatTech/zbpctrl"
+	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/file"
 )
 
 func init() {
-	engine := control.Register("nwife", order.AcquirePrio(), &control.Options{
+	engine := control.Register("nwife", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault:  false,
 		Help:              "nativewife\n- 抽wife[@xxx]\n- 添加wife[名字][图片]\n- 删除wife[名字]\n- [让 | 不让]所有人均可添加wife",
 		PrivateDataFolder: "nwife",
@@ -125,9 +124,9 @@ func init() {
 			var err error
 			switch text {
 			case "设置", "授予", "让":
-				err = setEveryoneCanAddWife(ctx.Event.GroupID, true)
+				err = setEveryoneCanAddWife(ctx, true)
 			case "取消", "撤销", "不让":
-				err = setEveryoneCanAddWife(ctx.Event.GroupID, false)
+				err = setEveryoneCanAddWife(ctx, false)
 			}
 			if err == nil {
 				ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("成功！"))
@@ -140,7 +139,7 @@ func init() {
 func chkAddWifePermission(ctx *zero.Ctx) bool {
 	gid := ctx.Event.GroupID
 	if gid > 0 {
-		m, ok := control.Lookup("nwife")
+		m, ok := ctx.State["manager"].(*ctrl.Control[*zero.Ctx])
 		if ok {
 			data := m.GetData(gid)
 			if data&1 == 1 {
@@ -152,13 +151,13 @@ func chkAddWifePermission(ctx *zero.Ctx) bool {
 	return false
 }
 
-func setEveryoneCanAddWife(gid int64, canadd bool) error {
-	m, ok := control.Lookup("nwife")
+func setEveryoneCanAddWife(ctx *zero.Ctx, canadd bool) error {
+	m, ok := ctx.State["manager"].(*ctrl.Control[*zero.Ctx])
 	if ok {
 		if canadd {
-			return m.SetData(gid, 1)
+			return m.SetData(ctx.Event.GroupID, 1)
 		}
-		return m.SetData(gid, 0)
+		return m.SetData(ctx.Event.GroupID, 0)
 	}
 	return errors.New("no such plugin")
 }

plugin/nbnhhsh/nbnhhsh.go

@@ -7,16 +7,15 @@ import (
 	"net/url"
 	"strings"
 
+	ctrl "github.com/FloatTech/zbpctrl"
 	"github.com/FloatTech/zbputils/control"
 	"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", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
 		Help:             "拼音首字母释义工具\n- ?? [缩写]",
 	}).OnRegex(`^[?？]{1,2} ?([a-z0-9]+)$`).SetBlock(false).

plugin/nihongo/model.go

@@ -0,0 +1,30 @@
+package nihongo
+
+import (
+	"fmt"
+
+	sql "github.com/FloatTech/sqlite"
+)
+
+type grammar struct {
+	ID            int    `db:"id"`
+	Tag           string `db:"tag"`
+	Name          string `db:"name"`
+	Pronunciation string `db:"pronunciation"`
+	Usage         string `db:"usage"`
+	Meaning       string `db:"meaning"`
+	Explanation   string `db:"explanation"`
+	Example       string `db:"example"`
+	GrammarURL    string `db:"grammar_url"`
+}
+
+func (g *grammar) string() string {
+	return fmt.Sprintf("ID:\n%d\n\n标签:\n%s\n\n语法名:\n%s\n\n发音:\n%s\n\n用法:\n%s\n\n意思:\n%s\n\n解说:\n%s\n\n示例:\n%s", g.ID, g.Tag, g.Name, g.Pronunciation, g.Usage, g.Meaning, g.Explanation, g.Example)
+}
+
+var db = &sql.Sqlite{}
+
+func getRandomGrammarByTag(tag string) (g grammar) {
+	_ = db.Find("grammar", &g, "where tag LIKE '%"+tag+"%' ORDER BY RANDOM() limit 1")
+	return
+}

plugin/nihongo/nihongo.go

@@ -0,0 +1,66 @@
+// Package nihongo 日语学习
+package nihongo
+
+import (
+	"time"
+
+	ctrl "github.com/FloatTech/zbpctrl"
+	"github.com/FloatTech/zbputils/binary"
+	"github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/img/text"
+	log "github.com/sirupsen/logrus"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+)
+
+func init() {
+	engine := control.Register("nihongo", &ctrl.Options[*zero.Ctx]{
+		DisableOnDefault: false,
+		Help:             "日语学习\n- 日语语法[xxx](使用tag随机)",
+		PublicDataFolder: "Nihongo",
+	})
+
+	getdb := ctxext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool {
+		db.DBPath = engine.DataFolder() + "nihongo.db"
+		_, err := engine.GetLazyData("nihongo.db", true)
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR:", err))
+			return false
+		}
+		err = db.Open(time.Hour * 24)
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR:", err))
+			return false
+		}
+		err = db.Create("grammar", &grammar{})
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR:", err))
+			return false
+		}
+		n, err := db.Count("grammar")
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR:", err))
+			return false
+		}
+		log.Infof("[nihongo]读取%d条语法", n)
+		return true
+	})
+
+	engine.OnRegex(`^日语语法\s?([0-9A-Za-z]{1,6})$`, getdb).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			g := getRandomGrammarByTag(ctx.State["regex_matched"].([]string)[1])
+			if g.ID == 0 {
+				ctx.SendChain(message.Text("未能找到", ctx.State["regex_matched"].([]string)[1], "相关标签的语法"))
+				return
+			}
+			data, err := text.RenderToBase64(g.string(), text.FontFile, 400, 20)
+			if err != nil {
+				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:可能被风控了"))
+			}
+		})
+}

plugin/novel/qianbi.go

@@ -11,17 +11,15 @@ 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"
 
+	ctrl "github.com/FloatTech/zbpctrl"
 	ub "github.com/FloatTech/zbputils/binary"
-	control "github.com/FloatTech/zbputils/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 +38,35 @@ const (
 var gCurCookieJar *cookiejar.Jar
 
 func init() {
-	control.Register("novel", order.AcquirePrio(), &control.Options{
+	control.Register("novel", &ctrl.Options[*zero.Ctx]{
 		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,7 +89,8 @@ 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:可能被风控了"))
@@ -116,38 +125,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 +165,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

@@ -3,17 +3,18 @@ package nsfw
 
 import (
 	"github.com/FloatTech/AnimeAPI/nsfw"
+	ctrl "github.com/FloatTech/zbpctrl"
 	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
 	"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", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
 		Help:             "nsfw图片识别\n- nsfw打分[图片]",
 	}).ApplySingle(ctxext.DefaultSingle)
@@ -23,34 +24,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", &ctrl.Options[*zero.Ctx]{
 		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 +72,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 +96,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,78 @@ 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"
+	ctrl "github.com/FloatTech/zbpctrl"
+	"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", &ctrl.Options[*zero.Ctx]{
 		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.Event.UserID, 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.Open(time.Hour * 24)
+			if err != nil {
+				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.Event.UserID, 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:可能被风控了"))
 			}
 		})
 }
-
-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,798 @@
+// Package qqwife 娶群友  基于“翻牌”和江林大佬的“群老婆”插件魔改作品，文案采用了Hana的zbp娶群友文案
+package qqwife
+
+import (
+	"math/rand"
+	"sort"
+	"strconv"
+	"sync"
+	"time"
+
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+
+	ctrl "github.com/FloatTech/zbpctrl"
+	control "github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/math"
+
+	// 数据库
+	sql "github.com/FloatTech/sqlite"
+	// 定时器
+
+	"github.com/wdvxdr1123/ZeroBot/extension/rate"
+
+	// 画图
+	"github.com/FloatTech/zbputils/file"
+	"github.com/FloatTech/zbputils/img/text"
+	"github.com/FloatTech/zbputils/img/writer"
+	"github.com/fogleman/gg"
+)
+
+//nolint: asciicheck
+type 婚姻登记 struct {
+	db   *sql.Sqlite
+	dbmu sync.RWMutex
+}
+
+// 结婚证信息
+type userinfo struct {
+	User       int64  // 用户身份证
+	Target     int64  // 对象身份证号
+	Username   string // 户主名称
+	Targetname string // 对象名称
+	Updatetime string // 登记时间
+
+}
+
+// 民政局的当前时间
+type updateinfo struct {
+	GID        int64
+	Updatetime string // 登记时间
+
+}
+
+func (sql *婚姻登记) checkupdate(gid int64) (updatetime string, err error) {
+	sql.dbmu.Lock()
+	defer sql.dbmu.Unlock()
+	err = sql.db.Create("updateinfo", &updateinfo{})
+	if err != nil {
+		return
+	}
+	gidstr := strconv.FormatInt(gid, 10)
+	dbinfo := updateinfo{}
+	err = sql.db.Find("updateinfo", &dbinfo, "where gid is "+gidstr) // 获取表格更新的时间
+	if err != nil {
+		updatetime = time.Now().Format("2006/01/02")
+		err = sql.db.Insert("updateinfo", &updateinfo{GID: gid, Updatetime: updatetime})
+		return
+	}
+	updatetime = dbinfo.Updatetime
+	return
+}
+
+func (sql *婚姻登记) 重置(gid string) error {
+	sql.dbmu.Lock()
+	defer sql.dbmu.Unlock()
+	if gid != "ALL" {
+		err := sql.db.Drop(gid)
+		if err != nil {
+			err = sql.db.Create(gid, &userinfo{})
+			return err
+		}
+		gidint, _ := strconv.ParseInt(gid, 10, 64)
+		updateinfo := updateinfo{
+			GID:        gidint,
+			Updatetime: time.Now().Format("2006/01/02"),
+		}
+		err = sql.db.Insert("updateinfo", &updateinfo)
+		return err
+	}
+	grouplist, err := sql.db.ListTables()
+	if err != nil {
+		return err
+	}
+	for _, gid := range grouplist {
+		err = sql.db.Drop(gid)
+		if err != nil {
+			continue
+		}
+		gidint, _ := strconv.ParseInt(gid, 10, 64)
+		updateinfo := updateinfo{
+			GID:        gidint,
+			Updatetime: time.Now().Format("2006/01/02"),
+		}
+		err = sql.db.Insert("updateinfo", &updateinfo)
+	}
+	return err
+}
+
+func (sql *婚姻登记) 离婚休妻(gid, wife int64) error {
+	sql.dbmu.Lock()
+	defer sql.dbmu.Unlock()
+	gidstr := strconv.FormatInt(gid, 10)
+	wifestr := strconv.FormatInt(wife, 10)
+	// 先判断用户是否存在
+	err := sql.db.Del(gidstr, "where target = "+wifestr)
+	return err
+}
+
+func (sql *婚姻登记) 离婚休夫(gid, husband int64) error {
+	sql.dbmu.Lock()
+	defer sql.dbmu.Unlock()
+	gidstr := strconv.FormatInt(gid, 10)
+	husbandstr := strconv.FormatInt(husband, 10)
+	// 先判断用户是否存在
+	err := sql.db.Del(gidstr, "where user = "+husbandstr)
+	return err
+}
+
+func (sql *婚姻登记) 复婚(gid, uid, target int64, username, targetname string) error {
+	sql.dbmu.Lock()
+	defer sql.dbmu.Unlock()
+	gidstr := strconv.FormatInt(gid, 10)
+	uidstr := strconv.FormatInt(uid, 10)
+	tagstr := strconv.FormatInt(target, 10)
+	var info userinfo
+	err := sql.db.Find(gidstr, &info, "where user = "+uidstr)
+	if err != nil {
+		err = sql.db.Find(gidstr, &info, "where user = "+tagstr)
+	}
+	if err != nil {
+		return err
+	}
+	updatetime := time.Now().Format("2006/01/02")
+	// 更改夫妻信息
+	info.User = uid
+	info.Username = username
+	info.Target = target
+	info.Targetname = targetname
+	info.Updatetime = updatetime
+	// 民政局登记数据
+	err = sql.db.Insert(gidstr, &info)
+	return err
+}
+
+func (sql *婚姻登记) 花名册(gid int64) (list [][4]string, number int, err error) {
+	sql.dbmu.Lock()
+	defer sql.dbmu.Unlock()
+	gidstr := strconv.FormatInt(gid, 10)
+	err = sql.db.Create(gidstr, &userinfo{})
+	if err != nil {
+		return
+	}
+	number, err = sql.db.Count(gidstr)
+	if err != nil || number <= 0 {
+		return
+	}
+	var info userinfo
+	list = make([][4]string, 0, number)
+	err = sql.db.FindFor(gidstr, &info, "GROUP BY user", func() error {
+		if info.Target == 0 {
+			return nil
+		}
+		dbinfo := [4]string{
+			info.Username,
+			strconv.FormatInt(info.User, 10),
+			info.Targetname,
+			strconv.FormatInt(info.Target, 10),
+		}
+		list = append(list, dbinfo)
+		return nil
+	})
+	if len(list) == 0 {
+		number = 0
+	}
+	return
+}
+
+func slicename(name string, canvas *gg.Context) (resultname string) {
+	usermane := []rune(name) // 将每个字符单独放置
+	widthlen := 0
+	numberlen := 0
+	for i, v := range usermane {
+		width, _ := canvas.MeasureString(string(v)) // 获取单个字符的宽度
+		widthlen += int(width)
+		if widthlen > 350 {
+			break // 总宽度不能超过350
+		}
+		numberlen = i
+	}
+	if widthlen > 350 {
+		resultname = string(usermane[:numberlen-1]) + "......" // 名字切片
+	} else {
+		resultname = name
+	}
+	return
+}
+
+func (sql *婚姻登记) 查户口(gid, uid int64) (info userinfo, status int, err error) {
+	sql.dbmu.Lock()
+	defer sql.dbmu.Unlock()
+	gidstr := strconv.FormatInt(gid, 10)
+	uidstr := strconv.FormatInt(uid, 10)
+	status = 3
+	if err = sql.db.Create(gidstr, &userinfo{}); err != nil {
+		status = 2
+		return
+	}
+	err = sql.db.Find(gidstr, &info, "where user = "+uidstr)
+	if err == nil {
+		status = 1
+		return
+	}
+	err = sql.db.Find(gidstr, &info, "where target = "+uidstr)
+	if err == nil {
+		status = 0
+		return
+	}
+	return
+}
+
+func (sql *婚姻登记) 登记(gid, uid, target int64, username, targetname string) error {
+	sql.dbmu.Lock()
+	defer sql.dbmu.Unlock()
+	gidstr := strconv.FormatInt(gid, 10)
+	err := sql.db.Create(gidstr, &userinfo{})
+	if err != nil {
+		return err
+	}
+	updatetime := time.Now().Format("2006/01/02")
+	// 填写夫妻信息
+	uidinfo := userinfo{
+		User:       uid,
+		Username:   username,
+		Target:     target,
+		Targetname: targetname,
+		Updatetime: updatetime,
+	}
+	// 民政局登记数据
+	err = sql.db.Insert(gidstr, &uidinfo)
+	return err
+}
+
+var (
+	//nolint: asciicheck
+	民政局 = &婚姻登记{
+		db: &sql.Sqlite{},
+	}
+	skillCD  = rate.NewManager[string](time.Hour*12, 1)
+	sendtext = [...][]string{
+		{ // 表白成功
+			"是个勇敢的孩子(*/ω＼*) 今天的运气都降临在你的身边~\n\n",
+			"(´･ω･`)对方答应了你 并表示愿意当今天的CP\n\n",
+		},
+		{ // 表白失败
+			"今天的运气有一点背哦~明天再试试叭",
+			"_(:з」∠)_下次还有机会 咱抱抱你w",
+			"今天失败了惹. 摸摸头~咱明天还有机会",
+		},
+		{ // ntr成功
+			"因为你的个人魅力~~今天他就是你的了w\n\n",
+		},
+		{ // 离婚失败
+			"打是情，骂是爱，,不打不亲不相爱。答应我不要分手。",
+			"床头打架床尾和，夫妻没有隔夜仇。安啦安啦，不要闹变扭。",
+		},
+		{ // 离婚成功
+			"离婚成功力\n天涯何处无芳草，何必单恋一枝花？不如再摘一支（bushi",
+			"离婚成功力\n话说你不考虑当个1？",
+		},
+	}
+)
+
+func init() {
+	engine := control.Register("qqwife", &ctrl.Options[*zero.Ctx]{
+		DisableOnDefault:  false,
+		PrivateDataFolder: "qqwife",
+		Help: "一群一天一夫一妻制群老婆\n（每天凌晨刷新CP）\n" +
+			"- 娶群友\n- 群老婆列表\n" +
+			"--------------------------------\n以下技能每人只能三选一\n   CD12H，不跨天刷新\n--------------------------------\n" +
+			"- (娶|嫁)@对方QQ\n- 当[对方Q号|@对方QQ]的小三\n- 闹离婚",
+	})
+	getdb := ctxext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool {
+		民政局.db.DBPath = engine.DataFolder() + "结婚登记表.db"
+		// 如果数据库不存在则下载
+		// _, _ = engine.GetLazyData("结婚登记表.db", false)
+
+		err := 民政局.db.Open(time.Hour * 24)
+		if err != nil {
+			ctx.SendChain(message.Text("数据库发生问题力，请联系bot管理员\n[error]", err))
+			return false
+		}
+		return true
+	})
+	engine.OnFullMatch("娶群友", zero.OnlyGroup, getdb).SetBlock(true).Limit(ctxext.LimitByUser).
+		Handle(func(ctx *zero.Ctx) {
+			gid := ctx.Event.GroupID
+			updatetime, err := 民政局.checkupdate(gid)
+			switch {
+			case err != nil:
+				ctx.SendChain(message.Text("数据库发生问题力，请联系bot管理员\n[error]", err))
+				return
+			case time.Now().Format("2006/01/02") != updatetime:
+				if err := 民政局.重置(strconv.FormatInt(gid, 10)); err != nil {
+					ctx.SendChain(message.Text("数据库发生问题力，请联系bot管理员\n[error]", err))
+					return
+				}
+			}
+			uid := ctx.Event.UserID
+			targetinfo, status, err := 民政局.查户口(gid, uid)
+			switch {
+			case status == 2:
+				ctx.SendChain(message.Text("数据库发生问题力，请联系bot管理员\n[error]", err))
+				return
+			case status != 3 && targetinfo.Target == 0: // 如果为单身贵族
+				ctx.SendChain(message.Text("今天你是单身贵族噢"))
+				return
+			case status == 1: // 娶过别人
+				ctx.SendChain(
+					message.At(uid),
+					message.Text("\n今天你已经娶过了，群老婆是"),
+					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
+			case status == 0: // 嫁给别人
+				ctx.SendChain(
+					message.At(uid),
+					message.Text("\n今天你被娶了，群老公是"),
+					message.Image("http://q4.qlogo.cn/g?b=qq&nk="+strconv.FormatInt(targetinfo.User, 10)+"&s=640").Add("cache", 0),
+					message.Text(
+						"\n",
+						"[", targetinfo.Username, "]",
+						"(", targetinfo.User, ")哒",
+					),
+				)
+				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()
+				_, status, _ := 民政局.查户口(gid, usr)
+				if status != 3 {
+					continue
+				}
+				qqgrouplist = append(qqgrouplist, usr)
+			}
+			// 没有人（只剩自己）的时候
+			if len(qqgrouplist) == 1 {
+				ctx.SendChain(message.Text("~群里没有ta人是单身了哦 明天再试试叭"))
+				return
+			}
+			// 随机抽娶
+			fiancee := qqgrouplist[rand.Intn(len(qqgrouplist))]
+			if fiancee == uid { // 如果是自己
+				ctx.SendChain(message.Text("呜...没娶到，你可以再尝试一次"))
+				return
+			}
+			// 去民政局办证
+			err = 民政局.登记(gid, uid, fiancee, ctx.CardOrNickName(uid), ctx.CardOrNickName(fiancee))
+			if err != nil {
+				ctx.SendChain(message.Text("数据库发生问题力，请联系bot管理员\n[error]", err))
+				return
+			}
+			// 请大家吃席
+			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, getdb, 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
+			gid := ctx.Event.GroupID
+			if uid == fiancee { // 如果是自己
+				switch rand.Intn(3) {
+				case 1:
+					err := 民政局.登记(gid, uid, 0, "", "")
+					if err != nil {
+						ctx.SendChain(message.Text("数据库发生问题力，请联系bot管理员\n[error]", err))
+						return
+					}
+					ctx.SendChain(message.Text("今日获得成就：单身贵族"))
+				default:
+					ctx.SendChain(message.Text("今日获得成就：自恋狂"))
+				}
+				return
+			}
+			if rand.Intn(2) == 0 { // 二分之一的概率表白成功
+				ctx.SendChain(message.Text(sendtext[1][rand.Intn(len(sendtext[1]))]))
+				return
+			}
+			// 去民政局登记
+			var choicetext string
+			switch choice {
+			case "娶":
+				err := 民政局.登记(gid, uid, fiancee, ctx.CardOrNickName(uid), ctx.CardOrNickName(fiancee))
+				if err != nil {
+					ctx.SendChain(message.Text("数据库发生问题力，请联系bot管理员\n[error]", err))
+					return
+				}
+				choicetext = "\n今天你的群老婆是"
+			default:
+				err := 民政局.登记(gid, fiancee, uid, ctx.CardOrNickName(fiancee), ctx.CardOrNickName(uid))
+				if err != nil {
+					ctx.SendChain(message.Text("数据库发生问题力，请联系bot管理员\n[error]", err))
+					return
+				}
+				choicetext = "\n今天你的群老公是"
+			}
+			// 请大家吃席
+			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, ")哒",
+				),
+			)
+		})
+	// NTR技能
+	engine.OnRegex(`^当(\[CQ:at,qq=(\d+)\]\s?|(\d+))的小三`, zero.OnlyGroup, getdb, 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)
+			uid := ctx.Event.UserID
+			if fiancee == uid {
+				ctx.SendChain(message.Text("今日获得成就：自我攻略"))
+				return
+			}
+			if rand.Intn(10)/4 != 0 { // 十分之三的概率NTR成功
+				ctx.SendChain(message.Text("失败了！可惜"))
+				return
+			}
+			gid := ctx.Event.GroupID
+			// 判断target是老公还是老婆
+			var choicetext string
+			_, gender, err := 民政局.查户口(gid, fiancee)
+			switch gender {
+			case 3:
+				ctx.SendChain(message.Text("ta现在还是单身哦，快向ta表白吧！"))
+				return
+			case 2:
+				ctx.SendChain(message.Text("数据库发生问题力，请联系bot管理员\n[error]", err))
+				return
+			case 1:
+				// 和对象结婚登记
+				err = 民政局.复婚(gid, fiancee, uid, ctx.CardOrNickName(fiancee), ctx.CardOrNickName(uid))
+				if err != nil {
+					ctx.SendChain(message.Text("数据库发生问题力，请联系bot管理员\n[error]", err))
+					return
+				}
+				choicetext = "老公"
+			case 0:
+				// 和对象结婚登记
+				err = 民政局.复婚(gid, uid, fiancee, ctx.CardOrNickName(uid), ctx.CardOrNickName(fiancee))
+				if err != nil {
+					ctx.SendChain(message.Text("数据库发生问题力，请联系bot管理员\n[error]", err))
+					return
+				}
+				choicetext = "老婆"
+			default:
+				ctx.SendChain(message.Text("数据库发生问题力，请联系bot管理员"))
+				return
+			}
+			// 输出结果
+			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, getdb).SetBlock(true).Limit(ctxext.LimitByUser).
+		Handle(func(ctx *zero.Ctx) {
+			gid := ctx.Event.GroupID
+			updatetime, err := 民政局.checkupdate(gid)
+			switch {
+			case err != nil:
+				ctx.SendChain(message.Text("数据库发生问题力，请联系bot管理员\n[error]", err))
+				return
+			case time.Now().Format("2006/01/02") != updatetime:
+				if err := 民政局.重置(strconv.FormatInt(gid, 10)); err != nil {
+					ctx.SendChain(message.Text("数据库发生问题力，请联系bot管理员\n[error]", err))
+					return
+				}
+				ctx.SendChain(message.Text("今天还没有人结婚哦"))
+				return
+			}
+			list, number, err := 民政局.花名册(gid)
+			if err != nil {
+				ctx.SendChain(message.Text("数据库发生问题力，请联系bot管理员\n[error]", err))
+				return
+			}
+			if number <= 0 {
+				ctx.SendChain(message.Text("今天还没有人结婚哦"))
+				return
+			}
+			/***********设置图片的大小和底色***********/
+			fontSize := 50.0
+			if number < 10 {
+				number = 10
+			}
+			canvas := gg.NewContext(1500, int(250+fontSize*float64(number)))
+			canvas.SetRGB(1, 1, 1) // 白色
+			canvas.Clear()
+			/***********下载字体，可以注销掉***********/
+			_, err = file.GetLazyData(text.BoldFontFile, true)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+			}
+			/***********设置字体颜色为黑色***********/
+			canvas.SetRGB(0, 0, 0)
+			/***********设置字体大小,并获取字体高度用来定位***********/
+			if err = canvas.LoadFontFace(text.BoldFontFile, fontSize*2); err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			sl, h := canvas.MeasureString("群老婆列表")
+			/***********绘制标题***********/
+			canvas.DrawString("群老婆列表", (1500-sl)/2, 160-h) // 放置在中间位置
+			canvas.DrawString("————————————————————", 0, 250-h)
+			/***********设置字体大小,并获取字体高度用来定位***********/
+			if err = canvas.LoadFontFace(text.BoldFontFile, fontSize); err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			_, h = canvas.MeasureString("焯")
+			for i, info := range list {
+				canvas.DrawString(slicename(info[0], canvas), 0, float64(260+50*i)-h)
+				canvas.DrawString("("+info[1]+")", 350, float64(260+50*i)-h)
+				canvas.DrawString("←→", 700, float64(260+50*i)-h)
+				canvas.DrawString(slicename(info[2], canvas), 800, float64(260+50*i)-h)
+				canvas.DrawString("("+info[3]+")", 1150, float64(260+50*i)-h)
+			}
+			data, cl := writer.ToBytes(canvas.Image())
+			ctx.SendChain(message.ImageBytes(data))
+			cl()
+		})
+	engine.OnFullMatchGroup([]string{"闹离婚", "办离婚"}, zero.OnlyGroup, getdb, checkfiancee).SetBlock(true).Limit(cdcheck, iscding2).
+		Handle(func(ctx *zero.Ctx) {
+			gid := ctx.Event.GroupID
+			uid := ctx.Event.UserID
+			info, uidstatus, err := 民政局.查户口(gid, uid)
+			switch uidstatus {
+			case 2:
+				ctx.SendChain(message.Text("数据库发生问题力，请联系bot管理员\n[error]", err))
+				return
+			case 1:
+				if rand.Intn(10) != 1 { // 十分之一的概率成功
+					ctx.SendChain(message.Text(sendtext[3][rand.Intn(len(sendtext[3]))]))
+					return
+				}
+				err := 民政局.离婚休妻(gid, info.Target)
+				if err != nil {
+					ctx.SendChain(message.Text("数据库发生问题力，请联系bot管理员\n[error]", err))
+					return
+				}
+				ctx.SendChain(message.Text(sendtext[4][0]))
+			case 0:
+				if rand.Intn(10) != 0 { // 十分之一的概率成功
+					ctx.SendChain(message.Text(sendtext[3][rand.Intn(len(sendtext[3]))]))
+					return
+				}
+				err := 民政局.离婚休夫(gid, info.User)
+				if err != nil {
+					ctx.SendChain(message.Text("数据库发生问题力，请联系bot管理员\n[error]", err))
+					return
+				}
+				ctx.SendChain(message.Text(sendtext[4][1]))
+			}
+		})
+	engine.OnRegex(`^重置(所有|本群|/d+)?花名册$`, zero.SuperUserPermission, getdb).SetBlock(true).Limit(ctxext.LimitByUser).
+		Handle(func(ctx *zero.Ctx) {
+			cmd := "ALL"
+			switch ctx.State["regex_matched"].([]string)[1] {
+			case "":
+				if ctx.Event.GroupID == 0 {
+					ctx.SendChain(message.Text("该功能只能在群组使用或者指定群组"))
+					return
+				}
+				cmd = strconv.FormatInt(ctx.Event.GroupID, 10)
+			case "所有":
+				break
+			case "本群":
+				if ctx.Event.GroupID == 0 {
+					ctx.SendChain(message.Text("该功能只能在群组使用或者指定群组"))
+					return
+				}
+				cmd = strconv.FormatInt(ctx.Event.GroupID, 10)
+			default:
+				cmd = ctx.State["regex_matched"].([]string)[1]
+			}
+			err := 民政局.重置(cmd)
+			if err != nil {
+				ctx.SendChain(message.Text("数据库发生问题力\n[error]", err))
+				return
+			}
+			ctx.SendChain(message.Text("重置成功"))
+		})
+}
+
+// 以群号和昵称为限制
+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 {
+	// 得先判断用户是否存在才行在，再重置
+	fiancee, err := strconv.ParseInt(ctx.State["regex_matched"].([]string)[2], 10, 64)
+	if err != nil {
+		ctx.SendChain(message.Text("额，你的target好像不存在？"))
+		return false
+	}
+	// 判断是否需要重置
+	gid := ctx.Event.GroupID
+	updatetime, err := 民政局.checkupdate(gid)
+	switch {
+	case err != nil:
+		ctx.SendChain(message.Text("数据库发生问题力，请联系bot管理员\n[error]", err))
+		return false
+	case time.Now().Format("2006/01/02") != updatetime:
+		if err := 民政局.重置(strconv.FormatInt(gid, 10)); err != nil {
+			ctx.SendChain(message.Text("数据库发生问题力，请联系bot管理员\n[error]", err))
+			return false
+		}
+		return true // 重置后也全是单身
+	}
+	uid := ctx.Event.UserID
+	// 获取用户信息
+	uidtarget, uidstatus, err1 := 民政局.查户口(gid, uid)
+	fianceeinfo, fianceestatus, err2 := 民政局.查户口(gid, fiancee)
+	switch {
+	case uidstatus == 2 || fianceestatus == 2:
+		ctx.SendChain(message.Text("数据库发生问题力，请联系bot管理员\n[error]", err1, "\n", err2))
+		return false
+	case uidstatus == 3 && fianceestatus == 3: // 必须是两个单身
+		return true
+	case uidtarget.Target == fiancee: // 如果本就是一块
+		ctx.SendChain(message.Text("笨蛋~你们明明已经在一起了啊w"))
+		return false
+	case uidstatus != 3 && uidtarget.Target == 0: // 如果是单身贵族
+		ctx.SendChain(message.Text("今天的你是单身贵族噢"))
+		return false
+	case uidstatus == 1: // 如果如为攻
+		ctx.SendChain(message.Text("笨蛋~你家里还有个吃白饭的w"))
+		return false
+	case uidstatus == 0: // 如果为受
+		ctx.SendChain(message.Text("该是0就是0，当0有什么不好"))
+		return false
+	case fianceestatus != 3 && fianceeinfo.Target == 0:
+		ctx.SendChain(message.Text("今天的ta是单身贵族噢"))
+		return false
+	case fianceestatus == 1: // 如果如为攻
+		ctx.SendChain(message.Text("他有别的女人了，你该放下了"))
+		return false
+	case fianceestatus == 0: // 如果为受
+		ctx.SendChain(message.Text("这是一个纯爱的世界，拒绝NTR"))
+		return false
+	}
+	return true
+}
+
+// 注入判断 是否满足小三要求
+func checkcp(ctx *zero.Ctx) bool {
+	gid := ctx.Event.GroupID
+	updatetime, err := 民政局.checkupdate(gid)
+	switch {
+	case err != nil:
+		ctx.SendChain(message.Text("数据库发生问题力，请联系bot管理员\n[error]", err))
+		return false
+	case time.Now().Format("2006/01/02") != updatetime:
+		if err := 民政局.重置(strconv.FormatInt(gid, 10)); err != nil {
+			ctx.SendChain(message.Text("数据库发生问题力，请联系bot管理员\n[error]", err))
+		} else {
+			ctx.SendChain(message.Text("ta现在还是单身哦，快向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
+	userinfo, uidstatus, err := 民政局.查户口(gid, uid)
+	switch {
+	case uidstatus == 2:
+		ctx.SendChain(message.Text("数据库发生问题力，请联系bot管理员\n[error]", err))
+		return false
+	case userinfo.Target == fiancee: // 如果本就是一块
+		ctx.SendChain(message.Text("笨蛋~你们明明已经在一起了啊w"))
+		return false
+	case uidstatus != 3 && userinfo.Target == 0: // 如果是单身贵族
+		ctx.SendChain(message.Text("今天的你是单身贵族哦"))
+		return false
+	case fiancee == uid: // 自我攻略
+		return true
+	case uidstatus == 1: // 如果如为攻
+		ctx.SendChain(message.Text("打灭，不给纳小妾！"))
+		return false
+	case uidstatus == 0: // 如果为受
+		ctx.SendChain(message.Text("该是0就是0，当0有什么不好"))
+		return false
+	}
+	fianceeinfo, fianceestatus, err := 民政局.查户口(gid, fiancee)
+	switch {
+	case fianceestatus == 2:
+		ctx.SendChain(message.Text("数据库发生问题力，请联系bot管理员\n[error]", err))
+		return false
+	case fianceestatus == 3:
+		ctx.SendChain(message.Text("ta现在还是单身哦，快向ta表白吧！"))
+		return false
+	case fianceeinfo.Target == 0:
+		ctx.SendChain(message.Text("今天的ta是单身贵族哦"))
+		return false
+	}
+	return true
+}
+
+func checkfiancee(ctx *zero.Ctx) bool {
+	gid := ctx.Event.GroupID
+	updatetime, err := 民政局.checkupdate(gid)
+	switch {
+	case err != nil:
+		ctx.SendChain(message.Text("数据库发生问题力，请联系bot管理员\n[error]", err))
+		return false
+	case time.Now().Format("2006/01/02") != updatetime:
+		if err := 民政局.重置(strconv.FormatInt(gid, 10)); err != nil {
+			ctx.SendChain(message.Text("数据库发生问题力，请联系bot管理员\n[error]", err))
+			return false
+		}
+		ctx.SendChain(message.Text("今天你还没有结婚哦"))
+		return false
+	}
+	// 获取用户信息
+	uid := ctx.Event.UserID
+	_, uidstatus, err := 民政局.查户口(gid, uid)
+	switch uidstatus {
+	case 2:
+		ctx.SendChain(message.Text("数据库发生问题力，请联系bot管理员\n[error]", err))
+		return false
+	case 3: // 如果是单身
+		ctx.SendChain(message.Text("今天你还没有结婚哦"))
+		return false
+	}
+	return true
+}
+
+func iscding2(ctx *zero.Ctx) {
+	ctx.SendChain(message.Text("打灭，禁止离婚  (你的技能正在CD中)"))
+}

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,46 @@ import (
 	"fmt"
 	"math/rand"
 
-	control "github.com/FloatTech/zbputils/control"
+	ctrl "github.com/FloatTech/zbpctrl"
+	"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", &ctrl.Options[*zero.Ctx]{
 		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

@@ -9,13 +9,12 @@ import (
 	"strings"
 	"time"
 
-	control "github.com/FloatTech/zbputils/control"
+	ctrl "github.com/FloatTech/zbpctrl"
+	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
-	"github.com/FloatTech/zbputils/control/order"
-
 	"github.com/tidwall/gjson"
 )
 
@@ -93,7 +92,7 @@ var (
 )
 
 func init() {
-	control.Register("runcode", order.AcquirePrio(), &control.Options{
+	control.Register("runcode", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
 		Help: "在线代码运行: \n" +
 			">runcode [language] [code block]\n" +

plugin/saucenao/searcher.go

@@ -3,6 +3,9 @@ package saucenao
 
 import (
 	"fmt"
+	"net/http"
+	"os"
+	"reflect"
 	"strconv"
 
 	"github.com/sirupsen/logrus"
@@ -11,23 +14,42 @@ 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"
 
+	ctrl "github.com/FloatTech/zbpctrl"
+	"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", &ctrl.Options[*zero.Ctx]{
 		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) {
@@ -66,15 +88,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,44 +116,54 @@ 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.Body.Close()
+								if resp.StatusCode == http.StatusOK {
+									msg = append(msg, message.Image(result.Header.Thumbnail))
+								} else {
+									msg = append(msg, message.Image(pic))
+								}
+							} 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))
 					continue
@@ -134,7 +173,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,
@@ -152,4 +191,22 @@ func init() { // 插件主体
 				}
 			}
 		})
+	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

@@ -21,9 +21,9 @@ import (
 	"github.com/FloatTech/AnimeAPI/nsfw"
 	"github.com/FloatTech/AnimeAPI/scale"
 
+	ctrl "github.com/FloatTech/zbpctrl"
 	"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 +32,7 @@ import (
 )
 
 func init() {
-	engine := control.Register("scale", order.AcquirePrio(), &control.Options{
+	engine := control.Register("scale", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault:  false,
 		Help:              "叔叔的AI二次元图片放大\n- 放大图片[图片]",
 		PrivateDataFolder: "scale",
@@ -57,7 +57,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
 				}

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,23 +8,26 @@ 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"
 
-	control "github.com/FloatTech/zbputils/control"
+	ctrl "github.com/FloatTech/zbpctrl"
+	"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"
 	"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,41 +38,31 @@ 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", &ctrl.Options[*zero.Ctx]{
 		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).
+	engine.OnFullMatch("签到", zero.OnlyGroup).Limit(ctxext.LimitByGroup).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			uid := ctx.Event.UserID
 			now := time.Now()
 			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 +70,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 +96,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 +109,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
@@ -154,7 +161,7 @@ func init() {
 			}
 			ctx.SendChain(message.Image("file:///" + file.BOTPATH + "/" + drawedFile))
 		})
-	engine.OnPrefix("获得签到背景", zero.OnlyGroup).SetBlock(true).
+	engine.OnPrefix("获得签到背景", zero.OnlyGroup).Limit(ctxext.LimitByGroup).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			param := ctx.State["args"].(string)
 			var uidStr string
@@ -170,19 +177,82 @@ func init() {
 			}
 			ctx.SendChain(message.Image("file:///" + file.BOTPATH + "/" + picFile))
 		})
+	engine.OnFullMatch("查看分数排名", zero.OnlyGroup).Limit(ctxext.LimitByGroup).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
+			}
+			f, err := os.Create(drawedFile)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			bars := make([]chart.Value, len(st))
+			for i, v := range st {
+				bars[i].Value = float64(v.Score)
+				bars[i].Label = ctx.CardOrNickName(v.UID)
+			}
+			err = chart.BarChart{
+				Font:  font,
+				Title: "饼干排名",
+				Background: chart.Style{
+					Padding: chart.Box{
+						Top: 40,
+					},
+				},
+				Height:   500,
+				BarWidth: 50,
+				Bars:     bars,
+			}.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 {
+	h := t.Hour()
 	switch {
-	case 6 <= t.Hour() && t.Hour() < 12:
+	case 6 <= h && h < 12:
 		return "早上好"
-	case 12 <= t.Hour() && t.Hour() < 14:
+	case 12 <= h && h < 14:
 		return "中午好"
-	case 14 <= t.Hour() && t.Hour() < 19:
+	case 14 <= h && h < 19:
 		return "下午好"
-	case 19 <= t.Hour() && t.Hour() < 24:
+	case 19 <= h && h < 24:
 		return "晚上好"
-	case 0 <= t.Hour() && t.Hour() < 6:
+	case 0 <= h && h < 6:
 		return "凌晨好"
 	default:
 		return ""
@@ -200,20 +270,18 @@ func getLevel(count int) int {
 	return -1
 }
 
-func initPic(picFile string) {
-	if file.IsNotExist(picFile) {
-		data, err := web.RequestDataWith(web.NewDefaultClient(), backgroundURL, "GET", referer, ua)
-		if err != nil {
-			log.Errorln("[score]", err)
-		}
-		picURL := gjson.Get(string(data), "pic").String()
-		data, err = web.RequestDataWith(web.NewDefaultClient(), picURL, "GET", "", ua)
-		if err != nil {
-			log.Errorln("[score]", err)
-		}
-		err = os.WriteFile(picFile, data, 0666)
-		if err != nil {
-			log.Errorln("[score]", err)
-		}
+func initPic(picFile string) error {
+	if file.IsExist(picFile) {
+		return nil
 	}
+	data, err := web.RequestDataWith(web.NewDefaultClient(), backgroundURL, "GET", referer, ua)
+	if err != nil {
+		return err
+	}
+	picURL := gjson.Get(binary.BytesToString(data), "pic.0").Str
+	data, err = web.RequestDataWith(web.NewDefaultClient(), picURL, "GET", "", ua)
+	if err != nil {
+		return err
+	}
+	return os.WriteFile(picFile, data, 0644)
 }

plugin/setutime/setu_geter.go

@@ -10,7 +10,8 @@ import (
 
 	"github.com/FloatTech/AnimeAPI/pixiv"
 	sql "github.com/FloatTech/sqlite"
-	control "github.com/FloatTech/zbputils/control"
+	ctrl "github.com/FloatTech/zbpctrl"
+	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
 	fileutil "github.com/FloatTech/zbputils/file"
 	imagepool "github.com/FloatTech/zbputils/img/pool"
@@ -18,8 +19,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 +50,7 @@ var pool = &imgpool{
 }
 
 func init() { // 插件主体
-	engine := control.Register("setutime", order.AcquirePrio(), &control.Options{
+	engine := control.Register("setutime", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
 		Help: "涩图\n" +
 			"- 来份[涩图/二次元/风景/车万]\n" +
@@ -61,22 +60,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)
-		err := pool.db.Open()
+		_, _ = engine.GetLazyData("SetuTime.db", false)
+		err := pool.db.Open(time.Hour * 24)
 		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.ValueInList(func(ctx *zero.Ctx) string { return ctx.State["regex_matched"].([]string)[1] }, pool)).SetBlock(true).Limit(ctxext.LimitByUser).
 		Handle(func(ctx *zero.Ctx) {
 			var imgtype = ctx.State["regex_matched"].([]string)[1]
 			// 补充池子
@@ -96,7 +98,7 @@ func init() { // 插件主体
 			}
 		})
 
-	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 +112,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.ValueInList(func(ctx *zero.Ctx) string { return ctx.State["regex_matched"].([]string)[1] }, pool), zero.SuperUserPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			var (
 				imgtype = ctx.State["regex_matched"].([]string)[1]
@@ -125,7 +127,7 @@ func init() { // 插件主体
 		})
 
 	// 查询数据库涩图数量
-	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()

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))
+	})
+}