🔖 1.4.0-beta2

🐛 无法在job中移除匹配触发器
加速word count
2026-02-10 01:00:24 +00:00 · 2022-04-29 20:41:57 +08:00 · 2022-04-29 20:40:37 +08:00 · 2022-04-28 23:29:48 +08:00 · 2022-04-28 23:15:27 +08:00 · 2022-04-28 22:26:00 +08:00
23 changed files with 1112 additions and 765 deletions
--- a/README.md
+++ b/README.md
--- a/2
+++ b/2
--- a/go.mod
+++ b/go.mod
@@ -3,15 +3,15 @@ module github.com/FloatTech/ZeroBot-Plugin
 go 1.18

 require (
-	github.com/FloatTech/AnimeAPI v1.3.3-0.20220417132103-df55797131af
+	github.com/FloatTech/AnimeAPI v1.3.4-0.20220428145645-93a688024a47
 	github.com/FloatTech/sqlite v0.2.1
-	github.com/FloatTech/zbputils v1.3.3-0.20220418145633-c1d3c00da628
+	github.com/FloatTech/zbputils v1.3.4-0.20220429123316-f504c32b198b
 	github.com/antchfx/htmlquery v1.2.4
 	github.com/corona10/goimagehash v1.0.3
 	github.com/fogleman/gg v1.3.0
 	github.com/fumiama/cron v1.3.0
-	github.com/fumiama/go-base16384 v1.4.0
-	github.com/fumiama/go-registry v0.1.5
+	github.com/fumiama/go-base16384 v1.5.2
+	github.com/fumiama/go-registry v0.1.6
 	github.com/fumiama/gofastTEA v0.0.10
 	github.com/fumiama/gotracemoe v0.0.3
 	github.com/fumiama/sqlite3 v1.14.6
@@ -21,9 +21,9 @@ require (
 	github.com/pkumza/numcn v1.0.0
 	github.com/shirou/gopsutil/v3 v3.22.3
 	github.com/sirupsen/logrus v1.8.1
-	github.com/tidwall/gjson v1.14.0
+	github.com/tidwall/gjson v1.14.1
 	github.com/wcharczuk/go-chart/v2 v2.1.0
-	github.com/wdvxdr1123/ZeroBot v1.5.0-mid.0.20220415071800-9e52436ab5c0
+	github.com/wdvxdr1123/ZeroBot v1.5.2-0.20220429121512-29258eb2cd2d
 	golang.org/x/image v0.0.0-20220413100746-70e8d0d3baa9
 )

@@ -34,24 +34,23 @@ require (
 	github.com/disintegration/imaging v1.6.2 // indirect
 	github.com/ericpauley/go-quantize v0.0.0-20200331213906-ae555eb2afa4 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
-	github.com/lufia/plan9stats v0.0.0-20220326011226-f1430873d8db // indirect
+	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
-	github.com/mattn/go-sqlite3 v1.14.12 // indirect
 	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
-	github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
+	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.0 // indirect
 	github.com/tklauser/go-sysconf v0.3.10 // indirect
 	github.com/tklauser/numcpus v0.4.0 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
-	golang.org/x/net v0.0.0-20220412020605-290c469a71a5 // indirect
+	golang.org/x/net v0.0.0-20201021035429-f5854403a974 // indirect
 	golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
 	golang.org/x/text v0.3.7 // indirect
-	modernc.org/libc v1.15.0 // indirect
+	modernc.org/libc v1.14.6 // indirect
 	modernc.org/mathutil v1.4.1 // indirect
-	modernc.org/memory v1.0.7 // indirect
+	modernc.org/memory v1.0.5 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -1,9 +1,9 @@
-github.com/FloatTech/AnimeAPI v1.3.3-0.20220417132103-df55797131af h1:K7Cdrd1jgiTUe8hcITgmwJeIdwfCMM+phw8DD1tALXA=
-github.com/FloatTech/AnimeAPI v1.3.3-0.20220417132103-df55797131af/go.mod h1:jUOit4oeiKOtRDy5ZLTJQa7aE0972R/KPF15b22Q3vY=
+github.com/FloatTech/AnimeAPI v1.3.4-0.20220428145645-93a688024a47 h1:/91ayCAwvhyJw9iQ4so9QDfJcu1GMPFJNTq1JjePkcY=
+github.com/FloatTech/AnimeAPI v1.3.4-0.20220428145645-93a688024a47/go.mod h1:K10BsQlE9FJtDRfcjvH2XNX/JFejWfL3oTdMjHvEHr4=
 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.3-0.20220418145633-c1d3c00da628 h1:NC7m06uyenwt4TRyCEkK5lFNId3TB5gKEeOYNQpYTBI=
-github.com/FloatTech/zbputils v1.3.3-0.20220418145633-c1d3c00da628/go.mod h1:K2IVrhwmrVKZSHSHmNoO9JthN1As9RcnQplf+stQ5BY=
+github.com/FloatTech/zbputils v1.3.4-0.20220429123316-f504c32b198b h1:S+DVRtlWVCzUV2jF5TDucPF/yyGkI1S4Um2gnZF/1co=
+github.com/FloatTech/zbputils v1.3.4-0.20220429123316-f504c32b198b/go.mod h1:yYXxsdc8fouB9yd2XMr17wso2TV0fH1ukARwhV3U43M=
 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=
@@ -32,10 +32,10 @@ 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/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.5 h1:5a7n+JwwKQrnW3U0+gOKSx+2x4Zv+2A3BhyQthJL4Ng=
-github.com/fumiama/go-registry v0.1.5/go.mod h1:dIUVbiOgfk9oZcsgwDvNLC72i+ctibVukSXR/9bLviI=
+github.com/fumiama/go-base16384 v1.5.2 h1:cbxXTcDH92PNgG7bEBwiCEoWb5O+nwZKxKOG94ilFo8=
+github.com/fumiama/go-base16384 v1.5.2/go.mod h1:OEn+947GV5gsbTAnyuUW/SrfxJYUdYupSIQXOuGOcXM=
+github.com/fumiama/go-registry v0.1.6 h1:Ee/tXCCIR/xt8celhbbw0W/xDMdhAXLwy2YFBB/LWFk=
+github.com/fumiama/go-registry v0.1.6/go.mod h1:dIUVbiOgfk9oZcsgwDvNLC72i+ctibVukSXR/9bLviI=
 github.com/fumiama/gofastTEA v0.0.10 h1:JJJ+brWD4kie+mmK2TkspDXKzqq0IjXm89aGYfoGhhQ=
 github.com/fumiama/gofastTEA v0.0.10/go.mod h1:RIdbYZyB4MbH6ZBlPymRaXn3cD6SedlCu5W/HHfMPBk=
 github.com/fumiama/gotracemoe v0.0.3 h1:iI5EbE9A3UUbfukG6+/soYPjp1S31eCNYf4tw7s6/Jc=
@@ -51,9 +51,8 @@ github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZ
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
+github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
@@ -69,15 +68,13 @@ github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
 github.com/lib/pq v1.1.1 h1:sJZmqHoEaY7f+NPP8pgLB/WxulyR3fewgCM2qaSlBb4=
 github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
-github.com/lufia/plan9stats v0.0.0-20220326011226-f1430873d8db h1:m2s7Fwo4OwmcheIWUc/Nw9/MZ0eFtP3to0ovTpqOiCQ=
-github.com/lufia/plan9stats v0.0.0-20220326011226-f1430873d8db/go.mod h1:VgrrWVwBO2+6XKn8ypT3WUqvoxCa8R2M5to2tRzGovI=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
+github.com/mattn/go-sqlite3 v1.14.0 h1:mLyGNKR8+Vv9CAU7PphKa2hkEqxxhn8i32J6FPj1/QA=
 github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus=
-github.com/mattn/go-sqlite3 v1.14.12 h1:TJ1bhYJPV44phC+IMu1u2K/i5RriLTPe+yc68XDJ1Z0=
-github.com/mattn/go-sqlite3 v1.14.12/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/mroth/weightedrand v0.4.1 h1:rHcbUBopmi/3x4nnrvwGJBhX9d0vk+KgoLUZeDP6YyI=
 github.com/mroth/weightedrand v0.4.1/go.mod h1:3p2SIcC8al1YMzGhAIoXD+r9olo/g/cdJgAD905gyNE=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
@@ -86,9 +83,8 @@ github.com/pkumza/numcn v1.0.0 h1:ZT5cf9IJkUZgRgEtCiNNykk0RwsrKXSTsvDHOwUTzgE=
 github.com/pkumza/numcn v1.0.0/go.mod h1:QSeH+al9dWCd8di5HZM/ZqHqhZmUKfph572e9Ev/ETc=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
-github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c h1:NRoLoZvkBTKvR5gQLgA3e0hqjkY9u1wm+iOL45VN/qI=
-github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/shirou/gopsutil/v3 v3.22.3 h1:UebRzEomgMpv61e3hgD1tGooqX5trFbdU/ehphbHd00=
@@ -99,8 +95,8 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/tidwall/gjson v1.14.0 h1:6aeJ0bzojgWLa82gDQHcx3S0Lr/O51I9bJ5nv6JFx5w=
-github.com/tidwall/gjson v1.14.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
+github.com/tidwall/gjson v1.14.1 h1:iymTbGkQBhveq21bEvAQ81I0LEBork8BFe1CUZXdyuo=
+github.com/tidwall/gjson v1.14.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
 github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
 github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
 github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
@@ -111,8 +107,8 @@ github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//
 github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ=
 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.0-mid.0.20220415071800-9e52436ab5c0 h1:SoNu5MZZsbleecVCBth/s610wLXWKIr18KADhZURCDw=
-github.com/wdvxdr1123/ZeroBot v1.5.0-mid.0.20220415071800-9e52436ab5c0/go.mod h1:K2vu0mslV8s4qhIAu/a03Z7YW24qjM0j3imIR+k21KI=
+github.com/wdvxdr1123/ZeroBot v1.5.2-0.20220429121512-29258eb2cd2d h1:gi/AuWH5LRwdKzftIqMA/YGrI1g82E8Ol80HG+u3evU=
+github.com/wdvxdr1123/ZeroBot v1.5.2-0.20220429121512-29258eb2cd2d/go.mod h1:LJ+VOf523i3IrykuLK53UEeWqnAclRL5d2wGT4sS4Zk=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=
 github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
@@ -120,8 +116,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 h1:kUhD7nTDoI3fVd9G4ORWrbV5NY0liEs/Jg2pv5f+bBA=
 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/image v0.0.0-20200927104501-e162460cd6b5/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/image v0.0.0-20220413100746-70e8d0d3baa9 h1:LRtI4W37N+KFebI/qV0OFiLUv4GLOWeEW5hn/KEJvxE=
@@ -133,9 +129,8 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974 h1:IX6qOQeG5uLjB/hjjwjedwfjND0hgjPMMyO1RoIXQNI=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20220412020605-290c469a71a5 h1:bRb386wvrE+oBNdF1d/Xh9mQrfQ4ecYhW5qJ5GvTGT4=
-golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -169,8 +164,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
 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=
@@ -188,8 +183,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/cc/v3 v3.35.25/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=
@@ -231,13 +224,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/ccgo/v3 v3.15.19/go.mod h1:TDJj+DxR26pkDteH2E5WQDj/xlmtsX7JdzkJkaZhOVU=
 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=
@@ -281,23 +268,16 @@ modernc.org/libc v1.14.1/go.mod h1:npFeGWjmZTjFeWALQLrvklVmAxv4m80jnG3+xI8FdJk=
 modernc.org/libc v1.14.2/go.mod h1:MX1GBLnRLNdvmK9azU9LCxZ5lMyhrbEMK8rG3X/Fe34=
 modernc.org/libc v1.14.3/go.mod h1:GPIvQVOVPizzlqyRX3l756/3ppsAgg1QgPxjr5Q4agQ=
 modernc.org/libc v1.14.5/go.mod h1:2PJHINagVxO4QW/5OQdRrvMYo+bm5ClpUFfyXCYl9ak=
+modernc.org/libc v1.14.6 h1:SSiZiE5199iYsGM9gtkDj90xqcXVwubWG8CtoYE+Mnk=
 modernc.org/libc v1.14.6/go.mod h1:2PJHINagVxO4QW/5OQdRrvMYo+bm5ClpUFfyXCYl9ak=
-modernc.org/libc v1.14.7/go.mod h1:f8xfWXW8LW41qb4X5+huVQo5dcfPlq7Cbny2TDheMv0=
-modernc.org/libc v1.14.8/go.mod h1:9+JCLb1MWSY23smyOpIPbd5ED+rSS/ieiDWUpdyO3mo=
-modernc.org/libc v1.14.10/go.mod h1:y1MtIWhwpJFpLYm6grAThtuXJKEsY6xkdZmXbRngIdo=
-modernc.org/libc v1.14.12/go.mod h1:fJdoe23MHu2ruPQkFPPqCpToDi5cckzsbmkI6Ez0LqQ=
-modernc.org/libc v1.15.0 h1:/CTHjQ1QO5mkLDeQICuA9Vh0YvhQTMqtCF2urQTaod8=
-modernc.org/libc v1.15.0/go.mod h1:H1OKCu+NYa9+uQG8WsP7DndMBP61I4PWH8ivWhbdoWQ=
 modernc.org/mathutil v1.1.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
 modernc.org/mathutil v1.2.2/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
 modernc.org/mathutil v1.4.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
 modernc.org/mathutil v1.4.1 h1:ij3fYGe8zBF4Vu+g0oT7mB06r8sqGWKuJu1yXeR4by8=
 modernc.org/mathutil v1.4.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
 modernc.org/memory v1.0.4/go.mod h1:nV2OApxradM3/OVbs2/0OsP6nPfakXpi50C7dcoHXlc=
+modernc.org/memory v1.0.5 h1:XRch8trV7GgvTec2i7jc33YlUI0RKVDBvZ5eZ5m8y14=
 modernc.org/memory v1.0.5/go.mod h1:B7OYswTRnfGg+4tDH1t1OeUNnsy2viGTdME4tzd+IjM=
-modernc.org/memory v1.0.6/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/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=
--- a/kanban/banner.go
+++ b/kanban/banner.go
@@ -10,7 +10,7 @@ import (
 var (
 	info = [...]string{
 		"* OneBot + ZeroBot + Golang",
-		"* Version 1.3.3-beta6 - 2022-04-16 00:34:43 +0800 CST",
+		"* Version 1.4.0-beta2 - 2022-04-29 20:41:26 +0800 CST",
 		"* Copyright © 2020 - 2022 FloatTech. All Rights Reserved.",
 		"* Project: https://github.com/FloatTech/ZeroBot-Plugin",
 	}
--- a/main.go
+++ b/main.go
@@ -57,7 +57,6 @@ import (
 	//                          vvvvvvvvvvvvvv                          //
 	//                               vvvv                               //

-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/acgimage"       // 随机图片与AI点评
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/ai_false"       // 服务器监控
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/aiwife"         // 随机老婆
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/b14"            // base16384加解密
--- a/plugin/acgimage/classify.go
+++ b/plugin/acgimage/classify.go
@@ -1,172 +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/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", &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.NewMessageIDFromInteger(
-					ctx.SendGroupForwardMessage(ctx.Event.GroupID,
-						message.Message{
-							ctxext.FakeSenderForwardNode(ctx,
-								message.Image(url).Add("cache", "0"),
-							),
-						}).Get("message_id").Int()))
-				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)
-	})
-}
--- a/plugin/bilibili/api.go
+++ b/plugin/bilibili/api.go
@@ -3,7 +3,6 @@ package bilibili
 import (
 	"encoding/json"
 	"errors"
-	"fmt"
 	"io"
 	"net/http"

@@ -166,7 +165,6 @@ func medalwall(uid string) (result []medal, err error) {
 	if err != nil {
 		return
 	}
-	fmt.Println("medalwall:", binary.BytesToString(data))
 	j := gjson.ParseBytes(data)
 	if j.Get("code").Int() == -101 {
 		err = errNeedCookie
--- a/plugin/bilibili_parse/bilibili_parse.go
+++ b/plugin/bilibili_parse/bilibili_parse.go
@@ -2,7 +2,6 @@
 package bilibiliparse

 import (
-	"fmt"
 	"regexp"
 	"strings"

@@ -51,9 +50,7 @@ func parseURL(bilibiliURL string) (m message.Message, err error) {
 	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
--- a/plugin/bilibili_push/bilibili_push.go
+++ b/plugin/bilibili_push/bilibili_push.go
@@ -205,12 +205,10 @@ func init() {
 			gid = -ctx.Event.UserID
 		}
 		bpl := bdb.getAllPushByGroup(gid)
-		fmt.Println(bpl)
 		msg := "--------b站推送列表--------"
 		for _, v := range bpl {
 			if _, ok := upMap[v.BilibiliUID]; !ok {
 				bdb.updateAllUp()
-				fmt.Println(upMap)
 			}
 			msg += fmt.Sprintf("\nuid:%-12d 动态：", v.BilibiliUID)
 			if v.DynamicDisable == 0 {
--- a/plugin/epidemic/epidemic.go
+++ b/plugin/epidemic/epidemic.go
@@ -7,7 +7,6 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"

-	"github.com/FloatTech/zbputils/binary"
 	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/web"
@@ -15,12 +14,14 @@ import (

 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 疫情数据
@@ -116,11 +117,6 @@ func queryEpidemic(findCityName string) (citydata *area, times string, err error
 	if err != nil {
 		return
 	}
-	var e epidemic
-	err = json.Unmarshal(binary.StringToBytes(r.Data), &e)
-	if err != nil {
-		return
-	}
-	citydata = rcity(e.AreaTree[0], findCityName)
-	return citydata, e.LastUpdateTime, nil
+	citydata = rcity(r.Data.Epidemic.AreaTree[0], findCityName)
+	return citydata, r.Data.Epidemic.LastUpdateTime, nil
 }
--- a/plugin/genshin/ys.go
+++ b/plugin/genshin/ys.go
@@ -9,6 +9,7 @@ import (
 	"image/jpeg"
 	"image/png"
 	"math/rand"
+	"regexp"
 	"strings"
 	"sync/atomic"

@@ -29,6 +30,7 @@ var (
 	totl                   uint64 // 累计抽奖次数
 	filetree               = make(zipfilestructure, 32)
 	starN3, starN4, starN5 *zip.File
+	namereg                = regexp.MustCompile(`_(.*)\.png`)
 )

 func init() {
@@ -91,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) // 抽到 三 , 四, 五星武器
@@ -145,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:
@@ -210,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) // 四星武器
@@ -256,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()

@@ -266,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()

@@ -276,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()

@@ -286,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()

@@ -296,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)
@@ -343,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()
+}
--- a/plugin/hs/run.go
+++ b/plugin/hs/run.go
@@ -2,7 +2,6 @@
 package hs

 import (
-	"fmt"
 	"os"
 	"strconv"
 	"strings"
@@ -87,7 +86,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)),
--- a/plugin/lolicon/lolicon.go
+++ b/plugin/lolicon/lolicon.go
@@ -2,6 +2,7 @@
 package lolicon

 import (
+	"encoding/base64"
 	"strings"
 	"time"

@@ -23,18 +24,30 @@ const (
 )

 var (
-	queue = make(chan string, capacity)
+	queue   = make(chan string, capacity)
+	custapi = ""
 )

 func init() {
-	control.Register("lolicon", &control.Options{
+	en := control.Register("lolicon", &control.Options{
 		DisableOnDefault: false,
 		Help: "lolicon\n" +
-			"- 来份萝莉",
-	}).ApplySingle(ctxext.DefaultSingle).OnFullMatch("来份萝莉").SetBlock(true).
+			"- 来份萝莉\n" +
+			"- 设置随机图片地址[http...]",
+	}).ApplySingle(ctxext.DefaultSingle)
+	en.OnFullMatch("来份萝莉").SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			go func() {
 				for i := 0; i < math.Min(cap(queue)-len(queue), 2); i++ {
+					if custapi != "" {
+						data, err := web.GetData(custapi)
+						if err != nil {
+							ctx.SendChain(message.Text("ERROR:", err))
+							continue
+						}
+						queue <- "base64://" + base64.StdEncoding.EncodeToString(data)
+						continue
+					}
 					data, err := web.GetData(api)
 					if err != nil {
 						ctx.SendChain(message.Text("ERROR:", err))
@@ -67,6 +80,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:图片发送失败，可能被风控了~"))
@@ -74,4 +88,13 @@ func init() {
 				}
 			}
 		})
+	en.OnPrefix("设置随机图片地址", zero.SuperUserPermission).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			u := strings.TrimSpace(ctx.State["args"].(string))
+			if !strings.HasPrefix(u, "http") {
+				ctx.SendChain(message.Text("ERROR:url非法!"))
+				return
+			}
+			custapi = u
+		})
 }
--- a/plugin/manager/manager.go
+++ b/plugin/manager/manager.go
@@ -349,11 +349,7 @@ func init() { // 插件主体
 	engine.OnFullMatchGroup([]string{"翻牌"}, zero.OnlyGroup).SetBlock(true).Limit(ctxext.LimitByUser).
 		Handle(func(ctx *zero.Ctx) {
 			// 无缓存获取群员列表
-			list := ctx.CallAction("get_group_member_list", zero.Params{
-				"group_id": ctx.Event.GroupID,
-				"no_cache": true,
-			}).Data
-			temp := list.Array()
+			temp := ctx.GetThisGroupMemberListNoCache().Array()
 			sort.SliceStable(temp, func(i, j int) bool {
 				return temp[i].Get("last_sent_time").Int() < temp[j].Get("last_sent_time").Int()
 			})
--- a/plugin/music/selecter.go
+++ b/plugin/music/selecter.go
@@ -140,20 +140,11 @@ func cloud163(keyword string) message.MessageSegment {
 		"User-Agent":   []string{"Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:84.0) Gecko/20100101 Firefox/84.0"},
 	}
 	data := url.Values{
-		"offset": []string{"0"},
-		"total":  []string{"true"},
-		"limit":  []string{"9"},
-		"type":   []string{"1"},
-		"s":      []string{keyword},
+		"keywords": []string{keyword},
 	}
-	// 搜索音乐信息 第一首歌
-	info := gjson.ParseBytes(netPost("http://music.163.com/api/search/pc", data, headers)).Get("result.songs.0")
+	// 通过API 搜索音乐信息 第一首
 	// 返回音乐卡片
-	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)
+	return message.Music("163", gjson.ParseBytes(netPost("https://nemapi.windis.xyz/search", data, headers)).Get("result.songs.0.id").Int())
 }

 // qqmusic 返回QQ音乐卡片
--- a/plugin/saucenao/searcher.go
+++ b/plugin/saucenao/searcher.go
@@ -88,7 +88,6 @@ func init() { // 插件主体
 			// 开始搜索图片
 			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))
 				} else {
--- a/plugin/score/sign_in.go
+++ b/plugin/score/sign_in.go
@@ -24,7 +24,7 @@ import (
 )

 const (
-	backgroundURL = "https://iw233.cn/API/pc.php?type=json"
+	backgroundURL = "https://iw233.cn/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
@@ -42,7 +42,7 @@ func init() {
 	})
 	cachePath := engine.DataFolder() + "cache/"
 	go func() {
-		os.RemoveAll(cachePath)
+		_ = os.RemoveAll(cachePath)
 		err := os.MkdirAll(cachePath, 0755)
 		if err != nil {
 			panic(err)
@@ -234,7 +234,7 @@ func init() {
 			err = graph.Render(chart.PNG, f)
 			_ = f.Close()
 			if err != nil {
-				os.Remove(drawedFile)
+				_ = os.Remove(drawedFile)
 				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
--- a/plugin/setutime/setu_geter.go
+++ b/plugin/setutime/setu_geter.go
@@ -97,7 +97,7 @@ func init() { // 插件主体
 			}
 		})

-	engine.OnRegex(`^添加(.+)\s?(\d+)$`, zero.SuperUserPermission, getdb).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]
@@ -111,7 +111,7 @@ func init() { // 插件主体
 			ctx.SendChain(message.Text("成功向分类", imgtype, "添加图片", id))
 		})

-	engine.OnRegex(`^删除(.+)\s?(\d+)$`, getdb, ctxext.FirstValueInList(pool), zero.SuperUserPermission).SetBlock(true).
+	engine.OnRegex(`^删除\s*([^0-9\s]+)\s*(\d+)$`, getdb, ctxext.FirstValueInList(pool), zero.SuperUserPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			var (
 				imgtype = ctx.State["regex_matched"].([]string)[1]
--- a/plugin/shadiao/shadiao.go
+++ b/plugin/shadiao/shadiao.go
@@ -6,9 +6,9 @@ import (
 )

 const (
-	chpURL          = "https://chp.shadiao.app/api.php"
-	duURL           = "https://du.shadiao.app/api.php"
-	pyqURL          = "https://pyq.shadiao.app/api.php"
+	chpURL          = "https://chp.shadiao.app/chp"
+	duURL           = "https://api.shadiao.app/du"
+	pyqURL          = "https://api.shadiao.app/pyq"
 	yduanziURL      = "http://www.yduanzi.com/duanzi/getduanzi"
 	chayiURL        = "https://api.lovelive.tools/api/SweetNothings/Web/0"
 	ganhaiURL       = "https://api.lovelive.tools/api/SweetNothings/Web/1"
--- a/plugin/tracemoe/moe.go
+++ b/plugin/tracemoe/moe.go
@@ -2,8 +2,6 @@
 package tracemoe

 import (
-	"fmt"
-
 	control "github.com/FloatTech/zbputils/control"
 	trmoe "github.com/fumiama/gotracemoe"
 	zero "github.com/wdvxdr1123/ZeroBot"
@@ -25,7 +23,6 @@ func init() { // 插件主体
 			// 开始搜索图片
 			ctx.SendChain(message.Text("少女祈祷中......"))
 			for _, pic := range ctx.State["image_url"].([]string) {
-				fmt.Println(pic)
 				if result, err := moe.Search(pic, true, true); err != nil {
 					ctx.SendChain(message.Text("ERROR:", err))
 				} else if len(result.Result) > 0 {
--- a/plugin/vtb_quotation/vtb_quotation.go
+++ b/plugin/vtb_quotation/vtb_quotation.go
@@ -7,6 +7,7 @@ import (
 	"net/http"
 	"net/url"
 	"os"
+	"path"
 	"regexp"
 	"strconv"
 	"strings"
@@ -26,12 +27,7 @@ import (
 	"github.com/FloatTech/ZeroBot-Plugin/plugin/vtb_quotation/model"
 )

-const regStr = ".*/(.*)"
-const recordRe = "(\\.mp3|\\.wav|\\.wma|\\.mpa|\\.ram|\\.ra|\\.aac|\\.aif|\\.m4a|\\.tsa)"
-
-var (
-	re = regexp.MustCompile(recordRe)
-)
+var reg = regexp.MustCompile(".*/(.*)")

 func init() {
 	engine := control.Register("vtbquotation", &control.Options{
@@ -57,9 +53,7 @@ func init() {

 	engine.OnFullMatch("vtb语录", getdb).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			var firstIndex int
-			var secondIndex int
-			var thirdIndex int
+			indexs := [3]int{}
 			echo, cancel := ctx.FutureEvent("message",
 				ctx.CheckSession()). // 只复读开启复读模式的人的消息
 				Repeat()             // 不断监听复读
@@ -95,147 +89,122 @@ func init() {
 						ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("输入错误太多,请重新发指令"))
 						return
 					}
+					msg := c.Event.Message.ExtractPlainText()
+					num, err := strconv.Atoi(msg)
+					if err != nil {
+						ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("请输入正确的序号，三次输入错误，指令可退出重输"))
+						errorCount++
+						continue
+					}
 					switch step {
 					case 0:
-						firstIndex, err = strconv.Atoi(c.Event.RawMessage)
-						// log.Debugln(fmt.Sprintf("当前在第%d步", step))
-						// log.Debugln(fmt.Sprintf("firstIndex:%d,secondIndex:%d,thirdIndex:%d", firstIndex, secondIndex, thirdIndex))
+						indexs[0] = num
+						secondStepMessage, err := db.GetAllSecondCategoryMessageByFirstIndex(indexs[0])
 						if err != nil {
-							ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("请输入正确的序号,三次输入错误，指令可退出重输"))
-							errorCount++
-						} else {
-							secondStepMessage, err := db.GetAllSecondCategoryMessageByFirstIndex(firstIndex)
-							if err != nil {
-								ctx.SendChain(message.Text("ERROR:", err))
-								return
-							}
-							// log.Debugln(secondStepMessage)
-							if secondStepMessage == "" {
-								ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("你选择的序号没有内容，请重新选择，三次输入错误，指令可退出重输"))
-								r, err := db.GetAllFirstCategoryMessage()
-								if err != nil {
-									ctx.SendChain(message.Text("ERROR:", err))
-									return
-								}
-								firstStepImageBytes, err := text.RenderToBase64(r, text.FontFile, 400, 20)
-								if err != nil {
-									ctx.SendChain(message.Text("ERROR:", err))
-									return
-								}
-								if id := ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Image("base64://"+helper.BytesToString(firstStepImageBytes))); id.ID() == 0 {
-									ctx.SendChain(message.Text("ERROR:可能被风控了"))
-								}
-								errorCount++
-							} else {
-								secondStepMessageBytes, err := text.RenderToBase64(secondStepMessage, text.FontFile, 400, 20)
-								if err != nil {
-									ctx.SendChain(message.Text("ERROR:", err))
-									return
-								}
-								if id := ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Image("base64://"+helper.BytesToString(secondStepMessageBytes))); id.ID() == 0 {
-									ctx.SendChain(message.Text("ERROR:可能被风控了"))
-								}
-								step++
-							}
+							ctx.SendChain(message.Text("ERROR:", err))
+							return
 						}
-					case 1:
-						secondIndex, err = strconv.Atoi(c.Event.RawMessage)
-						// log.Debugln(fmt.Sprintf("当前在第%d步", step))
-						// log.Debugln(fmt.Sprintf("firstIndex:%d,secondIndex:%d,thirdIndex:%d", firstIndex, secondIndex, thirdIndex))
-						if err != nil {
-							ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("请输入正确的序号，三次输入错误，指令可退出重输"))
-							errorCount++
-						} else {
-							thirdStepMessage, err := db.GetAllThirdCategoryMessageByFirstIndexAndSecondIndex(firstIndex, secondIndex)
+						if secondStepMessage == "" {
+							ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("你选择的序号没有内容，请重新选择，三次输入错误，指令可退出重输"))
+							r, err := db.GetAllFirstCategoryMessage()
 							if err != nil {
 								ctx.SendChain(message.Text("ERROR:", err))
 								return
 							}
-							// log.Debugln(thirdStepMessage)
-							if thirdStepMessage == "" {
-								ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("你选择的序号没有内容，请重新选择，三次输入错误，指令可退出重输"))
-								r, err := db.GetAllSecondCategoryMessageByFirstIndex(firstIndex)
-								if err != nil {
-									ctx.SendChain(message.Text("ERROR:", err))
-									return
-								}
-								secondStepMessageBytes, err := text.RenderToBase64(r, text.FontFile, 400, 20)
-								if err != nil {
-									ctx.SendChain(message.Text("ERROR:", err))
-									return
-								}
-								if id := ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Image("base64://"+helper.BytesToString(secondStepMessageBytes))); id.ID() == 0 {
-									ctx.SendChain(message.Text("ERROR:可能被风控了"))
-								}
-								errorCount++
-							} else {
-								thirdStepMessageBytes, err := text.RenderToBase64(thirdStepMessage, text.FontFile, 400, 20)
-								if err != nil {
-									ctx.SendChain(message.Text("ERROR:", err))
-									return
-								}
-								if id := ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Image("base64://"+helper.BytesToString(thirdStepMessageBytes))); id.ID() == 0 {
-									ctx.SendChain(message.Text("ERROR:可能被风控了"))
-								}
-								step++
+							firstStepImageBytes, err := text.RenderToBase64(r, text.FontFile, 400, 20)
+							if err != nil {
+								ctx.SendChain(message.Text("ERROR:", err))
+								return
 							}
+							if id := ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Image("base64://"+helper.BytesToString(firstStepImageBytes))); id.ID() == 0 {
+								ctx.SendChain(message.Text("ERROR:可能被风控了"))
+							}
+							errorCount++
+						} else {
+							secondStepMessageBytes, err := text.RenderToBase64(secondStepMessage, text.FontFile, 400, 20)
+							if err != nil {
+								ctx.SendChain(message.Text("ERROR:", err))
+								return
+							}
+							if id := ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Image("base64://"+helper.BytesToString(secondStepMessageBytes))); id.ID() == 0 {
+								ctx.SendChain(message.Text("ERROR:可能被风控了"))
+							}
+							step++
+						}
+
+					case 1:
+						indexs[1] = num
+						thirdStepMessage, err := db.GetAllThirdCategoryMessageByFirstIndexAndSecondIndex(indexs[0], indexs[1])
+						if err != nil {
+							ctx.SendChain(message.Text("ERROR:", err))
+							return
+						}
+						if thirdStepMessage == "" {
+							ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("你选择的序号没有内容，请重新选择，三次输入错误，指令可退出重输"))
+							r, err := db.GetAllSecondCategoryMessageByFirstIndex(indexs[0])
+							if err != nil {
+								ctx.SendChain(message.Text("ERROR:", err))
+								return
+							}
+							secondStepMessageBytes, err := text.RenderToBase64(r, text.FontFile, 400, 20)
+							if err != nil {
+								ctx.SendChain(message.Text("ERROR:", err))
+								return
+							}
+							if id := ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Image("base64://"+helper.BytesToString(secondStepMessageBytes))); id.ID() == 0 {
+								ctx.SendChain(message.Text("ERROR:可能被风控了"))
+							}
+							errorCount++
+						} else {
+							thirdStepMessageBytes, err := text.RenderToBase64(thirdStepMessage, text.FontFile, 400, 20)
+							if err != nil {
+								ctx.SendChain(message.Text("ERROR:", err))
+								return
+							}
+							if id := ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Image("base64://"+helper.BytesToString(thirdStepMessageBytes))); id.ID() == 0 {
+								ctx.SendChain(message.Text("ERROR:可能被风控了"))
+							}
+							step++
 						}
 					case 2:
-						thirdIndex, err = strconv.Atoi(c.Event.RawMessage)
-						// log.Debugln(fmt.Sprintf("当前在第%d步", step))
-						// log.Debugln(fmt.Sprintf("firstIndex:%d,secondIndex:%d,thirdIndex:%d", firstIndex, secondIndex, thirdIndex))
-						if err != nil {
-							ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("请输入正确的序号，三次输入错误，指令可退出重输"))
+						indexs[2] = num
+						tc := db.GetThirdCategory(indexs[0], indexs[1], indexs[2])
+						recURL := tc.ThirdCategoryPath
+						if recURL == "" {
+							ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("没有内容请重新选择，三次输入错误，指令可退出重输"))
+							r, err := db.GetAllFirstCategoryMessage()
+							if err != nil {
+								ctx.SendChain(message.Text("ERROR:", err))
+								return
+							}
+							firstStepImageBytes, err := text.RenderToBase64(r, text.FontFile, 400, 20)
+							if err != nil {
+								ctx.SendChain(message.Text("ERROR:", err))
+								return
+							}
+							if id := ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Image("base64://"+helper.BytesToString(firstStepImageBytes))); id.ID() == 0 {
+								ctx.SendChain(message.Text("ERROR:可能被风控了"))
+							}
 							errorCount++
+							step = 1
 						} else {
-							tc := db.GetThirdCategory(firstIndex, secondIndex, thirdIndex)
-							reg := regexp.MustCompile(regStr)
-							recURL := tc.ThirdCategoryPath
-							if recURL == "" {
-								ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("没有内容请重新选择，三次输入错误，指令可退出重输"))
-								r, err := db.GetAllFirstCategoryMessage()
-								if err != nil {
-									ctx.SendChain(message.Text("ERROR:", err))
-									return
-								}
-								firstStepImageBytes, err := text.RenderToBase64(r, text.FontFile, 400, 20)
-								if err != nil {
-									ctx.SendChain(message.Text("ERROR:", err))
-									return
-								}
-								if id := ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Image("base64://"+helper.BytesToString(firstStepImageBytes))); id.ID() == 0 {
-									ctx.SendChain(message.Text("ERROR:可能被风控了"))
-								}
-								errorCount++
-								step = 1
-							} else {
-								if reg.MatchString(recURL) {
-									// log.Debugln(reg.FindStringSubmatch(recordUrl)[1])
-									// log.Debugln(url.QueryEscape(reg.FindStringSubmatch(recordUrl)[1]))
-									recURL = strings.ReplaceAll(recURL, reg.FindStringSubmatch(recURL)[1], url.QueryEscape(reg.FindStringSubmatch(recURL)[1]))
-									recURL = strings.ReplaceAll(recURL, "+", "%20")
-									// log.Debugln(recordUrl)
-								}
-								ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("请欣赏《"+tc.ThirdCategoryName+"》"))
-
-								if !re.MatchString(recURL) {
-									ctx.SendChain(message.Text("ERROR:文件格式不匹配"))
-									return
-								}
-								format := re.FindStringSubmatch(recURL)[1]
-								recordFile := storePath + fmt.Sprintf("%d-%d-%d", firstIndex, secondIndex, thirdIndex) + format
-								if file.IsExist(recordFile) {
-									ctx.SendChain(message.Record("file:///" + file.BOTPATH + "/" + recordFile))
-									return
-								}
-								err = initRecord(recordFile, recURL)
-								if err != nil {
-									ctx.SendChain(message.Text("ERROR:", err))
-									return
-								}
+							if reg.MatchString(recURL) {
+								recURL = strings.ReplaceAll(recURL, reg.FindStringSubmatch(recURL)[1], url.QueryEscape(reg.FindStringSubmatch(recURL)[1]))
+								recURL = strings.ReplaceAll(recURL, "+", "%20")
+							}
+							ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("请欣赏《"+tc.ThirdCategoryName+"》"))
+							recordFile := storePath + fmt.Sprintf("%d-%d-%d", indexs[0], indexs[1], indexs[2]) + path.Ext(recURL)
+							if file.IsExist(recordFile) {
 								ctx.SendChain(message.Record("file:///" + file.BOTPATH + "/" + recordFile))
 								return
 							}
+							err = initRecord(recordFile, recURL)
+							if err != nil {
+								ctx.SendChain(message.Text("ERROR:", err))
+								return
+							}
+							ctx.SendChain(message.Record("file:///" + file.BOTPATH + "/" + recordFile))
+							return
 						}
 					default:
 						return
@@ -257,19 +226,13 @@ func init() {
 			tc := db.RandomVtb()
 			fc := db.GetFirstCategoryByFirstUID(tc.FirstCategoryUID)
 			if (tc != model.ThirdCategory{}) && (fc != model.FirstCategory{}) {
-				reg := regexp.MustCompile(regStr)
 				recURL := tc.ThirdCategoryPath
 				if reg.MatchString(recURL) {
 					recURL = strings.ReplaceAll(recURL, reg.FindStringSubmatch(recURL)[1], url.QueryEscape(reg.FindStringSubmatch(recURL)[1]))
 					recURL = strings.ReplaceAll(recURL, "+", "%20")
 				}
 				ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("请欣赏"+fc.FirstCategoryName+"的《"+tc.ThirdCategoryName+"》"))
-				if !re.MatchString(recURL) {
-					ctx.SendChain(message.Text("ERROR:文件格式不匹配"))
-					return
-				}
-				format := re.FindStringSubmatch(recURL)[1]
-				recordFile := storePath + fmt.Sprintf("%d-%d-%d", fc.FirstCategoryIndex, tc.SecondCategoryIndex, tc.ThirdCategoryIndex) + format
+				recordFile := storePath + fmt.Sprintf("%d-%d-%d", fc.FirstCategoryIndex, tc.SecondCategoryIndex, tc.ThirdCategoryIndex) + path.Ext(recURL)
 				if file.IsExist(recordFile) {
 					ctx.SendChain(message.Record("file:///" + file.BOTPATH + "/" + recordFile))
 					return
--- a/plugin/word_count/word_count.go
+++ b/plugin/word_count/word_count.go
@@ -8,6 +8,7 @@ import (
 	"sort"
 	"strconv"
 	"strings"
+	"sync"
 	"time"

 	"github.com/FloatTech/zbputils/binary"
@@ -17,6 +18,7 @@ import (
 	"github.com/FloatTech/zbputils/img/text"
 	"github.com/golang/freetype"
 	"github.com/sirupsen/logrus"
+	"github.com/tidwall/gjson"
 	"github.com/wcharczuk/go-chart/v2"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
@@ -48,12 +50,28 @@ func init() {
 			ctx.SendChain(message.Text("ERROR:", err))
 			return false
 		}
-		stopwords = strings.Split(binary.BytesToString(data), "\r\n")
+		stopwords = strings.Split(strings.ReplaceAll(binary.BytesToString(data), "\r", ""), "\n")
 		sort.Strings(stopwords)
 		logrus.Infoln("[wordcount]加载", len(stopwords), "条停用词")
 		return true
 	})).Limit(ctxext.LimitByUser).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
+			_, err := file.GetLazyData(text.FontFile, false, true)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			b, err := os.ReadFile(text.FontFile)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			font, err := freetype.ParseFont(b)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+
 			ctx.SendChain(message.Text("少女祈祷中..."))
 			gid, _ := strconv.ParseInt(ctx.State["regex_matched"].([]string)[1], 10, 64)
 			p, _ := strconv.ParseInt(ctx.State["regex_matched"].([]string)[2], 10, 64)
@@ -77,28 +95,44 @@ func init() {
 				ctx.SendChain(message.Image("file:///" + file.BOTPATH + "/" + drawedFile))
 				return
 			}
-			messageMap := make(map[string]int)
-			h := ctx.CallAction("get_group_msg_history", zero.Params{"group_id": gid}).Data
-			messageSeq := h.Get("messages.0.message_seq").Int()
-			for i := 0; i < int(p/20) && messageSeq != 0; i++ {
-				if i != 0 {
-					h = ctx.CallAction("get_group_msg_history", zero.Params{"group_id": gid, "message_seq": messageSeq}).Data
+			messageMap := make(map[string]int, 256)
+			msghists := make(chan *gjson.Result, 256)
+			go func() {
+				h := ctx.GetLatestGroupMessageHistory(gid)
+				messageSeq := h.Get("messages.0.message_seq").Int()
+				msghists <- &h
+				for i := 1; i < int(p/20) && messageSeq != 0; i++ {
+					h := ctx.GetGroupMessageHistory(gid, messageSeq)
+					msghists <- &h
+					messageSeq = h.Get("messages.0.message_seq").Int()
 				}
-				for _, v := range h.Get("messages.#.message").Array() {
-					tex := strings.TrimSpace(message.ParseMessageFromString(v.Str).ExtractPlainText())
-					if tex == "" {
-						continue
-					}
-					for _, t := range ctx.GetWordSlices(tex).Get("slices").Array() {
-						tex := strings.TrimSpace(t.Str)
-						i := sort.SearchStrings(stopwords, tex)
-						if re.MatchString(tex) && (i >= len(stopwords) || stopwords[i] != tex) {
-							messageMap[tex]++
+				close(msghists)
+			}()
+			var wg sync.WaitGroup
+			var mapmu sync.Mutex
+			for h := range msghists {
+				wg.Add(1)
+				go func(h *gjson.Result) {
+					for _, v := range h.Get("messages.#.message").Array() {
+						tex := strings.TrimSpace(message.ParseMessageFromString(v.Str).ExtractPlainText())
+						if tex == "" {
+							continue
+						}
+						for _, t := range ctx.GetWordSlices(tex).Get("slices").Array() {
+							tex := strings.TrimSpace(t.Str)
+							i := sort.SearchStrings(stopwords, tex)
+							if re.MatchString(tex) && (i >= len(stopwords) || stopwords[i] != tex) {
+								mapmu.Lock()
+								messageMap[tex]++
+								mapmu.Unlock()
+							}
 						}
 					}
-				}
-				messageSeq = h.Get("messages.0.message_seq").Int()
+					wg.Done()
+				}(h)
 			}
+			wg.Wait()
+
 			wc := rankByWordCount(messageMap)
 			if len(wc) > 20 {
 				wc = wc[:20]
@@ -108,21 +142,6 @@ func init() {
 				ctx.SendChain(message.Text("ERROR:历史消息为空或者无法获得历史消息"))
 				return
 			}
-			_, err := file.GetLazyData(text.FontFile, false, true)
-			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
-				return
-			}
-			b, err := os.ReadFile(text.FontFile)
-			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
-				return
-			}
-			font, err := freetype.ParseFont(b)
-			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
-				return
-			}
 			bars := make([]chart.Value, len(wc))
 			for i, v := range wc {
 				bars[i] = chart.Value{
Author	SHA1	Message	Date
源文雨	9a3b4b3ecb	🔖 1.4.0-beta2	2022-04-29 20:41:57 +08:00
源文雨	cbaeb4d5f2	🐛 无法在job中移除匹配触发器	2022-04-29 20:40:37 +08:00
源文雨	592c306aa0	加速word count	2022-04-28 23:29:48 +08:00
源文雨	136e6bddf4	加速word count	2022-04-28 23:15:27 +08:00
源文雨	0e8bef0541	sync data	2022-04-28 22:26:00 +08:00
fumiama	9d8c52303e	update deps	2022-04-28 22:19:53 +08:00
fumiama	e6ae7df546	🔖 1.4.0-beta1	2022-04-28 19:58:22 +08:00
fumiama	5b57a759be	update deps	2022-04-28 19:56:37 +08:00
MSCxar#0293	cc96eeae32	🐛README.md查缺补漏 (#208 )	2022-04-28 17:38:30 +08:00
himawari	484fef1228	🎨 优化vtb插件代码，更换shadiao的api (#206 ) * 🎨 优化vtb插件代码，更换shadiao的api * 🎨 正则全局变量 Co-authored-by: haibaraguo <haibaraguo@yeahka.com>	2022-04-28 17:37:57 +08:00
Coloured-glaze	ba4ca11c83	🎨增加文字回复 (#205 ) * 🎨增加文字回复 * 🎨增加文字回复 * 🎨增加文字回复 * 🎨增加文字回复(fix) * 🎨small letter=> * Update ys.go * Update ys.go * Update ys.go Co-authored-by: 源文雨 <41315874+fumiama@users.noreply.github.com>	2022-04-27 14:11:23 +08:00
Mayuri	9372902348	🐛fix : setutime regex (#203 )	2022-04-25 09:33:53 +08:00
源文雨	0cc9420570	Merge branch 'master' of https://github.com/FloatTech/ZeroBot-Plugin	2022-04-22 09:24:29 +08:00
源文雨	18fa48d283	🔖 1.3.3-fix1	2022-04-22 09:24:15 +08:00
源文雨	9034fedbd0	✨ lolicon add custom rand api	2022-04-22 09:23:31 +08:00
源文雨	ec3b6ec5fa	🔥 remove plugin acgimage	2022-04-22 09:13:43 +08:00
Mayuri	8cc2a4174e	🐛 更新签到背景图API (#202 )	2022-04-21 21:36:23 +08:00
Yiwen-Chan	8a0014928d	🐛 更新疫情API	2022-04-21 12:59:01 +08:00
github-actions[bot]	228ca7f9c0	🎨 改进代码样式	2022-04-20 04:50:42 +00:00
MoeMagicMango	c0fa7efb27	简单修了下网易点歌 (#200 )	2022-04-20 12:49:24 +08:00
himawari	3553683bb1	🐛 兼容linux和windows文件换行不同 (#199 )	2022-04-19 23:00:01 +08:00
源文雨	ccb58e0a6c	🎨 edit README	2022-04-19 13:02:13 +08:00
源文雨	93253e2188	🎨 edit README	2022-04-19 12:59:47 +08:00
MSCxar#0293	e34bcc9bbd	[水pr]整理README.md (#198 ) * 整理 README.md	2022-04-19 12:39:45 +08:00
源文雨	72169e3a4d	🔖 1.3.3	2022-04-18 23:07:49 +08:00