🎨 改进代码样式 (#521)

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

.github/workflows/nightly.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Setup Go environment
         uses: actions/setup-go@master
         with:
-          go-version: 1.18
+          go-version: 1.19
       - name: Cache downloaded module
         uses: actions/cache@master
         with:

.github/workflows/pull.yml

@@ -8,7 +8,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@master
         with:
-          go-version: 1.18
+          go-version: 1.19
 
       - name: Check out code into the Go module directory
         uses: actions/checkout@master

.github/workflows/push.yml

@@ -8,7 +8,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@master
         with:
-          go-version: 1.18
+          go-version: 1.19
 
       - name: Check out code into the Go module directory
         uses: actions/checkout@master
@@ -17,7 +17,7 @@ jobs:
         uses: golangci/golangci-lint-action@master
         with:
           version: latest
-          args: --issues-exit-code=0
+
       - name: Commit back
         continue-on-error: true
         run: |
@@ -25,4 +25,6 @@ jobs:
           git config --local user.email '41898282+github-actions[bot]@users.noreply.github.com'
           git add --all
           git commit -m "🎨 改进代码样式"
-          git push
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v4

.github/workflows/release.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@master
         with:
-          go-version: '1.18'
+          go-version: '1.19'
 
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@master

.golangci.yml

@@ -18,7 +18,6 @@ linters:
   fast: false
   enable:
     - bodyclose
-    - deadcode
     - depguard
     - dogsled
     - errcheck
@@ -39,13 +38,11 @@ linters:
     - nolintlint
     - rowserrcheck
     - staticcheck
-    - structcheck
     - stylecheck
     - typecheck
     - unconvert
     - unparam
     - unused
-    - varcheck
     - whitespace
     - prealloc
     - predeclared
@@ -62,7 +59,7 @@ run:
   tests: false
   skip-dirs:
     - order
-  go: '1.18'
+  go: '1.19'
 
 # output configuration options
 output:
@@ -76,4 +73,5 @@ issues:
   fix: true
   exclude-use-default: false
   exclude:
-    - "Error return value of .((os.)?std(out|err)..*|.*Close|.*Seek|.*Flush|os.Remove(All)?|.*print(f|ln)?|os.(Un)?Setenv). is not check"
+    - "Error return value of .((os.)?std(out|err)..*|.*Close|.*Seek|.*Flush|os.Remove(All)?|.*print(f|ln)?|os.(Un)?Setenv). is not check"
+    - 'identifier ".*" contain non-ASCII character: U\+.*'

LICENSE

@@ -1,5 +1,5 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
 
  Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
@@ -7,17 +7,15 @@
 
                             Preamble
 
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
 
   The licenses for most software and other practical works are designed
 to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
+our General Public Licenses are intended to guarantee your freedom to
 share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
+software for all its users.
 
   When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
@@ -26,44 +24,34 @@ them if you wish), that you receive source code or can get it if you
 want it, that you can change the software or use pieces of it in new
 free programs, and that you know you can do these things.
 
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
 
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
 
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
 
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
@@ -72,7 +60,7 @@ modification follow.
 
   0. Definitions.
 
-  "This License" refers to version 3 of the GNU General Public License.
+  "This License" refers to version 3 of the GNU Affero General Public License.
 
   "Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.
@@ -549,35 +537,45 @@ to collect a royalty for further conveying from those to whom you convey
 the Program, the only way you could satisfy both those terms and this
 License would be to refrain entirely from conveying the Program.
 
-  13. Use with the GNU Affero General Public License.
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
 
   Notwithstanding any other provision of this License, you have
 permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
+under version 3 of the GNU General Public License into a single
 combined work, and to convey the resulting work.  The terms of this
 License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
 
   14. Revised Versions of this License.
 
   The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
 
   Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
+Program specifies that a certain numbered version of the GNU Affero General
 Public License "or any later version" applies to it, you have the
 option of following the terms and conditions either of that numbered
 version or of any later version published by the Free Software
 Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
+GNU Affero General Public License, you may choose any version ever published
 by the Free Software Foundation.
 
   If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
+versions of the GNU Affero General Public License can be used, that proxy's
 public statement of acceptance of a version permanently authorizes you
 to choose that version for the Program.
 
@@ -635,40 +633,29 @@ the "copyright" line and a pointer to where the full notice is found.
     Copyright (C) <year>  <name of author>
 
     This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+    GNU Affero General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
+    You should have received a copy of the GNU Affero General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
 
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<https://www.gnu.org/licenses/>.

README.md

@@ -26,7 +26,9 @@
   | [Mrs4s/go-cqhttp](https://github.com/Mrs4s/go-cqhttp) | [MiraiGo](https://github.com/Mrs4s/MiraiGo) | Mrs4s |
   | [yyuueexxiinngg/cqhttp-mirai](https://github.com/yyuueexxiinngg/cqhttp-mirai) | [Mirai](https://github.com/mamoe/mirai) | yyuueexxiinngg |
   | [takayama-lily/onebot](https://github.com/takayama-lily/onebot) | [OICQ](https://github.com/takayama-lily/oicq) | takayama |
-  
+
+  [![Star Trend](https://api.star-history.com/svg?repos=FloatTech/ZeroBot-Plugin&type=Timeline)](https://seladb.github.io/StarTrack-js/#/preload?r=FloatTech,ZeroBot-Plugin)
+
 </div>
 
 > 如果您不知道什么是 [OneBot](https://github.com/howmanybots/onebot) 或不希望运行多个程序，还可以直接前往 [gocqzbp](https://github.com/FloatTech/gocqzbp) 的 [Release](https://github.com/FloatTech/gocqzbp/releases) 页面下载单一可执行文件或前往 [Packages](https://github.com/FloatTech/gocqzbp/pkgs/container/gocqzbp) 页面使用`docker`，运行后按提示登录即可。
@@ -36,16 +38,19 @@
 ## 命令行参数
 > `[]`代表是可选参数
 ```bash
-zerobot [-c config.json] [-h] [-s config.json] [-t token] [-u url] [-n nickname] [-p prefix] [-d|w] [qq1 qq2 qq3 ...] [&]
+zerobot [-h] [-n nickname] [-t token] [-u url] [-p prefix] [-d|w] [-c|s config.json] [-l latency] [-r ringlen] [-x max process time] [qq1 qq2 qq3 ...] [&]
 ```
-- **-c config.json**: 从`config.json`加载`bot`配置
 - **-h**: 显示帮助
-- **-s config.json**: 保存现在`bot`配置到`config.json`
+- **-n nickname**: 设置默认昵称，默认为`椛椛`
 - **-t token**: 设置`AccessToken`，默认为空
 - **-u url**: 设置`Url`，默认为`ws://127.0.0.1:6700`
-- **-n nickname**: 设置默认昵称，默认为`椛椛`
 - **-p prefix**: 设置命令前缀，默认为`/`
 - **-d|w**: 开启 debug | warning 级别及以上日志输出
+- **-c config.json**: 从`config.json`加载`bot`配置
+- **-s config.json**: 保存现在`bot`配置到`config.json`
+- **-l latency**: 全局处理延时 (ms)
+- **-r ringlen**: 接收消息环缓冲区大小
+- **-x max process time**: 最大处理时间 (min)
 - **qqs**: superusers 的 qq 号
 - **&**: 驻留在后台，必须放在最后，仅`Linux`下有效
 
@@ -61,7 +66,10 @@ zerobot [-c config.json] [-h] [-s config.json] [-t token] [-u url] [-n nickname]
             "アトリ"
         ],
         "command_prefix": "/",
-        "super_users": []
+        "super_users": [],
+        "ring_len": 4096,
+        "latency": 233000000,
+        "max_process_time": 240000000000
     },
     "ws": [
         {
@@ -114,8 +122,9 @@ zerobot [-c config.json] [-h] [-s config.json] [-t token] [-u url] [-n nickname]
 
   - [x] /服务列表
 
-  - [x] /服务详情
+  - [x] /设置服务列表显示行数 xx
 
+	默认值为9,该设置仅运行时有效,zbp重启后重置
   - [x] @Bot 插件冲突检测 (会在本群发送一条消息并在约 1s 后撤回以检测其它同类 bot 中已启用的插件并禁用)
 
 </details>
@@ -220,9 +229,15 @@ zerobot [-c config.json] [-h] [-s config.json] [-t token] [-u url] [-n nickname]
 
   - [x] [开启 | 关闭]gist加群自动审批
 
+  - [x] 对信息回复:[设置 | 取消]精华
+
+  - [x] 取消精华 [信息ID]
+
+  - [x] /精华列表
+
   - [ ] 同意好友请求
 
-  - [ ] 撤回[@xxx] [xxx]
+  - [x] 对信息回复: 撤回
 
   - [ ] 警告[@xxx]
 
@@ -236,7 +251,8 @@ zerobot [-c config.json] [-h] [-s config.json] [-t token] [-u url] [-n nickname]
 
   `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/thesaurus"`
 
-  - [x] @Bot 关键词
+  - [x] 切换[kimo|傲娇|可爱]词库
+  - [x] 设置词库触发概率0.x (0<x<9)
 
 </details>
 <details>
@@ -250,7 +266,7 @@ zerobot [-c config.json] [-h] [-s config.json] [-t token] [-u url] [-n nickname]
 
   - [x] 取消以"完全匹配关键词"触发的(代表我执行的)指令
 
-  - [x] 记录在"cron"触发的指令
+  - [x] 记录在"cron"触发的(别名xxx的)指令
 
   - [x] 取消在"cron"触发的指令
 
@@ -329,7 +345,14 @@ print("run[CQ:image,file="+j["img"]+"]")
 </details>
 
 ### *中优先级*
+<details>
+  <summary>ahsai tts</summary>
 
+  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/ahsai"`
+
+  - [x] 使[ 伊織弓鶴 | 紲星あかり | 結月ゆかり | 京町セイカ |東北きりたん | 東北イタコ | ついなちゃん標準語 | ついなちゃん関西弁 | 音街ウナ | 琴葉茜 | 吉田くん | 民安ともえ | 桜乃そら | 月読アイ | 琴葉葵 | 東北ずん子 | 月読ショウタ | 水奈瀬コウ ]说(日语)
+
+</details>
 <details>
   <summary>AIfalse</summary>
 
@@ -339,6 +362,30 @@ print("run[CQ:image,file="+j["img"]+"]")
 
   - [x] 设置默认限速为每 m [分钟 | 秒] n 次触发
 
+</details>
+<details>
+  <summary>ai绘图</summary>
+
+  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/aipaint"`
+
+  - [x] [ ai绘图 | 生成色图 | 生成涩图 | ai画图 ] xxx
+
+  - [x] [ ai高级绘图 | 高级生成色图 | 高级生成涩图 | ai高级画图 ] xxx
+
+  - [x] [ 以图绘图 | 以图生图 | 以图画图 ] xxx [图片]|@xxx|[qq号]
+  
+  - [x] 设置ai绘图配置 [server] [token]
+  
+  - [x] 设置ai绘图撤回时间90s
+  
+  - [x] 查看ai绘图配置
+  
+  例: 设置ai绘图配置 http://91.216.169.75:5010 abc
+
+  参考服务器 http://91.217.139.190:5010, http://91.216.169.75:5010, http://185.80.202.180:5010
+
+  通过 http://91.217.139.190:5010/token 获取token
+
 </details>
 <details>
   <summary>AIWife</summary>
@@ -347,6 +394,14 @@ print("run[CQ:image,file="+j["img"]+"]")
 
   - [x] waifu | 随机waifu(从[100000个AI生成的waifu](https://www.thiswaifudoesnotexist.net/)中随机一位)
 
+</details>
+<details>
+  <summary>支付宝到账语音</summary>
+
+  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/alipayvoice"`
+
+  - [x] 支付宝到账 1
+
 </details>
 <details>
   <summary>base16384加解密</summary>
@@ -369,6 +424,79 @@ print("run[CQ:image,file="+j["img"]+"]")
 
   - [x] 百度下[xxx]
 
+</details>
+<details>
+  <summary>百度内容审核</summary>
+
+  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/baiduaudit"`
+
+  - [x] 获取BDAkey
+
+  - [x] 配置BDAKey [API Key] [Secret Key]
+
+  - [x] 获取BDAkey
+
+  - [x] [开启|关闭]内容审核
+
+  - [x] [开启|关闭]撤回提示
+
+  - [x] [开启|关闭]详细提示
+
+  - [x] [开启|关闭]撤回禁言
+
+  - [x] [开启|关闭]禁言累加
+
+  - [x] [开启|关闭]文本检测
+
+  - [x] [开启|关闭]图像检测
+
+  - [x] 设置最大禁言时间[分钟，默认:60,最大43200]
+
+  - [x] 设置每次累加时间[分钟，默认:1]
+
+  - [x] 设置撤回禁言时间[分钟，默认:1]
+
+  - [x] 查看检测类型
+
+  - [x] 查看检测配置
+
+  - [x] 测试文本检测[文本内容]
+
+  - [x] 测试图像检测[图片]
+
+  - [x] 设置检测类型[类型编号]
+
+  - [x] 设置不检测类型[类型编号]
+
+    检测类型编号列表:[1:违禁违规|2:文本色情|3:敏感信息|4:恶意推广|5:低俗辱骂|6:恶意推广-联系方式|7:恶意推广-软文推广]
+</details>
+<details>
+  <summary>base64卦加解密</summary>
+
+  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/base64gua"`
+
+  - [x] 六十四卦加密xxx
+
+  - [x] 六十四卦解密xxx
+
+  - [x] 六十四卦用yyy加密xxx
+
+  - [x] 六十四卦用yyy解密xxx
+
+</details>
+<details>
+  <summary>base天城文加解密</summary>
+
+  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/baseamasiro"`
+
+  - [x] 天城文加密xxx
+
+  - [x] 天城文解密xxx
+
+  - [x] 天城文用yyy加密xxx
+
+  - [x] 天城文用yyy解密xxx
+
 </details>
 <details>
   <summary>bilibili</summary>
@@ -381,8 +509,12 @@ print("run[CQ:image,file="+j["img"]+"]")
 
   - [x] 查成分 [xxx]
 
-  - [x] 设置b站cookie SESSDATA=82da790d,1663822823,06ecf\*31
+  - [x] 查弹幕 [xxx] 2 (最后一个参数是页码)
 
+  - [x] 设置b站cookie b_ut=7;buvid3=0;i-wanna-go-back=-1;innersign=0; (最好把cookie设全)
+
+    获取Cookie可以使用[这个工具](https://github.com/XiaoMiku01/login_bili_go)
+    
   - [x] 更新vup
 
 </details>
@@ -421,6 +553,14 @@ print("run[CQ:image,file="+j["img"]+"]")
 
   - [x] 随机书评
 
+</details>
+<details>
+  <summary>打断复读</summary>
+
+  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/breakrepeat"`
+
+  - [x] (打断三次以上的复读)
+
 </details>
 <details>
   <summary>藏头诗</summary>
@@ -431,14 +571,6 @@ print("run[CQ:image,file="+j["img"]+"]")
 
   - [x] 藏尾诗[xxx]
 
-</details>
-<details>
-  <summary>英文字符翻转</summary>
-
-  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/char_reverser"`
-
-  - [x] 翻转 [英文字符串]
-
 </details>
 <details>
   <summary>选择困难症帮手</summary>
@@ -455,6 +587,14 @@ print("run[CQ:image,file="+j["img"]+"]")
 
   - [x] 抽象翻译[xxx]
 
+</details>
+<details>
+  <summary>英文字符翻转</summary>
+
+  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/chrev"`
+
+  - [x] 翻转 I love you
+
 </details>
 <details>
   <summary>coser</summary>
@@ -493,7 +633,19 @@ print("run[CQ:image,file="+j["img"]+"]")
 
   - [x] 教你一篇小作文[作文]
 
-  - [x] [回复]查重
+</details>
+<details>
+  <summary>女装</summary>
+
+  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/dress"`
+
+  - [x] 女装
+
+  - [x] 男装
+  
+  - [x] 随机女装
+  
+  - [x] 随机男装
 
 </details>
 <details>
@@ -501,29 +653,9 @@ print("run[CQ:image,file="+j["img"]+"]")
 
   `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/drift_bottle"`
 
-  - [x] (在群xxx)丢漂流瓶(到频道xxx) [消息]
+  - [x] @Bot pick (随机捞一个漂流瓶)
 
-  - [x] (从频道xxx)捡漂流瓶
-
-  - [x] @BOT 创建频道 xxx
-
-  - [x] 跳入(频道)海中
-
-  - [x] 注：不显式限制时，私聊发送可在所有群抽到，群聊发送仅可在本群抽到，默认频道为 global
-
-</details>
-<details>
-  <summary>一群一天一夫一妻制群老婆</summary>
-
-  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/qqwife"`
-
-  - [x] 娶群友
-
-  - [x] (娶|嫁)[@对方QQ]
-  
-  - [x] 当[对方Q号|@对方QQ]的小三
-
-  - [x] 群老婆列表
+  - [x] @Bot throw xxx (投递内容xxx,支持图片文字,投递内容需要大于10个字符或者带有图片)
 
 </details>
 <details>
@@ -541,6 +673,18 @@ print("run[CQ:image,file="+j["img"]+"]")
 
   - [x] xxx疫情
 
+</details>
+<details>
+  <summary>好友申请及群聊邀请事件处理</summary>
+
+  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/event"`
+
+  - [x] [开启|关闭]自动同意[申请|邀请|主人]
+
+  - [x] [同意|拒绝][申请|邀请][flag]
+
+  - flag跟随事件一起发送, 默认同意主人的事件
+
 </details>
 <details>
   <summary>渲染任意文字到图片</summary>
@@ -606,33 +750,40 @@ print("run[CQ:image,file="+j["img"]+"]")
 
   `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/guessmusic"`
 
-  - 猜歌插件（该插件依赖ffmpeg）
-  
-  - [x] 设置猜歌缓存歌库路径 [绝对路径]
-  
-  - [x] 设置猜歌[本地/Api] [true/false]
-  
-  - [x] 登录网易云
-  
-  - 注：不登陆也能用，API有几率返回400
-  
-  - [x] 添加歌单 [网易云歌单ID] [歌单名称]
-  
-  - 注：[歌单名称]可为空，默认原标题
-  
-  - [x] 删除歌单 [网易云歌单ID/API歌单名称]
-  
-  - [x] 获取歌单列表
-  
-  - [x] [网易云歌单ID/API歌单名称]歌单信息
-  
+  猜歌插件（该插件依赖ffmpeg）
+	
+  ---------主 人 指 令---------
+  - [x] 设置猜歌歌库路径 [绝对路径]
+  - [x] [创建/删除]歌单 [歌单名称]
+  - [x] 下载歌曲[歌曲名称/网易云歌曲ID]到[歌单名称]
+	
+  -------管 理 员 指 令--------
+  - [x] 设置猜歌默认歌单 [歌单名称]
+  - [x] 上传歌曲[群文件的音乐名]到[歌单名称]
+	
+  ------公 用 指 令------
+  - [x] 歌单列表
   - [x] [个人/团队]猜歌
-  
-  - 注：默认歌库为网易云ACG动画榜
-  
-  - 可在后面添加[-歌单名称]进行指定歌单猜歌
-  
-  - 歌单的歌曲命名规则为:歌名 - 歌手 - 其他(歌曲出处之类)
+	
+  ------插 件 扩 展------
+	
+  - 本插件内置了[NeteaseCloudMusicApi](https://binaryify.github.io/NeteaseCloudMusicApi/#/)框架的一些功能
+  - [x] 设置猜歌API帮助
+  - [x] 设置猜歌API [API首页网址]
+  - [x] 猜歌[开启/关闭][歌单/歌词]自动下载
+  - [ ] 登录网易云
+  - [x] 歌单信息 [网易云歌单链接/ID]
+  - [x] [歌单名称]绑定网易云[网易云歌单链接/ID]
+  - [x] 下载歌单[网易云歌单链接/ID]到[歌单名称]
+  - [x] 解除绑定 [歌单名称]
+
+</details>
+<details>
+  <summary>黑丝</summary>
+
+  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/heisi"`
+
+  - [x] 来点黑丝/白丝/jk/巨乳/足控/网红
 
 </details>
 <details>
@@ -682,6 +833,38 @@ print("run[CQ:image,file="+j["img"]+"]")
 
   - [x] 更新[屌|弔|吊]图
 
+  </details>
+<details>
+  <summary>兽语加密(嗷呜~)</summary>
+
+  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/jiami"`
+
+  - [x] 兽语加密xxx
+
+  - [x] 兽语解密xxx
+
+</details>
+<details>
+  <summary>小鸡词典</summary>
+
+  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/jikipedia"`
+
+  - [x] [查梗|小鸡词典][梗]
+
+</details>
+<details>
+  <summary>日语听力学习材料</summary>
+
+  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/jptingroom"`
+
+  - [x] 随机日语听力
+  
+  - [x] 随机日语歌曲
+  
+  - [x] 日语听力 xxx
+  
+  - [x] 日语歌曲 xxx
+
 </details>
 <details>
   <summary>绝绝子</summary>
@@ -696,7 +879,9 @@ print("run[CQ:image,file="+j["img"]+"]")
 
   `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/lolicon"`
 
-  - [x] 来份萝莉
+  - [x] 随机图片
+
+  - [x] 随机图片 萝莉|少女
 
   - [x] 设置随机图片地址[http...]
 
@@ -706,6 +891,14 @@ print("run[CQ:image,file="+j["img"]+"]")
 来份萝莉
 ```
 
+</details>
+<details>
+  <summary>MagicPrompt-Stable-Diffusion吟唱提示</summary>
+
+  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/magicprompt"`
+
+  - [x] 吟唱提示[xxxx]
+
 </details>
 <details>
   <summary>简易midi音乐制作</summary>
@@ -831,6 +1024,8 @@ print("run[CQ:image,file="+j["img"]+"]")
   `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/nihongo"`
 
   - [x] 日语语法 [xxx] (使用tag随机)
+  
+  - [x] 搜索日语语法 [xxx]
 
 </details>
 <details>
@@ -860,6 +1055,74 @@ print("run[CQ:image,file="+j["img"]+"]")
 
   - [x] 解签
 
+</details>
+<details>
+  <summary>一群一天一夫一妻制群老婆</summary>
+
+  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/qqwife"`
+
+  - 引入好感度系统，好感度越高，自由恋爱成功率越高
+  
+  - [x] 设置CD为xx小时
+
+  - [x] [允许|禁止]自由恋爱
+
+  - [x] [允许|禁止]牛头人
+
+  - [x] 娶群友
+
+  - [x] [娶|嫁][@对方QQ]
+  
+  - [x] 当[对方Q号|@对方QQ]的小三
+
+  - [x] 做媒 @攻方QQ @受方QQ
+  
+  - [x] 买礼物给[对方Q号|@对方QQ]
+
+  - [x] 群老婆列表
+
+  - [x] 查好感度[对方Q号|@对方QQ]
+
+  - [x] 好感度列表
+
+  - [x] 重置花名册
+
+</details>
+<details>
+  <summary>权重查询</summary>
+
+  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/quan"`
+
+  - 来看看大家的账号分吧~据说越高越不容易封号哦
+
+  - [x] 权重查询+@xxx
+
+  - [x] 权重查询+QQ号(为空时匹配触发者QQ)
+
+</details>
+<details>
+  <summary>qq空间表白墙</summary>
+
+  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/qzone"`
+
+  - [x] 登录QQ空间 (Cookie过期很快, 要经常登录)
+  
+  - [x] 发说说[xxx]
+  
+  - [x] (匿名)发表白墙[xxx]
+  
+  - [x] [ 同意 | 拒绝 ]表白墙 1,2,3 (最后一个参数是表白墙的序号数组, 用英文逗号连接)
+  
+  - [x] 查看[ 等待 | 同意 | 拒绝 | 所有 ]表白墙 0 (最后一个参数是页码, 建议私聊审稿)
+
+</details>
+<details>
+  <summary>Real-CUGAN清晰术</summary>
+
+  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/realcugan"`
+
+  - [x] 清晰术(双重吟唱|三重吟唱|四重吟唱)(强力术式|中等术式|弱术式|不变式|原式)[图片]
+
 </details>
 <details>
   <summary>投胎</summary>
@@ -876,11 +1139,11 @@ print("run[CQ:image,file="+j["img"]+"]")
 
   `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/runcode"`
 
-  - [x] > runcode [language] help
+  - [x] >runcode [language] help
 
-  - [x] > runcode [language] [code block]
+  - [x] >runcode [language] [code block]
 
-  - [x] > runcoderaw [language] [code block]
+  - [x] >runcoderaw [language] [code block]
 
 </details>
 <details>
@@ -892,6 +1155,8 @@ print("run[CQ:image,file="+j["img"]+"]")
 
   - [x] 搜图[P站图片ID]
 
+  - [x] 设置 saucenao api key [apikey]
+
 </details>
 <details>
   <summary>叔叔的AI二次元图片放大</summary>
@@ -908,6 +1173,11 @@ print("run[CQ:image,file="+j["img"]+"]")
 
   - [x] 签到
   - [x] 获得签到背景[@xxx] | 获得签到背景
+  - [x] 查看等级排名
+  - 注:跨群排行
+  - [x] 查看我的钱包
+  - [x] 查看钱包排名
+  - 注:本群排行，若群人数太多不建议使用该功能!!!
 
 </details>
 <details>
@@ -950,6 +1220,14 @@ print("run[CQ:image,file="+j["img"]+"]")
   - [x] 解塔罗牌[牌名]
   - [x] [塔罗|大阿卡纳|小阿卡纳|混合]牌阵[圣三角|时间之流|四要素|五牌阵|吉普赛十字|马蹄|六芒星]
 
+</details>
+<details>
+  <summary>舔狗日记</summary>
+
+  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/tiangou"`
+
+  - [x] 舔狗日记
+
 </details>
 <details>
   <summary>搜番</summary>
@@ -958,20 +1236,6 @@ print("run[CQ:image,file="+j["img"]+"]")
 
   - [x] 搜番 | 搜索番剧[图片]
 
-</details>
-<details>
-  <summary>猜单词</summary>
-
-  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/wordle"`
-
-  - [x] 个人猜单词
-
-  - [x] 团队猜单词
-
-  - [x] 团队六阶猜单词
-
-  - [x] 团队七阶猜单词
-
 </details>
 <details>
   <summary>翻译</summary>
@@ -980,6 +1244,14 @@ print("run[CQ:image,file="+j["img"]+"]")
 
   - [x] >TL 你好
 
+</details>
+<details>
+  <summary>vits猫雷</summary>
+
+  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/vitsnyaru"`
+
+  - [x] 让猫雷说[xxxx]
+
 </details>
 <details>
   <summary>vtb语录</summary>
@@ -1000,6 +1272,64 @@ print("run[CQ:image,file="+j["img"]+"]")
 
   - [x] 来份网易云热评
 
+  </details>
+<details>
+  <summary>天气/拼音查询-名言</summary>
+
+  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/wenben"`
+
+  - [x] xx天气
+
+  - [x] xx拼音
+
+  - [x] 每日情话/一言/鸡汤
+
+  - [x] 绕口令
+
+</details>
+<details>
+  <summary>百度文心AI</summary>
+
+  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/wenxinAI"`
+
+  基于百度文心API的一些功能
+
+  key申请链接：https://wenxin.baidu.com/moduleApi/key
+  
+  - [x] 为[自己/本群/QQ号/群+群号]设置文心key [API Key] [Secret Key]
+  
+  - [x] 为[自己/本群/QQ号/群+群号]设置画图key [API Key] [Secret Key]
+  
+  例：“为10086设置画图key 123 456”；“为群10010设置画图key 789 101”
+  
+  文心key和画图key的API key 可以是相同的，只是文心key日限为200，画图日限为50，以此作区别。
+  
+  - [x] 文心作文 (x字的)[作文题目]
+  
+  - [x] 文心提案 (x字的)[文案标题]
+  
+  - [x] 文心摘要 (x字的)[文章内容]
+  
+  - [x] 文心小说 (x字的)[小说上文]
+  
+  - [x] 文心对联 [上联]
+  
+  - [x] 文心问答 [问题]
+	
+  - [x] 文心补全 [带“_”的填空题]
+  
+  - [x] 文心自定义 [prompt]
+
+  - [x] [bot名称]画几张[图片描述]的[图片类型][图片尺寸]
+
+  指令示例：
+
+  - 文心作文 我的椛椛机器人
+
+  - 文心作文 300字的我的椛椛机器人
+
+  - 椛椛帮我画几张金凤凰，背景绚烂，高饱和，古风，仙境，高清，4K，古风的油画方图
+
 </details>
 <details>
   <summary>月幕galgame图</summary>
@@ -1016,14 +1346,6 @@ print("run[CQ:image,file="+j["img"]+"]")
 
   - [x] 更新gal
 
-</details>
-<details>
-  <summary>舔狗日记</summary>
-
-  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/tiangou"`
-
-  - [x] 舔狗日记
-
 </details>
 <details>
   <summary>聊天热词</summary>
@@ -1032,6 +1354,43 @@ print("run[CQ:image,file="+j["img"]+"]")
 
   - [x] 热词 [群号] [消息数目]|热词 123456 1000
 
+</details>
+<details>
+  <summary>猜单词</summary>
+
+  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/wordle"`
+
+  - [x] 个人猜单词
+
+  - [x] 团队猜单词
+
+  - [x] 团队六阶猜单词
+
+  - [x] 团队七阶猜单词
+
+</details>
+<details>
+  <summary>一些游戏王插件</summary>
+
+  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/ygo"`
+  
+  ##### 白鸽API卡查
+	    
+  ###### `"github.com/FloatTech/ZeroBot-Plugin/plugin/ygo/ygocdb.go"`
+  - [x] /ydp [xxx]
+  - [x] /yds [xxx]
+  - [x] /ydb [xxx]
+  - 注：[xxx]为搜索内容;p:返回一张图片;s:返回一张效果描述;b:高级搜索
+	
+  ##### 集换社卡价查询
+
+  ###### `"github.com/FloatTech/ZeroBot-Plugin/plugin/ygo/ygotrade.go"`
+  - [x] 查卡价 [卡名]
+  - [x] 查卡价 [卡名] -r [稀有度 稀有度 ...]
+  - [x] 查卡店  [卡名]
+  - [x] 查卡店  [卡名] -r [稀有度]
+  - 注：卡店只支持单个稀有度查询
+	
 </details>
 <details>
   <summary>鬼东西</summary>
@@ -1065,7 +1424,11 @@ print("run[CQ:image,file="+j["img"]+"]")
 
   - [x] @Bot 任意文本(任意一句话回复)
 
-  - [x] 设置回复模式[青云客 | 小爱]
+  - [x] 设置回复模式[青云客 | 小爱 | ChatGPT]
+
+  - [x] 设置 ChatGPT SessionToken xxx
+  
+  - 注册和获取token可以参见这两篇文章：[注册](https://www.cnblogs.com/ranxi169/p/16954797.html) [获取token](https://juejin.cn/post/7174088036035067917)
 
 </details>
 
@@ -1131,3 +1494,9 @@ GOOS=linux GOARCH=mips GOMIPS=softfloat CGO_ENABLED=0 go build -ldflags "-s -w"
 
 - [ZeroBot](https://github.com/wdvxdr1123/ZeroBot)
 - [ATRI](https://github.com/Kyomotoi/ATRI)
+
+同时感谢以下开发者对 ZeroBot-Plugin 作出的贡献：
+
+<a href="https://github.com/FloatTech/ZeroBot-Plugin/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=FloatTech/ZeroBot-Plugin&max=1000" />
+</a>

config.go

@@ -1,13 +0,0 @@
-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

@@ -1,77 +1,93 @@
 module github.com/FloatTech/ZeroBot-Plugin
 
-go 1.18
+go 1.19
 
 require (
-	github.com/Coloured-glaze/gg v1.3.2
-	github.com/FloatTech/AnimeAPI v1.5.1-0.20220816023211-5e11b0d21958
-	github.com/FloatTech/sqlite v0.3.3
-	github.com/FloatTech/zbpctrl v1.4.1-0.20220715042842-93f081cb0133
-	github.com/FloatTech/zbputils v1.5.1-0.20220816020252-0f57a5ae28aa
+	github.com/Baidu-AIP/golang-sdk v1.1.1
+	github.com/Coloured-glaze/gg v1.3.4
+	github.com/FloatTech/AnimeAPI v1.6.1-0.20221210053102-a9b76da3c119
+	github.com/FloatTech/floatbox v0.0.0-20221210051813-4bd44af40c60
+	github.com/FloatTech/sqlite v1.5.7
+	github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b
+	github.com/FloatTech/zbpctrl v1.5.3-0.20221210051848-740ab7bd6ec3
+	github.com/FloatTech/zbputils v1.6.1-0.20221210052030-50f19ddfae6f
+	github.com/RomiChan/syncx v0.0.0-20221202055724-5f842c53020e
+	github.com/RomiChan/websocket v1.4.3-0.20220227141055-9b2c6168c9c5
 	github.com/antchfx/htmlquery v1.2.5
-	github.com/corona10/goimagehash v1.0.3
+	github.com/corona10/goimagehash v1.1.0
+	github.com/fumiama/ahsai v0.1.0
 	github.com/fumiama/cron v1.3.0
-	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/go-base16384 v1.6.1
+	github.com/fumiama/go-registry v0.2.5-0.20221121111817-44b0846bdce6
 	github.com/fumiama/gotracemoe v0.0.3
-	github.com/fumiama/sqlite3 v1.14.6
+	github.com/fumiama/jieba v0.0.0-20221203025406-36c17a10b565
+	github.com/fumiama/unibase2n v0.0.0-20221020155353-02876e777430
 	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/lucas-clemente/quic-go v0.31.0
+	github.com/mroth/weightedrand v1.0.0
+	github.com/pkg/errors v0.9.1
 	github.com/pkumza/numcn v1.0.0
-	github.com/shirou/gopsutil/v3 v3.22.3
+	github.com/shirou/gopsutil/v3 v3.22.11
 	github.com/sirupsen/logrus v1.9.0
-	github.com/tidwall/gjson v1.14.2
+	github.com/tidwall/gjson v1.14.4
 	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
+	github.com/wdvxdr1123/ZeroBot v1.6.6
+	gitlab.com/gomidi/midi/v2 v2.0.25
+	golang.org/x/image v0.1.0
+	gopkg.in/yaml.v3 v3.0.1
 )
 
 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/FloatTech/rendercard v0.0.2-0.20221128165614-a41216d2422e // 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/faiface/beep v1.1.0 // indirect
+	github.com/fumiama/go-simple-protobuf v0.1.0 // indirect
+	github.com/fumiama/gofastTEA v0.0.10 // 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/golang/mock v1.6.0 // indirect
+	github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
 	github.com/google/uuid v1.3.0 // indirect
+	github.com/hajimehoshi/oto v0.7.1 // indirect
+	github.com/jfreymuth/oggvorbis v1.0.1 // indirect
+	github.com/jfreymuth/vorbis v1.0.0 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
+	github.com/kr/pretty v0.3.1 // 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/marten-seemann/qpack v0.3.0 // indirect
+	github.com/marten-seemann/qtls-go1-18 v0.1.3 // indirect
+	github.com/marten-seemann/qtls-go1-19 v0.1.1 // indirect
+	github.com/mattn/go-isatty v0.0.16 // indirect
 	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
-	github.com/nxadm/tail v1.4.8 // indirect
-	github.com/onsi/ginkgo v1.16.4 // indirect
+	github.com/onsi/ginkgo/v2 v2.2.0 // 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/tklauser/go-sysconf v0.3.11 // indirect
+	github.com/tklauser/numcpus v0.6.0 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // 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
-	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.1.1 // indirect
+	golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
+	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
+	golang.org/x/exp/shiny v0.0.0-20221126150942-6ab00d035af9 // indirect
+	golang.org/x/mobile v0.0.0-20201217150744-e6ae53a27f4f // indirect
+	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/sys v0.2.0 // indirect
+	golang.org/x/text v0.4.0 // indirect
+	golang.org/x/tools v0.1.12 // indirect
+	modernc.org/libc v1.21.5 // indirect
+	modernc.org/mathutil v1.5.0 // indirect
+	modernc.org/memory v1.4.0 // indirect
+	modernc.org/sqlite v1.20.0 // indirect
 )
+
+replace modernc.org/sqlite => github.com/fumiama/sqlite3 v1.20.0-with-win386
+
+replace github.com/remyoudompheng/bigfft => github.com/fumiama/bigfft v0.0.0-20211011143303-6e0bfa3c836b

go.sum

@@ -1,45 +1,40 @@
-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/Coloured-glaze/gg v1.3.2 h1:HRWF0qoIxwhO1O0N5eN2eTPwaO+xHpFu1FfNhtls22w=
-github.com/Coloured-glaze/gg v1.3.2/go.mod h1:Ih5NLNNDHOy3RJbB0EPqGTreIzq/H02TGThIagh8HJg=
-github.com/FloatTech/AnimeAPI v1.5.1-0.20220816023211-5e11b0d21958 h1:BXjlcvPK/7IwaW1HTEPt/pMvbPrc3id1NfFkJ+lh1e4=
-github.com/FloatTech/AnimeAPI v1.5.1-0.20220816023211-5e11b0d21958/go.mod h1:vhrzmpfFp9p4V1T+xY2OaFUAx498LmMxdk/UqJmPMTc=
-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/Baidu-AIP/golang-sdk v1.1.1 h1:RQsAmgDSAkiq22I6n7XJ2t3afgzFeqjY46FGhvrx4cw=
+github.com/Baidu-AIP/golang-sdk v1.1.1/go.mod h1:bXnGw7xPeKt8aF7UCELKrV6UZ/46spItONK1RQBQj1Y=
+github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+github.com/Coloured-glaze/gg v1.3.4 h1:l31zIF/HaVwkzjrj+A56RGQoSKyKuR1IWtIrqXGFStI=
+github.com/Coloured-glaze/gg v1.3.4/go.mod h1:Ih5NLNNDHOy3RJbB0EPqGTreIzq/H02TGThIagh8HJg=
+github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
+github.com/FloatTech/AnimeAPI v1.6.1-0.20221210053102-a9b76da3c119 h1:8uBYj/4UTX4mGxcY/C22NIaQvHe+B0LTxZh8eC/331k=
+github.com/FloatTech/AnimeAPI v1.6.1-0.20221210053102-a9b76da3c119/go.mod h1:N5+P+xQlmn/qNfvFO4ZLR0/OXQC298pp5o6kOPkBN1M=
+github.com/FloatTech/floatbox v0.0.0-20221210051813-4bd44af40c60 h1:S4KfcdK6LdOa0+TTyacHYOZ8aWkR6YbvlnI6GWe66Jc=
+github.com/FloatTech/floatbox v0.0.0-20221210051813-4bd44af40c60/go.mod h1:/k2zxRJtAJ17w9fSpc7xf2QjPDTUBmqhBsOGyHVyX0U=
+github.com/FloatTech/rendercard v0.0.2-0.20221128165614-a41216d2422e h1:7bF01RHsYS99Zp+OWfob1W/Cymho6fcggoRSpiuiYB8=
+github.com/FloatTech/rendercard v0.0.2-0.20221128165614-a41216d2422e/go.mod h1:e2M5OWspdblwq182zbVgRefiOc+gXtB1XzTW/2z86/I=
+github.com/FloatTech/sqlite v1.5.7 h1:Bvo4LSojcZ6dVtbHrkqvt6z4v8e+sj0G5PSUIvdawsk=
+github.com/FloatTech/sqlite v1.5.7/go.mod h1:zFbHzRfB+CJ+VidfjuVbrcin3DAz283F7hF1hIeHzpY=
 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.1-0.20220816020252-0f57a5ae28aa h1:nltmv5w1cdB0vU52zkLFI9a5FdBozaAhZZq/GCLi6Xs=
-github.com/FloatTech/zbputils v1.5.1-0.20220816020252-0f57a5ae28aa/go.mod h1:l06shz0lp4jqMBZDJaRRSUdOlIwg99cIKV4sx4YR0DI=
+github.com/FloatTech/zbpctrl v1.5.3-0.20221210051848-740ab7bd6ec3 h1:dxARTVta2i48OOYa0xMRzWTO0lr6bM4M6JmQWLkHdNE=
+github.com/FloatTech/zbpctrl v1.5.3-0.20221210051848-740ab7bd6ec3/go.mod h1:KFfMTzItP5usfnUYs7cFWjk89dzjtdO1eI+B1BVQNig=
+github.com/FloatTech/zbputils v1.6.1-0.20221210052030-50f19ddfae6f h1:l+MzleQkVkEdGFOfmxuPL5gGLd+d8za7m4g+AyQ+qeA=
+github.com/FloatTech/zbputils v1.6.1-0.20221210052030-50f19ddfae6f/go.mod h1:S7M4oH9MM8DRmIOHfTcpUpIW9KbmWht9Y6zkZLtaeKE=
 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/RomiChan/syncx v0.0.0-20221202055724-5f842c53020e h1:wR3MXQ3VbUlPKOOUwLOYgh/QaJThBTYtsl673O3lqSA=
+github.com/RomiChan/syncx v0.0.0-20221202055724-5f842c53020e/go.mod h1:vD7Ra3Q9onRtojoY5sMCLQ7JBgjUsrXDnDKyFxqpf9w=
+github.com/RomiChan/websocket v1.4.3-0.20220227141055-9b2c6168c9c5 h1:bBmmB7he0iVN4m5mcehfheeRUEer/Avo4ujnxI3uCqs=
+github.com/RomiChan/websocket v1.4.3-0.20220227141055-9b2c6168c9c5/go.mod h1:0UcFaCkhp6vZw6l5Dpq0Dp673CoF9GdvA8lTfst0GiU=
 github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
-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/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
+github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
+github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
+github.com/corona10/goimagehash v1.1.0 h1:teNMX/1e+Wn/AYSbLHX8mj+mF9r60R1kBeqE9MkoYwI=
+github.com/corona10/goimagehash v1.1.0/go.mod h1:VkvE0mLn84L4aF8vCb6mafVajEb6QYMHl2ZJLn0mOGI=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/d4l3k/messagediff v1.2.2-0.20190829033028-7e0a312ae40b/go.mod h1:Oozbb1TVXFac9FtSIxHBMnBCq2qeH/2KkEQxENCrlLo=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -47,89 +42,76 @@ github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd h1:83Wprp6RO
 github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
 github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c=
 github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4=
-github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/ericpauley/go-quantize v0.0.0-20200331213906-ae555eb2afa4 h1:BBade+JlV/f7JstZ4pitd4tHhpN+w+6I+LyOS7B4fyU=
 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/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/faiface/beep v1.1.0 h1:A2gWP6xf5Rh7RG/p9/VAW2jRSDEGQm5sbOb38sf5d4c=
+github.com/faiface/beep v1.1.0/go.mod h1:6I8p6kK2q4opL/eWb+kAkk38ehnTunWeToJB+s51sT4=
+github.com/fumiama/ahsai v0.1.0 h1:LXD61Kaj6kJHa3AEGsLIfKNzcgaVxg7JB72OR4yNNZ4=
+github.com/fumiama/ahsai v0.1.0/go.mod h1:fFeNnqgo44i8FIaguK659aQryuZeFy+4klYLQu/rfdk=
+github.com/fumiama/bigfft v0.0.0-20211011143303-6e0bfa3c836b h1:Zt3pFQditAdWTHCOVkiloc9ZauBoWrb37guFV4iIRvE=
+github.com/fumiama/bigfft v0.0.0-20211011143303-6e0bfa3c836b/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 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.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/go-base16384 v1.6.1 h1:4yb4JgmBJDnQtq3XGXXdLrVwEnRpjhMUt4eAcsNeA30=
+github.com/fumiama/go-base16384 v1.6.1/go.mod h1:OEn+947GV5gsbTAnyuUW/SrfxJYUdYupSIQXOuGOcXM=
+github.com/fumiama/go-registry v0.2.5-0.20221121111817-44b0846bdce6 h1:rCvtE5Qcj6HVJICbDC7SOmIl4QnkAKSNt5/wJ/AO4wo=
+github.com/fumiama/go-registry v0.2.5-0.20221121111817-44b0846bdce6/go.mod h1:GP45kejHuDLFxcWdksrt75r5rHBqYwtfeUl3JzGWxfQ=
+github.com/fumiama/go-simple-protobuf v0.1.0 h1:rLzJgNqB6LHNDVMl81yyNt6ZKziWtVfu+ioF0edlEVw=
+github.com/fumiama/go-simple-protobuf v0.1.0/go.mod h1:5yYNapXq1tQMOZg9bOIVhQlZk9pQqpuFIO4DZLbsdy4=
 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/fumiama/jieba v0.0.0-20221203025406-36c17a10b565 h1:sQuR2+N5HurnvsZhiKdEg+Ig354TaqgCQRxd/0KgIOQ=
+github.com/fumiama/jieba v0.0.0-20221203025406-36c17a10b565/go.mod h1:UUEvyLTJ7yoOA/viKG4wEis4ERydM7+Ny6gZUWgkS80=
+github.com/fumiama/sqlite3 v1.20.0-with-win386 h1:ZR1AXGBEtkfq9GAXehOVcwn+aaCG8itrkgEsz4ggx5k=
+github.com/fumiama/sqlite3 v1.20.0-with-win386/go.mod h1:Os58MHwYCcYZCy2PGChBrQtBAw5/LS1ZZOkfc+C/I7s=
+github.com/fumiama/unibase2n v0.0.0-20221020155353-02876e777430 h1:XL4SnagpaVHYybnnj6whQxmt8Ps9/kaG6sCNn4X1GGA=
+github.com/fumiama/unibase2n v0.0.0-20221020155353-02876e777430/go.mod h1:lEaZsT4FRSqcjnQ5q8y+mkenkzR/r1D3BJmfdp0vqDg=
 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/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg=
+github.com/gdamore/tcell v1.3.0/go.mod h1:Hjvr+Ofd+gLglo7RYKxxnzCBmev3BzsS67MebKS4zMM=
+github.com/go-audio/audio v1.0.0/go.mod h1:6uAu0+H2lHkwdGsAY+j2wHPNPpPoeg5AaEFh9FlA+Zs=
+github.com/go-audio/riff v1.0.0/go.mod h1:l3cQwc85y79NQFCRB7TiPoNiaijp6q8Z0Uv38rVG498=
+github.com/go-audio/wav v1.0.0/go.mod h1:3yoReyQOsiARkvPl3ERCi8JFjihzG6WhjYpZCf5zAWE=
 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-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
 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/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/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE=
+github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 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/hajimehoshi/go-mp3 v0.3.0/go.mod h1:qMJj/CSDxx6CGHiZeCgbiq2DSUkbK0UbtXShQcnfyMM=
+github.com/hajimehoshi/oto v0.6.1/go.mod h1:0QXGEkbuJRohbJaxr7ZQSxnju7hEhseiPx2hrh6raOI=
+github.com/hajimehoshi/oto v0.7.1 h1:I7maFPz5MBCwiutOrz++DLdbr4rTzBsbBuV2VpgU9kk=
+github.com/hajimehoshi/oto v0.7.1/go.mod h1:wovJ8WWMfFKvP587mhHgot/MBr4DnNy9m6EepeVGnos=
+github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
+github.com/icza/bitio v1.0.0/go.mod h1:0jGnlLAx8MKMr9VGnn/4YrvZiprkvBelsVIbA9Jjr9A=
+github.com/icza/mighty v0.0.0-20180919140131-cfd07d671de6/go.mod h1:xQig96I1VNBDIWGCdTt54nHt6EeI639SmHycLYL7FkA=
+github.com/jfreymuth/oggvorbis v1.0.1 h1:NT0eXBgE2WHzu6RT/6zcb2H10Kxj6Fm3PccT0LE6bqw=
+github.com/jfreymuth/oggvorbis v1.0.1/go.mod h1:NqS+K+UXKje0FUYUPosyQ+XTVvjmVjps1aEZH1sumIk=
+github.com/jfreymuth/vorbis v1.0.0 h1:SmDf783s82lIjGZi8EGUUaS7YxPHgRj4ZXW/h7rUi7U=
+github.com/jfreymuth/vorbis v1.0.0/go.mod h1:8zy3lUAm9K/rJJk223RKy6vjCZTWC61NA2QD06bfOE0=
 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=
@@ -138,405 +120,175 @@ 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/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/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 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/lucas-clemente/quic-go v0.31.0 h1:MfNp3fk0wjWRajw6quMFA3ap1AVtlU+2mtwmbVogB2M=
+github.com/lucas-clemente/quic-go v0.31.0/go.mod h1:0wFbizLgYzqHqtlyxyCaJKlE7bYgE6JQ+54TLd/Dq2g=
+github.com/lucasb-eyer/go-colorful v1.0.2/go.mod h1:0MS4r+7BZKSJ5mw4/S5MPN+qHFF1fYclkSPilDOKW0s=
 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/marten-seemann/qpack v0.3.0 h1:UiWstOgT8+znlkDPOg2+3rIuYXJ2CnGDkGUXN6ki6hE=
+github.com/marten-seemann/qpack v0.3.0/go.mod h1:cGfKPBiP4a9EQdxCwEwI/GEeWAsjSekBvx/X8mh58+g=
+github.com/marten-seemann/qtls-go1-18 v0.1.3 h1:R4H2Ks8P6pAtUagjFty2p7BVHn3XiwDAl7TTQf5h7TI=
+github.com/marten-seemann/qtls-go1-18 v0.1.3/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
+github.com/marten-seemann/qtls-go1-19 v0.1.1 h1:mnbxeq3oEyQxQXwI4ReCgW9DPoPR94sNlqWoDZnjRIE=
+github.com/marten-seemann/qtls-go1-19 v0.1.1/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI=
+github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 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/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/mewkiz/flac v1.0.7/go.mod h1:yU74UH277dBUpqxPouHSQIar3G1X/QIclVbFahSd1pU=
+github.com/mewkiz/pkg v0.0.0-20190919212034-518ade7978e2/go.mod h1:3E2FUC/qYUfM8+r9zAwpeHJzqRVVMIYnpzD/clwWxyA=
+github.com/mroth/weightedrand v1.0.0 h1:V8JeHChvl2MP1sAoXq4brElOcza+jxLkRuwvtQu8L3E=
+github.com/mroth/weightedrand v1.0.0/go.mod h1:3p2SIcC8al1YMzGhAIoXD+r9olo/g/cdJgAD905gyNE=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
-github.com/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.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/onsi/ginkgo/v2 v2.2.0 h1:3ZNA3L1c5FYDFTTxbFeVGGD8jYvjYauHD30YgLxVsNI=
+github.com/onsi/ginkgo/v2 v2.2.0/go.mod h1:MEH45j8TBi6u9BMogfbp0stKC5cdGjumZj5Y7AG4VIk=
+github.com/onsi/gomega v1.20.1 h1:PA/3qinGoukvymdIDV8pii6tiZgC8kbmJO6Z5+b002Q=
+github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.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/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/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/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
+github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
+github.com/shirou/gopsutil/v3 v3.22.11 h1:kxsPKS+Eeo+VnEQ2XCaGJepeP6KY53QoRTETx3+1ndM=
+github.com/shirou/gopsutil/v3 v3.22.11/go.mod h1:xl0EeL4vXJ+hQMAGN8B9VFpxukEMA0XdevQOe5MZ1oY=
 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/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 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/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-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/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/tidwall/gjson v1.14.4 h1:uo0p8EbA09J7RQaflQ1aBRffTR7xedD2bcIVSYxLnkM=
+github.com/tidwall/gjson v1.14.4/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.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw=
-github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk=
-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/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU=
-github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM=
+github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM=
+github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI=
+github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms=
+github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4=
 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/wdvxdr1123/ZeroBot v1.6.6 h1:UG5OKh3POo6JID4I3/Qab94aQFgqP2rA5nIswwHke58=
+github.com/wdvxdr1123/ZeroBot v1.6.6/go.mod h1:T5kD5vLi/YxL/fyDOCOaawi96LRBdJjcXh2CIjDyFfg=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 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=
+gitlab.com/gomidi/midi/v2 v2.0.25 h1:dkzVBqbaFHjyWwP71MrQNX7IeRUIDonddmHbPpO/Ucg=
+gitlab.com/gomidi/midi/v2 v2.0.25/go.mod h1:quTyMKSQ4Klevxu6gY4gy2USbeZra0fV5SalndmPfsY=
 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-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 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/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4=
+golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA=
+golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA=
+golang.org/x/exp/shiny v0.0.0-20221126150942-6ab00d035af9 h1:tLxpBz7qD8qFkRDC159unetNbxKp4zeqsqw2rLwvdxc=
+golang.org/x/exp/shiny v0.0.0-20221126150942-6ab00d035af9/go.mod h1:VjAR7z0ngyATZTELrBSkxOOHhhlnVUxDye4mcjx5h/8=
+golang.org/x/image v0.0.0-20190220214146-31aff87c08e9/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
+golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
+golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 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-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/image v0.1.0 h1:r8Oj8ZA2Xy12/b5KZYj3tuv7NG/fBz3TwQVvpJ9l8Rk=
+golang.org/x/image v0.1.0/go.mod h1:iyPr49SD/G/TBxYVB/9RRtGUT5eNbo2u4NamWeQcD5c=
+golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
+golang.org/x/mobile v0.0.0-20190415191353-3e0bab5405d6/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
+golang.org/x/mobile v0.0.0-20201217150744-e6ae53a27f4f h1:kgfVkAEEQXXQ0qc6dH7n6y37NAYmTFmz0YRwrRjgxKw=
+golang.org/x/mobile v0.0.0-20201217150744-e6ae53a27f4f/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4=
+golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
+golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 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-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 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/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 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/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 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-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190429190828-d89cdac9e872/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/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-20191204072324-ce4227a45e2e/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-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-20220520151302-bc2c85ada10a/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/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
+golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 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/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
+golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 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-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 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.0.0-20200117012304-6edc0a871e69/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 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=
+google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
 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/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 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=
-modernc.org/cc/v3 v3.33.11/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
-modernc.org/cc/v3 v3.34.0/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
-modernc.org/cc/v3 v3.35.0/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
-modernc.org/cc/v3 v3.35.4/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
-modernc.org/cc/v3 v3.35.5/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
-modernc.org/cc/v3 v3.35.7/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
-modernc.org/cc/v3 v3.35.8/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
-modernc.org/cc/v3 v3.35.10/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
-modernc.org/cc/v3 v3.35.15/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
-modernc.org/cc/v3 v3.35.16/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
-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/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=
-modernc.org/ccgo/v3 v3.11.1/go.mod h1:lWHxfsn13L3f7hgGsGlU28D9eUOf6y3ZYHKoPaKU0ag=
-modernc.org/ccgo/v3 v3.11.3/go.mod h1:0oHunRBMBiXOKdaglfMlRPBALQqsfrCKXgw9okQ3GEw=
-modernc.org/ccgo/v3 v3.12.4/go.mod h1:Bk+m6m2tsooJchP/Yk5ji56cClmN6R1cqc9o/YtbgBQ=
-modernc.org/ccgo/v3 v3.12.6/go.mod h1:0Ji3ruvpFPpz+yu+1m0wk68pdr/LENABhTrDkMDWH6c=
-modernc.org/ccgo/v3 v3.12.8/go.mod h1:Hq9keM4ZfjCDuDXxaHptpv9N24JhgBZmUG5q60iLgUo=
-modernc.org/ccgo/v3 v3.12.11/go.mod h1:0jVcmyDwDKDGWbcrzQ+xwJjbhZruHtouiBEvDfoIsdg=
-modernc.org/ccgo/v3 v3.12.14/go.mod h1:GhTu1k0YCpJSuWwtRAEHAol5W7g1/RRfS4/9hc9vF5I=
-modernc.org/ccgo/v3 v3.12.18/go.mod h1:jvg/xVdWWmZACSgOiAhpWpwHWylbJaSzayCqNOJKIhs=
-modernc.org/ccgo/v3 v3.12.20/go.mod h1:aKEdssiu7gVgSy/jjMastnv/q6wWGRbszbheXgWRHc8=
-modernc.org/ccgo/v3 v3.12.21/go.mod h1:ydgg2tEprnyMn159ZO/N4pLBqpL7NOkJ88GT5zNU2dE=
-modernc.org/ccgo/v3 v3.12.22/go.mod h1:nyDVFMmMWhMsgQw+5JH6B6o4MnZ+UQNw1pp52XYFPRk=
-modernc.org/ccgo/v3 v3.12.25/go.mod h1:UaLyWI26TwyIT4+ZFNjkyTbsPsY3plAEB6E7L/vZV3w=
-modernc.org/ccgo/v3 v3.12.29/go.mod h1:FXVjG7YLf9FetsS2OOYcwNhcdOLGt8S9bQ48+OP75cE=
-modernc.org/ccgo/v3 v3.12.36/go.mod h1:uP3/Fiezp/Ga8onfvMLpREq+KUjUmYMxXPO8tETHtA8=
-modernc.org/ccgo/v3 v3.12.38/go.mod h1:93O0G7baRST1vNj4wnZ49b1kLxt0xCW5Hsa2qRaZPqc=
-modernc.org/ccgo/v3 v3.12.43/go.mod h1:k+DqGXd3o7W+inNujK15S5ZYuPoWYLpF5PYougCmthU=
-modernc.org/ccgo/v3 v3.12.46/go.mod h1:UZe6EvMSqOxaJ4sznY7b23/k13R8XNlyWsO5bAmSgOE=
-modernc.org/ccgo/v3 v3.12.47/go.mod h1:m8d6p0zNps187fhBwzY/ii6gxfjob1VxWb919Nk1HUk=
-modernc.org/ccgo/v3 v3.12.50/go.mod h1:bu9YIwtg+HXQxBhsRDE+cJjQRuINuT9PUK4orOco/JI=
-modernc.org/ccgo/v3 v3.12.51/go.mod h1:gaIIlx4YpmGO2bLye04/yeblmvWEmE4BBBls4aJXFiE=
-modernc.org/ccgo/v3 v3.12.53/go.mod h1:8xWGGTFkdFEWBEsUmi+DBjwu/WLy3SSOrqEmKUjMeEg=
-modernc.org/ccgo/v3 v3.12.54/go.mod h1:yANKFTm9llTFVX1FqNKHE0aMcQb1fuPJx6p8AcUx+74=
-modernc.org/ccgo/v3 v3.12.55/go.mod h1:rsXiIyJi9psOwiBkplOaHye5L4MOOaCjHg1Fxkj7IeU=
-modernc.org/ccgo/v3 v3.12.56/go.mod h1:ljeFks3faDseCkr60JMpeDb2GSO3TKAmrzm7q9YOcMU=
-modernc.org/ccgo/v3 v3.12.57/go.mod h1:hNSF4DNVgBl8wYHpMvPqQWDQx8luqxDnNGCMM4NFNMc=
-modernc.org/ccgo/v3 v3.12.60/go.mod h1:k/Nn0zdO1xHVWjPYVshDeWKqbRWIfif5dtsIOCUVMqM=
-modernc.org/ccgo/v3 v3.12.66/go.mod h1:jUuxlCFZTUZLMV08s7B1ekHX5+LIAurKTTaugUr/EhQ=
-modernc.org/ccgo/v3 v3.12.67/go.mod h1:Bll3KwKvGROizP2Xj17GEGOTrlvB1XcVaBrC90ORO84=
-modernc.org/ccgo/v3 v3.12.73/go.mod h1:hngkB+nUUqzOf3iqsM48Gf1FZhY599qzVg1iX+BT3cQ=
-modernc.org/ccgo/v3 v3.12.81/go.mod h1:p2A1duHoBBg1mFtYvnhAnQyI6vL0uw5PGYLSIgF6rYY=
-modernc.org/ccgo/v3 v3.12.84/go.mod h1:ApbflUfa5BKadjHynCficldU1ghjen84tuM5jRynB7w=
-modernc.org/ccgo/v3 v3.12.86/go.mod h1:dN7S26DLTgVSni1PVA3KxxHTcykyDurf3OgUzNqTSrU=
-modernc.org/ccgo/v3 v3.12.90/go.mod h1:obhSc3CdivCRpYZmrvO88TXlW0NvoSVvdh/ccRjJYko=
-modernc.org/ccgo/v3 v3.12.92/go.mod h1:5yDdN7ti9KWPi5bRVWPl8UNhpEAtCjuEE7ayQnzzqHA=
-modernc.org/ccgo/v3 v3.13.1/go.mod h1:aBYVOUfIlcSnrsRVU8VRS35y2DIfpgkmVkYZ0tpIXi4=
-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/ccorpus v1.11.1/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=
-modernc.org/libc v1.11.0/go.mod h1:2lOfPmj7cz+g1MrPNmX65QCzVxgNq2C5o0jdLY2gAYg=
-modernc.org/libc v1.11.2/go.mod h1:ioIyrl3ETkugDO3SGZ+6EOKvlP3zSOycUETe4XM4n8M=
-modernc.org/libc v1.11.5/go.mod h1:k3HDCP95A6U111Q5TmG3nAyUcp3kR5YFZTeDS9v8vSU=
-modernc.org/libc v1.11.6/go.mod h1:ddqmzR6p5i4jIGK1d/EiSw97LBcE3dK24QEwCFvgNgE=
-modernc.org/libc v1.11.11/go.mod h1:lXEp9QOOk4qAYOtL3BmMve99S5Owz7Qyowzvg6LiZso=
-modernc.org/libc v1.11.13/go.mod h1:ZYawJWlXIzXy2Pzghaf7YfM8OKacP3eZQI81PDLFdY8=
-modernc.org/libc v1.11.16/go.mod h1:+DJquzYi+DMRUtWI1YNxrlQO6TcA5+dRRiq8HWBWRC8=
-modernc.org/libc v1.11.19/go.mod h1:e0dgEame6mkydy19KKaVPBeEnyJB4LGNb0bBH1EtQ3I=
-modernc.org/libc v1.11.24/go.mod h1:FOSzE0UwookyT1TtCJrRkvsOrX2k38HoInhw+cSCUGk=
-modernc.org/libc v1.11.26/go.mod h1:SFjnYi9OSd2W7f4ct622o/PAYqk7KHv6GS8NZULIjKY=
-modernc.org/libc v1.11.27/go.mod h1:zmWm6kcFXt/jpzeCgfvUNswM0qke8qVwxqZrnddlDiE=
-modernc.org/libc v1.11.28/go.mod h1:Ii4V0fTFcbq3qrv3CNn+OGHAvzqMBvC7dBNyC4vHZlg=
-modernc.org/libc v1.11.31/go.mod h1:FpBncUkEAtopRNJj8aRo29qUiyx5AvAlAxzlx9GNaVM=
-modernc.org/libc v1.11.34/go.mod h1:+Tzc4hnb1iaX/SKAutJmfzES6awxfU1BPvrrJO0pYLg=
-modernc.org/libc v1.11.37/go.mod h1:dCQebOwoO1046yTrfUE5nX1f3YpGZQKNcITUYWlrAWo=
-modernc.org/libc v1.11.39/go.mod h1:mV8lJMo2S5A31uD0k1cMu7vrJbSA3J3waQJxpV4iqx8=
-modernc.org/libc v1.11.42/go.mod h1:yzrLDU+sSjLE+D4bIhS7q1L5UwXDOw99PLSX0BlZvSQ=
-modernc.org/libc v1.11.44/go.mod h1:KFq33jsma7F5WXiYelU8quMJasCCTnHK0mkri4yPHgA=
-modernc.org/libc v1.11.45/go.mod h1:Y192orvfVQQYFzCNsn+Xt0Hxt4DiO4USpLNXBlXg/tM=
-modernc.org/libc v1.11.47/go.mod h1:tPkE4PzCTW27E6AIKIR5IwHAQKCAtudEIeAV1/SiyBg=
-modernc.org/libc v1.11.49/go.mod h1:9JrJuK5WTtoTWIFQ7QjX2Mb/bagYdZdscI3xrvHbXjE=
-modernc.org/libc v1.11.51/go.mod h1:R9I8u9TS+meaWLdbfQhq2kFknTW0O3aw3kEMqDDxMaM=
-modernc.org/libc v1.11.53/go.mod h1:5ip5vWYPAoMulkQ5XlSJTy12Sz5U6blOQiYasilVPsU=
-modernc.org/libc v1.11.54/go.mod h1:S/FVnskbzVUrjfBqlGFIPA5m7UwB3n9fojHhCNfSsnw=
-modernc.org/libc v1.11.55/go.mod h1:j2A5YBRm6HjNkoSs/fzZrSxCuwWqcMYTDPLNx0URn3M=
-modernc.org/libc v1.11.56/go.mod h1:pakHkg5JdMLt2OgRadpPOTnyRXm/uzu+Yyg/LSLdi18=
-modernc.org/libc v1.11.58/go.mod h1:ns94Rxv0OWyoQrDqMFfWwka2BcaF6/61CqJRK9LP7S8=
-modernc.org/libc v1.11.71/go.mod h1:DUOmMYe+IvKi9n6Mycyx3DbjfzSKrdr/0Vgt3j7P5gw=
-modernc.org/libc v1.11.75/go.mod h1:dGRVugT6edz361wmD9gk6ax1AbDSe0x5vji0dGJiPT0=
-modernc.org/libc v1.11.82/go.mod h1:NF+Ek1BOl2jeC7lw3a7Jj5PWyHPwWD4aq3wVKxqV1fI=
-modernc.org/libc v1.11.86/go.mod h1:ePuYgoQLmvxdNT06RpGnaDKJmDNEkV7ZPKI2jnsvZoE=
-modernc.org/libc v1.11.87/go.mod h1:Qvd5iXTeLhI5PS0XSyqMY99282y+3euapQFxM7jYnpY=
-modernc.org/libc v1.11.88/go.mod h1:h3oIVe8dxmTcchcFuCcJ4nAWaoiwzKCdv82MM0oiIdQ=
-modernc.org/libc v1.11.98/go.mod h1:ynK5sbjsU77AP+nn61+k+wxUGRx9rOFcIqWYYMaDZ4c=
-modernc.org/libc v1.11.101/go.mod h1:wLLYgEiY2D17NbBOEp+mIJJJBGSiy7fLL4ZrGGZ+8jI=
-modernc.org/libc v1.12.0/go.mod h1:2MH3DaF/gCU8i/UBiVE1VFRos4o523M7zipmwH8SIgQ=
-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.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=
-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.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=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+modernc.org/libc v1.21.5 h1:xBkU9fnHV+hvZuPSRszN0AXDG4M7nwPLwTWwkYcvLCI=
+modernc.org/libc v1.21.5/go.mod h1:przBsL5RDOZajTVslkugzLBj1evTue36jEomFQOoYuI=
+modernc.org/mathutil v1.5.0 h1:rV0Ko/6SfM+8G+yKiyI830l3Wuz1zRutdslNoQ0kfiQ=
+modernc.org/mathutil v1.5.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
+modernc.org/memory v1.4.0 h1:crykUfNSnMAXaOJnnxcSzbUGMqkLWjklJKkBK2nwZwk=
+modernc.org/memory v1.4.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU=

kanban/banner.go

@@ -1,45 +1,7 @@
 package kanban
 
-import (
-	"fmt"
-	"strings"
-
-	"github.com/fumiama/go-registry"
-)
-
-var (
-	info = [...]string{
-		"* OneBot + ZeroBot + Golang",
-		"* 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.fumiama.top:32664", "fumiama")
-)
-
-// PrintBanner ...
-func PrintBanner() {
-	fmt.Print(
-		"\n======================[ZeroBot-Plugin]======================",
-		"\n", Banner, "\n",
-		"----------------------[ZeroBot-公告栏]----------------------",
-		"\n", Kanban(), "\n",
-		"============================================================\n\n",
-	)
-}
-
-// Kanban ...
-func Kanban() string {
-	err := reg.Connect()
-	if err != nil {
-		return err.Error()
-	}
-	defer reg.Close()
-	text, err := reg.Get("ZeroBot-Plugin/kanban")
-	if err != nil {
-		return err.Error()
-	}
-	return text
-}
+// Banner ...
+var Banner = "* OneBot + ZeroBot + Golang\n" +
+	"* Version v1.6.0 - 2022-12-10 13:57:05 +0800 CST\n" +
+	"* Copyright © 2020 - 2022 FloatTech. All Rights Reserved.\n" +
+	"* Project: https://github.com/FloatTech/ZeroBot-Plugin"

kanban/gen/banner.go

@@ -0,0 +1,43 @@
+// Package main generates banner.go
+package main
+
+import (
+	"bytes"
+	"fmt"
+	"os"
+	"os/exec"
+	"strings"
+	"time"
+)
+
+const banner = `package kanban
+
+// Banner ...
+var Banner = "* OneBot + ZeroBot + Golang\n" +
+	"* Version %s - %s\n" +
+	"* Copyright © 2020 - %d FloatTech. All Rights Reserved.\n" +
+	"* Project: https://github.com/FloatTech/ZeroBot-Plugin"
+`
+
+const timeformat = `2006-01-02 15:04:05 +0800 CST`
+
+func main() {
+	f, err := os.Create("banner.go")
+	if err != nil {
+		panic(err)
+	}
+	defer f.Close()
+	vartag := bytes.NewBuffer(nil)
+	vartagcmd := exec.Command("git", "tag", "--sort=committerdate")
+	vartagcmd.Stdout = vartag
+	err = vartagcmd.Run()
+	if err != nil {
+		panic(err)
+	}
+	s := strings.Split(vartag.String(), "\n")
+	now := time.Now()
+	_, err = fmt.Fprintf(f, banner, s[len(s)-2], now.Format(timeformat), now.Year())
+	if err != nil {
+		panic(err)
+	}
+}

kanban/init.go

@@ -1,6 +1,45 @@
 // Package kanban 打印版本信息
 package kanban
 
+import (
+	"fmt"
+	"sync"
+
+	"github.com/FloatTech/zbputils/control"
+	"github.com/fumiama/go-registry"
+)
+
+//go:generate go run github.com/FloatTech/ZeroBot-Plugin/kanban/gen
+
+var once sync.Once
+
 func init() {
-	PrintBanner()
+	once.Do(PrintBanner)
+}
+
+var reg = registry.NewRegReader("reilia.fumiama.top:32664", control.Md5File, "fumiama")
+
+// PrintBanner ...
+func PrintBanner() {
+	fmt.Print(
+		"\n======================[ZeroBot-Plugin]======================",
+		"\n", Banner, "\n",
+		"----------------------[ZeroBot-公告栏]----------------------",
+		"\n", Kanban(), "\n",
+		"============================================================\n\n",
+	)
+}
+
+// Kanban ...
+func Kanban() string {
+	err := reg.Connect()
+	if err != nil {
+		return err.Error()
+	}
+	defer reg.Close()
+	text, err := reg.Get("ZeroBot-Plugin/kanban")
+	if err != nil {
+		return err.Error()
+	}
+	return text
 }

main.go

@@ -1,3 +1,4 @@
+// Package main ZeroBot-Plugin main file
 package main
 
 import (
@@ -25,6 +26,8 @@ import (
 	//                          vvvvvvvvvvvvvv                          //
 	//                               vvvv                               //
 
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/antiabuse" // 违禁词
+
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/chat" // 基础词库
 
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/sleep_manage" // 统计睡眠时间
@@ -55,23 +58,31 @@ import (
 	//                          vvvvvvvvvvvvvv                          //
 	//                               vvvv                               //
 
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/ahsai"         // ahsai tts
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/ai_false"      // 服务器监控
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/aipaint"       // ai绘图
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/aiwife"        // 随机老婆
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/alipayvoice"   // 支付宝到账语音
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/b14"           // base16384加解密
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/baidu"         // 百度一下
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/baiduaudit"    // 百度内容审核
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/base64gua"     // base64卦加解密
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/baseamasiro"   // base天城文加解密
 	_ "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/chrev"         // 英文字符翻转
 	_ "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/dress"         // 女装
 	_ "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/event"         // 好友申请群聊邀请事件处理
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/font"          // 渲染任意文字到图片
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/fortune"       // 运势
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/funny"         // 笑话
@@ -79,13 +90,18 @@ import (
 	_ "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/heisi"         // 黑丝
 	_ "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/jiami"         // 兽语加密
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/jikipedia"     // 小鸡词典
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/jptingroom"    // 日语听力学习材料
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/juejuezi"      // 绝绝子生成器
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/lolicon"       // lolicon 随机图片
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/magicprompt"   // magicprompt吟唱提示
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/midicreate"    // 简易midi音乐制作
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/moegoe"        // 日韩 VITS 模型拟声
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/moyu"          // 摸鱼
@@ -99,6 +115,9 @@ import (
 	_ "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/quan"          // QQ权重查询
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/qzone"         // qq空间表白墙
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/realcugan"     // realcugan清晰术
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/reborn"        // 投胎
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/runcode"       // 在线运行代码
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/saucenao"      // 以图搜图
@@ -111,10 +130,14 @@ import (
 	_ "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/vitsnyaru"     // vits猫雷
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/vtb_quotation" // vtb语录
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/wangyiyun"     // 网易云音乐热评
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/wenben"        // 文本指令大全
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/wenxinAI"      // 百度文心AI画图
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/word_count"    // 聊天热词
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/wordle"        // 猜单词
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/ygo"           // 游戏王相关插件
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/ymgal"         // 月幕galgame
 
 	// _ "github.com/FloatTech/ZeroBot-Plugin/plugin/wtf"            // 鬼东西
@@ -141,6 +164,8 @@ import (
 
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/ai_reply" // 人工智能回复
 
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/breakrepeat" // 打断复读
+
 	//                               ^^^^                               //
 	//                          ^^^^^^^^^^^^^^                          //
 	//                      ^^^^^^^低优先级区^^^^^^^                      //
@@ -153,7 +178,7 @@ import (
 	//                                                                  //
 	//                                                                  //
 	// -----------------------以下为内置依赖，勿动------------------------ //
-	"github.com/FloatTech/zbputils/process"
+	"github.com/FloatTech/floatbox/process"
 	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/driver"
@@ -161,6 +186,13 @@ import (
 	// -----------------------以上为内置依赖，勿动------------------------ //
 )
 
+type zbpcfg struct {
+	Z zero.Config        `json:"zero"`
+	W []*driver.WSClient `json:"ws"`
+}
+
+var config zbpcfg
+
 func init() {
 	sus := make([]int64, 0, 16)
 	// 解析命令行参数
@@ -176,11 +208,13 @@ func init() {
 	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.")
+	late := flag.Uint("l", 233, "Response latency (ms).")
+	rsz := flag.Uint("r", 4096, "Receiving buffer ring size.")
+	maxpt := flag.Uint("x", 4, "Max process time (min).")
 
 	flag.Parse()
 
 	if *h {
-		kanban.PrintBanner()
 		fmt.Println("Usage:")
 		flag.PrintDefaults()
 		os.Exit(0)
@@ -226,10 +260,13 @@ func init() {
 
 	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]},
+		NickName:       append([]string{*adana}, "ATRI", "atri", "亚托莉", "アトリ"),
+		CommandPrefix:  *prefix,
+		SuperUsers:     sus,
+		RingLen:        *rsz,
+		Latency:        time.Duration(*late) * time.Millisecond,
+		MaxProcessTime: time.Duration(*maxpt) * time.Minute,
+		Driver:         []zero.Driver{config.W[0]},
 	}
 
 	if *save != "" {
@@ -258,5 +295,5 @@ func main() {
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SendChain(message.Text(kanban.Kanban()))
 		})
-	zero.RunAndBlock(config.Z, process.GlobalInitMutex.Unlock)
+	zero.RunAndBlock(&config.Z, process.GlobalInitMutex.Unlock)
 }

plugin/ahsai/ahsai.go

@@ -0,0 +1,97 @@
+// Package ahsai AH Soft フリーテキスト音声合成 demo API
+package ahsai
+
+import (
+	"fmt"
+	"math/rand"
+	"os"
+	"sort"
+	"strconv"
+	"time"
+
+	"github.com/FloatTech/floatbox/file"
+	ctrl "github.com/FloatTech/zbpctrl"
+	"github.com/FloatTech/zbputils/control"
+	ahsaitts "github.com/fumiama/ahsai"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+)
+
+var (
+	namelist = [...]string{"伊織弓鶴", "紲星あかり", "結月ゆかり", "京町セイカ", "東北きりたん", "東北イタコ", "ついなちゃん標準語", "ついなちゃん関西弁", "音街ウナ", "琴葉茜", "吉田くん", "民安ともえ", "桜乃そら", "月読アイ", "琴葉葵", "東北ずん子", "月読ショウタ", "水奈瀬コウ"}
+	namesort = func() []string {
+		nl := namelist[:]
+		sort.Strings(nl)
+		return nl
+	}()
+)
+
+func init() {
+	engine := control.Register("ahsai", &ctrl.Options[*zero.Ctx]{
+		DisableOnDefault:  false,
+		Brief:             "フリーテキスト音声合成",
+		Help:              "- 使[伊織弓鶴|紲星あかり|結月ゆかり|京町セイカ|東北きりたん|東北イタコ|ついなちゃん標準語|ついなちゃん関西弁|音街ウナ|琴葉茜|吉田くん|民安ともえ|桜乃そら|月読アイ|琴葉葵|東北ずん子|月読ショウタ|水奈瀬コウ]说(日语)\n",
+		PrivateDataFolder: "ahsai",
+	})
+	cachePath := engine.DataFolder() + "cache/"
+	_ = os.RemoveAll(cachePath)
+	_ = os.MkdirAll(cachePath, 0755)
+	engine.OnRegex("^使(.{0,10})说([A-Za-z\\s\\d\u3005\u3040-\u30ff\u4e00-\u9fff\uff11-\uff19\uff21-\uff3a\uff41-\uff5a\uff66-\uff9d\\pP]+)$", selectName).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+		ctx.SendChain(message.Text("少女祈祷中..."))
+		uid := ctx.Event.UserID
+		today := time.Now().Format("20060102150405")
+		ahsaiFile := cachePath + strconv.FormatInt(uid, 10) + today + "ahsai.wav"
+		s := ahsaitts.NewSpeaker()
+		err := s.SetName(ctx.State["ahsainame"].(string))
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR: ", err))
+			return
+		}
+		u, err := s.Speak(ctx.State["ahsaitext"].(string))
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR: ", err))
+			return
+		}
+		err = ahsaitts.SaveOggToFile(u, ahsaiFile)
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR: ", err))
+			return
+		}
+		ctx.SendChain(message.Record("file:///" + file.BOTPATH + "/" + ahsaiFile))
+	})
+}
+
+func selectName(ctx *zero.Ctx) bool {
+	regexMatched := ctx.State["regex_matched"].([]string)
+	ctx.State["ahsaitext"] = regexMatched[2]
+	name := regexMatched[1]
+	index := sort.SearchStrings(namesort, name)
+	if index < len(namelist) && namesort[index] == name {
+		ctx.State["ahsainame"] = name
+		return true
+	}
+	speaktext := ""
+	for i, v := range namelist {
+		speaktext += fmt.Sprintf("%d. %s\n", i, v)
+	}
+	ctx.SendChain(message.Text("输入的音源为空, 请输入音源序号\n", speaktext))
+	next, cancel := zero.NewFutureEvent("message", 999, false, ctx.CheckSession(), zero.RegexRule(`\d{0,2}`)).Repeat()
+	defer cancel()
+	for {
+		select {
+		case <-time.After(time.Second * 10):
+			ctx.State["ahsainame"] = namelist[rand.Intn(len(namelist))]
+			ctx.SendChain(message.Text("时间太久啦！", zero.BotConfig.NickName[0], "帮你选择", ctx.State["ahsainame"]))
+			return true
+		case c := <-next:
+			msg := c.Event.Message.ExtractPlainText()
+			num, _ := strconv.Atoi(msg)
+			if num < 0 || num >= len(namelist) {
+				ctx.SendChain(message.Text("序号非法!"))
+				continue
+			}
+			ctx.State["ahsainame"] = namelist[num]
+			return true
+		}
+	}
+}

plugin/ai_false/ai_false.go

@@ -22,8 +22,8 @@ import (
 func init() { // 插件主体
 	engine := control.Register("aifalse", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
-		Help: "AIfalse\n" +
-			"- 查询计算机当前活跃度: [检查身体 | 自检 | 启动自检 | 系统状态]\n" +
+		Brief:            "自检, 全局限速",
+		Help: "- 查询计算机当前活跃度: [检查身体 | 自检 | 启动自检 | 系统状态]\n" +
 			"- 设置默认限速为每 m [分钟 | 秒] n 次触发",
 	})
 	c, ok := control.Lookup("aifalse")
@@ -50,34 +50,34 @@ func init() { // 插件主体
 		Handle(func(ctx *zero.Ctx) {
 			c, ok := ctx.State["manager"].(*ctrl.Control[*zero.Ctx])
 			if !ok {
-				ctx.SendChain(message.Text("ERROR:no such plugin"))
+				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))
+				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"))
+				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))
+				ctx.SendChain(message.Text("ERROR: ", err))
 				return
 			}
 			if n >= 65536 || n <= 0 {
-				ctx.SendChain(message.Text("ERROR:burst too big"))
+				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))
+				ctx.SendChain(message.Text("ERROR: ", err))
 				return
 			}
 			ctx.SendChain(message.Text("设置默认限速为每", m, "秒触发", n, "次"))

plugin/ai_reply/ai_tts.go

@@ -1,181 +1,270 @@
 package aireply
 
 import (
+	"errors"
+	"net/url"
 	"regexp"
-	"strconv"
 	"sync"
 
-	"github.com/pkumza/numcn"
-	log "github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
-	"github.com/wdvxdr1123/ZeroBot/message"
 
 	"github.com/FloatTech/AnimeAPI/aireply"
-	"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"
 )
 
-const ttsServiceName = "tts"
+const (
+	cnapi = "https://genshin.azurewebsites.net/api/speak?format=mp3&id=%d&text=%s&code=%s"
+)
 
-var re = regexp.MustCompile(`(\-|\+)?\d+(\.\d+)?`)
-
-type ttsInstances struct {
-	sync.RWMutex
-	m map[string]tts.TTS
-	l []string
+// 每个角色的测试文案
+var testRecord = map[string]string{
+	"派蒙":    "哎，又是看不懂的东西。我完全不知道这些奇怪的问题和实验，能得到什么结果…",
+	"凯亚":    "真是个急性子啊你。",
+	"安柏":    "最初的鸟儿是不会飞翔的，飞翔是它们勇敢跃入峡谷的奖励。",
+	"丽莎":    "嗨，小可爱，你是新来的助理吗？",
+	"琴":     "蒲公英骑士，琴，申请入队。",
+	"香菱":    "我是来自璃月的厨师香菱，最擅长的是做各种捞…捞，料理…哎呀，练了那么多次，还是会紧张，嘿。",
+	"枫原万叶":  "飘摇风雨中，带刀归来赤脚行。",
+	"迪卢克":   "在黎明来临之前，总要有人照亮黑暗。",
+	"温迪":    "若你困于无风之地，我将为你奏响高天之歌。",
+	"可莉":    "西风骑士团，火花骑士，可莉，前来报到！…呃—后面该说什么词来着？可莉背不下来啦...",
+	"早柚":    "终末番,早柚，参上。 呼——",
+	"托马":    "初次见面，异乡的旅人，你的名字我可是早就听说了。只要你不嫌弃，我托马，从今天起就是你的朋友了。",
+	"芭芭拉":   "芭芭拉，闪耀登场~治疗就交给我吧，不会让你失望的！",
+	"优菈":    "沉沦是很容易的一件事，但我仍想冻住这股潮流。",
+	"云堇":    "曲高未必人不识，自有知音和清词。",
+	"钟离":    "人间归离复归离，借一浮生逃浮生。",
+	"魈":     "三眼五显仙人，魈，听召，前来守护",
+	"凝光":    "就算古玩价值连城，给人的快乐，也只有刚拥有的一瞬",
+	"雷电将军":  "浮世千百年来风景依旧，人之在世却如白露与泡影。",
+	"北斗":    "不知道如何向前的话，总之先迈出第一步，后面的道路就会自然而然地展开了。",
+	"甘雨":    "这项工作，该划掉了。",
+	"七七":    "椰羊的奶，好喝!比一般的羊奶，好喝!",
+	"刻晴":    "劳逸结合是不错，但也别放松过头。",
+	"神里绫华":  "若知是梦何须醒，不比真如一相会。",
+	"雷泽":    "你是朋友。我和你一起狩猎。",
+	"神里绫人":  "此前听绫华屡次提起阁下，不料公务繁忙，直至今日才有机会相见。",
+	"罗莎莉亚":  "哪怕如今你已经走上截然不同的道路，也不要否认从前的自己，从前的每一个你都是你脚下的基石，不要害怕过去，不要畏惧与它抗衡。",
+	"阿贝多":   "用自己的双脚丈量土地，将未知变为知识。",
+	"八重神子":  "我的神明，就托付给你了。",
+	"宵宫":    "即使只是片刻的火花，也能在仰望黑夜的人心中留下久久不灭的美丽光芒。",
+	"荒泷一斗":  "更好地活下去,绝不该靠牺牲同类换取，应该是,一起更好地活着,才对。",
+	"九条裟罗":  "想要留住雪花。但在手心里，它只会融化的更快。",
+	"夜兰":    "线人来信了，嗯，看来又出现了新的变数。",
+	"珊瑚宫心海": "成为了现任人神巫女之后，我也慢慢习惯了这样的生活，更重要的是我也因此和你相遇了，不是吗？",
+	"五郎":    "海祇岛反抗军大将，五郎，前来助阵！",
+	"达达利亚":  "许下的诺言就好好遵守，做错了事情就承担责任，这才是家人应有的样子吧。",
+	"莫娜":    "正是因为无法更改，无可违逆，只能接受，命运才会被称之为命运。",
+	"班尼特":   "只要有大家在，伤口就不会痛!",
+	"申鹤":    "不知道你是喜欢人间的灯火，还是山林的月光？",
+	"行秋":    "有时明月无人夜，独向昭潭制恶龙。",
+	"烟绯":    "律法即是约束，也是工具。",
+	"久岐忍":   "有麻烦事要处理的话，直接告诉我就好，我来摆平。",
+	"辛焱":    "马上就要演出了，你也一起来嗨吗？",
+	"砂糖":    "我是砂糖，炼金术的…研究员。",
+	"胡桃":    "阴阳有序，命运无常，死亡难以预测，却也有它的规矩。",
+	"重云":    "我名重云，家族久居璃月，世代以驱邪除魔为业。",
+	"菲谢尔":   "我即断罪之皇女，真名为菲谢尔。应命运的召唤降临在此间——哎？你也是，异世界的旅人吗…？",
+	"诺艾尔":   "我是诺艾尔，西风骑士团的女仆，从今天起会陪你一起去冒险。",
+	"迪奥娜":   "猫尾酒馆的招牌调酒师，迪奥娜，我的出场费可是很贵的。",
+	"鹿野院平藏": "我叫鹿野院平藏，是天领奉行里破案最多最快的侦探……",
 }
 
-func (t *ttsInstances) List() []string {
-	t.RLock()
-	cl := make([]string, len(t.l))
-	_ = copy(cl, t.l)
-	t.RUnlock()
-	return cl
-}
-
-func init() {
-	t := &ttsInstances{
-		m: map[string]tts.TTS{
-			"百度女声":   baidutts.NewBaiduTTS(0),
-			"百度男声":   baidutts.NewBaiduTTS(1),
-			"百度度逍遥":  baidutts.NewBaiduTTS(3),
-			"百度度丫丫":  baidutts.NewBaiduTTS(4),
-			"拟声鸟阿梓":  nil,
-			"拟声鸟文静":  nil,
-			"拟声鸟药水哥": nil,
-		},
-		l: []string{"拟声鸟阿梓", "拟声鸟文静", "拟声鸟药水哥", "百度女声", "百度男声", "百度度逍遥", "百度度丫丫"},
+var (
+	re        = regexp.MustCompile(`(\-|\+)?\d+(\.\d+)?`)
+	soundList = [...]string{
+		"派蒙", "凯亚", "安柏", "丽莎", "琴",
+		"香菱", "枫原万叶", "迪卢克", "温迪", "可莉",
+		"早柚", "托马", "芭芭拉", "优菈", "云堇",
+		"钟离", "魈", "凝光", "雷电将军", "北斗",
+		"甘雨", "七七", "刻晴", "神里绫华", "雷泽",
+		"神里绫人", "罗莎莉亚", "阿贝多", "八重神子", "宵宫",
+		"荒泷一斗", "九条裟罗", "夜兰", "珊瑚宫心海", "五郎",
+		"达达利亚", "莫娜", "班尼特", "申鹤", "行秋",
+		"烟绯", "久岐忍", "辛焱", "砂糖", "胡桃",
+		"重云", "菲谢尔", "诺艾尔", "迪奥娜", "鹿野院平藏",
 	}
-	engine := control.Register(ttsServiceName, &ctrl.Options[*zero.Ctx]{
-		DisableOnDefault: true,
-		Help: "语音回复(包括拟声鸟和百度)\n" +
-			"- @Bot 任意文本(任意一句话回复)\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, 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
-				})
-				if err == nil {
-					ctx.SendChain(message.Record(rec))
-				} else {
-					ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(reply))
-				}
-			}
-		})
-	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)
-			if err != nil {
-				ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(err))
-				return
-			}
-			ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("设置成功，当前模式为", param))
-		})
-	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)
-			ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("设置成功，默认模式为", param))
-		})
-}
+)
 
-// new 语音简单工厂
-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 {
+/*************************************************************
+*******************************AIreply************************
+*************************************************************/
+func setReplyMode(ctx *zero.Ctx, name string) error {
 	gid := ctx.Event.GroupID
 	if gid == 0 {
 		gid = -ctx.Event.UserID
 	}
+	var ok bool
 	var index int64
-	t.RLock()
-	for i, s := range t.l {
+	for i, s := range replyModes {
 		if s == name {
+			ok = true
 			index = int64(i)
 			break
 		}
 	}
-	t.RUnlock()
-	m := ctx.State["manager"].(*ctrl.Control[*zero.Ctx])
+	if !ok {
+		return errors.New("no such mode")
+	}
+	m, ok := ctx.State["manager"].(*ctrl.Control[*zero.Ctx])
+	if !ok {
+		return errors.New("no such plugin")
+	}
 	return m.SetData(gid, index)
 }
 
-func (t *ttsInstances) getSoundMode(ctx *zero.Ctx) (name string) {
+var chats *aireply.ChatGPT
+
+func getReplyMode(ctx *zero.Ctx) aireply.AIReply {
 	gid := ctx.Event.GroupID
 	if gid == 0 {
 		gid = -ctx.Event.UserID
 	}
 	m, ok := ctx.State["manager"].(*ctrl.Control[*zero.Ctx])
 	if ok {
-		t.RLock()
-		defer t.RUnlock()
-		index := m.GetData(gid)
-		if int(index) < len(t.l) {
-			return t.l[index]
+		switch m.GetData(gid) {
+		case 0:
+			return aireply.NewQYK(aireply.QYKURL, aireply.QYKBotName)
+		case 1:
+			return aireply.NewXiaoAi(aireply.XiaoAiURL, aireply.XiaoAiBotName)
+		case 2:
+			if chats != nil {
+				return chats
+			}
 		}
 	}
-	return "拟声鸟阿梓"
+	return aireply.NewQYK(aireply.QYKURL, aireply.QYKBotName)
 }
 
-func (t *ttsInstances) setDefaultSoundMode(name string) {
-	var index int
-	t.RLock()
-	for _, s := range t.l {
+/*************************************************************
+***********************tts************************************
+*************************************************************/
+type ttsmode struct {
+	sync.RWMutex `json:"-"`
+	APIKey       string
+	mode         map[int64]int64
+}
+
+func list(list []string, num int) string {
+	s := ""
+	for i, value := range list {
+		s += value
+		if (i+1)%num == 0 {
+			s += "\n"
+		} else {
+			s += " | "
+		}
+	}
+	return s
+}
+
+func newttsmode() *ttsmode {
+	tts := &ttsmode{}
+	tts.Lock()
+	defer tts.Unlock()
+	m, ok := control.Lookup("tts")
+	tts.mode = make(map[int64]int64, 2*len(soundList))
+	tts.mode[-2905] = 1
+	if ok {
+		index := m.GetData(-2905)
+		if index > 0 && index < int64(len(soundList)) {
+			tts.mode[-2905] = index
+		}
+	}
+	return tts
+}
+
+func (tts *ttsmode) getAPIKey(ctx *zero.Ctx) string {
+	if tts.APIKey == "" {
+		m := ctx.State["manager"].(*ctrl.Control[*zero.Ctx])
+		gid := ctx.Event.GroupID
+		if gid == 0 {
+			gid = -ctx.Event.UserID
+		}
+		_ = m.Manager.GetExtra(gid, &tts)
+	}
+	return url.QueryEscape(tts.APIKey)
+}
+
+func (tts *ttsmode) setAPIKey(m *ctrl.Control[*zero.Ctx], grp int64, key string) error {
+	err := m.Manager.SetExtra(grp, &key)
+	if err != nil {
+		return err
+	}
+	tts.APIKey = key
+	return nil
+}
+
+func (tts *ttsmode) setSoundMode(ctx *zero.Ctx, name string) error {
+	gid := ctx.Event.GroupID
+	if gid == 0 {
+		gid = -ctx.Event.UserID
+	}
+	var index int64
+	for i, s := range soundList {
 		if s == name {
+			index = int64(i + 1)
 			break
 		}
-		index++
 	}
-	t.RUnlock()
-	t.Lock()
-	t.l[0], t.l[index] = t.l[index], t.l[0]
-	t.Unlock()
+	if index == 0 {
+		return errors.New("不支持设置语音人物" + name)
+	}
+	m := ctx.State["manager"].(*ctrl.Control[*zero.Ctx])
+	tts.Lock()
+	defer tts.Unlock()
+	tts.mode[gid] = index
+	return m.SetData(gid, index)
+}
+
+func (tts *ttsmode) getSoundMode(ctx *zero.Ctx) int64 {
+	gid := ctx.Event.GroupID
+	if gid == 0 {
+		gid = -ctx.Event.UserID
+	}
+	tts.Lock()
+	defer tts.Unlock()
+	i, ok := tts.mode[gid]
+	if !ok {
+		m := ctx.State["manager"].(*ctrl.Control[*zero.Ctx])
+		i = m.GetData(gid)
+	}
+	if i <= 0 || i >= int64(len(soundList)) {
+		i = tts.mode[-2905]
+	}
+	return i - 1
+}
+
+func (tts *ttsmode) resetSoundMode(ctx *zero.Ctx) error {
+	gid := ctx.Event.GroupID
+	if gid == 0 {
+		gid = -ctx.Event.UserID
+	}
+	tts.Lock()
+	defer tts.Unlock()
+	m := ctx.State["manager"].(*ctrl.Control[*zero.Ctx])
+	tts.mode[gid] = 0
+	return m.SetData(gid, 0) // 重置数据
+}
+
+func (tts *ttsmode) setDefaultSoundMode(name string) error {
+	var index int64
+	for i, s := range soundList {
+		if s == name {
+			index = int64(i + 1)
+			break
+		}
+	}
+	if index == 0 {
+		return errors.New("不支持设置语音人物" + name)
+	}
+	tts.Lock()
+	defer tts.Unlock()
+	m, ok := control.Lookup("tts")
+	if !ok {
+		return errors.New("[tts] service not found")
+	}
+	tts.mode[-2905] = index
+	return m.SetData(-2905, index)
 }

plugin/ai_reply/main.go

@@ -2,34 +2,51 @@
 package aireply
 
 import (
-	"errors"
+	"fmt"
+	"net/url"
+	"os"
+	"strconv"
 	"time"
 
 	"github.com/FloatTech/AnimeAPI/aireply"
+	"github.com/FloatTech/AnimeAPI/chatgpt"
+	"github.com/FloatTech/floatbox/binary"
 	ctrl "github.com/FloatTech/zbpctrl"
 	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/pkumza/numcn"
+	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 )
 
-const (
-	replyServiceName = "aireply"
-)
-
-var replyModes = [...]string{"青云客", "小爱"}
+var replyModes = [...]string{"青云客", "小爱", "ChatGPT"}
 
 func init() { // 插件主体
-	engine := control.Register(replyServiceName, &ctrl.Options[*zero.Ctx]{
-		DisableOnDefault: false,
-		Help: "人工智能回复\n" +
-			"- @Bot 任意文本(任意一句话回复)\n- 设置回复模式[青云客  |  小爱]\n- ",
+	ent := control.Register("tts", &ctrl.Options[*zero.Ctx]{
+		DisableOnDefault: true,
+		Brief:            "人工智能语音回复",
+		Help: "- @Bot 任意文本(任意一句话回复)\n" +
+			"- 设置语音模式[原神人物]\n" +
+			"- 设置默认语音模式[原神人物]\n" +
+			"- 恢复成默认语音模式\n" +
+			"- 为群 xxx 设置原神语音 api key xxxxxx (key请加开发群获得)\n" +
+			"当前适用的原神人物含有以下：\n" + list(soundList[:], 5),
 	})
-	// 回复 @和包括名字
-	engine.OnMessage(zero.OnlyToMe).SetBlock(true).Limit(ctxext.LimitByUser).
+	tts := newttsmode()
+	enr := control.Register("aireply", &ctrl.Options[*zero.Ctx]{
+		DisableOnDefault:  false,
+		Brief:             "人工智能回复",
+		Help:              "- @Bot 任意文本(任意一句话回复)\n- 设置回复模式[青云客|小爱|ChatGPT]\n- 设置 ChatGPT SessionToken xxx",
+		PrivateDataFolder: "aireply",
+	})
+	/*************************************************************
+	*******************************AIreply************************
+	*************************************************************/
+	enr.OnMessage(zero.OnlyToMe).SetBlock(true).Limit(ctxext.LimitByUser).
 		Handle(func(ctx *zero.Ctx) {
-			aireply := aireply.NewAIReply(getReplyMode(ctx))
-			reply := message.ParseMessageFromString(aireply.Talk(ctx.ExtractPlainText(), zero.BotConfig.NickName[0]))
+			aireply := getReplyMode(ctx)
+			reply := message.ParseMessageFromString(aireply.Talk(ctx.Event.UserID, ctx.ExtractPlainText(), zero.BotConfig.NickName[0]))
 			// 回复
 			time.Sleep(time.Second * 1)
 			if zero.OnlyPublic(ctx) {
@@ -39,53 +56,151 @@ func init() { // 插件主体
 			}
 			ctx.Send(reply)
 		})
-	engine.OnPrefix(`设置回复模式`).SetBlock(true).
+	enr.OnPrefix("设置回复模式", zero.AdminPermission).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+		param := ctx.State["args"].(string)
+		err := setReplyMode(ctx, param)
+		if err != nil {
+			ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(err))
+			return
+		}
+		ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("成功"))
+	})
+	/*************************************************************
+	***********************tts************************************
+	*************************************************************/
+	ent.OnMessage(zero.OnlyToMe).SetBlock(true).Limit(ctxext.LimitByUser).
 		Handle(func(ctx *zero.Ctx) {
-			param := ctx.State["args"].(string)
-			err := setReplyMode(ctx, param)
-			if err != nil {
-				ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(err))
-				return
+			msg := ctx.ExtractPlainText()
+			// 获取回复模式
+			r := getReplyMode(ctx)
+			// 获取回复的文本
+			reply := r.TalkPlain(ctx.Event.UserID, msg, zero.BotConfig.NickName[0])
+			// 获取语音
+			index := tts.getSoundMode(ctx)
+			record := message.Record(fmt.Sprintf(cnapi, index, url.QueryEscape(
+				// 将数字转文字
+				re.ReplaceAllStringFunc(reply, func(s string) string {
+					f, err := strconv.ParseFloat(s, 64)
+					if err != nil {
+						logrus.Errorln("[tts]", err)
+						return s
+					}
+					return numcn.EncodeFromFloat64(f)
+				}),
+			), tts.getAPIKey(ctx)))
+			// 发送语音
+			if ID := ctx.SendChain(record); ID.ID() == 0 {
+				ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(reply))
 			}
-			ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("成功"))
 		})
-}
-
-func setReplyMode(ctx *zero.Ctx, name string) error {
-	gid := ctx.Event.GroupID
-	if gid == 0 {
-		gid = -ctx.Event.UserID
-	}
-	var ok bool
-	var index int64
-	for i, s := range replyModes {
-		if s == name {
-			ok = true
-			index = int64(i)
-			break
+	ent.OnRegex(`^设置语音模式(.*)$`, zero.AdminPermission, func(ctx *zero.Ctx) bool {
+		param := ctx.State["regex_matched"].([]string)[1]
+		if _, ok := testRecord[param]; !ok {
+			return false
 		}
-	}
-	if !ok {
-		return errors.New("no such mode")
-	}
-	m, ok := ctx.State["manager"].(*ctrl.Control[*zero.Ctx])
-	if !ok {
-		return errors.New("no such plugin")
-	}
-	return m.SetData(gid, index)
-}
-
-func getReplyMode(ctx *zero.Ctx) (name string) {
-	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)
-		if int(index) < len(replyModes) {
-			return replyModes[index]
+		return true
+	}).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+		param := ctx.State["regex_matched"].([]string)[1]
+		// 保存设置
+		err := tts.setSoundMode(ctx, param)
+		if err != nil {
+			ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(err))
+			return
 		}
+		// 设置验证
+		i := tts.getSoundMode(ctx)
+		if _, ok := testRecord[soundList[i]]; !ok {
+			ctx.SendChain(message.Text("配置的语音人物数据丢失！请重新设置语音人物。"))
+			return
+		}
+		record := message.Record(fmt.Sprintf(cnapi, i, url.QueryEscape(testRecord[soundList[i]]), tts.getAPIKey(ctx))).Add("cache", 0)
+		if ID := ctx.SendChain(record); ID.ID() == 0 {
+			ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("设置失败！无法发送测试语音，请重试。"))
+			return
+		}
+		time.Sleep(time.Second * 2)
+		ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("设置成功"))
+	})
+	ent.OnRegex(`^设置默认语音模式(.*)$`, zero.SuperUserPermission, func(ctx *zero.Ctx) bool {
+		param := ctx.State["regex_matched"].([]string)[1]
+		if _, ok := testRecord[param]; !ok {
+			return false
+		}
+		return true
+	}).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+		param := ctx.State["regex_matched"].([]string)[1]
+		// 保存设置
+		err := tts.setDefaultSoundMode(param)
+		if err != nil {
+			ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(err))
+			return
+		}
+		ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("设置成功"))
+	})
+	ent.OnFullMatch("恢复成默认语音模式", zero.AdminPermission).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+		err := tts.resetSoundMode(ctx)
+		if err != nil {
+			ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(err))
+			return
+		}
+		// 设置验证
+		index := tts.getSoundMode(ctx)
+		ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("设置成功，当前为", soundList[index]))
+	})
+	ent.OnRegex(`^为群\s*(-?\d+)\s*设置原神语音\s*api\s*key\s*([0-9a-zA-Z-_]{54}==)$`, zero.OnlyPrivate, zero.SuperUserPermission).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+		grp, _ := strconv.ParseInt(ctx.State["regex_matched"].([]string)[1], 10, 64)
+		err := tts.setAPIKey(ctx.State["manager"].(*ctrl.Control[*zero.Ctx]), grp, ctx.State["regex_matched"].([]string)[2])
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR: ", err))
+			return
+		}
+		ctx.SendChain(message.Text("设置成功"))
+	})
+	chatgptfile := enr.DataFolder() + "chatgpt.txt"
+	cfg := &chatgpt.Config{
+		UA:              chatgpt.UA,
+		RefreshInterval: time.Hour,
+		Timeout:         time.Minute,
 	}
-	return "青云客"
+	data, err := os.ReadFile(chatgptfile)
+	if err == nil {
+		cfg.SessionToken = binary.BytesToString(data)
+		chats = aireply.NewChatGPT(cfg)
+	}
+	go func() {
+		for range time.NewTicker(time.Hour).C {
+			if chats == nil {
+				continue
+			}
+			err := os.WriteFile(chatgptfile, binary.StringToBytes(cfg.SessionToken), 0644)
+			if err != nil {
+				logrus.Warnln("[aireply] 保存 chatgpt session token 到", chatgptfile, "失败:", err)
+			}
+		}
+	}()
+	enr.OnRegex(`^设置\s*ChatGPT\s*SessionToken\s*(.*)$`, zero.OnlyPrivate, zero.SuperUserPermission).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+		token := ctx.State["regex_matched"].([]string)[1]
+		f, err := os.Create(chatgptfile)
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR: ", err))
+			return
+		}
+		defer f.Close()
+		_, err = f.WriteString(token)
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR: ", err))
+			return
+		}
+		chats = aireply.NewChatGPT(&chatgpt.Config{
+			UA:              chatgpt.UA,
+			SessionToken:    token,
+			RefreshInterval: time.Hour,
+			Timeout:         time.Minute,
+		})
+		ctx.SendChain(message.Text("设置成功"))
+	})
+	enr.OnFullMatch("重置ChatGPT连接").SetBlock(true).Handle(func(ctx *zero.Ctx) {
+		chats.Reset(ctx.Event.UserID)
+		ctx.SendChain(message.Text("成功"))
+	})
 }

plugin/aipaint/aipaint.go

@@ -0,0 +1,227 @@
+// Package aipaint ai绘图
+package aipaint
+
+import (
+	"encoding/base64"
+	"encoding/json"
+	"fmt"
+	"net/url"
+	"os"
+	"regexp"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/FloatTech/floatbox/binary"
+	"github.com/FloatTech/floatbox/file"
+	"github.com/FloatTech/floatbox/web"
+	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 (
+	datapath  string
+	predictRe = regexp.MustCompile(`{"steps".+?}`)
+	// 参考host http://91.217.139.190:5010 http://91.216.169.75:5010
+	aipaintTxt2ImgURL = "/got_image?token=%v&tags=%v"
+	aipaintImg2ImgURL = "/got_image2image?token=%v&tags=%v"
+	cfg               = newServerConfig("data/aipaint/config.json")
+)
+
+type result struct {
+	Steps    int     `json:"steps"`
+	Sampler  string  `json:"sampler"`
+	Seed     int     `json:"seed"`
+	Strength float64 `json:"strength"`
+	Noise    float64 `json:"noise"`
+	Scale    float64 `json:"scale"`
+	Uc       string  `json:"uc"`
+}
+
+func (r *result) String() string {
+	return fmt.Sprintf("steps: %v\nsampler: %v\nseed: %v\nstrength: %v\nnoise: %v\nscale: %v\nuc: %v\n", r.Steps, r.Sampler, r.Seed, r.Strength, r.Noise, r.Scale, r.Uc)
+}
+
+func init() { // 插件主体
+	engine := control.Register("aipaint", &ctrl.Options[*zero.Ctx]{
+		DisableOnDefault: false,
+		Brief:            "ai绘图",
+		Help: "- [ ai绘图 | 生成色图 | 生成涩图 | ai画图 ] xxx\n" +
+			"- [ ai高级绘图 | 高级生成色图 | 高级生成涩图 | ai高级画图 ] [prompt]\n" +
+			"- 设置ai绘图配置 [server] [token]\n" +
+			"- 设置ai绘图撤回时间90s\n" +
+			"- 查看ai绘图配置\n" +
+			"例: 设置ai绘图配置 http://91.217.139.190:5010 abc\n" +
+			"参考服务器 http://91.217.139.190:5010, http://91.216.169.75:5010, http://185.80.202.180:5010\n" +
+			"通过 http://91.217.139.190:5010/token 获取token\n" +
+			"[prompt]参数如下\n" +
+			"tags:tag词条\nntags:ntag词条\nshape:[Portrait|Landscape|Square]\nscale:[6:20]\nseed:种子\nstrength:[0-1] 建议0-0.7\nnoise:[0-1] 建议0-0.15" +
+			"参数与参数内容用:连接,每个参数之间用回车分割",
+		PrivateDataFolder: "aipaint",
+	})
+	datapath = file.BOTPATH + "/" + engine.DataFolder()
+	if file.IsNotExist(cfg.file) {
+		s := serverConfig{}
+		data, err := json.Marshal(s)
+		if err != nil {
+			panic(err)
+		}
+		err = os.WriteFile(cfg.file, data, 0666)
+		if err != nil {
+			panic(err)
+		}
+	}
+	engine.OnPrefixGroup([]string{`ai绘图`, `生成色图`, `生成涩图`, `ai画图`}).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			err := cfg.load()
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+			ctx.SendChain(message.Text("少女祈祷中..."))
+			args := ctx.State["args"].(string)
+			data, err := web.GetData(cfg.BaseURL + fmt.Sprintf(aipaintTxt2ImgURL, cfg.Token, url.QueryEscape(strings.TrimSpace(strings.ReplaceAll(args, " ", "%20")))))
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+			sendAiImg(ctx, data, cfg.Interval)
+		})
+	engine.OnPrefixGroup([]string{`ai高级绘图`, `高级生成色图`, `高级生成涩图`, `ai高级画图`}).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			err := cfg.load()
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+			tags := make(map[string]string)
+			args := strings.Split(ctx.State["args"].(string), "\n")
+			if len(args) < 1 {
+				ctx.SendChain(message.Text("ERROR: 请输入正确的参数"))
+				return
+			}
+			for _, info := range args {
+				value := strings.Split(info, ":")
+				if len(value) > 1 {
+					if value[0] == "R18" && value[1] == "1" {
+						value[1] = "0"
+						ctx.SendChain(message.Text("不准涩涩! 已将R18设置为0. "))
+					}
+					tags[value[0]] = strings.Join(value[1:], ":")
+				}
+			}
+			ctx.SendChain(message.Text("少女祈祷中..."))
+			apiurl := "/got_image?token=" + cfg.Token
+			if _, ok := tags["tags"]; ok {
+				apiurl += "&tags=" + url.QueryEscape(strings.ReplaceAll(strings.TrimSpace(tags["tags"]), " ", "%20"))
+			}
+			if _, ok := tags["ntags"]; ok {
+				apiurl += "&ntags=" + url.QueryEscape(strings.ReplaceAll(strings.TrimSpace(tags["ntags"]), " ", "%20"))
+			}
+			if _, ok := tags["R18"]; ok {
+				apiurl += "&R18=" + url.QueryEscape(strings.TrimSpace(tags["R18"]))
+			}
+			if _, ok := tags["shape"]; ok {
+				apiurl += "&shape=" + url.QueryEscape(strings.TrimSpace(tags["shape"]))
+			}
+			if _, ok := tags["scale"]; ok {
+				apiurl += "&scale=" + url.QueryEscape(strings.TrimSpace(tags["scale"]))
+			}
+			if _, ok := tags["seed"]; ok {
+				apiurl += "&seed=" + url.QueryEscape(strings.TrimSpace(tags["seed"]))
+			}
+			if _, ok := tags["strength"]; ok {
+				apiurl += "&strength=" + url.QueryEscape(strings.TrimSpace(tags["strength"]))
+			}
+			if _, ok := tags["noise"]; ok {
+				apiurl += "&noise=" + url.QueryEscape(strings.TrimSpace(tags["noise"]))
+			}
+			data, err := web.GetData(cfg.BaseURL + apiurl)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+			sendAiImg(ctx, data, cfg.Interval)
+		})
+	engine.OnRegex(`^设置ai绘图配置\s(.*[^\s$])\s(.+)$`, zero.SuperUserPermission).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			regexMatched := ctx.State["regex_matched"].([]string)
+			err := cfg.load()
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+			err = cfg.update(regexMatched[1], regexMatched[2], cfg.Interval)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+			text := fmt.Sprintf("成功设置\nbase_url: %v\ntoken: %v\ninterval: %v\n", cfg.BaseURL, cfg.Token, cfg.Interval)
+			ctx.SendChain(message.Text(text))
+		})
+	engine.OnRegex(`^设置ai绘图撤回时间(\d{1,3})s$`, zero.SuperUserPermission).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			regexMatched := ctx.State["regex_matched"].([]string)
+			interval, err := strconv.Atoi(regexMatched[1])
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+			err = cfg.load()
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+			err = cfg.update(cfg.BaseURL, cfg.Token, interval)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+			text := fmt.Sprintf("成功设置\nbase_url: %v\ntoken: %v\ninterval: %v\n", cfg.BaseURL, cfg.Token, cfg.Interval)
+			ctx.SendChain(message.Text(text))
+		})
+	engine.OnFullMatch(`查看ai绘图配置`, zero.SuperUserPermission).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			err := cfg.load()
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+			text := fmt.Sprintf("base_url: %v\ntoken: %v\ninterval: %v\n", cfg.BaseURL, cfg.Token, cfg.Interval)
+			ctx.SendChain(message.Text(text))
+		})
+}
+
+func sendAiImg(ctx *zero.Ctx, data []byte, interval int) {
+	var loadData string
+	if predictRe.MatchString(binary.BytesToString(data)) {
+		loadData = predictRe.FindStringSubmatch(binary.BytesToString(data))[0]
+	}
+	var r result
+	if loadData != "" {
+		err := json.Unmarshal(binary.StringToBytes(loadData), &r)
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR: ", err))
+			return
+		}
+		r.Uc, err = url.QueryUnescape(r.Uc)
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR: ", err))
+			return
+		}
+	}
+	encodeStr := base64.StdEncoding.EncodeToString(data)
+	m := message.Message{ctxext.FakeSenderForwardNode(ctx, message.Image("base64://"+encodeStr))}
+	m = append(m, ctxext.FakeSenderForwardNode(ctx, message.Text(r.String())))
+	if mid := ctx.Send(m); mid.ID() == 0 {
+		ctx.SendChain(message.Text("ERROR: 可能被风控或下载图片用时过长，请耐心等待"))
+	} else if interval > 0 {
+		go func(i message.MessageID) {
+			time.Sleep(time.Duration(interval) * time.Second)
+			ctx.DeleteMessage(i)
+		}(mid)
+	}
+}

plugin/aipaint/config.go

@@ -0,0 +1,56 @@
+package aipaint
+
+import (
+	"encoding/json"
+	"errors"
+	"os"
+
+	"github.com/FloatTech/floatbox/file"
+)
+
+// 配置结构体
+type serverConfig struct {
+	BaseURL  string `json:"base_url"`
+	Token    string `json:"token"`
+	Interval int    `json:"interval"`
+	file     string
+}
+
+func newServerConfig(file string) *serverConfig {
+	return &serverConfig{
+		file: file,
+	}
+}
+
+func (cfg *serverConfig) update(baseURL, token string, interval int) (err error) {
+	if baseURL != "" {
+		cfg.BaseURL = baseURL
+	}
+	if token != "" {
+		cfg.Token = token
+	}
+	cfg.Interval = interval
+	reader, err := os.Create(cfg.file)
+	if err != nil {
+		return err
+	}
+	defer reader.Close()
+	return json.NewEncoder(reader).Encode(cfg)
+}
+
+func (cfg *serverConfig) load() (err error) {
+	if cfg.BaseURL != "" && cfg.Token != "" && cfg.Interval != 0 {
+		return
+	}
+	if file.IsNotExist(cfg.file) {
+		err = errors.New("no server config")
+		return
+	}
+	reader, err := os.Open(cfg.file)
+	if err != nil {
+		return
+	}
+	defer reader.Close()
+	err = json.NewDecoder(reader).Decode(cfg)
+	return
+}

plugin/aipaint/context.go

@@ -0,0 +1,39 @@
+package aipaint
+
+import (
+	"os"
+	"strconv"
+	"strings"
+
+	"github.com/FloatTech/floatbox/file"
+)
+
+type context struct {
+	usrdir      string
+	headimgsdir []string
+}
+
+func newContext(user int64) *context {
+	c := new(context)
+	c.usrdir = datapath + "users/" + strconv.FormatInt(user, 10) + `/`
+	_ = os.MkdirAll(c.usrdir, 0755)
+	c.headimgsdir = make([]string, 2)
+	c.headimgsdir[0] = c.usrdir + "0.gif"
+	c.headimgsdir[1] = c.usrdir + "1.gif"
+	return c
+}
+
+func (cc *context) prepareLogos(s ...string) error {
+	for i, v := range s {
+		_, err := strconv.Atoi(v)
+		if err != nil {
+			err = file.DownloadTo("https://gchat.qpic.cn/gchatpic_new//--"+strings.ToUpper(v)+"/0", cc.usrdir+strconv.Itoa(i)+".gif", true)
+		} else {
+			err = file.DownloadTo("http://q4.qlogo.cn/g?b=qq&nk="+v+"&s=640", cc.usrdir+strconv.Itoa(i)+".gif", true)
+		}
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}

plugin/aipaint/img2img.go

@@ -0,0 +1,88 @@
+// Package aipaint ai绘图
+package aipaint
+
+import (
+	"bytes"
+	"fmt"
+	"image"
+	"net/url"
+	"os"
+	"strconv"
+	"strings"
+
+	"github.com/FloatTech/floatbox/file"
+	"github.com/FloatTech/floatbox/img/writer"
+	"github.com/FloatTech/floatbox/web"
+	ctrl "github.com/FloatTech/zbpctrl"
+	"github.com/FloatTech/zbputils/control"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+)
+
+func init() { // 插件主体
+	engine := control.Register("img2img", &ctrl.Options[*zero.Ctx]{
+		DisableOnDefault: true,
+		Brief:            "以图绘图",
+		Help: "- [ 以图绘图 | 以图生图 | 以图画图 ] xxx [图片]|@xxx|[qq号]\n" +
+			"- 官方以图绘图api已失效 需要自建api 其他配置参数同ai绘图",
+		PrivateDataFolder: "img2img",
+	})
+	datapath = file.BOTPATH + "/" + engine.DataFolder()
+	engine.OnRegex(`^(以图绘图|以图生图|以图画图)[\s\S]*?(\[CQ:(image\,file=([0-9a-zA-Z]{32}).*|at.+?(\d{5,11}))\].*|(\d+))$`).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			err := cfg.load()
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+			c := newContext(ctx.Event.UserID)
+			list := ctx.State["regex_matched"].([]string)
+			err = c.prepareLogos(list[4]+list[5]+list[6], strconv.FormatInt(ctx.Event.UserID, 10))
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+			args := strings.TrimSuffix(strings.TrimPrefix(list[0], list[1]), list[2])
+			if args == "" {
+				ctx.SendChain(message.Text("ERROR: 以图绘图必须添加tag"))
+				return
+			}
+			ctx.SendChain(message.Text("少女祈祷中..."))
+			postURL := cfg.BaseURL + fmt.Sprintf(aipaintImg2ImgURL, cfg.Token, url.QueryEscape(strings.TrimSpace(strings.ReplaceAll(args, " ", "%20"))))
+
+			f, err := os.Open(c.headimgsdir[0])
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+			defer f.Close()
+
+			img, _, err := image.Decode(f)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+			imageShape := ""
+			switch {
+			case img.Bounds().Dx() > img.Bounds().Dy():
+				imageShape = "Landscape"
+			case img.Bounds().Dx() == img.Bounds().Dy():
+				imageShape = "Square"
+			default:
+				imageShape = "Portrait"
+			}
+
+			// 图片转base64
+			base64Bytes, err := writer.ToBase64(img)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+			data, err := web.PostData(postURL+"&shape="+imageShape, "text/plain", bytes.NewReader(base64Bytes))
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+			sendAiImg(ctx, data, cfg.Interval)
+		})
+}

plugin/aiwife/non-existent.go

@@ -19,8 +19,8 @@ const (
 func init() { // 插件主体
 	control.Register("aiwife", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
-		Help: "AIWife\n" +
-			"- waifu | 随机waifu",
+		Brief:            "ai随机生成老婆",
+		Help:             "- waifu | 随机waifu",
 	}).ApplySingle(ctxext.DefaultSingle).OnFullMatchGroup([]string{"waifu", "随机waifu"}).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			miku := rand.Intn(100000) + 1

plugin/alipayvoice/alipayvoice.go

@@ -0,0 +1,32 @@
+// Package alipayvoice 支付宝到账语音
+package alipayvoice
+
+import (
+	"fmt"
+	"strings"
+
+	ctrl "github.com/FloatTech/zbpctrl"
+	"github.com/FloatTech/zbputils/control"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+)
+
+const (
+	alipayvoiceURL = "https://mm.cqu.cc/share/zhifubaodaozhang/mp3/%v.mp3"
+)
+
+func init() { // 插件主体
+	engine := control.Register("alipayvoice", &ctrl.Options[*zero.Ctx]{
+		DisableOnDefault:  false,
+		Brief:             "支付宝到账语音",
+		Help:              "- 支付宝到账 1",
+		PrivateDataFolder: "alipayvoice",
+	})
+
+	// 开启
+	engine.OnPrefix(`支付宝到账`).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			args := ctx.State["args"].(string)
+			ctx.SendChain(message.Record(fmt.Sprintf(alipayvoiceURL, strings.TrimSpace(args))))
+		})
+}

plugin/antiabuse/anti.go

@@ -0,0 +1,124 @@
+// Package antiabuse defines antiabuse plugin ,support abuse words check and add/remove abuse words
+package antiabuse
+
+import (
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/FloatTech/floatbox/binary"
+	fcext "github.com/FloatTech/floatbox/ctxext"
+	"github.com/FloatTech/ttl"
+	ctrl "github.com/FloatTech/zbpctrl"
+	"github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/img/text"
+	"github.com/sirupsen/logrus"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+)
+
+const bandur time.Duration = time.Minute * 10
+
+var (
+	managers *ctrl.Manager[*zero.Ctx] // managers lazy load
+	cache    = ttl.NewCacheOn(bandur, [4]func(int64, struct{}){nil, nil, onDel, nil})
+	db       *antidb
+)
+
+func onDel(uid int64, _ struct{}) {
+	if managers == nil {
+		return
+	}
+	if err := managers.DoUnblock(uid); err != nil {
+		logrus.Errorln("[antiabuse.onDel] unblock:", err)
+	}
+	if err := db.Del("__bantime__", "WHERE id="+strconv.FormatInt(uid, 10)); err != nil {
+		logrus.Errorln("[antiabuse.onDel] db:", err)
+	}
+}
+
+func init() {
+	engine := control.Register("antiabuse", &ctrl.Options[*zero.Ctx]{
+		DisableOnDefault:  false,
+		Brief:             "违禁词检测",
+		Help:              "- /[添加|删除|查看]违禁词",
+		PrivateDataFolder: "anti_abuse",
+	})
+
+	onceRule := fcext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool {
+		managers = ctx.State["manager"].(*ctrl.Control[*zero.Ctx]).Manager
+		var err error
+		db, err = newantidb(engine.DataFolder() + "anti_abuse.db")
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR: ", err))
+			return false
+		}
+		return true
+	})
+
+	engine.OnMessage(onceRule, zero.OnlyGroup, func(ctx *zero.Ctx) bool {
+		if !ctx.Event.IsToMe {
+			return true
+		}
+		uid := ctx.Event.UserID
+		gid := ctx.Event.GroupID
+		msg := strings.ReplaceAll(ctx.MessageString(), "\n", "")
+		msg = strings.ReplaceAll(msg, "\r", "")
+		msg = strings.ReplaceAll(msg, "\t", "")
+		msg = strings.ReplaceAll(msg, ";", "")
+		if db.isInAntiList(gid, msg) {
+			if err := ctx.State["manager"].(*ctrl.Control[*zero.Ctx]).Manager.DoBlock(uid); err == nil {
+				t := time.Now().Unix()
+				cache.Set(uid, struct{}{})
+				ctx.SetGroupBan(gid, uid, int64(bandur.Minutes()))
+				ctx.SendChain(message.Text("检测到违禁词, 已封禁/屏蔽", bandur))
+				db.Lock()
+				defer db.Unlock()
+				err := db.Create("__bantime__", nilbt)
+				if err != nil {
+					ctx.SendChain(message.Text("ERROR: ", err))
+					return false
+				}
+				err = db.Insert("__bantime__", &banTime{ID: uid, Time: t})
+				if err != nil {
+					ctx.SendChain(message.Text("ERROR: ", err))
+					return false
+				}
+			} else {
+				ctx.SendChain(message.Text("ERROR: block user: ", err))
+			}
+			return false
+		}
+		return true
+	})
+
+	engine.OnCommand("添加违禁词", zero.OnlyGroup, zero.AdminPermission, onceRule).Handle(
+		func(ctx *zero.Ctx) {
+			args := ctx.State["args"].(string)
+			if err := db.insertWord(ctx.Event.GroupID, args); err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+			} else {
+				ctx.SendChain(message.Text("成功"))
+			}
+		})
+
+	engine.OnCommand("删除违禁词", zero.OnlyGroup, zero.AdminPermission, onceRule).Handle(
+		func(ctx *zero.Ctx) {
+			args := ctx.State["args"].(string)
+			if err := db.deleteWord(ctx.Event.GroupID, args); err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+			} else {
+				ctx.SendChain(message.Text("成功"))
+			}
+		})
+
+	engine.OnCommand("查看违禁词", zero.OnlyGroup, onceRule).Handle(
+		func(ctx *zero.Ctx) {
+			b, err := text.RenderToBase64(db.listWords(ctx.Event.GroupID), text.FontFile, 400, 20)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+			ctx.SendChain(message.Text("本群违禁词有\n"), message.Image("base64://"+binary.BytesToString(b)))
+		})
+}

plugin/antiabuse/db.go

@@ -0,0 +1,102 @@
+package antiabuse
+
+import (
+	"errors"
+	"strconv"
+	"strings"
+	"sync"
+	"time"
+
+	sqlite "github.com/FloatTech/sqlite"
+)
+
+type antidb struct {
+	sync.RWMutex
+	sqlite.Sqlite
+}
+
+type banWord struct {
+	Word string `db:"word"`
+}
+
+type banTime struct {
+	ID   int64 `db:"id"`
+	Time int64 `db:"time"`
+}
+
+var (
+	nilban = &banWord{}
+	nilbt  = &banTime{}
+)
+
+func newantidb(path string) (*antidb, error) {
+	db := &antidb{Sqlite: sqlite.Sqlite{DBPath: path}}
+	err := db.Open(bandur)
+	if err != nil {
+		return nil, err
+	}
+	_ = db.FindFor("__bantime__", nilbt, "", func() error {
+		t := time.Unix(nilbt.Time, 0)
+		ttl := time.Until(t.Add(bandur))
+		if ttl < time.Minute {
+			_ = managers.DoUnblock(nilbt.ID)
+			return nil
+		}
+		cache.Set(nilbt.ID, struct{}{})
+		cache.Touch(nilbt.ID, -time.Since(t))
+		return nil
+	})
+	_ = db.Del("__bantime__", "WHERE time<="+strconv.FormatInt(time.Now().Add(time.Minute-bandur).Unix(), 10))
+	return db, nil
+}
+
+func (db *antidb) isInAntiList(gid int64, msg string) bool {
+	grp := strconv.FormatInt(gid, 36)
+	db.RLock()
+	defer db.RUnlock()
+	return db.CanFind(grp, "WHERE instr('"+msg+"', word)>0")
+}
+
+func (db *antidb) insertWord(gid int64, word string) error {
+	grp := strconv.FormatInt(gid, 36)
+	db.Lock()
+	defer db.Unlock()
+	err := db.Create(grp, nilban)
+	if err != nil {
+		return err
+	}
+	return db.Insert(grp, &banWord{Word: word})
+}
+
+func (db *antidb) deleteWord(gid int64, word string) error {
+	grp := strconv.FormatInt(gid, 36)
+	db.Lock()
+	defer db.Unlock()
+	if n, _ := db.Count(grp); n == 0 {
+		return errors.New("本群还没有违禁词~")
+	}
+	return db.Del(grp, "WHERE word='"+word+"'")
+}
+
+func (db *antidb) listWords(gid int64) string {
+	grp := strconv.FormatInt(gid, 36)
+	word := &banWord{}
+	sb := strings.Builder{}
+	sb.WriteByte('[')
+	i := 0
+	db.RLock()
+	defer db.RUnlock()
+	_ = db.FindFor(grp, word, "", func() error {
+		if i > 0 {
+			sb.WriteString(" | ")
+		}
+		sb.WriteString(word.Word)
+		i++
+		return nil
+	})
+	if sb.Len() <= 4 {
+		return "[]"
+	}
+	sb.WriteByte(']')
+	return sb.String()
+}

plugin/atri/atri.go

@@ -12,21 +12,17 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
+	"github.com/FloatTech/floatbox/process"
 	ctrl "github.com/FloatTech/zbpctrl"
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/process"
 )
 
-const (
-	// 服务名
-	servicename = "atri"
-	// ATRI 表情的 codechina 镜像
-	res = "https://gitcode.net/u011570312/zbpdata/-/raw/main/Atri/"
-)
+const res = "https://gitcode.net/u011570312/zbpdata/-/raw/main/Atri/"
 
 func init() { // 插件主体
-	engine := control.Register(servicename, &ctrl.Options[*zero.Ctx]{
+	engine := control.Register("atri", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
+		Brief:            "atri人格文本回复",
 		Help: "本插件基于 ATRI ，为 Golang 移植版\n" +
 			"- ATRI醒醒\n- ATRI睡吧\n- 萝卜子\n- 喜欢 | 爱你 | 爱 | suki | daisuki | すき | 好き | 贴贴 | 老婆 | 亲一个 | mua\n" +
 			"- 草你妈 | 操你妈 | 脑瘫 | 废柴 | fw | 废物 | 战斗 | 爬 | 爪巴 | sb | SB | 傻B\n- 早安 | 早哇 | 早上好 | ohayo | 哦哈哟 | お早う | 早好 | 早 | 早早早\n" +

plugin/b14/main.go

@@ -2,12 +2,10 @@
 package b14coder
 
 import (
-	"unsafe"
-
+	"github.com/FloatTech/floatbox/crypto"
 	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"
@@ -16,8 +14,8 @@ import (
 func init() {
 	en := control.Register("base16384", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
-		Help: "base16384加解密\n" +
-			"- 加密xxx\n- 解密xxx\n- 用yyy加密xxx\n- 用yyy解密xxx",
+		Brief:            "base16384加解密",
+		Help:             "- 加密xxx\n- 解密xxx\n- 用yyy加密xxx\n- 用yyy解密xxx",
 	})
 	en.OnRegex(`^加密\s*(.+)$`).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
@@ -42,7 +40,7 @@ func init() {
 	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)
+			t := crypto.GetTEA(key)
 			es, err := base14.UTF16BE2UTF8(base14.Encode(t.Encrypt(helper.StringToBytes(str))))
 			if err == nil {
 				ctx.SendChain(message.Text(helper.BytesToString(es)))
@@ -53,7 +51,7 @@ func init() {
 	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)
+			t := crypto.GetTEA(key)
 			es, err := base14.UTF82UTF16BE(helper.StringToBytes(str))
 			if err == nil {
 				ctx.SendChain(message.Text(helper.BytesToString(t.Decrypt(base14.Decode(es)))))
@@ -62,15 +60,3 @@ func init() {
 			}
 		})
 }
-
-func getea(key string) tea.TEA {
-	kr := []rune(key)
-	if len(kr) > 4 {
-		kr = kr[:4]
-	} else {
-		for len(kr) < 4 {
-			kr = append(kr, rune(4-len(kr)))
-		}
-	}
-	return *(*tea.TEA)(*(*unsafe.Pointer)(unsafe.Pointer(&kr)))
-}

plugin/baidu/search.go

@@ -15,8 +15,8 @@ import (
 func init() {
 	control.Register("baidu", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
-		Help: "baidu\n" +
-			"- 百度下[xxx]",
+		Brief:            "不会百度吗",
+		Help:             "- 百度下[xxx]",
 	}).OnPrefix("百度下").SetBlock(true).Limit(ctxext.LimitByGroup).
 		Handle(func(ctx *zero.Ctx) {
 			txt := ctx.State["args"].(string)

plugin/baiduaudit/audit.go

@@ -0,0 +1,500 @@
+// Package baiduaudit 百度内容审核
+package baiduaudit
+
+import (
+	"encoding/json"
+	"fmt"
+	"os"
+	"strconv"
+
+	"github.com/Baidu-AIP/golang-sdk/aip/censor"
+	"github.com/FloatTech/floatbox/binary"
+	"github.com/FloatTech/floatbox/file"
+	ctrl "github.com/FloatTech/zbpctrl"
+	"github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/img/text"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+)
+
+// 服务网址:https://console.bce.baidu.com/ai/?_=1665977657185#/ai/antiporn/overview/index
+// 返回参数说明：https://cloud.baidu.com/doc/ANTIPORN/s/Nk3h6xbb2
+type baiduRes struct {
+	LogID          int         `json:"log_id"`         // 请求唯一id
+	Conclusion     string      `json:"conclusion"`     // 审核结果，可取值：合规、不合规、疑似、审核失败
+	ConclusionType int         `json:"conclusionType"` // 审核结果类型，可取值1.合规，2.不合规，3.疑似，4.审核失败
+	Data           []auditData `json:"data"`
+	ErrorCode      int         `json:"error_code"` // 错误提示码，失败才返回，成功不返回
+	ErrorMsg       string      `json:"error_msg"`  // 错误提示信息，失败才返回，成功不返回
+}
+
+type auditData struct {
+	Type           int    `json:"type"`           // 审核主类型，11：百度官方违禁词库、12：文本反作弊、13:自定义文本黑名单、14:自定义文本白名单
+	SubType        int    `json:"subType"`        // 审核子类型，0:含多种类型，具体看官方链接，1:违禁违规、2:文本色情、3:敏感信息、4:恶意推广、5:低俗辱骂 6:恶意推广-联系方式、7:恶意推广-软文推广
+	Conclusion     string `json:"conclusion"`     // 审核结果，可取值：合规、不合规、疑似、审核失败
+	ConclusionType int    `json:"conclusionType"` // 审核结果类型，可取值1.合规，2.不合规，3.疑似，4.审核失败
+	Msg            string `json:"msg"`            // 不合规项描述信息
+	Hits           []hit  `json:"hits"`
+} // 不合规/疑似/命中白名单项详细信息。响应成功并且conclusion为疑似或不合规或命中白名单时才返回，响应失败或conclusion为合规且未命中白名单时不返回。
+
+type hit struct {
+	DatasetName string   `json:"datasetName"`           // 违规项目所属数据集名称
+	Words       []string `json:"words"`                 // 送检文本命中词库的关键词（备注：建议参考新字段“wordHitPositions”，包含信息更丰富：关键词以及对应的位置及标签信息）
+	Probability float64  `json:"probability,omitempty"` // 不合规项置信度
+} //	送检文本违规原因的详细信息
+type keyConfig struct {
+	Key1   string          `json:"key1"`   // 百度云服务内容审核key存储
+	Key2   string          `json:"key2"`   // 百度云服务内容审核key存储
+	Groups map[int64]group `json:"groups"` // 群配置存储
+}
+
+type group struct {
+	Enable             EnableMark             // 是否启用内容审核
+	TextAudit          EnableMark             // 文本检测
+	ImageAudit         EnableMark             // 图像检测
+	DMRemind           EnableMark             // 撤回提示
+	MoreRemind         EnableMark             // 详细违规提示
+	DMBAN              EnableMark             // 撤回后禁言
+	BANTimeAddEnable   EnableMark             // 禁言累加
+	BANTime            int64                  // 标准禁言时间，禁用累加，但开启禁言的的情况下采用该值
+	MaxBANTimeAddRange int64                  // 最大禁言时间累加范围，最高禁言时间
+	BANTimeAddTime     int64                  // 禁言累加时间，该值是开启禁累加功能后，再次触发时，根据被禁次数X该值计算出的禁言时间
+	WhiteListType      [8]bool                // 类型白名单，处于白名单类型的违规，不会被触发 0:含多种类型，具体看官方链接，1:违禁违规、2:文本色情、3:敏感信息、4:恶意推广、5:低俗辱骂 6:恶意推广-联系方式、7:恶意推广-软文推广
+	AuditHistory       map[int64]auditHistory // 被封禁用户列表
+}
+
+// EnableMark 启用：●，禁用：○
+type EnableMark bool
+
+// String 打印启用状态
+func (em EnableMark) String() string {
+	if em {
+		return "开启"
+	}
+	return "关闭"
+}
+
+type auditHistory struct {
+	Count   int64      `json:"key2"`    // 被禁次数
+	ResList []baiduRes `json:"reslist"` // 禁言原因
+}
+
+var bdcli *censor.ContentCensorClient // 百度云审核服务Client
+var typetext = [8]string{
+	0: "默认违禁词库",
+	1: "违禁违规",
+	2: "文本色情",
+	3: "敏感信息",
+	4: "恶意推广",
+	5: "低俗辱骂",
+	6: "恶意推广-联系方式",
+	7: "恶意推广-软文推广",
+} // 文本类型
+
+var (
+	config     keyConfig // 插件配置
+	configinit bool      // 配置初始化
+	configpath string    // 配置路径
+)
+
+func init() {
+	engine := control.Register("baiduaudit", &ctrl.Options[*zero.Ctx]{
+		DisableOnDefault: false,
+		Brief:            "百度内容审核",
+		Help: "##该功能来自百度内容审核，需购买相关服务，并创建app##\n" +
+			"- 获取BDAKey\n" +
+			"- 配置BDAKey [API key] [Secret Key]\n" +
+			"- 开启/关闭内容审核\n" +
+			"- 开启/关闭撤回提示\n" +
+			"- 开启/关闭详细提示\n" +
+			"- 开启/关闭撤回禁言\n" +
+			"##禁言时间设置## 禁言时间计算方式为：禁言次数*每次禁言累加时间,当达到最大禁言时间时，再次触发按最大禁言时间计算\n" +
+			"- 开启/关闭禁言累加\n" +
+			"- 设置撤回禁言时间[分钟，默认:1]\n" +
+			"- 设置最大禁言时间[分钟，默认:60,最大43200]\n" +
+			"- 设置每次累加时间[分钟，默认:1]\n" +
+			"##检测类型设置## 类型编号列表:[1:违禁违规、2:文本色情、3:敏感信息、4:恶意推广、5:低俗辱骂 6:恶意推广-联系方式、7:恶意推广-软文推广]\n" +
+			"- 查看检测类型\n" +
+			"- 查看检测配置\n" +
+			"- 设置检测类型[类型编号]\n" +
+			"- 设置不检测类型[类型编号]\n" +
+			"- 开启/关闭文本检测\n" +
+			"- 开启/关闭图像检测\n" +
+			"##测试功能##\n" +
+			"- 测试文本检测[文本内容]\n" +
+			"- 测试图像检测[图片]\n",
+		PrivateDataFolder: "baiduaudit",
+	})
+	configpath = engine.DataFolder() + "config.json"
+	loadConfig()
+	if configinit {
+		bdcli = censor.NewClient(config.Key1, config.Key2)
+	}
+	engine.OnFullMatch("获取BDAKey", zero.SuperUserPermission).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			ctx.SendChain(message.Text("接口key创建网址:\n" +
+				"https://console.bce.baidu.com/ai/?_=1665977657185#/ai/antiporn/overview/index\n" +
+				"免费8w次数领取地址:\n" +
+				"https://console.bce.baidu.com/ai/?_=1665977657185#/ai/antiporn/overview/resource/getFree"))
+		})
+
+	engine.OnRegex("^查看检测(类型|配置)$", zero.AdminPermission, clientCheck).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			// 获取群配置
+			group := getGroup(ctx.Event.GroupID)
+			var msgs string
+			k1 := ctx.State["regex_matched"].([]string)[1]
+			if k1 == "类型" {
+				msgs += "本群检测类型:"
+				find := false
+				// 遍历群检测类型名单
+				for i, v := range group.WhiteListType {
+					if !v {
+						find = true
+						msgs += fmt.Sprint("\n", i, ".", typetext[i])
+					}
+				}
+				if !find {
+					msgs += "无"
+				}
+			} else {
+				// 生成配置文本
+				msgs = fmt.Sprintf("本群配置:\n"+
+					"内容审核:%s\n"+
+					"-文本:%s\n"+
+					"-图像:%s\n"+
+					"撤回提示:%s\n"+
+					"-详细提示:%s\n"+
+					"撤回禁言:%s\n"+
+					"-禁言累加:%s\n"+
+					"-撤回禁言时间:%v分钟\n"+
+					"-每次累加时间:%v分钟\n"+
+					"-最大禁言时间:%v分钟", group.Enable, group.TextAudit, group.ImageAudit, group.DMRemind, group.MoreRemind, group.DMBAN, group.BANTimeAddEnable, group.BANTime, group.BANTimeAddTime, group.MaxBANTimeAddRange)
+			}
+			b, err := text.RenderToBase64(msgs, text.FontFile, 300, 20)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+			ctx.SendChain(message.Image("base64://" + binary.BytesToString(b)))
+		})
+	engine.OnRegex("^设置(不)?检测类型([01234567])$", zero.AdminPermission, clientCheck).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			defer jsonSave(config, configpath)
+			k1 := ctx.State["regex_matched"].([]string)[1]
+			k2 := ctx.State["regex_matched"].([]string)[2]
+			group := getGroup(ctx.Event.GroupID)
+			inputType, _ := strconv.Atoi(k2)
+			if k1 == "不" {
+				group.WhiteListType[inputType] = true // 不检测：则进入类型白名单
+			} else {
+				group.WhiteListType[inputType] = false // 检测：则退出白名单
+			}
+			config.Groups[ctx.Event.GroupID] = group
+			ctx.SendChain(message.At(ctx.Event.UserID), message.Text(fmt.Sprintf("本群将%s检测%s类型内容", k1, typetext[inputType])))
+		})
+	engine.OnRegex("^设置(最大|每次|撤回)(累加|禁言)时间(\\d{1,5})$", zero.AdminPermission, clientCheck).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			defer jsonSave(config, configpath)
+			k1 := ctx.State["regex_matched"].([]string)[1]
+			k3 := ctx.State["regex_matched"].([]string)[3]
+			group := getGroup(ctx.Event.GroupID)
+			time, _ := strconv.ParseInt(k1, 10, 64)
+			switch k1 {
+			case "最大":
+				group.MaxBANTimeAddRange = time
+			case "每次":
+				group.BANTimeAddTime = time
+			case "撤回":
+				group.BANTime = time
+			}
+			config.Groups[ctx.Event.GroupID] = group
+			ctx.SendChain(message.At(ctx.Event.UserID), message.Text(fmt.Sprintf("本群%s禁言累加时间已设置为%s", k3, k1)))
+		})
+	engine.OnRegex("^(开启|关闭)(内容审核|撤回提示|撤回禁言|禁言累加|详细提示|文本检测|图像检测)$", zero.AdminPermission, clientCheck).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			defer jsonSave(config, configpath)
+			k1 := ctx.State["regex_matched"].([]string)[1]
+			k2 := ctx.State["regex_matched"].([]string)[2]
+			isEnable := EnableMark(false)
+			group := getGroup(ctx.Event.GroupID)
+			if k1 == "开启" {
+				isEnable = true
+			}
+			switch k2 {
+			case "内容审核":
+				group.Enable = isEnable
+			case "撤回提示":
+				group.DMRemind = isEnable
+			case "撤回禁言":
+				group.DMBAN = isEnable
+			case "禁言累加":
+				group.BANTimeAddEnable = isEnable
+			case "详细提示":
+				group.MoreRemind = isEnable
+			case "文本检测":
+				group.TextAudit = isEnable
+			case "图像检测":
+				group.ImageAudit = isEnable
+			}
+			config.Groups[ctx.Event.GroupID] = group
+			ctx.SendChain(message.At(ctx.Event.UserID), message.Text(fmt.Sprintf("本群%s已%s", k2, k1)))
+		})
+	engine.OnRegex(`^配置BDAKey\s(.*)\s(.*)$`, zero.SuperUserPermission).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			k1 := ctx.State["regex_matched"].([]string)[1]
+			k2 := ctx.State["regex_matched"].([]string)[2]
+			bdcli = censor.NewClient(k1, k2)
+			config.Key1 = k1
+			config.Key2 = k2
+			if bdcli != nil {
+				jsonSave(config, configpath)
+				ctx.SendChain(message.Text("配置成功"))
+			}
+		})
+	engine.OnMessage().SetBlock(false).Handle(func(ctx *zero.Ctx) {
+		group, ok := config.Groups[ctx.Event.GroupID]
+		// 如果没该配置，或者审核功能未开启直接跳过
+		if !ok || !bool(group.Enable) {
+			return
+		}
+		for _, elem := range ctx.Event.Message {
+			switch elem.Type {
+			case "image":
+				if !group.ImageAudit {
+					return
+				}
+				res := bdcli.ImgCensorUrl(elem.Data["url"], nil)
+				bdres, err := jsonToBaiduRes(res)
+				if err != nil {
+					ctx.SendChain(message.Text("Error:", bdres.ErrorMsg, "(", bdres.ErrorCode, ")"))
+					return
+				}
+				banCheck(ctx, bdres)
+
+			case "text":
+				if !group.TextAudit {
+					return
+				}
+				res := bdcli.TextCensor(elem.Data["text"])
+				bdres, err := jsonToBaiduRes(res)
+				if err != nil {
+					ctx.SendChain(message.Text("Error:", bdres.ErrorMsg, "(", bdres.ErrorCode, ")"))
+					return
+				}
+				banCheck(ctx, bdres)
+			}
+		}
+	})
+	engine.OnPrefix("文本检测", clientCheck).SetBlock(false).
+		Handle(func(ctx *zero.Ctx) {
+			if bdcli == nil {
+				ctx.SendChain(message.Text("Key未配置"))
+				return
+			}
+			args := ctx.ExtractPlainText()
+			res := bdcli.TextCensor(args)
+			bdres, err := jsonToBaiduRes(res)
+			if err != nil {
+				ctx.SendChain(message.Text("Error:", bdres.ErrorMsg, "(", bdres.ErrorCode, ")"))
+				return
+			}
+			group := getGroup(ctx.Event.GroupID)
+			ctx.SendChain(buildResp(bdres, group)...)
+		})
+	engine.OnPrefix("^图像检测", clientCheck).SetBlock(false).
+		Handle(func(ctx *zero.Ctx) {
+			var urls []string
+			for _, elem := range ctx.Event.Message {
+				if elem.Type == "image" {
+					if elem.Data["url"] != "" {
+						urls = append(urls, elem.Data["url"])
+					}
+				}
+			}
+			if len(urls) == 0 {
+				return
+			}
+			res := bdcli.ImgCensorUrl(urls[0], nil)
+			bdres, err := jsonToBaiduRes(res)
+			if err != nil {
+				ctx.SendChain(message.Text("Error:", bdres.ErrorMsg, "(", bdres.ErrorCode, ")"))
+				return
+			}
+			group := getGroup(ctx.Event.GroupID)
+			ctx.SendChain(buildResp(bdres, group)...)
+		})
+}
+
+// 禁言检测
+func banCheck(ctx *zero.Ctx, bdres baiduRes) {
+	// 如果返回类型为2（不合规），0为合规，3为疑似
+	if bdres.ConclusionType == 2 {
+		// 创建消息ID
+		mid := message.NewMessageIDFromInteger(ctx.Event.MessageID.(int64))
+		// 获取群配置
+		group := getGroup(ctx.Event.GroupID)
+		// 检测群配置里的不检测类型白名单，忽略掉不检测的违规类型
+		for i, b := range group.WhiteListType {
+			if i == bdres.Data[0].SubType && b {
+				return
+			}
+		}
+		// 生成回复文本
+		res := buildResp(bdres, group)
+		// 撤回消息
+		ctx.DeleteMessage(mid)
+		// 查看是否启用撤回后禁言
+		if group.DMBAN {
+			// 从历史违规记录中获取指定用户
+			user := group.getUser(ctx.Event.UserID)
+			// 用户违规次数自增
+			user.Count++
+			// 用户违规原因记录
+			user.ResList = append(user.ResList, bdres)
+			// 覆写该用户到群违规记录中
+			group.AuditHistory[ctx.Event.UserID] = user
+			// 覆写该群信息
+			config.Groups[ctx.Event.GroupID] = group
+			// 保存到json
+			jsonSave(config, configpath)
+			var bantime int64
+			// 查看是否开启禁言累加功能，并计算禁言时间
+			if group.BANTimeAddEnable {
+				bantime = user.Count * group.BANTimeAddTime * 60
+			} else {
+				bantime = group.BANTime * 60
+			}
+			// 执行禁言
+			ctx.SetGroupBan(ctx.Event.GroupID, ctx.Event.UserID, bantime)
+		}
+		// 查看是否开启撤回提示
+		if group.DMRemind {
+			res = append(res, message.At(ctx.Event.Sender.ID))
+			ctx.SendChain(res...)
+		}
+	}
+}
+
+// 获取群配置
+func getGroup(groupID int64) group {
+	g, ok := config.Groups[groupID]
+	if ok {
+		return g
+	}
+	if config.Groups == nil {
+		config.Groups = make(map[int64]group)
+	}
+	g = group{
+		TextAudit:          true,
+		ImageAudit:         true,
+		BANTime:            1,
+		MaxBANTimeAddRange: 60,
+		BANTimeAddTime:     1,
+		WhiteListType:      [8]bool{},
+		AuditHistory:       map[int64]auditHistory{},
+	}
+	config.Groups[groupID] = g
+	return g
+}
+
+// 从群历史违规记录中获取用户
+func (group *group) getUser(userID int64) auditHistory {
+	audit, ok := group.AuditHistory[userID]
+	if ok {
+		return audit
+	}
+	// 如果没有用户，则创建一个并返回
+	if group.AuditHistory == nil {
+		group.AuditHistory = make(map[int64]auditHistory)
+	}
+	audit = auditHistory{0, []baiduRes{}}
+	group.AuditHistory[userID] = audit
+	return audit
+}
+
+// 客户端是否初始化检测
+func clientCheck(ctx *zero.Ctx) bool {
+	if bdcli == nil {
+		ctx.SendChain(message.Text("Key未配置"))
+		return false
+	}
+	return true
+}
+
+// 加载JSON配置文件
+func loadConfig() {
+	if file.IsExist(configpath) {
+		data, err := os.OpenFile(configpath, os.O_RDONLY, 0755)
+		if err != nil {
+			panic(err)
+		}
+		err = json.NewDecoder(data).Decode(&config)
+		if err != nil {
+			panic(err)
+		}
+		configinit = true
+	} else {
+		config = keyConfig{}
+		configinit = false
+	}
+}
+
+// 保存配置文件
+func jsonSave(v keyConfig, path string) {
+	jsf, _ := os.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0666)
+	defer func(file *os.File) {
+		err := file.Close()
+		if err != nil {
+			fmt.Println(err)
+		}
+	}(jsf) // 结束时关闭句柄，释放资源
+	err := json.NewEncoder(jsf).Encode(v)
+	if err != nil {
+		fmt.Println(err)
+	}
+}
+
+// JSON反序列化
+func jsonToBaiduRes(resjson string) (baiduRes, error) {
+	var bdres baiduRes
+	err := json.Unmarshal(binary.StringToBytes(resjson), &bdres)
+	return bdres, err
+}
+
+// 生成回复文本
+func buildResp(bdres baiduRes, group group) []message.MessageSegment {
+	// 建立消息段
+	msgs := make([]message.MessageSegment, 0, 8)
+	// 生成简略审核结果回复
+	msgs = append(msgs, message.Text(bdres.Conclusion, "\n"))
+	// 查看是否开启详细审核内容提示，并确定审核内容值为疑似，或者不合规
+	if !group.MoreRemind {
+		return msgs
+	}
+	// 遍历返回的不合规数据，生成详细违规内容
+	for i, datum := range bdres.Data {
+		msgs = append(msgs, message.Text("[", i, "]:", datum.Msg, "\n"))
+		// 检查命中词条是否大于0
+		if len(datum.Hits) == 0 {
+			return msgs
+		}
+		// 遍历打印命中的违规词条
+		for _, hit := range datum.Hits {
+			if len(datum.Hits) == 0 {
+				return msgs
+			}
+			msgs = append(msgs, message.Text("("))
+			for i4, i3 := range hit.Words {
+				// 检查是否是最后一个要打印的词条，如果是则不加上逗号
+				if i4 != len(hit.Words)-1 {
+					msgs = append(msgs, message.Text(i3, ","))
+				} else {
+					msgs = append(msgs, message.Text(i3))
+				}
+			}
+			msgs = append(msgs, message.Text(")"))
+		}
+	}
+	return msgs
+}

plugin/base64gua/main.go

@@ -0,0 +1,62 @@
+// Package base64gua base64卦 与 tea 加解密
+package base64gua
+
+import (
+	"github.com/FloatTech/floatbox/crypto"
+	ctrl "github.com/FloatTech/zbpctrl"
+	"github.com/FloatTech/zbputils/control"
+	"github.com/fumiama/unibase2n"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+	"github.com/wdvxdr1123/ZeroBot/utils/helper"
+)
+
+func init() {
+	en := control.Register("base64gua", &ctrl.Options[*zero.Ctx]{
+		DisableOnDefault: false,
+		Brief:            "六十四卦加解密",
+		Help:             "- 六十四卦加密xxx\n- 六十四卦解密xxx\n- 六十四卦用yyy加密xxx\n- 六十四卦用yyy解密xxx",
+	})
+	en.OnRegex(`^六十四卦加密\s*(.+)$`).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			str := ctx.State["regex_matched"].([]string)[1]
+			es := unibase2n.Base64Gua.EncodeString(str)
+			if es != "" {
+				ctx.SendChain(message.Text(es))
+			} else {
+				ctx.SendChain(message.Text("加密失败!"))
+			}
+		})
+	en.OnRegex(`^六十四卦解密\s*([䷀-䷿]+[☰☱]?)$`).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			str := ctx.State["regex_matched"].([]string)[1]
+			es := unibase2n.Base64Gua.DecodeString(str)
+			if es != "" {
+				ctx.SendChain(message.Text(es))
+			} else {
+				ctx.SendChain(message.Text("解密失败!"))
+			}
+		})
+	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 := crypto.GetTEA(key)
+			es, err := unibase2n.UTF16BE2UTF8(unibase2n.Base64Gua.Encode(t.Encrypt(helper.StringToBytes(str))))
+			if err == nil {
+				ctx.SendChain(message.Text(helper.BytesToString(es)))
+			} else {
+				ctx.SendChain(message.Text("加密失败!"))
+			}
+		})
+	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 := crypto.GetTEA(key)
+			es, err := unibase2n.UTF82UTF16BE(helper.StringToBytes(str))
+			if err == nil {
+				ctx.SendChain(message.Text(helper.BytesToString(t.Decrypt(unibase2n.Base64Gua.Decode(es)))))
+			} else {
+				ctx.SendChain(message.Text("解密失败!"))
+			}
+		})
+}

plugin/baseamasiro/main.go

@@ -0,0 +1,62 @@
+// Package baseamasiro base天城文 与 tea 加解密
+package baseamasiro
+
+import (
+	"github.com/FloatTech/floatbox/crypto"
+	ctrl "github.com/FloatTech/zbpctrl"
+	"github.com/FloatTech/zbputils/control"
+	"github.com/fumiama/unibase2n"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+	"github.com/wdvxdr1123/ZeroBot/utils/helper"
+)
+
+func init() {
+	en := control.Register("baseamasiro", &ctrl.Options[*zero.Ctx]{
+		DisableOnDefault: false,
+		Brief:            "天城文加解密",
+		Help:             "- 天城文加密xxx\n- 天城文解密xxx\n- 天城文用yyy加密xxx\n- 天城文用yyy解密xxx",
+	})
+	en.OnRegex(`^天城文加密\s*(.+)$`).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			str := ctx.State["regex_matched"].([]string)[1]
+			es := unibase2n.BaseDevanagari.EncodeString(str)
+			if es != "" {
+				ctx.SendChain(message.Text(es))
+			} else {
+				ctx.SendChain(message.Text("加密失败!"))
+			}
+		})
+	en.OnRegex(`^天城文解密\s*([ऀ-ॿ]+[০-৫]?)$`).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			str := ctx.State["regex_matched"].([]string)[1]
+			es := unibase2n.BaseDevanagari.DecodeString(str)
+			if es != "" {
+				ctx.SendChain(message.Text(es))
+			} else {
+				ctx.SendChain(message.Text("解密失败!"))
+			}
+		})
+	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 := crypto.GetTEA(key)
+			es, err := unibase2n.UTF16BE2UTF8(unibase2n.BaseDevanagari.Encode(t.Encrypt(helper.StringToBytes(str))))
+			if err == nil {
+				ctx.SendChain(message.Text(helper.BytesToString(es)))
+			} else {
+				ctx.SendChain(message.Text("加密失败!"))
+			}
+		})
+	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 := crypto.GetTEA(key)
+			es, err := unibase2n.UTF82UTF16BE(helper.StringToBytes(str))
+			if err == nil {
+				ctx.SendChain(message.Text(helper.BytesToString(t.Decrypt(unibase2n.BaseDevanagari.Decode(es)))))
+			} else {
+				ctx.SendChain(message.Text("解密失败!"))
+			}
+		})
+}

plugin/bilibili/api.go

@@ -1,128 +0,0 @@
-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

@@ -2,10 +2,13 @@
 package bilibili
 
 import (
+	"crypto/tls"
 	"encoding/binary"
+	"encoding/json"
 	"fmt"
 	"image"
 	"image/color"
+	"net/http"
 	"os"
 	"path"
 	"regexp"
@@ -14,53 +17,69 @@ import (
 	"time"
 
 	"github.com/Coloured-glaze/gg"
+	bz "github.com/FloatTech/AnimeAPI/bilibili"
+	fcext "github.com/FloatTech/floatbox/ctxext"
+	"github.com/FloatTech/floatbox/file"
+	"github.com/FloatTech/floatbox/img/writer"
+	"github.com/FloatTech/floatbox/web"
 	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"
 	log "github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 )
 
-var re = regexp.MustCompile(`^\d+$`)
+var (
+	re             = regexp.MustCompile(`^\d+$`)
+	danmakuTypeMap = map[int64]string{
+		0: "普通消息",
+		1: "礼物",
+		2: "上舰",
+		3: "Superchat",
+		4: "进入直播间",
+		5: "标题变动",
+		6: "分区变动",
+		7: "直播中止",
+		8: "直播继续",
+	}
+	cfg = bz.NewCookieConfig("data/Bilibili/config.json")
+)
 
 // 查成分的
 func init() {
 	engine := control.Register("bilibili", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
-		Help: "bilibili\n" +
-			"- >vup info [xxx]\n" +
+		Brief:            "b站查成分查弹幕",
+		Help: "- >vup info [xxx]\n" +
 			"- >user info [xxx]\n" +
 			"- 查成分 [xxx]\n" +
-			"- 设置b站cookie SESSDATA=82da790d,1663822823,06ecf*31\n" +
-			"- 更新vup",
+			"- 查弹幕 [xxx]\n" +
+			"- 设置b站cookie b_ut=7;buvid3=0;i-wanna-go-back=-1;innersign=0;\n" +
+			"- 更新vup" +
+			"Tips: (412就是拦截的意思,建议私聊把cookie设全)\n",
 		PublicDataFolder: "Bilibili",
 	})
 	cachePath := engine.DataFolder() + "cache/"
 	_ = os.RemoveAll(cachePath)
 	_ = os.MkdirAll(cachePath, 0755)
-	var getdb = ctxext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool {
+	var getdb = fcext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool {
 		var err error
 		_, _ = engine.GetLazyData("bilibili.db", false)
 		vdb, err = initializeVup(engine.DataFolder() + "bilibili.db")
 		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
+			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)
+			card, err := bz.GetMemberCard(id)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
+				ctx.SendChain(message.Text("ERROR: ", err))
 				return
 			}
 			ctx.SendChain(message.Text(
@@ -77,9 +96,9 @@ func init() {
 		Handle(func(ctx *zero.Ctx) {
 			id := ctx.State["uid"].(string)
 			// 获取详情
-			fo, err := getVtbDetail(id)
+			fo, err := bz.GetVtbDetail(id)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
+				ctx.SendChain(message.Text("ERROR: ", err))
 				return
 			}
 			ctx.SendChain(message.Text(
@@ -96,7 +115,7 @@ func init() {
 			))
 		})
 
-	engine.OnRegex(`^查成分\s?(.{1,25})$`, getdb, getPara).SetBlock(true).
+	engine.OnRegex(`^查成分\s?(.{1,25})$`, getPara, getdb).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			id := ctx.State["uid"].(string)
 			today := time.Now().Format("20060102")
@@ -105,24 +124,24 @@ func init() {
 				ctx.SendChain(message.Image("file:///" + file.BOTPATH + "/" + drawedFile))
 				return
 			}
-			u, err := getMemberCard(id)
+			u, err := bz.GetMemberCard(id)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
+				ctx.SendChain(message.Text("ERROR: ", err))
 				return
 			}
 			vups, err := vdb.filterVup(u.Attentions)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
+				ctx.SendChain(message.Text("ERROR: ", err))
 				return
 			}
 			vupLen := len(vups)
-			medals, err := getMedalwall(id)
-			sort.Sort(medalSlice(medals))
+			medals, err := bz.GetMedalWall(cfg, id)
+			sort.Sort(bz.MedalSorter(medals))
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
+				ctx.SendChain(message.Text("ERROR: ", err))
 			}
 			frontVups := make([]vup, 0)
-			medalMap := make(map[int64]medal)
+			medalMap := make(map[int64]bz.Medal)
 			for _, v := range medals {
 				up := vup{
 					Mid:   v.Mid,
@@ -147,18 +166,18 @@ func init() {
 			if path.Ext(u.Face) != ".webp" {
 				err = initFacePic(facePath, u.Face)
 				if err != nil {
-					ctx.SendChain(message.Text("ERROR:", err))
+					ctx.SendChain(message.Text("ERROR: ", err))
 					return
 				}
 				back, err = gg.LoadImage(facePath)
 				if err != nil {
-					ctx.SendChain(message.Text("ERROR:", err))
+					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"))
+				ctx.SendChain(message.Text(u.Name + "关注的up主太多了, 只展示前50个up"))
 				vups = vups[:50]
 			}
 			canvas := gg.NewContext(1500, int(500*(1.1+float64(len(vups))/3)))
@@ -169,12 +188,12 @@ func init() {
 				canvas.DrawImage(back, 0, 0)
 			}
 			canvas.SetColor(color.Black)
-			_, err = file.GetLazyData(text.BoldFontFile, true)
+			_, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
+				ctx.SendChain(message.Text("ERROR: ", err))
 			}
 			if err = canvas.LoadFontFace(text.BoldFontFile, fontSize); err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
+				ctx.SendChain(message.Text("ERROR: ", err))
 				return
 			}
 			sl, _ := canvas.MeasureString("好")
@@ -248,29 +267,290 @@ func init() {
 			_, err = writer.WriteTo(canvas.Image(), f)
 			_ = f.Close()
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
+				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).
+	engine.OnRegex(`^查弹幕\s?(\S{1,25})\s?(\d*)$`, getPara).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+		id := ctx.State["uid"].(string)
+		pagenum := ctx.State["regex_matched"].([]string)[2]
+		if pagenum == "" {
+			pagenum = "0"
+		}
+		u, err := bz.GetMemberCard(id)
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR: ", err))
+			return
+		}
+		var danmaku bz.Danmakusuki
+		tr := &http.Transport{
+			DisableKeepAlives: true,
+			TLSClientConfig:   &tls.Config{InsecureSkipVerify: true},
+		}
+
+		client := &http.Client{Transport: tr}
+		data, err := web.RequestDataWith(client, fmt.Sprintf(bz.DanmakuAPI, id, pagenum), "GET", "", web.RandUA())
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR: ", err))
+			return
+		}
+		err = json.Unmarshal(data, &danmaku)
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR: ", err))
+			return
+		}
+		today := time.Now().Format("20060102150415")
+		drawedFile := cachePath + id + today + "vupLike.png"
+		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
+		}
+		canvas := gg.NewContext(100, 100)
+		fontSize := 50.0
+		_, err = file.GetLazyData(text.BoldFontFile, control.Md5File, 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
+		}
+		dz, h := canvas.MeasureString("好")
+		danmuH := h * 2
+		faceH := float64(510)
+
+		totalDanmuku := 0
+		for i := 0; i < len(danmaku.Data.Data); i++ {
+			totalDanmuku += len(danmaku.Data.Data[i].Danmakus) + 1
+		}
+		cw := 10000
+		mcw := float64(2000)
+		ch := 550 + len(danmaku.Data.Data)*int(faceH) + totalDanmuku*int(danmuH)
+		canvas = gg.NewContext(cw, ch)
+		canvas.SetColor(color.White)
+		canvas.Clear()
+		canvas.SetColor(color.Black)
+		if err = canvas.LoadFontFace(text.BoldFontFile, fontSize); err != nil {
+			ctx.SendChain(message.Text("ERROR: ", err))
+			return
+		}
+		facestart := 100
+		fontH := h * 1.6
+		startWidth := float64(700)
+		startWidth2 := float64(20)
+
+		if back != nil {
+			canvas.DrawImage(back, facestart, 0)
+		}
+		length, _ := canvas.MeasureString(u.Mid)
+		n, _ := canvas.MeasureString(u.Name)
+		canvas.DrawString(u.Name, startWidth, 122.5)
+		canvas.DrawRoundedRectangle(900+n-length*0.1, 66, length*1.2, 75, fontSize*0.2)
+		canvas.SetRGB255(221, 221, 221)
+		canvas.Fill()
+		canvas.SetColor(color.Black)
+		canvas.DrawString(u.Mid, 900+n, 122.5)
+		canvas.DrawString(fmt.Sprintf("粉丝：%d   关注：%d", u.Fans, u.Attention), startWidth, 222.5)
+		canvas.DrawString(fmt.Sprintf("页码：[%d/%d]", danmaku.Data.PageNum, (danmaku.Data.Total-1)/5), startWidth, 322.5)
+		canvas.DrawString("网页链接: "+fmt.Sprintf(bz.DanmakuURL, u.Mid), startWidth, 422.5)
+		var channelStart float64
+		channelStart = float64(550)
+		for i := 0; i < len(danmaku.Data.Data); i++ {
+			item := danmaku.Data.Data[i]
+			facePath = cachePath + strconv.Itoa(int(item.Channel.UID)) + "vupFace" + path.Ext(item.Channel.FaceURL)
+			if path.Ext(item.Channel.FaceURL) != ".webp" {
+				err = initFacePic(facePath, item.Channel.FaceURL)
+				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 back != nil {
+				canvas.DrawImage(back, facestart, int(channelStart))
+			}
+			canvas.SetRGB255(24, 144, 255)
+			canvas.DrawString("标题: "+item.Live.Title, startWidth, channelStart+fontH)
+			canvas.DrawString("主播: "+item.Channel.Name, startWidth, channelStart+fontH*2)
+			canvas.SetColor(color.Black)
+			canvas.DrawString("开始时间: "+time.UnixMilli(item.Live.StartDate).Format("2006-01-02 15:04:05"), startWidth, channelStart+fontH*3)
+			if item.Live.IsFinish {
+				canvas.DrawString("结束时间: "+time.UnixMilli(item.Live.StopDate).Format("2006-01-02 15:04:05"), startWidth, channelStart+fontH*4)
+				canvas.DrawString("直播时长: "+strconv.FormatFloat(float64(item.Live.StopDate-item.Live.StartDate)/3600000.0, 'f', 1, 64)+"小时", startWidth, channelStart+fontH*5)
+			} else {
+				t := "结束时间:"
+				l, _ := canvas.MeasureString(t)
+				canvas.DrawString(t, startWidth, channelStart+fontH*4)
+
+				canvas.SetRGB255(0, 128, 0)
+				t = "正在直播"
+				canvas.DrawString(t, startWidth+l*1.1, channelStart+fontH*4)
+				canvas.SetColor(color.Black)
+
+				canvas.DrawString("直播时长: "+strconv.FormatFloat(float64(time.Now().UnixMilli()-item.Live.StartDate)/3600000.0, 'f', 1, 64)+"小时", startWidth, channelStart+fontH*5)
+			}
+			canvas.DrawString("弹幕数量: "+strconv.Itoa(int(item.Live.DanmakusCount)), startWidth, channelStart+fontH*6)
+			canvas.DrawString("观看次数: "+strconv.Itoa(int(item.Live.WatchCount)), startWidth, channelStart+fontH*7)
+
+			t := "收益:"
+			l, _ := canvas.MeasureString(t)
+			canvas.DrawString(t, startWidth, channelStart+fontH*8)
+
+			t = "￥" + strconv.Itoa(int(item.Live.TotalIncome))
+			canvas.SetRGB255(255, 0, 0)
+			canvas.DrawString(t, startWidth+l*1.1, channelStart+fontH*8)
+			canvas.SetColor(color.Black)
+
+			DanmakuStart := channelStart + faceH
+			for i := 0; i < len(item.Danmakus); i++ {
+				moveW := startWidth2
+				danmuNow := DanmakuStart + danmuH*float64(i+1)
+				danItem := item.Danmakus[i]
+
+				t := time.UnixMilli(danItem.SendDate).Format("15:04:05")
+				l, _ := canvas.MeasureString(t)
+				canvas.DrawString(t, moveW, danmuNow)
+				moveW += l + dz
+
+				t = danItem.Name
+				l, _ = canvas.MeasureString(t)
+				canvas.SetRGB255(24, 144, 255)
+				canvas.DrawString(t, moveW, danmuNow)
+				canvas.SetColor(color.Black)
+				moveW += l + dz
+
+				switch danItem.Type {
+				case 0:
+					t = danItem.Message
+					l, _ = canvas.MeasureString(t)
+					canvas.DrawString(t, moveW, danmuNow)
+					moveW += l + dz
+				case 1:
+					t = danmakuTypeMap[danItem.Type]
+					l, _ = canvas.MeasureString(t)
+					canvas.SetRGB255(255, 0, 0)
+					canvas.DrawString(t, moveW, danmuNow)
+					moveW += l + dz
+
+					t = danItem.Message
+					l, _ = canvas.MeasureString(t)
+					canvas.DrawString(t, moveW, danmuNow)
+					canvas.SetColor(color.Black)
+					moveW += l + dz
+				case 2, 3:
+					t = danmakuTypeMap[danItem.Type]
+					l, _ = canvas.MeasureString(t)
+					if danItem.Type == 3 {
+						canvas.SetRGB255(0, 85, 255)
+					} else {
+						canvas.SetRGB255(128, 0, 128)
+					}
+
+					canvas.DrawString(t, moveW, danmuNow)
+					moveW += l + dz
+
+					t = danItem.Message
+					l, _ = canvas.MeasureString(t)
+					canvas.DrawString(t, moveW, danmuNow)
+					moveW += l
+
+					t = "["
+					l, _ = canvas.MeasureString(t)
+					canvas.DrawString(t, moveW, danmuNow)
+					moveW += l
+
+					t = "￥" + strconv.FormatFloat(danItem.Price, 'f', 1, 64)
+					l, _ = canvas.MeasureString(t)
+					canvas.SetRGB255(255, 0, 0)
+					canvas.DrawString(t, moveW, danmuNow)
+					if danItem.Type == 3 {
+						canvas.SetRGB255(0, 85, 255)
+					} else {
+						canvas.SetRGB255(128, 0, 128)
+					}
+					moveW += l
+
+					t = "]"
+					l, _ = canvas.MeasureString(t)
+					canvas.DrawString(t, moveW, danmuNow)
+					canvas.SetColor(color.Black)
+					moveW += l + dz
+				case 4, 5, 6, 7, 8:
+					t = danmakuTypeMap[danItem.Type]
+					canvas.SetRGB255(0, 128, 0)
+					l, _ = canvas.MeasureString(t)
+					canvas.DrawString(t, moveW, danmuNow)
+					canvas.SetColor(color.Black)
+					moveW += l + dz
+				default:
+					canvas.SetRGB255(0, 128, 0)
+					l, _ = canvas.MeasureString("未知类型" + strconv.Itoa(int(danItem.Type)))
+					canvas.DrawString(t, moveW, danmuNow)
+					canvas.SetColor(color.Black)
+					moveW += l + dz
+				}
+				if moveW > mcw {
+					mcw = moveW
+				}
+			}
+			channelStart = DanmakuStart + float64(len(item.Danmakus)+1)*danmuH
+		}
+		im := canvas.Image().(*image.RGBA)
+		nim := im.SubImage(image.Rect(0, 0, int(mcw), ch))
+		f, err := os.Create(drawedFile)
+		if err != nil {
+			log.Errorln("[bilibili]", err)
+			data, cl := writer.ToBytes(nim)
+			ctx.SendChain(message.ImageBytes(data))
+			cl()
+			return
+		}
+		_, err = writer.WriteTo(nim, 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+(.*)$`, zero.SuperUserPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			cookie := ctx.State["regex_matched"].([]string)[1]
-			err := vdb.setBilibiliCookie(cookie)
+			err := cfg.Set(cookie)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
+				ctx.SendChain(message.Text("ERROR: ", err))
 				return
 			}
 			ctx.SendChain(message.Text("成功设置b站cookie为" + cookie))
 		})
 
-	engine.OnFullMatch("更新vup", zero.SuperUserPermission, getdb).SetBlock(true).
+	engine.OnFullMatch("更新vup", zero.SuperUserPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SendChain(message.Text("少女祈祷中..."))
 			err := updateVup()
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
+				ctx.SendChain(message.Text("ERROR: ", err))
 				return
 			}
 			ctx.SendChain(message.Text("vup已更新"))
@@ -301,9 +581,9 @@ func int2rbg(t int64) (int64, int64, int64) {
 func getPara(ctx *zero.Ctx) bool {
 	keyword := ctx.State["regex_matched"].([]string)[1]
 	if !re.MatchString(keyword) {
-		searchRes, err := searchUser(keyword)
+		searchRes, err := bz.SearchUser(cfg, keyword)
 		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
+			ctx.SendChain(message.Text("ERROR: ", err))
 			return false
 		}
 		ctx.State["uid"] = strconv.FormatInt(searchRes[0].Mid, 10)
@@ -312,7 +592,7 @@ func getPara(ctx *zero.Ctx) bool {
 	next := zero.NewFutureEvent("message", 999, false, ctx.CheckSession())
 	recv, cancel := next.Repeat()
 	defer cancel()
-	ctx.SendChain(message.Text("输入为纯数字，请选择查询uid还是用户名，输入对应序号：\n0. 查询uid\n1. 查询用户名"))
+	ctx.SendChain(message.Text("输入为纯数字, 请选择查询uid还是用户名, 输入对应序号：\n0. 查询uid\n1. 查询用户名"))
 	for {
 		select {
 		case <-time.After(time.Second * 10):
@@ -334,9 +614,9 @@ func getPara(ctx *zero.Ctx) bool {
 				ctx.State["uid"] = keyword
 				return true
 			} else if num == 1 {
-				searchRes, err := searchUser(keyword)
+				searchRes, err := bz.SearchUser(cfg, keyword)
 				if err != nil {
-					ctx.SendChain(message.Text("ERROR:", err))
+					ctx.SendChain(message.Text("ERROR: ", err))
 					return false
 				}
 				ctx.State["uid"] = strconv.FormatInt(searchRes[0].Mid, 10)

plugin/bilibili/bilibili_parse.go

@@ -5,6 +5,7 @@ import (
 	"regexp"
 	"time"
 
+	bz "github.com/FloatTech/AnimeAPI/bilibili"
 	ctrl "github.com/FloatTech/zbpctrl"
 	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
@@ -28,13 +29,13 @@ var (
 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 ",
+		Brief:            "b站链接解析",
+		Help:             "例:- t.bilibili.com/642277677329285174\n- bilibili.com/read/cv17134450\n- bilibili.com/video/BV13B4y1x7pS\n- 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)
+			realurl, err := bz.GetRealUrl("https://" + url)
 			if err != nil {
 				ctx.SendChain(message.Text("ERROR: ", err))
 				return
@@ -65,14 +66,14 @@ func handleVideo(ctx *zero.Ctx) {
 	if id == "" {
 		id = ctx.State["regex_matched"].([]string)[2]
 	}
-	card, err := getVideoInfo(id)
+	card, err := bz.GetVideoInfo(id)
 	if err != nil {
-		ctx.SendChain(message.Text("ERROR:", err))
+		ctx.SendChain(message.Text("ERROR: ", err))
 		return
 	}
 	msg, err := videoCard2msg(card)
 	if err != nil {
-		ctx.SendChain(message.Text("ERROR:", err))
+		ctx.SendChain(message.Text("ERROR: ", err))
 		return
 	}
 	ctx.SendChain(msg...)
@@ -81,25 +82,25 @@ func handleVideo(ctx *zero.Ctx) {
 func handleDynamic(ctx *zero.Ctx) {
 	msg, err := dynamicDetail(ctx.State["regex_matched"].([]string)[2])
 	if err != nil {
-		ctx.SendChain(message.Text("ERROR:", err))
+		ctx.SendChain(message.Text("ERROR: ", err))
 		return
 	}
 	ctx.SendChain(msg...)
 }
 
 func handleArticle(ctx *zero.Ctx) {
-	card, err := getArticleInfo(ctx.State["regex_matched"].([]string)[1])
+	card, err := bz.GetArticleInfo(ctx.State["regex_matched"].([]string)[1])
 	if err != nil {
-		ctx.SendChain(message.Text("ERROR:", err))
+		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])
+	card, err := bz.GetLiveRoomInfo(ctx.State["regex_matched"].([]string)[1])
 	if err != nil {
-		ctx.SendChain(message.Text("ERROR:", err))
+		ctx.SendChain(message.Text("ERROR: ", err))
 		return
 	}
 	ctx.SendChain(liveCard2msg(card)...)

plugin/bilibili/bilibilimodel.go

@@ -3,17 +3,12 @@ package bilibili
 import (
 	"os"
 
-	"github.com/FloatTech/zbputils/binary"
-	"github.com/FloatTech/zbputils/web"
-	_ "github.com/fumiama/sqlite3" // use sql
+	"github.com/FloatTech/floatbox/binary"
+	"github.com/FloatTech/floatbox/web"
 	"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
@@ -32,15 +27,6 @@ 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"
-}
-
 // initializeVup 初始化vup数据库
 func initializeVup(dbpath string) (*vupdb, error) {
 	if _, err := os.Stat(dbpath); err != nil || os.IsNotExist(err) {
@@ -55,7 +41,7 @@ func initializeVup(dbpath string) (*vupdb, error) {
 	if err != nil {
 		return nil, err
 	}
-	gdb.AutoMigrate(&vup{}).AutoMigrate(&config{})
+	gdb.AutoMigrate(&vup{})
 	return (*vupdb)(gdb), nil
 }
 
@@ -102,29 +88,3 @@ func updateVup() error {
 	}
 	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/bilibilipush.go

@@ -13,18 +13,18 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
+	bz "github.com/FloatTech/AnimeAPI/bilibili"
+	"github.com/FloatTech/floatbox/binary"
+	"github.com/FloatTech/floatbox/web"
 	ctrl "github.com/FloatTech/zbpctrl"
-	"github.com/FloatTech/zbputils/binary"
 	"github.com/FloatTech/zbputils/control"
 	"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=%v"
-	serviceName = "bilibilipush"
+	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=%v"
 )
 
 // bdb bilibili推送数据库
@@ -37,16 +37,18 @@ var (
 )
 
 func init() {
-	en := control.Register(serviceName, &ctrl.Options[*zero.Ctx]{
+	en := control.Register("bilibilipush", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
-		Help: "bilibilipush,需要配合job一起使用\n" +
-			"- 添加b站订阅[uid|name]\n" +
+		Brief:            "b站推送",
+		Help: "- 添加b站订阅[uid|name]\n" +
 			"- 取消b站订阅[uid|name]\n" +
 			"- 取消b站动态订阅[uid|name]\n" +
 			"- 取消b站直播订阅[uid|name]\n" +
 			"- b站推送列表\n" +
-			"- 拉取b站推送 (使用job执行定时任务------记录在\"@every 10s\"触发的指令)",
-		PrivateDataFolder: serviceName,
+			"Tips: 需要配合job一起使用, 全局只需要设置一个, 无视响应状态推送, 下为例子\n" +
+			"记录在\"@every 5m\"触发的指令)\n" +
+			"拉取b站推送",
+		PrivateDataFolder: "bilibilipush",
 	})
 
 	// 加载bilibili推送数据库
@@ -54,11 +56,11 @@ func init() {
 	dbfile := dbpath + "push.db"
 	bdb = initializePush(dbfile)
 
-	en.OnRegex(`^添加b站订阅\s?(.{1,25})$`, zero.UserOrGrpAdmin, getPara).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+	en.OnRegex(`^添加[B|b]站订阅\s?(.{1,25})$`, zero.UserOrGrpAdmin, getPara).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		buid, _ := strconv.ParseInt(ctx.State["uid"].(string), 10, 64)
 		name, err := getName(buid)
 		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
+			ctx.SendChain(message.Text("ERROR: ", err))
 			return
 		}
 		gid := ctx.Event.GroupID
@@ -66,16 +68,16 @@ func init() {
 			gid = -ctx.Event.UserID
 		}
 		if err := subscribe(buid, gid); err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
+			ctx.SendChain(message.Text("ERROR: ", err))
 			return
 		}
 		ctx.SendChain(message.Text("已添加" + name + "的订阅"))
 	})
-	en.OnRegex(`^取消b站订阅\s?(.{1,25})$`, zero.UserOrGrpAdmin, getPara).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+	en.OnRegex(`^取消[B|b]站订阅\s?(.{1,25})$`, zero.UserOrGrpAdmin, getPara).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		buid, _ := strconv.ParseInt(ctx.State["uid"].(string), 10, 64)
 		name, err := getName(buid)
 		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
+			ctx.SendChain(message.Text("ERROR: ", err))
 			return
 		}
 		gid := ctx.Event.GroupID
@@ -83,16 +85,16 @@ func init() {
 			gid = -ctx.Event.UserID
 		}
 		if err := unsubscribe(buid, gid); err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
+			ctx.SendChain(message.Text("ERROR: ", err))
 			return
 		}
 		ctx.SendChain(message.Text("已取消" + name + "的订阅"))
 	})
-	en.OnRegex(`^取消b站动态订阅\s?(.{1,25})$`, zero.UserOrGrpAdmin, getPara).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+	en.OnRegex(`^取消[B|b]站动态订阅\s?(.{1,25})$`, zero.UserOrGrpAdmin, getPara).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		buid, _ := strconv.ParseInt(ctx.State["uid"].(string), 10, 64)
 		name, err := getName(buid)
 		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
+			ctx.SendChain(message.Text("ERROR: ", err))
 			return
 		}
 		gid := ctx.Event.GroupID
@@ -100,12 +102,12 @@ func init() {
 			gid = -ctx.Event.UserID
 		}
 		if err := unsubscribeDynamic(buid, gid); err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
+			ctx.SendChain(message.Text("ERROR: ", err))
 			return
 		}
 		ctx.SendChain(message.Text("已取消" + name + "的动态订阅"))
 	})
-	en.OnRegex(`^取消b站直播订阅\s?(.{1,25})$`, zero.UserOrGrpAdmin, getPara).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+	en.OnRegex(`^取消[B|b]站直播订阅\s?(.{1,25})$`, zero.UserOrGrpAdmin, getPara).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		buid, _ := strconv.ParseInt(ctx.State["uid"].(string), 10, 64)
 		gid := ctx.Event.GroupID
 		if gid == 0 {
@@ -113,22 +115,22 @@ func init() {
 		}
 		name, err := getName(buid)
 		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
+			ctx.SendChain(message.Text("ERROR: ", err))
 			return
 		}
 		if err := unsubscribeLive(buid, gid); err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
+			ctx.SendChain(message.Text("ERROR: ", err))
 			return
 		}
 		ctx.SendChain(message.Text("已取消" + name + "的直播订阅"))
 	})
-	en.OnFullMatch("b站推送列表", zero.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+	en.OnRegex(`^[B|b]站推送列表$`, zero.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		gid := ctx.Event.GroupID
 		if gid == 0 {
 			gid = -ctx.Event.UserID
 		}
 		bpl := bdb.getAllPushByGroup(gid)
-		msg := "--------b站推送列表--------"
+		msg := "--------B站推送列表--------"
 		for _, v := range bpl {
 			if _, ok := upMap[v.BilibiliUID]; !ok {
 				bdb.updateAllUp()
@@ -149,14 +151,14 @@ func init() {
 		}
 		data, err := text.RenderToBase64(msg, text.FontFile, 600, 20)
 		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
+			ctx.SendChain(message.Text("ERROR: ", err))
 			return
 		}
 		if id := ctx.SendChain(message.Image("base64://" + binary.BytesToString(data))); id.ID() == 0 {
-			ctx.SendChain(message.Text("ERROR:可能被风控了"))
+			ctx.SendChain(message.Text("ERROR: 可能被风控了"))
 		}
 	})
-	en.OnFullMatch("拉取b站推送").SetBlock(true).Handle(func(ctx *zero.Ctx) {
+	en.OnRegex(`拉取[B|b]站推送$`).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		err := sendDynamic(ctx)
 		if err != nil {
 			ctx.SendPrivateMessage(ctx.Event.UserID, message.Text("Error: bilibilipush,", err))
@@ -191,7 +193,7 @@ func getName(buid int64) (name string, err error) {
 
 // subscribe 订阅
 func subscribe(buid, groupid int64) (err error) {
-	bpMap := map[string]interface{}{
+	bpMap := map[string]any{
 		"bilibili_uid":    buid,
 		"group_id":        groupid,
 		"live_disable":    0,
@@ -202,7 +204,7 @@ func subscribe(buid, groupid int64) (err error) {
 
 // unsubscribe 取消订阅
 func unsubscribe(buid, groupid int64) (err error) {
-	bpMap := map[string]interface{}{
+	bpMap := map[string]any{
 		"bilibili_uid":    buid,
 		"group_id":        groupid,
 		"live_disable":    1,
@@ -212,7 +214,7 @@ func unsubscribe(buid, groupid int64) (err error) {
 }
 
 func unsubscribeDynamic(buid, groupid int64) (err error) {
-	bpMap := map[string]interface{}{
+	bpMap := map[string]any{
 		"bilibili_uid":    buid,
 		"group_id":        groupid,
 		"dynamic_disable": 1,
@@ -221,7 +223,7 @@ func unsubscribeDynamic(buid, groupid int64) (err error) {
 }
 
 func unsubscribeLive(buid, groupid int64) (err error) {
-	bpMap := map[string]interface{}{
+	bpMap := map[string]any{
 		"bilibili_uid": buid,
 		"group_id":     groupid,
 		"live_disable": 1,
@@ -230,7 +232,7 @@ func unsubscribeLive(buid, groupid int64) (err error) {
 }
 
 func getUserDynamicCard(buid int64) (cardList []gjson.Result, err error) {
-	data, err := web.RequestDataWith(web.NewDefaultClient(), fmt.Sprintf(spaceHistoryURL, buid, 0), "GET", referer, ua)
+	data, err := web.RequestDataWith(web.NewDefaultClient(), fmt.Sprintf(bz.SpaceHistoryURL, buid, 0), "GET", referer, ua)
 	if err != nil {
 		return
 	}
@@ -239,13 +241,13 @@ func getUserDynamicCard(buid int64) (cardList []gjson.Result, err error) {
 }
 
 func getLiveList(uids ...int64) (string, error) {
-	m := make(map[string]interface{})
+	m := make(map[string]any)
 	m["uids"] = uids
 	b, err := json.Marshal(m)
 	if err != nil {
 		return "", err
 	}
-	data, err := web.PostData(liveListURL, "application/json", bytes.NewReader(b))
+	data, err := web.PostData(bz.LiveListURL, "application/json", bytes.NewReader(b))
 	if err != nil {
 		return "", err
 	}
@@ -273,10 +275,15 @@ func sendDynamic(ctx *zero.Ctx) error {
 			ct := cardList[i].Get("desc.timestamp").Int()
 			if ct > t && ct > time.Now().Unix()-600 {
 				lastTime[buid] = ct
-				m, ok := control.Lookup(serviceName)
+				m, ok := control.Lookup("bilibilipush")
 				if ok {
 					groupList := bdb.getAllGroupByBuidAndDynamic(buid)
-					msg, err := dynamicCard2msg(cardList[i].Raw, 0)
+					dc, err := bz.LoadDynamicDetail(cardList[i].Raw)
+					if err != nil {
+						err = errors.Errorf("动态%v的解析有问题,%v", cardList[i].Get("desc.dynamic_id_str"), err)
+						return err
+					}
+					msg, err := dynamicCard2msg(&dc)
 					if err != nil {
 						err = errors.Errorf("动态%v的解析有问题,%v", cardList[i].Get("desc.dynamic_id_str"), err)
 						return err
@@ -317,14 +324,14 @@ func sendLive(ctx *zero.Ctx) error {
 		oldStatus := liveStatus[key.Int()]
 		if newStatus != oldStatus && newStatus == 1 {
 			liveStatus[key.Int()] = newStatus
-			m, ok := control.Lookup(serviceName)
+			m, ok := control.Lookup("bilibilipush")
 			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)
+				lURL := bz.LiveURL + strconv.FormatInt(roomID, 10)
 				lName := value.Get("uname").String()
 				lTitle := value.Get("title").String()
 				lCover := value.Get("cover_from_user").String()

plugin/bilibili/bilibilipushmodel.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"os"
 
-	_ "github.com/fumiama/sqlite3" // import sql
 	"github.com/jinzhu/gorm"
 )
 
@@ -54,7 +53,7 @@ func initializePush(dbpath string) *bilibilipushdb {
 }
 
 // insertOrUpdateLiveAndDynamic 插入或更新数据库
-func (bdb *bilibilipushdb) insertOrUpdateLiveAndDynamic(bpMap map[string]interface{}) (err error) {
+func (bdb *bilibilipushdb) insertOrUpdateLiveAndDynamic(bpMap map[string]any) (err error) {
 	db := (*gorm.DB)(bdb)
 	bp := bilibilipush{}
 	data, err := json.Marshal(&bpMap)

plugin/bilibili/card2msg.go

@@ -2,18 +2,15 @@ package bilibili
 
 import (
 	"encoding/json"
-	"errors"
-	"fmt"
 	"time"
 
-	"github.com/FloatTech/zbputils/binary"
-	"github.com/FloatTech/zbputils/web"
-	"github.com/tidwall/gjson"
+	bz "github.com/FloatTech/AnimeAPI/bilibili"
+	"github.com/FloatTech/floatbox/binary"
 	"github.com/wdvxdr1123/ZeroBot/message"
 )
 
 var (
-	typeMsg = map[int]string{
+	msgType = map[int]string{
 		1:    "转发了动态",
 		2:    "有图营业",
 		4:    "无图营业",
@@ -27,66 +24,56 @@ var (
 	}
 )
 
-// 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) {
+// dynamicCard2msg 处理DynCard
+func dynamicCard2msg(dynamicCard *bz.DynamicCard) (msg []message.MessageSegment, err error) {
 	var (
-		dynamicCard dynamicCard
-		card        Card
-		vote        Vote
+		card  bz.Card
+		vote  bz.Vote
+		cType int
 	)
 	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模式")
+	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
 	// 生成消息
 	switch cType {
 	case 1:
-		msg = append(msg, message.Text(card.User.Uname, typeMsg[cType], "\n",
+		msg = append(msg, message.Text(card.User.Uname, msgType[cType], "\n",
 			card.Item.Content, "\n",
 			"转发的内容: \n"))
 		var originMsg []message.MessageSegment
-		originMsg, err = dynamicCard2msg(card.Origin, card.Item.OrigType)
+		var co bz.Card
+		co, err = bz.LoadCardDetail(card.Origin)
+		if err != nil {
+			return
+		}
+		originMsg, err = card2msg(dynamicCard, &co, 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",
+		msg = append(msg, message.Text(card.User.Name, "在", time.Unix(int64(card.Item.UploadTime), 0).Format("2006-01-02 15:04:05"), msgType[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",
+		msg = append(msg, message.Text(card.User.Uname, "在", time.Unix(int64(card.Item.Timestamp), 0).Format("2006-01-02 15:04:05"), msgType[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",
+				"参与人数: ", bz.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"))
@@ -96,18 +83,18 @@ func dynamicCard2msg(str string, cType int) (msg []message.MessageSegment, err e
 			}
 		}
 	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",
+		msg = append(msg, message.Text(card.Owner.Name, "在", time.Unix(int64(card.Pubdate), 0).Format("2006-01-02 15:04:05"), msgType[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",
+		msg = append(msg, message.Text(card.User.Name, "在", time.Unix(int64(card.Item.UploadTime), 0).Format("2006-01-02 15:04:05"), msgType[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",
+		msg = append(msg, message.Text(card.Author.(map[string]any)["name"], "在", time.Unix(int64(card.PublishTime), 0).Format("2006-01-02 15:04:05"), msgType[cType], "\n",
 			card.Title, "\n",
 			card.Summary))
 		for i := 0; i < len(card.ImageUrls); i++ {
@@ -117,7 +104,7 @@ func dynamicCard2msg(str string, cType int) (msg []message.MessageSegment, err e
 			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",
+		msg = append(msg, message.Text(card.Upper, "在", time.Unix(int64(card.Ctime), 0).Format("2006-01-02 15:04:05"), msgType[cType], "\n",
 			card.Title))
 		msg = append(msg, message.Image(card.Cover))
 		msg = append(msg, message.Text(card.Intro, "\n"))
@@ -126,7 +113,7 @@ func dynamicCard2msg(str string, cType int) (msg []message.MessageSegment, err e
 		}
 
 	case 2048:
-		msg = append(msg, message.Text(card.User.Uname, typeMsg[cType], "\n",
+		msg = append(msg, message.Text(card.User.Uname, msgType[cType], "\n",
 			card.Vest.Content, "\n",
 			card.Sketch.Title, "\n",
 			card.Sketch.DescText, "\n"))
@@ -134,7 +121,7 @@ func dynamicCard2msg(str string, cType int) (msg []message.MessageSegment, err e
 		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.Text(dynamicCard.Desc.UserProfile.Info.Uname, msgType[cType], "\n"))
 		}
 		msg = append(msg, message.Image(card.LivePlayInfo.Cover))
 		msg = append(msg, message.Text("\n", card.LivePlayInfo.Title, "\n",
@@ -153,35 +140,141 @@ func dynamicCard2msg(str string, cType int) (msg []message.MessageSegment, err e
 		msg = append(msg, message.Text("动态id: ", dynamicCard.Desc.DynamicIDStr, "未知动态类型: ", cType, "\n"))
 	}
 	if dynamicCard.Desc.DynamicIDStr != "" {
-		msg = append(msg, message.Text("动态链接: ", tURL, dynamicCard.Desc.DynamicIDStr))
+		msg = append(msg, message.Text("动态链接: ", bz.TURL, dynamicCard.Desc.DynamicIDStr))
+	}
+	return
+}
+
+// card2msg cType=1, 2, 4, 8, 16, 64, 256, 2048, 4200, 4308时,处理Card字符串,cType为card类型
+func card2msg(dynamicCard *bz.DynamicCard, card *bz.Card, cType int) (msg []message.MessageSegment, err error) {
+	var (
+		vote bz.Vote
+	)
+	msg = make([]message.MessageSegment, 0, 16)
+	// 生成消息
+	switch cType {
+	case 1:
+		msg = append(msg, message.Text(card.User.Uname, msgType[cType], "\n",
+			card.Item.Content, "\n",
+			"转发的内容: \n"))
+		var originMsg []message.MessageSegment
+		var co bz.Card
+		co, err = bz.LoadCardDetail(card.Origin)
+		if err != nil {
+			return
+		}
+		originMsg, err = card2msg(dynamicCard, &co, 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"), msgType[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"), msgType[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",
+				"参与人数: ", bz.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"), msgType[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"), msgType[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]any)["name"], "在", time.Unix(int64(card.PublishTime), 0).Format("2006-01-02 15:04:05"), msgType[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"), msgType[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, msgType[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, msgType[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("动态链接: ", bz.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))
+	dyc, err := bz.GetDynamicDetail(dynamicIDStr)
 	if err != nil {
 		return
 	}
-	return dynamicCard2msg(gjson.ParseBytes(data).Get("data.card").Raw, 0)
+	return dynamicCard2msg(&dyc)
 }
 
 // articleCard2msg 专栏转消息
-func articleCard2msg(card Card, defaultID string) (msg []message.MessageSegment) {
+func articleCard2msg(card bz.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))
+		"阅读: ", bz.HumanNum(card.Stats.View), " 评论: ", bz.HumanNum(card.Stats.Reply), "\n",
+		bz.CVURL, defaultID))
 	return
 }
 
 // liveCard2msg 直播卡片转消息
-func liveCard2msg(card roomCard) (msg []message.MessageSegment) {
+func liveCard2msg(card bz.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",
@@ -197,37 +290,37 @@ func liveCard2msg(card roomCard) (msg []message.MessageSegment) {
 	if card.RoomInfo.LiveStatus == 0 {
 		msg = append(msg, message.Text("未开播 \n"))
 	} else {
-		msg = append(msg, message.Text("直播中 ", humanNum(card.RoomInfo.Online), "人气\n"))
+		msg = append(msg, message.Text("直播中 ", bz.HumanNum(card.RoomInfo.Online), "人气\n"))
 	}
 	if card.RoomInfo.ShortID != 0 {
-		msg = append(msg, message.Text("直播间链接: ", lURL, card.RoomInfo.ShortID))
+		msg = append(msg, message.Text("直播间链接: ", bz.LURL, card.RoomInfo.ShortID))
 	} else {
-		msg = append(msg, message.Text("直播间链接: ", lURL, card.RoomInfo.RoomID))
+		msg = append(msg, message.Text("直播间链接: ", bz.LURL, card.RoomInfo.RoomID))
 	}
 
 	return
 }
 
 // videoCard2msg 视频卡片转消息
-func videoCard2msg(card Card) (msg []message.MessageSegment, err error) {
-	var mCard memberCard
+func videoCard2msg(card bz.Card) (msg []message.MessageSegment, err error) {
+	var mCard bz.MemberCard
 	msg = make([]message.MessageSegment, 0, 16)
-	mCard, err = getMemberCard(card.Owner.Mid)
+	mCard, err = bz.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"))
+			msg = append(msg, message.Text(card.Staff[i].Title, ": ", card.Staff[i].Name, " 粉丝: ", bz.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("UP主: ", card.Owner.Name, " 粉丝: ", bz.HumanNum(mCard.Fans), "\n"))
 	}
-	msg = append(msg, message.Text("播放: ", humanNum(card.Stat.View), " 弹幕: ", humanNum(card.Stat.Danmaku)))
+	msg = append(msg, message.Text("播放: ", bz.HumanNum(card.Stat.View), " 弹幕: ", bz.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))
+	msg = append(msg, message.Text("\n点赞: ", bz.HumanNum(card.Stat.Like), " 投币: ", bz.HumanNum(card.Stat.Coin), "\n",
+		"收藏: ", bz.HumanNum(card.Stat.Favorite), " 分享: ", bz.HumanNum(card.Stat.Share), "\n",
+		bz.VURL, card.BvID))
 	return
 }

plugin/bilibili/card2msg_test.go

@@ -2,10 +2,12 @@ package bilibili
 
 import (
 	"testing"
+
+	bz "github.com/FloatTech/AnimeAPI/bilibili"
 )
 
 func TestArticleInfo(t *testing.T) {
-	card, err := getArticleInfo("17279244")
+	card, err := bz.GetArticleInfo("17279244")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -43,7 +45,7 @@ func TestDynamicDetail(t *testing.T) {
 }
 
 func TestMemberCard(t *testing.T) {
-	card, err := getMemberCard(2)
+	card, err := bz.GetMemberCard(2)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -51,22 +53,22 @@ func TestMemberCard(t *testing.T) {
 }
 
 func TestVideoInfo(t *testing.T) {
-	card, err := getVideoInfo("10007")
+	card, err := bz.GetVideoInfo("10007")
 	if err != nil {
 		t.Fatal(err)
 	}
 	t.Log(videoCard2msg(card))
-	card, err = getVideoInfo("BV1xx411c7mD")
+	card, err = bz.GetVideoInfo("BV1xx411c7mD")
 	if err != nil {
 		t.Fatal(err)
 	}
 	t.Log(videoCard2msg(card))
-	card, err = getVideoInfo("bv1xx411c7mD")
+	card, err = bz.GetVideoInfo("bv1xx411c7mD")
 	if err != nil {
 		t.Fatal(err)
 	}
 	t.Log(videoCard2msg(card))
-	card, err = getVideoInfo("BV1mF411j7iU")
+	card, err = bz.GetVideoInfo("BV1mF411j7iU")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -74,7 +76,7 @@ func TestVideoInfo(t *testing.T) {
 }
 
 func TestLiveRoomInfo(t *testing.T) {
-	card, err := getLiveRoomInfo("83171")
+	card, err := bz.GetLiveRoomInfo("83171")
 	if err != nil {
 		t.Fatal(err)
 	}

plugin/bilibili/types.go

@@ -1,273 +0,0 @@
-package bilibili
-
-const (
-	// tURL bilibili动态前缀
-	tURL = "https://t.bilibili.com/"
-	// liveURL bilibili直播前缀
-	liveURL = "https://live.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"
-	// spaceHistoryURL 历史动态信息,一共12个card
-	spaceHistoryURL = "https://api.vc.bilibili.com/dynamic_svr/v1/dynamic_svr/space_history?host_uid=%v&offset_dynamic_id=%v&need_top=0"
-	// liveListURL 获得直播状态
-	liveListURL = "https://api.live.bilibili.com/room/v1/Room/get_status_info_by_uids"
-)
-
-// 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

@@ -1,25 +0,0 @@
-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/book_review/book_review.go

@@ -8,37 +8,38 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
+	"github.com/FloatTech/floatbox/binary"
+	fcext "github.com/FloatTech/floatbox/ctxext"
 	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"
 )
 
 func init() {
 	engine := control.Register("bookreview", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
-		Help:             "哀伤雪刃推书记录\n- 书评[xxx]\n- 随机书评",
+		Brief:            "哀伤雪刃推书书评",
+		Help:             "- 书评[xxx]\n- 随机书评",
 		PublicDataFolder: "BookReview",
 	})
 
-	getdb := ctxext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool {
+	getdb := fcext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool {
 		db.DBPath = engine.DataFolder() + "bookreview.db"
 		// os.RemoveAll(dbpath)
 		_, _ = engine.GetLazyData("bookreview.db", true)
 		err := db.Open(time.Hour * 24)
 		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
+			ctx.SendChain(message.Text("ERROR: ", err))
 			return false
 		}
 		err = db.Create("bookreview", &book{})
 		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
+			ctx.SendChain(message.Text("ERROR: ", err))
 			return false
 		}
 		n, err := db.Count("bookreview")
 		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
+			ctx.SendChain(message.Text("ERROR: ", err))
 			return false
 		}
 		log.Infof("[bookreview]读取%d条书评", n)
@@ -51,11 +52,11 @@ func init() {
 			b := getBookReviewByKeyword(ctx.State["regex_matched"].([]string)[1])
 			data, err := text.RenderToBase64(b.BookReview, text.FontFile, 400, 20)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
+				ctx.SendChain(message.Text("ERROR: ", err))
 				return
 			}
 			if id := ctx.SendChain(message.Image("base64://" + binary.BytesToString(data))); id.ID() == 0 {
-				ctx.SendChain(message.Text("ERROR:可能被风控了"))
+				ctx.SendChain(message.Text("ERROR: 可能被风控了"))
 			}
 		})
 
@@ -64,11 +65,11 @@ func init() {
 			br := getRandomBookReview()
 			data, err := text.RenderToBase64(br.BookReview, text.FontFile, 400, 20)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
+				ctx.SendChain(message.Text("ERROR: ", err))
 				return
 			}
 			if id := ctx.SendChain(message.Image("base64://" + binary.BytesToString(data))); id.ID() == 0 {
-				ctx.SendChain(message.Text("ERROR:可能被风控了"))
+				ctx.SendChain(message.Text("ERROR: 可能被风控了"))
 			}
 		})
 }

plugin/breakrepeat/breakrepeat.go

@@ -0,0 +1,50 @@
+// Package breakrepeat 打断复读
+package breakrepeat
+
+import (
+	"math/rand"
+	"strconv"
+
+	ctrl "github.com/FloatTech/zbpctrl"
+	"github.com/FloatTech/zbputils/control"
+	"github.com/RomiChan/syncx"
+	zero "github.com/wdvxdr1123/ZeroBot"
+)
+
+const throttle = 3 // 不可超过 9
+
+var sm syncx.Map[int64, string]
+
+func init() {
+	engine := control.Register("breakrepeat", &ctrl.Options[*zero.Ctx]{
+		DisableOnDefault: false,
+		Brief:            "打断复读",
+		Help:             "- 打断" + strconv.Itoa(throttle) + "次以上复读\n",
+	})
+	engine.On("message/group", zero.OnlyGroup, func(ctx *zero.Ctx) bool {
+		return !zero.HasPicture(ctx)
+	}).SetBlock(false).
+		Handle(func(ctx *zero.Ctx) {
+			gid := ctx.Event.GroupID
+			raw := ctx.Event.RawMessage
+			r, ok := sm.Load(gid)
+			if !ok || len(r) <= 3 || r[3:] != raw {
+				sm.Store(gid, "0: "+raw)
+				return
+			}
+			c := int(r[0] - '0')
+			if c < throttle {
+				sm.Store(gid, strconv.Itoa(c+1)+": "+raw)
+				return
+			}
+			sm.Delete(gid)
+			if len(r) > 5 {
+				ru := []rune(r[3:])
+				rand.Shuffle(len(ru), func(i, j int) {
+					ru[i], ru[j] = ru[j], ru[i]
+				})
+				r = string(ru)
+			}
+			ctx.Send(r)
+		})
+}

plugin/cangtoushi/cangtoushi.go

@@ -32,24 +32,24 @@ var (
 func init() {
 	engine := control.Register("cangtoushi", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
-		Help: "藏头诗\n" +
-			"- 藏头诗[xxx]\n- 藏尾诗[xxx]",
+		Brief:            "藏头诗, 藏尾诗",
+		Help:             "- 藏头诗[xxx]\n- 藏尾诗[xxx]",
 	})
 	engine.OnRegex(`藏头诗\s?([一-龥]{3,10})$`).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		kw := ctx.State["regex_matched"].([]string)[1]
 		err := login()
 		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
+			ctx.SendChain(message.Text("ERROR: ", err))
 			return
 		}
 		data, err := search(kw, "7", "0")
 		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
+			ctx.SendChain(message.Text("ERROR: ", err))
 			return
 		}
 		text, err := dealHTML(helper.BytesToString(data))
 		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
+			ctx.SendChain(message.Text("ERROR: ", err))
 			return
 		}
 		ctx.SendChain(message.Text(text))
@@ -59,17 +59,17 @@ func init() {
 		kw := ctx.State["regex_matched"].([]string)[1]
 		err := login()
 		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
+			ctx.SendChain(message.Text("ERROR: ", err))
 			return
 		}
 		data, err := search(kw, "7", "2")
 		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
+			ctx.SendChain(message.Text("ERROR: ", err))
 			return
 		}
 		text, err := dealHTML(helper.BytesToString(data))
 		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
+			ctx.SendChain(message.Text("ERROR: ", err))
 			return
 		}
 		ctx.SendChain(message.Text(text))

plugin/char_reverser/init.go

@@ -1,111 +0,0 @@
-// 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

@@ -17,6 +17,7 @@ var (
 	poke   = rate.NewManager[int64](time.Minute*5, 8) // 戳一戳
 	engine = control.Register("chat", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
+		Brief:            "基础反应, 群空调",
 		Help:             "chat\n- [BOT名字]\n- [戳一戳BOT]\n- 空调开\n- 空调关\n- 群温度\n- 设置温度[正整数]",
 	})
 )

plugin/choose/choose.go

@@ -15,9 +15,9 @@ import (
 func init() {
 	engine := control.Register("choose", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
-		Help: "choose\n" +
-			"- 选择可口可乐还是百事可乐\n" +
-			"- 选择肯德基还是麦当劳还是必胜客",
+		Brief:            "选择困难症帮手",
+		Help: "例: 选择可口可乐还是百事可乐\n" +
+			"选择肯德基还是麦当劳还是必胜客",
 	})
 	engine.OnPrefix("选择").SetBlock(true).Handle(handle)
 }

plugin/chouxianghua/chouxianghua.go

@@ -8,36 +8,37 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
+	fcext "github.com/FloatTech/floatbox/ctxext"
 	ctrl "github.com/FloatTech/zbpctrl"
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/ctxext"
 )
 
 func init() {
 	en := control.Register("chouxianghua", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
-		Help:             "抽象话\n- 抽象翻译xxx",
+		Brief:            "翻译为抽象话",
+		Help:             "- 抽象翻译xxx",
 		PublicDataFolder: "ChouXiangHua",
 	})
 
 	en.OnRegex("^抽象翻译((\\s|[\\r\\n]|[\\p{Han}\\p{P}A-Za-z0-9])+)$",
-		ctxext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool {
+		fcext.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))
+				ctx.SendChain(message.Text("ERROR: ", err))
 				return false
 			}
 			err = db.Create("pinyin", &pinyin{})
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
+				ctx.SendChain(message.Text("ERROR: ", err))
 				return false
 			}
 			n, err := db.Count("pinyin")
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
+				ctx.SendChain(message.Text("ERROR: ", err))
 				return false
 			}
 			logrus.Printf("[chouxianghua]读取%d条拼音", n)

plugin/chrev/init.go

@@ -0,0 +1,33 @@
+// Package chrev 英文字符反转
+package chrev
+
+import (
+	"strings"
+
+	ctrl "github.com/FloatTech/zbpctrl"
+	"github.com/FloatTech/zbputils/control"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+)
+
+func init() {
+	// 初始化engine
+	engine := control.Register("chrev", &ctrl.Options[*zero.Ctx]{
+		DisableOnDefault: false,
+		Brief:            "英文字符翻转",
+		Help:             "例: 翻转 I love you",
+	})
+	// 处理字符翻转指令
+	engine.OnRegex(`^翻转\s*([A-Za-z\s]*)$`).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			// 获取需要翻转的字符串
+			str := ctx.State["regex_matched"].([]string)[1]
+			// 将字符顺序翻转
+			tmp := strings.Builder{}
+			for i := len(str) - 1; i >= 0; i-- {
+				tmp.WriteRune(charMap[str[i]])
+			}
+			// 发送翻转后的字符串
+			ctx.SendChain(message.Text(tmp.String()))
+		})
+}

plugin/chrev/map.go

@@ -0,0 +1,59 @@
+package chrev
+
+var charMap [256]rune
+
+func init() {
+	charMap[' '] = ' '
+	charMap['a'] = 'ɐ'
+	charMap['b'] = 'q'
+	charMap['c'] = 'ɔ'
+	charMap['d'] = 'p'
+	charMap['e'] = 'ǝ'
+	charMap['f'] = 'ɟ'
+	charMap['g'] = 'ƃ'
+	charMap['h'] = 'ɥ'
+	charMap['i'] = 'ᴉ'
+	charMap['j'] = 'ɾ'
+	charMap['k'] = 'ʞ'
+	charMap['l'] = 'l'
+	charMap['m'] = 'ɯ'
+	charMap['n'] = 'u'
+	charMap['o'] = 'o'
+	charMap['p'] = 'd'
+	charMap['q'] = 'b'
+	charMap['r'] = 'ɹ'
+	charMap['s'] = 's'
+	charMap['t'] = 'ʇ'
+	charMap['u'] = 'n'
+	charMap['v'] = 'ʌ'
+	charMap['w'] = 'ʍ'
+	charMap['x'] = 'x'
+	charMap['y'] = 'ʎ'
+	charMap['z'] = 'z'
+	charMap['A'] = '∀'
+	charMap['B'] = 'ᗺ'
+	charMap['C'] = 'Ɔ'
+	charMap['D'] = 'ᗡ'
+	charMap['E'] = 'Ǝ'
+	charMap['F'] = 'Ⅎ'
+	charMap['G'] = '⅁'
+	charMap['H'] = 'H'
+	charMap['I'] = 'I'
+	charMap['J'] = 'ſ'
+	charMap['K'] = 'ʞ'
+	charMap['L'] = '˥'
+	charMap['M'] = 'W'
+	charMap['N'] = 'N'
+	charMap['O'] = 'O'
+	charMap['P'] = 'Ԁ'
+	charMap['Q'] = 'Ò'
+	charMap['R'] = 'ᴚ'
+	charMap['S'] = 'S'
+	charMap['T'] = '⏊'
+	charMap['U'] = '∩'
+	charMap['V'] = 'Λ'
+	charMap['W'] = 'M'
+	charMap['X'] = 'X'
+	charMap['Y'] = '⅄'
+	charMap['Z'] = 'Z'
+}

plugin/coser/coser.go

@@ -10,10 +10,10 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
+	"github.com/FloatTech/floatbox/web"
 	ctrl "github.com/FloatTech/zbpctrl"
 	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
-	"github.com/FloatTech/zbputils/web"
 )
 
 var (
@@ -25,13 +25,14 @@ var (
 func init() {
 	control.Register("coser", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
-		Help:             "三次元小姐姐\n- coser",
-	}).ApplySingle(ctxext.DefaultSingle).OnFullMatch("coser", zero.OnlyGroup).SetBlock(true).Limit(ctxext.LimitByGroup).
+		Brief:            "三次元coser",
+		Help:             "- coser",
+	}).ApplySingle(ctxext.DefaultSingle).OnFullMatch("coser").SetBlock(true).Limit(ctxext.LimitByGroup).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SendChain(message.Text("少女祈祷中......"))
 			data, err := web.RequestDataWith(web.NewDefaultClient(), coserURL, "GET", "", ua)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
+				ctx.SendChain(message.Text("ERROR: ", err))
 				return
 			}
 			text := gjson.Get(helper.BytesToString(data), "data.Title").String()
@@ -46,11 +47,8 @@ func init() {
 				m = append(m, ctxext.FakeSenderForwardNode(ctx, message.Image(value.String())))
 				return true
 			})
-
-			if id := ctx.SendGroupForwardMessage(
-				ctx.Event.GroupID,
-				m).Get("message_id").Int(); id == 0 {
-				ctx.SendChain(message.Text("ERROR:可能被风控或下载图片用时过长，请耐心等待"))
+			if id := ctx.Send(m).ID(); id == 0 {
+				ctx.SendChain(message.Text("ERROR: 可能被风控或下载图片用时过长，请耐心等待"))
 			}
 		})
 }

plugin/cpstory/cpstory.go

@@ -9,36 +9,37 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
+	fcext "github.com/FloatTech/floatbox/ctxext"
+	"github.com/FloatTech/floatbox/math"
 	ctrl "github.com/FloatTech/zbpctrl"
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/ctxext"
-	"github.com/FloatTech/zbputils/math"
 )
 
 func init() {
 	engine := control.Register("cpstory", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
-		Help:             "cp短打\n- 组cp[@xxx][@xxx]\n- 磕cp大老师 雪乃",
+		Brief:            "cp短打", // 这里也许有更好的名字
+		Help:             "- 组cp[@xxx][@xxx]\n- 磕cp大老师 雪乃",
 		PublicDataFolder: "CpStory",
 	})
 
-	getdb := ctxext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool {
+	getdb := fcext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool {
 		db.DBPath = engine.DataFolder() + "cp.db"
 		// os.RemoveAll(dbpath)
 		_, _ = engine.GetLazyData("cp.db", true)
 		err := db.Open(time.Hour * 24)
 		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
+			ctx.SendChain(message.Text("ERROR: ", err))
 			return false
 		}
 		err = db.Create("cp_story", &cpstory{})
 		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
+			ctx.SendChain(message.Text("ERROR: ", err))
 			return false
 		}
 		n, err := db.Count("cp_story")
 		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
+			ctx.SendChain(message.Text("ERROR: ", err))
 			return false
 		}
 		logrus.Printf("[cpstory]读取%d条故事", n)

plugin/curse/curse.go

@@ -8,10 +8,11 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
+	fcext "github.com/FloatTech/floatbox/ctxext"
+	"github.com/FloatTech/floatbox/process"
 	ctrl "github.com/FloatTech/zbpctrl"
 	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
-	"github.com/FloatTech/zbputils/process"
 )
 
 const (
@@ -22,30 +23,31 @@ const (
 func init() {
 	engine := control.Register("curse", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: true,
-		Help:             "骂人(求骂,自卫)\n- 骂我\n- 大力骂我",
+		Brief:            "骂人反击",
+		Help:             "- 骂我\n- 大力骂我",
 		PublicDataFolder: "Curse",
 	})
 
-	getdb := ctxext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool {
+	getdb := fcext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool {
 		db.DBPath = engine.DataFolder() + "curse.db"
 		_, err := engine.GetLazyData("curse.db", true)
 		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
+			ctx.SendChain(message.Text("ERROR: ", err))
 			return false
 		}
 		err = db.Open(time.Hour * 24)
 		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
+			ctx.SendChain(message.Text("ERROR: ", err))
 			return false
 		}
 		err = db.Create("curse", &curse{})
 		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
+			ctx.SendChain(message.Text("ERROR: ", err))
 			return false
 		}
 		c, err := db.Count("curse")
 		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
+			ctx.SendChain(message.Text("ERROR: ", err))
 			return false
 		}
 		logrus.Infoln("[curse]加载", c, "条骂人语录")

plugin/danbooru/main.go

@@ -4,12 +4,13 @@ package deepdanbooru
 import (
 	"crypto/md5"
 	"encoding/hex"
+	"strings"
 
-	"github.com/FloatTech/AnimeAPI/danbooru"
+	"github.com/FloatTech/floatbox/file"
+	"github.com/FloatTech/floatbox/img/writer"
 	ctrl "github.com/FloatTech/zbpctrl"
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/file"
-	"github.com/FloatTech/zbputils/img/writer"
+	"github.com/FloatTech/zbputils/ctxext"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
@@ -17,9 +18,9 @@ import (
 
 func init() { // 插件主体
 	engine := control.Register("danbooru", &ctrl.Options[*zero.Ctx]{
-		DisableOnDefault: false,
-		Help: "二次元图片标签识别\n" +
-			"- 鉴赏图片[图片]",
+		DisableOnDefault:  false,
+		Brief:             "二次元图片标签识别",
+		Help:              "- 鉴赏图片[图片]",
 		PrivateDataFolder: "danbooru",
 	})
 
@@ -30,9 +31,9 @@ func init() { // 插件主体
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SendChain(message.Text("少女祈祷中..."))
 			for _, url := range ctx.State["image_url"].([]string) {
-				t, err := danbooru.TagURL("", url)
+				t, st, err := tagurl("", url)
 				if err != nil {
-					ctx.SendChain(message.Text("ERROR:", err))
+					ctx.SendChain(message.Text("ERROR: ", err))
 					return
 				}
 				digest := md5.Sum(helper.StringToBytes(url))
@@ -40,7 +41,11 @@ func init() { // 插件主体
 				if file.IsNotExist(f) {
 					_ = writer.SavePNG2Path(f, t)
 				}
-				ctx.SendChain(message.Image("file:///" + file.BOTPATH + "/" + f))
+				m := message.Message{ctxext.FakeSenderForwardNode(ctx, message.Image("file:///"+file.BOTPATH+"/"+f))}
+				m = append(m, ctxext.FakeSenderForwardNode(ctx, message.Text("tags: ", strings.Join(st.tseq, ","))))
+				if id := ctx.Send(m).ID(); id == 0 {
+					ctx.SendChain(message.Text("ERROR: 可能被风控或下载图片用时过长，请耐心等待"))
+				}
 			}
 		})
 }

plugin/danbooru/tag.go

@@ -0,0 +1,119 @@
+package deepdanbooru
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"image"
+	"net/url"
+	"sort"
+
+	"github.com/Coloured-glaze/gg"
+	"github.com/FloatTech/floatbox/file"
+	"github.com/FloatTech/floatbox/web"
+	"github.com/FloatTech/zbputils/control"
+	imgutils "github.com/FloatTech/zbputils/img"
+	"github.com/FloatTech/zbputils/img/text" // jpg png gif
+	_ "golang.org/x/image/webp"              // webp
+)
+
+const api = "https://nsfwtag.azurewebsites.net/api/tag?limit=0.5&url="
+
+type sorttags struct {
+	tags map[string]float64
+	tseq []string
+}
+
+func newsorttags(tags map[string]float64) (s *sorttags) {
+	t := make([]string, 0, len(tags))
+	for k := range tags {
+		t = append(t, k)
+	}
+	return &sorttags{tags: tags, tseq: t}
+}
+
+func (s *sorttags) Len() int {
+	return len(s.tags)
+}
+
+func (s *sorttags) Less(i, j int) bool {
+	v1 := s.tseq[i]
+	v2 := s.tseq[j]
+	return s.tags[v1] >= s.tags[v2]
+}
+
+// Swap swaps the elements with indexes i and j.
+func (s *sorttags) Swap(i, j int) {
+	s.tseq[j], s.tseq[i] = s.tseq[i], s.tseq[j]
+}
+
+func tagurl(name, u string) (im image.Image, st *sorttags, err error) {
+	ch := make(chan []byte, 1)
+	go func() {
+		var data []byte
+		data, err = web.GetData(u)
+		ch <- data
+	}()
+
+	data, err := web.GetData(api + url.QueryEscape(u))
+	if err != nil {
+		return
+	}
+	tags := make(map[string]float64)
+	err = json.Unmarshal(data, &tags)
+	if err != nil {
+		return
+	}
+
+	longestlen := 0
+	for k := range tags {
+		if len(k) > longestlen {
+			longestlen = len(k)
+		}
+	}
+	longestlen++
+
+	st = newsorttags(tags)
+	sort.Sort(st)
+
+	_, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true)
+	if err != nil {
+		return
+	}
+	_, err = file.GetLazyData(text.ConsolasFontFile, control.Md5File, true)
+	if err != nil {
+		return
+	}
+
+	data = <-ch
+	if err != nil {
+		return
+	}
+	img, _, err := image.Decode(bytes.NewReader(data))
+	if err != nil {
+		return
+	}
+
+	img = imgutils.Limit(img, 1280, 720)
+
+	canvas := gg.NewContext(img.Bounds().Size().X, img.Bounds().Size().Y+int(float64(img.Bounds().Size().X)*0.2)+len(tags)*img.Bounds().Size().X/25)
+	canvas.SetRGB(1, 1, 1)
+	canvas.Clear()
+	canvas.DrawImage(img, 0, 0)
+	if err = canvas.LoadFontFace(text.BoldFontFile, float64(img.Bounds().Size().X)*0.1); err != nil {
+		return
+	}
+	canvas.SetRGB(0, 0, 0)
+	canvas.DrawString(name, float64(img.Bounds().Size().X)*0.02, float64(img.Bounds().Size().Y)+float64(img.Bounds().Size().X)*0.1)
+	i := float64(img.Bounds().Size().Y) + float64(img.Bounds().Size().X)*0.2
+	if err = canvas.LoadFontFace(text.ConsolasFontFile, float64(img.Bounds().Size().X)*0.04); err != nil {
+		return
+	}
+	rate := float64(img.Bounds().Size().X) * 0.04
+	for _, k := range st.tseq {
+		canvas.DrawString(fmt.Sprintf("* %-*s -%.3f-", longestlen, k, tags[k]), float64(img.Bounds().Size().X)*0.04, i)
+		i += rate
+	}
+	im = canvas.Image()
+	return
+}

plugin/diana/bing.go

@@ -5,28 +5,27 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
+	fcext "github.com/FloatTech/floatbox/ctxext"
 	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", &ctrl.Options[*zero.Ctx]{
 	DisableOnDefault: false,
-	Help: "嘉然\n" +
-		"- 小作文\n" +
+	Brief:            "嘉然相关", // 也许使用常用功能当Brief更好
+	Help: "- 小作文\n" +
 		"- 发大病\n" +
-		"- 教你一篇小作文[作文]\n" +
-		"- [回复]查重",
+		"- 教你一篇小作文[作文]",
 	PublicDataFolder: "Diana",
 })
 
 func init() {
-	getdb := ctxext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool {
+	getdb := fcext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool {
 		err := data.LoadText(engine.DataFolder() + "text.db")
 		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
+			ctx.SendChain(message.Text("ERROR: ", err))
 			return false
 		}
 		return true
@@ -49,7 +48,7 @@ func init() {
 		Handle(func(ctx *zero.Ctx) {
 			err := data.AddText(ctx.State["regex_matched"].([]string)[1])
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
+				ctx.SendChain(message.Text("ERROR: ", err))
 			} else {
 				ctx.SendChain(message.Text("记住啦!"))
 			}

plugin/diana/data/text.go

@@ -6,9 +6,10 @@ import (
 	"encoding/binary"
 	"time"
 
+	binutils "github.com/FloatTech/floatbox/binary"
+	"github.com/FloatTech/floatbox/file"
 	sql "github.com/FloatTech/sqlite"
-	binutils "github.com/FloatTech/zbputils/binary"
-	"github.com/FloatTech/zbputils/file"
+	"github.com/FloatTech/zbputils/control"
 	"github.com/sirupsen/logrus"
 )
 
@@ -21,7 +22,7 @@ type text struct {
 
 // LoadText 加载小作文
 func LoadText(dbfile string) error {
-	_, err := file.GetLazyData(dbfile, false)
+	_, err := file.GetLazyData(dbfile, control.Md5File, false)
 	db.DBPath = dbfile
 	if err != nil {
 		return err

plugin/diana/zhiwang.go

@@ -1,89 +0,0 @@
-// Package diana 嘉然相关
-package diana
-
-import (
-	"bytes"
-	"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"
-
-	zero "github.com/wdvxdr1123/ZeroBot"
-)
-
-// 小作文查重: 回复要查的消息 查重
-func init() {
-	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", "")
-				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/dress/api.go

@@ -0,0 +1,39 @@
+package dress
+
+import (
+	"fmt"
+
+	"github.com/FloatTech/floatbox/web"
+	"github.com/tidwall/gjson"
+)
+
+const (
+	dressURL       = "http://www.yoooooooooo.com/gitdress"
+	male           = "dress"
+	female         = "girldress"
+	dressListURL   = dressURL + "/%v/album/list.json"
+	dressDetailURL = dressURL + "/%v/album/%v/info.json"
+	dressImageURL  = dressURL + "/%v/album/%v/%v-m.webp"
+)
+
+func dressList(sex string) (dressList []string, err error) {
+	data, err := web.GetData(fmt.Sprintf(dressListURL, sex))
+	if err != nil {
+		return
+	}
+	arr := gjson.ParseBytes(data).Get("@this").Array()
+	dressList = make([]string, len(arr))
+	for i, v := range arr {
+		dressList[i] = v.String()
+	}
+	return
+}
+
+func detail(sex, name string) (count int, err error) {
+	data, err := web.GetData(fmt.Sprintf(dressDetailURL, sex, name))
+	if err != nil {
+		return
+	}
+	count = int(gjson.ParseBytes(data).Get("@this.#").Int())
+	return
+}

plugin/dress/dress.go

@@ -0,0 +1,113 @@
+// Package dress 女装
+package dress
+
+import (
+	"fmt"
+	"math/rand"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/FloatTech/floatbox/binary"
+	ctrl "github.com/FloatTech/zbpctrl"
+	"github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/img/text"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+)
+
+func init() { // 插件主体
+	engine := control.Register("dress", &ctrl.Options[*zero.Ctx]{
+		DisableOnDefault: false,
+		Brief:            "女装",
+		Help: "女装\n" +
+			"- 女装\n" +
+			"- 男装\n" +
+			"- 随机女装\n" +
+			"- 随机男装",
+		PrivateDataFolder: "dress",
+	})
+	engine.OnFullMatchGroup([]string{"女装", "男装"}).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			matched := ctx.State["matched"].(string)
+			sex := male
+			if matched == "男装" {
+				sex = female
+			}
+			next := zero.NewFutureEvent("message", 999, false, ctx.CheckSession())
+			recv, cancel := next.Repeat()
+			defer cancel()
+			nameList, err := dressList(sex)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+			tex := "请输入" + matched + "序号\n"
+			for i, v := range nameList {
+				tex += fmt.Sprintf("%d. %s\n", i, v)
+			}
+			base64Str, err := text.RenderToBase64(tex, text.FontFile, 400, 20)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+			ctx.SendChain(message.Image("base64://" + binary.BytesToString(base64Str)))
+			for {
+				select {
+				case <-time.After(time.Second * 120):
+					ctx.SendChain(message.Text(matched, "指令过期"))
+					return
+				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 >= len(nameList) {
+						ctx.SendChain(message.Text("序号非法!"))
+						continue
+					}
+					name := nameList[num]
+					sendImage(ctx, sex, matched, name)
+					return
+				}
+			}
+		})
+	engine.OnFullMatchGroup([]string{"随机女装", "随机男装"}).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			matched := strings.TrimPrefix(ctx.State["matched"].(string), "随机")
+			sex := male
+			if matched == "男装" {
+				sex = female
+			}
+			nameList, err := dressList(sex)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+			name := nameList[rand.Intn(len(nameList))]
+			sendImage(ctx, sex, matched, name)
+		})
+}
+
+func sendImage(ctx *zero.Ctx, sex, matched, name string) {
+	ctx.SendChain(message.Text("请欣赏", matched, ": ", name))
+	count, err := detail(sex, name)
+	if err != nil {
+		ctx.SendChain(message.Text("ERROR: ", err))
+		return
+	}
+	imageList := make([]string, count)
+	for i := range imageList {
+		imageList[i] = fmt.Sprintf(dressImageURL, sex, name, i+1)
+	}
+	m := message.Message{}
+	for _, v := range imageList {
+		m = append(m, ctxext.FakeSenderForwardNode(ctx, message.Image(v)))
+	}
+	if id := ctx.Send(m).ID(); id == 0 {
+		ctx.SendChain(message.Text("ERROR: 可能被风控或下载图片用时过长，请耐心等待"))
+	}
+}

plugin/drift_bottle/data.go

@@ -1,53 +0,0 @@
-package driftbottle
-
-import (
-	"fmt"
-	"hash/crc64"
-	"strconv"
-	"sync"
-
-	sql "github.com/FloatTech/sqlite"
-	"github.com/FloatTech/zbputils/binary"
-)
-
-type bottle struct {
-	ID   int64  `db:"id"`   // ID qq_grp_name_msg 的 crc64
-	QQ   int64  `db:"qq"`   // QQ 发送者 qq
-	Grp  int64  `db:"grp"`  // Grp 限制抽出的群 / 人（负数）
-	Name string `db:"name"` // Name 发送者 昵称
-	Msg  string `db:"msg"`  // Msg 消息，纯文本
-}
-
-var sea = &sql.Sqlite{}
-var seamu sync.RWMutex
-
-func newBottle(qq, grp int64, name, msg string) *bottle {
-	id := int64(crc64.Checksum(binary.StringToBytes(fmt.Sprintf("%d_%d_%s_%s", qq, grp, name, msg)), crc64.MakeTable(crc64.ISO)))
-	return &bottle{ID: id, QQ: qq, Grp: grp, Name: name, Msg: msg}
-}
-
-func (b *bottle) throw(db *sql.Sqlite, channel string) error {
-	seamu.Lock()
-	defer seamu.Unlock()
-	return db.Insert(channel, b)
-}
-
-func (b *bottle) destroy(db *sql.Sqlite, channel string) error {
-	seamu.Lock()
-	defer seamu.Unlock()
-	return db.Del(channel, "WHERE id="+strconv.FormatInt(b.ID, 10))
-}
-
-// fetchBottle grp != 0
-func fetchBottle(db *sql.Sqlite, channel string, grp int64) (*bottle, error) {
-	seamu.RLock()
-	defer seamu.RUnlock()
-	b := new(bottle)
-	return b, db.Find(channel, b, "WHERE grp=0 or grp="+strconv.FormatInt(grp, 10)+" ORDER BY RANDOM() limit 1")
-}
-
-func createChannel(db *sql.Sqlite, channel string) error {
-	seamu.Lock()
-	defer seamu.Unlock()
-	return db.Create(channel, &bottle{})
-}

plugin/drift_bottle/main.go

@@ -2,132 +2,108 @@
 package driftbottle
 
 import (
+	"fmt"
+	"hash/crc64"
 	"strconv"
-	"strings"
 	"sync"
 	"time"
+	"unicode/utf8"
 
+	"github.com/FloatTech/floatbox/binary"
+	sql "github.com/FloatTech/sqlite"
 	ctrl "github.com/FloatTech/zbpctrl"
 	"github.com/FloatTech/zbputils/control"
-	"github.com/sirupsen/logrus"
+	"github.com/FloatTech/zbputils/ctxext"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 )
 
+type sea struct {
+	ID   int64  `db:"id"`   // ID qq_grp_name_msg 的 crc64 hashCheck.
+	QQ   int64  `db:"qq"`   // Get current user(Who sends this)
+	Name string `db:"Name"` //  his or her name at that time:P
+	Msg  string `db:"msg"`  // What he or she sent to bot?
+	Grp  int64  `db:"grp"`  // which group sends this msg?
+	Time string `db:"time"` // we need to know the current time,master>
+}
+
+var seaSide = &sql.Sqlite{}
+var seaLocker sync.RWMutex
+
+// We need a container to inject what we need :(
+
 func init() {
 	en := control.Register("driftbottle", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault:  false,
-		Help:              "漂流瓶\n- (在群xxx)丢漂流瓶(到频道xxx) [消息]\n- (从频道xxx)捡漂流瓶\n- @BOT 创建频道 xxx\n- 跳入(频道)海中\n- 注：不显式限制时，私聊发送可在所有群抽到，群聊发送仅可在本群抽到，默认频道为 global",
+		Brief:             "漂流瓶",
+		Help:              "- @bot pick" + "- @bot throw xxx (xxx为投递内容)",
 		PrivateDataFolder: "driftbottle",
 	})
-	sea.DBPath = en.DataFolder() + "sea.db"
-	err := sea.Open(time.Hour * 24)
+	seaSide.DBPath = en.DataFolder() + "sea.db"
+	err := seaSide.Open(time.Hour * 24)
 	if err != nil {
 		panic(err)
 	}
-	_ = createChannel(sea, "global")
-	en.OnRegex(`^(在群\d+)?丢漂流瓶(到频道\w+)?\s+(.*)$`).SetBlock(true).
-		Handle(func(ctx *zero.Ctx) {
-			msgs := ctx.State["regex_matched"].([]string)
-			grp := ctx.Event.GroupID
-			channel := "global"
-			msg := msgs[3]
-			var err error
-			if msgs[1] != "" {
-				grp, err = strconv.ParseInt(msgs[1][6:], 10, 64)
-				if err != nil {
-					ctx.SendChain(message.Text("群号非法!"))
-					return
-				}
-			}
-			if msgs[2] != "" {
-				channel = msgs[2][9:]
-			}
-			if msg == "" {
-				ctx.SendChain(message.Text("消息为空!"))
-				return
-			}
-			logrus.Debugln("[driftbottle]", grp, channel, msg)
-			err = newBottle(
-				ctx.Event.UserID,
-				grp,
-				ctx.CardOrNickName(ctx.Event.UserID),
-				msg,
-			).throw(sea, channel)
-			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
-				return
-			}
-			ctx.Send(message.ReplyWithMessage(ctx.Event.MessageID, message.Text("你将它扔进大海，希望有人捞到吧~")))
-		})
-	en.OnRegex(`^(从频道\w+)?捡漂流瓶$`).SetBlock(true).
-		Handle(func(ctx *zero.Ctx) {
-			msgs := ctx.State["regex_matched"].([]string)
-			grp := ctx.Event.GroupID
-			if grp == 0 {
-				grp = -ctx.Event.UserID
-			}
-			if grp == 0 {
-				ctx.SendChain(message.Text("找不到对象!"))
-				return
-			}
-			channel := "global"
-			if msgs[1] != "" {
-				channel = msgs[1][9:]
-			}
-			logrus.Debugln("[driftbottle]", grp, channel)
-			b, err := fetchBottle(sea, channel, grp)
-			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
-				return
-			}
-			var wg sync.WaitGroup
-			wg.Add(1)
-			go func() {
-				err = b.destroy(sea, channel)
-				wg.Done()
-			}()
-			ctx.Send(
-				message.ReplyWithMessage(
-					ctx.Event.MessageID,
-					message.Text("你在海边捡到了一个来自 ", b.Name, " 的漂流瓶，打开瓶子，里面有一张纸条，写着："),
-					message.Text(b.Msg),
-				),
-			)
-			wg.Wait()
-			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
-				return
-			}
-		})
-	en.OnPrefix("创建频道", zero.SuperUserPermission, zero.OnlyToMe).SetBlock(true).
-		Handle(func(ctx *zero.Ctx) {
-			channel := strings.TrimRight(ctx.State["args"].(string), " ")
-			if channel == "" {
-				ctx.SendChain(message.Text("频道名为空!"))
-				return
-			}
-			err := createChannel(sea, channel)
-			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
-				return
-			}
-			ctx.Send(message.ReplyWithMessage(ctx.Event.MessageID, message.Text("成功~")))
-		})
-	en.OnRegex(`^跳入(\w+)?海中$`).SetBlock(true).
-		Handle(func(ctx *zero.Ctx) {
-			msgs := ctx.State["regex_matched"].([]string)
-			channel := "global"
-			if msgs[1] != "" {
-				channel = msgs[1]
-			}
-			seamu.RLock()
-			c, err := sea.Count(channel)
-			seamu.RUnlock()
-			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
-				return
-			}
-			ctx.Send(message.ReplyWithMessage(ctx.Event.MessageID, message.Text("你缓缓走入大海，感受着海浪轻柔地拍打着你的小腿，膝盖……\n波浪卷着你的腰腹，你感觉有些把握不住平衡了……\n……\n你沉入海中，", c, " 个物体与你一同沉浮。\n不知何处涌来一股暗流，你失去了意识。")))
-		})
+
+	_ = createChannel(seaSide)
+	en.OnFullMatch("pick", zero.OnlyToMe, zero.OnlyGroup).Limit(ctxext.LimitByGroup).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+		be, err := fetchBottle(seaSide)
+		if err != nil {
+			ctx.SendChain(message.Text("ERR:", err))
+		}
+		idstr := strconv.Itoa(int(be.ID))
+		qqstr := strconv.Itoa(int(be.QQ))
+		grpstr := strconv.Itoa(int(be.Grp))
+		botname := zero.BotConfig.NickName[0]
+		msg := message.Message{message.CustomNode(botname, ctx.Event.SelfID, botname+"试着帮你捞出来了这个~\nID:"+idstr+"\n投递人: "+be.Name+"("+qqstr+")"+"\n群号: "+grpstr+"\n时间: "+be.Time+"\n内容: \n"+be.Msg)}
+		ctx.Send(msg)
+	})
+
+	en.OnRegex(`throw.*?(.*)`, zero.OnlyToMe, zero.OnlyGroup).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+		senderFormatTime := time.Unix(ctx.Event.Time, 0).Format("2006-01-02 15:04:05")
+		rawSenderMessage := ctx.State["regex_matched"].([]string)[1]
+		rawMessageCallBack := message.UnescapeCQCodeText(rawSenderMessage)
+		keyWordsNum := utf8.RuneCountInString(rawMessageCallBack)
+		if keyWordsNum < 10 {
+			ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("需要投递的内容过少( "))
+			return
+		}
+		// check current needs and prepare to throw drift_bottle.
+		err = globalbottle(
+			ctx.Event.UserID,
+			ctx.Event.GroupID,
+			senderFormatTime,
+			ctx.CardOrNickName(ctx.Event.UserID),
+			rawMessageCallBack,
+		).throw(seaSide)
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR: ", err))
+			return
+		}
+		ctx.Send(message.ReplyWithMessage(ctx.Event.MessageID, message.Text("已经帮你丢出去了哦~")))
+	})
+}
+
+func globalbottle(qq, grp int64, time, name, msg string) *sea { // Check as if the User is available and collect information to store.
+	id := int64(crc64.Checksum(binary.StringToBytes(fmt.Sprintf("%d_%d_%s_%s_%s", grp, qq, time, name, msg)), crc64.MakeTable(crc64.ISO)))
+	return &sea{ID: id, Grp: grp, Time: time, QQ: qq, Name: name, Msg: msg}
+}
+
+func (be *sea) throw(db *sql.Sqlite) error {
+	seaLocker.Lock()
+	defer seaLocker.Unlock()
+	return db.Insert("global", be)
+}
+
+func fetchBottle(db *sql.Sqlite) (*sea, error) {
+	seaLocker.Lock()
+	defer seaLocker.Unlock()
+	be := new(sea)
+	return be, db.Pick("global", be)
+}
+
+func createChannel(db *sql.Sqlite) error {
+	seaLocker.Lock()
+	defer seaLocker.Unlock()
+	return db.Create("global", &sea{})
 }

plugin/emojimix/mix.go

@@ -19,8 +19,8 @@ const bed = "https://www.gstatic.com/android/keyboard/emojikitchen/%d/u%x/u%x_u%
 func init() {
 	control.Register("emojimix", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
-		Help: "合成emoji\n" +
-			"- [emoji][emoji]",
+		Brief:            "合成emoji",
+		Help:             "- [emoji][emoji]",
 	}).OnMessage(match).SetBlock(true).Limit(ctxext.LimitByUser).
 		Handle(func(ctx *zero.Ctx) {
 			r := ctx.State["emojimix"].([]rune)

plugin/epidemic/epidemic.go

@@ -7,16 +7,13 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
+	"github.com/FloatTech/floatbox/web"
 	ctrl "github.com/FloatTech/zbpctrl"
 	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
-	"github.com/FloatTech/zbputils/web"
 )
 
-const (
-	servicename = "epidemic"
-	txurl       = "https://api.inews.qq.com/newsqa/v1/query/inner/publish/modules/list?modules=statisGradeCityDetail,diseaseh5Shelf"
-)
+const txurl = "https://api.inews.qq.com/newsqa/v1/query/inner/publish/modules/list?modules=statisGradeCityDetail,diseaseh5Shelf"
 
 // result 疫情查询结果
 type result struct {
@@ -35,8 +32,8 @@ type epidemic struct {
 type area struct {
 	Name  string `json:"name"`
 	Today struct {
-		Confirm int         `json:"confirm"`
-		Wzzadd  interface{} `json:"wzz_add"`
+		Confirm int `json:"confirm"`
+		Wzzadd  any `json:"wzz_add"`
 	} `json:"today"`
 	Total struct {
 		NowConfirm int    `json:"nowConfirm"`
@@ -50,10 +47,10 @@ type area struct {
 }
 
 func init() {
-	engine := control.Register(servicename, &ctrl.Options[*zero.Ctx]{
+	engine := control.Register("epidemic", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
-		Help: "城市疫情查询\n" +
-			"- xxx疫情\n",
+		Brief:            "城市疫情查询",
+		Help:             "- xxx疫情\n",
 	})
 	engine.OnSuffix("疫情").SetBlock(true).Limit(ctxext.LimitByUser).
 		Handle(func(ctx *zero.Ctx) {
@@ -64,7 +61,7 @@ func init() {
 			}
 			data, time, err := queryEpidemic(city)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
+				ctx.SendChain(message.Text("ERROR: ", err))
 				return
 			}
 			if data == nil {

plugin/event/data.go

@@ -0,0 +1,45 @@
+package event
+
+type storage int64
+
+// 申请
+func (s *storage) setapply(on bool) {
+	if on {
+		*s |= 0b001
+	} else {
+		*s &= 0b110
+	}
+}
+
+// 邀请
+func (s *storage) setinvite(on bool) {
+	if on {
+		*s |= 0b010
+	} else {
+		*s &= 0b101
+	}
+}
+
+// 主人
+func (s *storage) setmaster(on bool) {
+	if on {
+		*s |= 0b100
+	} else {
+		*s &= 0b011
+	}
+}
+
+// 申请
+func (s *storage) isapplyon() bool {
+	return *s&0b001 > 0
+}
+
+// 邀请
+func (s *storage) isinviteon() bool {
+	return *s&0b010 > 0
+}
+
+// 主人
+func (s *storage) ismasteroff() bool {
+	return *s&0b100 > 0
+}

plugin/event/event.go

@@ -0,0 +1,144 @@
+// Package event 好友申请以及群聊邀请事件处理
+package event
+
+import (
+	"encoding/binary"
+	"strconv"
+	"time"
+
+	ctrl "github.com/FloatTech/zbpctrl"
+	"github.com/FloatTech/zbputils/control"
+	base14 "github.com/fumiama/go-base16384"
+	"github.com/sirupsen/logrus"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+)
+
+func init() {
+	engine := control.Register("event", &ctrl.Options[*zero.Ctx]{
+		DisableOnDefault: false,
+		Brief:            "好友申请和群聊邀请事件处理",
+		Help: "- [开启|关闭]自动同意[申请|邀请|主人]\n" +
+			"- [同意|拒绝][申请|邀请][flag]\n" +
+			"Tips: 信息默认发送给主人列表第一位, 默认同意所有主人的事件, flag跟随事件一起发送",
+	})
+	engine.On("request/group/invite").SetBlock(false).
+		Handle(func(ctx *zero.Ctx) {
+			c, ok := ctx.State["manager"].(*ctrl.Control[*zero.Ctx])
+			if ok {
+				su := zero.BotConfig.SuperUsers[0]
+				now := time.Unix(ctx.Event.Time, 0).Format("2006-01-02 15:04:05")
+				flag, err := strconv.ParseInt(ctx.Event.Flag, 10, 64)
+				if err != nil {
+					ctx.SendChain(message.Text("ERROR: ", err))
+					return
+				}
+				var buf [8]byte
+				binary.BigEndian.PutUint64(buf[:], uint64(flag))
+				es := base14.EncodeToString(buf[1:])
+				userid := ctx.Event.UserID
+				username := ctx.CardOrNickName(userid)
+				data := (storage)(c.GetData(-su))
+				groupid := ctx.Event.GroupID
+				groupname := ctx.GetGroupInfo(groupid, true).Name
+				logrus.Info("[event]收到来自[", username, "](", userid, ")的群聊邀请，群:[", groupname, "](", groupid, ")")
+				if data.isinviteon() || (!data.ismasteroff() && zero.SuperUserPermission(ctx)) {
+					ctx.SetGroupAddRequest(ctx.Event.Flag, "invite", true, "")
+					ctx.SendPrivateForwardMessage(su, message.Message{message.CustomNode(username, userid,
+						"已自动同意在"+now+"收到来自"+
+							"\n用户:["+username+"]("+strconv.FormatInt(userid, 10)+")的群聊邀请"+
+							"\n群聊:["+groupname+"]("+strconv.FormatInt(groupid, 10)+")"+
+							"\nflag:"+es)})
+					return
+				}
+				ctx.SendPrivateForwardMessage(su,
+					message.Message{message.CustomNode(username, userid,
+						"在"+now+"收到来自"+
+							"\n用户:["+username+"]("+strconv.FormatInt(userid, 10)+")的群聊邀请"+
+							"\n群聊:["+groupname+"]("+strconv.FormatInt(groupid, 10)+")"+
+							"\n请在下方复制flag并在前面加上:"+
+							"\n同意/拒绝邀请，来决定同意还是拒绝"),
+						message.CustomNode(username, userid, es)})
+			}
+		})
+	engine.On("request/friend").SetBlock(false).
+		Handle(func(ctx *zero.Ctx) {
+			c, ok := ctx.State["manager"].(*ctrl.Control[*zero.Ctx])
+			if ok {
+				su := zero.BotConfig.SuperUsers[0]
+				now := time.Unix(ctx.Event.Time, 0).Format("2006-01-02 15:04:05")
+				flag, err := strconv.ParseInt(ctx.Event.Flag, 10, 64)
+				if err != nil {
+					ctx.SendChain(message.Text("ERROR: ", err))
+					return
+				}
+				var buf [8]byte
+				binary.BigEndian.PutUint64(buf[:], uint64(flag))
+				es := base14.EncodeToString(buf[1:])
+				comment := ctx.Event.Comment
+				userid := ctx.Event.UserID
+				username := ctx.CardOrNickName(userid)
+				data := (storage)(c.GetData(-su))
+				logrus.Info("[event]收到来自[", username, "](", userid, ")的好友申请")
+				if data.isapplyon() || (!data.ismasteroff() && zero.SuperUserPermission(ctx)) {
+					ctx.SetFriendAddRequest(ctx.Event.Flag, true, "")
+					ctx.SendPrivateForwardMessage(su, message.Message{message.CustomNode(username, userid,
+						"已自动同意在"+now+"收到来自"+
+							"\n用户:["+username+"]("+strconv.FormatInt(userid, 10)+")"+
+							"\n的好友请求:"+comment+
+							"\nflag:"+es)})
+					return
+				}
+				ctx.SendPrivateForwardMessage(su,
+					message.Message{message.CustomNode(username, userid,
+						"在"+now+"收到来自"+
+							"\n用户:["+username+"]("+strconv.FormatInt(userid, 10)+")"+
+							"\n的好友请求:"+comment+
+							"\n请在下方复制flag并在前面加上:"+
+							"\n同意/拒绝申请，来决定同意还是拒绝"),
+						message.CustomNode(username, userid, es)})
+			}
+		})
+	engine.OnRegex(`^(同意|拒绝)(申请|邀请)\s*([一-踀]{4})\s*(.*)$`, zero.SuperUserPermission, zero.OnlyPrivate).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			su := zero.BotConfig.SuperUsers[0]
+			cmd := ctx.State["regex_matched"].([]string)[1]
+			org := ctx.State["regex_matched"].([]string)[2]
+			es := ctx.State["regex_matched"].([]string)[3]
+			other := ctx.State["regex_matched"].([]string)[4]
+			var buf [8]byte
+			copy(buf[1:], base14.DecodeFromString(es))
+			flag := strconv.FormatInt(int64(binary.BigEndian.Uint64(buf[:])), 10)
+			ok := cmd == "同意"
+			switch org {
+			case "申请":
+				ctx.SetFriendAddRequest(flag, ok, other)
+				ctx.SendPrivateMessage(su, message.Text("已", cmd, org))
+			case "邀请":
+				ctx.SetGroupAddRequest(flag, "invite", ok, other)
+				ctx.SendPrivateMessage(su, message.Text("已", cmd, org))
+			}
+		})
+	engine.OnRegex(`^(开启|关闭)自动同意(申请|邀请|主人)$`, zero.SuperUserPermission, zero.OnlyPrivate).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			c := ctx.State["manager"].(*ctrl.Control[*zero.Ctx])
+			su := zero.BotConfig.SuperUsers[0]
+			option := ctx.State["regex_matched"].([]string)[1]
+			from := ctx.State["regex_matched"].([]string)[2]
+			data := (storage)(c.GetData(-su))
+			switch from {
+			case "申请":
+				data.setapply(option == "开启")
+			case "邀请":
+				data.setinvite(option == "开启")
+			case "主人":
+				data.setmaster(option == "关闭")
+			}
+			err := c.SetData(-su, int64(data))
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+			ctx.SendChain(message.Text("已设置自动同意" + from + "为" + option))
+		})
+}

plugin/font/main.go

@@ -2,8 +2,8 @@
 package font
 
 import (
+	"github.com/FloatTech/floatbox/binary"
 	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"
@@ -14,7 +14,8 @@ import (
 func init() {
 	control.Register("font", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
-		Help:             "渲染任意文字到图片\n- (用[终末体|终末变体|紫罗兰体|樱酥体|Consolas体|苹方体])渲染文字xxx",
+		Brief:            "渲染任意文字到图片",
+		Help:             "- (用[字体])渲染文字xxx\n可选字体: [终末体|终末变体|紫罗兰体|樱酥体|Consolas体|苹方体]",
 	}).OnRegex(`^(用.+)?渲染文字([\s\S]+)$`).SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
 		fnt := ctx.State["regex_matched"].([]string)[1]
 		txt := ctx.State["regex_matched"].([]string)[2]
@@ -36,7 +37,7 @@ func init() {
 		}
 		b, err := text.RenderToBase64(txt, fnt, 400, 20)
 		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
+			ctx.SendChain(message.Text("ERROR: ", err))
 			return
 		}
 		ctx.SendChain(message.Image("base64://" + binary.BytesToString(b)))

plugin/fortune/fortune.go

@@ -17,13 +17,14 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
+	fcext "github.com/FloatTech/floatbox/ctxext"
+	"github.com/FloatTech/floatbox/file"
+	"github.com/FloatTech/floatbox/img/writer"
+	"github.com/FloatTech/floatbox/math"
 	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"
 )
 
 const (
@@ -50,8 +51,8 @@ func init() {
 	// 插件主体
 	en := control.Register("fortune", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
-		Help: "每日运势: \n" +
-			"- 运势 | 抽签\n" +
+		Brief:            "每日运势",
+		Help: "- 运势 | 抽签\n" +
 			"- 设置底图[车万 | DC4 | 爱因斯坦 | 星空列车 | 樱云之恋 | 富婆妹 | 李清歌 | 公主连结 | 原神 | 明日方舟 | 碧蓝航线 | 碧蓝幻想 | 战双 | 阴阳师 | 赛马娘 | 东方归言录 | 奇异恩典 | 夏日口袋 | ASoul]",
 		PublicDataFolder: "Fortune",
 	})
@@ -87,21 +88,21 @@ func init() {
 			}
 			ctx.SendChain(message.Text("没有这个底图哦～"))
 		})
-	en.OnFullMatchGroup([]string{"运势", "抽签"}, ctxext.DoOnceOnSuccess(
+	en.OnFullMatchGroup([]string{"运势", "抽签"}, fcext.DoOnceOnSuccess(
 		func(ctx *zero.Ctx) bool {
-			data, err := file.GetLazyData(omikujson, false)
+			data, err := file.GetLazyData(omikujson, control.Md5File, false)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
+				ctx.SendChain(message.Text("ERROR: ", err))
 				return false
 			}
 			err = json.Unmarshal(data, &omikujis)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
+				ctx.SendChain(message.Text("ERROR: ", err))
 				return false
 			}
-			_, err = file.GetLazyData(font, true)
+			_, err = file.GetLazyData(font, control.Md5File, true)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
+				ctx.SendChain(message.Text("ERROR: ", err))
 				return false
 			}
 			return true
@@ -125,21 +126,21 @@ func init() {
 			}
 			// 检查背景图片是否存在
 			zipfile := images + kind + ".zip"
-			_, err := file.GetLazyData(zipfile, false)
+			_, err := file.GetLazyData(zipfile, control.Md5File, false)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
+				ctx.SendChain(message.Text("ERROR: ", err))
 				return
 			}
 
 			// 随机获取背景
 			background, index, err := randimage(zipfile, ctx)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
+				ctx.SendChain(message.Text("ERROR: ", err))
 				return
 			}
 
 			// 随机获取签文
-			randtextindex := ctxext.RandSenderPerDayN(ctx.Event.UserID, len(omikujis))
+			randtextindex := fcext.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[:])
@@ -154,7 +155,7 @@ func init() {
 				return err
 			}, ctxext.Send(ctx), ctxext.GetMessage(ctx))
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
+				ctx.SendChain(message.Text("ERROR: ", err))
 				return
 			}
 		})
@@ -171,7 +172,7 @@ func randimage(path string, ctx *zero.Ctx) (im image.Image, index int, err error
 	}
 	defer reader.Close()
 
-	file := reader.File[ctxext.RandSenderPerDayN(ctx.Event.UserID, len(reader.File))]
+	file := reader.File[fcext.RandSenderPerDayN(ctx.Event.UserID, len(reader.File))]
 	f, err := file.Open()
 	if err != nil {
 		return

plugin/funny/laugh.go

@@ -9,6 +9,7 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
+	fcext "github.com/FloatTech/floatbox/ctxext"
 	sql "github.com/FloatTech/sqlite"
 	ctrl "github.com/FloatTech/zbpctrl"
 	"github.com/FloatTech/zbputils/control"
@@ -25,31 +26,31 @@ var db = &sql.Sqlite{}
 func init() {
 	en := control.Register("funny", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
-		Help: "讲个笑话\n" +
-			"- 讲个笑话[@xxx|qq号|人名] | 夸夸[@xxx|qq号|人名] ",
+		Brief:            "讲个笑话",
+		Help:             "- 讲个笑话[@xxx|qq号|人名] | 夸夸[@xxx|qq号|人名] ",
 		PublicDataFolder: "Funny",
 	})
 
-	en.OnPrefixGroup([]string{"讲个笑话", "夸夸"}, ctxext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool {
+	en.OnPrefixGroup([]string{"讲个笑话", "夸夸"}, fcext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool {
 		db.DBPath = en.DataFolder() + "jokes.db"
 		_, err := en.GetLazyData("jokes.db", true)
 		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
+			ctx.SendChain(message.Text("ERROR: ", err))
 			return false
 		}
 		err = db.Open(time.Hour * 24)
 		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
+			ctx.SendChain(message.Text("ERROR: ", err))
 			return false
 		}
 		err = db.Create("jokes", &joke{})
 		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
+			ctx.SendChain(message.Text("ERROR: ", err))
 			return false
 		}
 		c, err := db.Count("jokes")
 		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
+			ctx.SendChain(message.Text("ERROR: ", err))
 			return false
 		}
 		logrus.Infoln("[funny]加载", c, "个笑话")
@@ -60,7 +61,7 @@ func init() {
 		var j joke
 		err := db.Pick("jokes", &j)
 		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
+			ctx.SendChain(message.Text("ERROR: ", err))
 			return
 		}
 		ctx.SendChain(message.Text(strings.ReplaceAll(j.Text, "%name", name)))

plugin/genshin/ys.go

@@ -13,11 +13,12 @@ import (
 	"strings"
 	"sync/atomic"
 
+	fcext "github.com/FloatTech/floatbox/ctxext"
+	"github.com/FloatTech/floatbox/img/writer"
+	"github.com/FloatTech/floatbox/process"
 	ctrl "github.com/FloatTech/zbpctrl"
 	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
-	"github.com/FloatTech/zbputils/img/writer"
-	"github.com/FloatTech/zbputils/process"
 	"github.com/golang/freetype"
 	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
@@ -36,7 +37,8 @@ var (
 func init() {
 	engine := control.Register("genshin", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
-		Help:             "原神抽卡\n- 原神十连\n- 切换原神卡池",
+		Brief:            "原神模拟抽卡",
+		Help:             "- 原神十连\n- 切换原神卡池",
 		PublicDataFolder: "Genshin",
 	}).ApplySingle(ctxext.DefaultSingle)
 
@@ -62,21 +64,21 @@ func init() {
 			err := c.SetData(gid, int64(store))
 			if err != nil {
 				process.SleepAbout1sTo2s()
-				ctx.SendChain(message.Text("ERROR:", err))
+				ctx.SendChain(message.Text("ERROR: ", err))
 			}
 		})
 
-	engine.OnFullMatch("原神十连", ctxext.DoOnceOnSuccess(
+	engine.OnFullMatch("原神十连", fcext.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))
+				ctx.SendChain(message.Text("ERROR: ", err))
 				return false
 			}
 			err = parsezip(zipfile)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
+				ctx.SendChain(message.Text("ERROR: ", err))
 				return false
 			}
 			return true
@@ -95,7 +97,7 @@ func init() {
 			store := (storage)(c.GetData(gid))
 			img, str, mode, err := randnums(10, store)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
+				ctx.SendChain(message.Text("ERROR: ", err))
 				return
 			}
 			b, cl := writer.ToBytes(img)

plugin/gif/context.go

@@ -5,7 +5,8 @@ import (
 	"strconv"
 	"sync"
 
-	"github.com/FloatTech/zbputils/file"
+	"github.com/FloatTech/floatbox/file"
+	"github.com/FloatTech/floatbox/web"
 	"github.com/FloatTech/zbputils/img"
 	"github.com/sirupsen/logrus"
 )
@@ -18,10 +19,22 @@ type context struct {
 func dlchan(name string, s *string, wg *sync.WaitGroup, exit func(error)) {
 	defer wg.Done()
 	target := datapath + `materials/` + name
-	var err error
 	if file.IsNotExist(target) {
-		err = file.DownloadTo(`https://gitcode.net/m0_60838134/imagematerials/-/raw/main/`+name, target, true)
+		data, err := web.RequestDataWith(web.NewTLS12Client(), `https://gitcode.net/m0_60838134/imagematerials/-/raw/main/`+name, "GET", "gitcode.net", web.RandUA())
 		if err != nil {
+			_ = os.Remove(target)
+			exit(err)
+			return
+		}
+		f, err := os.Create(target)
+		if err != nil {
+			exit(err)
+			return
+		}
+		_, err = f.Write(data)
+		_ = f.Close()
+		if err != nil {
+			_ = os.Remove(target)
 			exit(err)
 			return
 		}
@@ -35,8 +48,19 @@ 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://gitcode.net/m0_60838134/imagematerials/-/raw/main/`+name, target, true)
+		data, err := web.RequestDataWith(web.NewTLS12Client(), `https://gitcode.net/m0_60838134/imagematerials/-/raw/main/`+name, "GET", "gitcode.net", web.RandUA())
 		if err != nil {
+			_ = os.Remove(target)
+			return "", err
+		}
+		f, err := os.Create(target)
+		if err != nil {
+			return "", err
+		}
+		_, err = f.Write(data)
+		_ = f.Close()
+		if err != nil {
+			_ = os.Remove(target)
 			return "", err
 		}
 		logrus.Debugln("[gif] dl", name, "to", target, "succeeded")

plugin/gif/gif.go

@@ -1,37 +1,38 @@
 package gif
 
 import (
+	"errors"
 	"image"
 	"image/color"
 	"sync"
 
 	"github.com/Coloured-glaze/gg"
+	"github.com/FloatTech/floatbox/file"
+	"github.com/FloatTech/floatbox/img/writer"
+	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/img"
-	"github.com/FloatTech/zbputils/img/writer"
+	"github.com/FloatTech/zbputils/img/text"
 )
 
 // mo 摸
 func mo(cc *context, value ...string) (string, error) {
 	_ = value
 	var wg sync.WaitGroup
-	var err error
+	var errwg error
 	var m sync.Mutex
 	name := cc.usrdir + "摸.gif"
 	c := dlrange("mo", 5, &wg, func(e error) {
 		m.Lock()
-		err = e
+		errwg = 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
+	if errwg != nil {
+		return "", errwg
 	}
 	imgs, err := loadFirstFrames(c, 5)
 	if err != nil {
@@ -51,17 +52,14 @@ func mo(cc *context, value ...string) (string, error) {
 func cuo(cc *context, value ...string) (string, error) {
 	_ = value
 	var wg sync.WaitGroup
-	var err error
+	var errwg error
 	var m sync.Mutex
 	name := cc.usrdir + "搓.gif"
 	c := dlrange("cuo", 5, &wg, func(e error) {
 		m.Lock()
-		err = e
+		errwg = e
 		m.Unlock()
 	})
-	if err != nil {
-		return "", err
-	}
 	tou, err := cc.getLogo(110, 110)
 	if err != nil {
 		return "", err
@@ -71,8 +69,8 @@ func cuo(cc *context, value ...string) (string, error) {
 	m3 := img.Rotate(tou, 216, 0, 0)
 	m4 := img.Rotate(tou, 288, 0, 0)
 	wg.Wait()
-	if err != nil {
-		return "", err
+	if errwg != nil {
+		return "", errwg
 	}
 	imgs, err := loadFirstFrames(c, 5)
 	if err != nil {
@@ -92,24 +90,21 @@ func cuo(cc *context, value ...string) (string, error) {
 func qiao(cc *context, value ...string) (string, error) {
 	_ = value
 	var wg sync.WaitGroup
-	var err error
+	var errwg error
 	var m sync.Mutex
 	name := cc.usrdir + "敲.gif"
 	c := dlrange("qiao", 2, &wg, func(e error) {
 		m.Lock()
-		err = e
+		errwg = e
 		m.Unlock()
 	})
-	if err != nil {
-		return "", err
-	}
 	tou, err := cc.getLogo(40, 40)
 	if err != nil {
 		return "", err
 	}
 	wg.Wait()
-	if err != nil {
-		return "", err
+	if errwg != nil {
+		return "", errwg
 	}
 	imgs, err := loadFirstFrames(c, 2)
 	if err != nil {
@@ -126,24 +121,21 @@ func qiao(cc *context, value ...string) (string, error) {
 func chi(cc *context, value ...string) (string, error) {
 	_ = value
 	var wg sync.WaitGroup
-	var err error
+	var errwg error
 	var m sync.Mutex
 	name := cc.usrdir + "吃.gif"
 	c := dlrange("chi", 3, &wg, func(e error) {
 		m.Lock()
-		err = e
+		errwg = e
 		m.Unlock()
 	})
-	if err != nil {
-		return "", err
-	}
 	tou, err := cc.getLogo(32, 32)
 	if err != nil {
 		return "", err
 	}
 	wg.Wait()
-	if err != nil {
-		return "", err
+	if errwg != nil {
+		return "", errwg
 	}
 	imgs, err := loadFirstFrames(c, 3)
 	if err != nil {
@@ -161,17 +153,14 @@ func chi(cc *context, value ...string) (string, error) {
 func ceng(cc *context, value ...string) (string, error) {
 	_ = value
 	var wg sync.WaitGroup
-	var err error
+	var errwg error
 	var m sync.Mutex
 	name := cc.usrdir + "蹭.gif"
 	c := dlrange("ceng", 6, &wg, func(e error) {
 		m.Lock()
-		err = e
+		errwg = e
 		m.Unlock()
 	})
-	if err != nil {
-		return "", err
-	}
 	tou, err := cc.getLogo(100, 100)
 	if err != nil {
 		return "", err
@@ -181,8 +170,8 @@ func ceng(cc *context, value ...string) (string, error) {
 		return "", err
 	}
 	wg.Wait()
-	if err != nil {
-		return "", err
+	if errwg != nil {
+		return "", errwg
 	}
 	imgs, err := loadFirstFrames(c, 6)
 	if err != nil {
@@ -203,24 +192,21 @@ func ceng(cc *context, value ...string) (string, error) {
 func ken(cc *context, value ...string) (string, error) {
 	_ = value
 	var wg sync.WaitGroup
-	var err error
+	var errwg error
 	var m sync.Mutex
 	name := cc.usrdir + "啃.gif"
 	c := dlrange("ken", 16, &wg, func(e error) {
 		m.Lock()
-		err = e
+		errwg = 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
+	if errwg != nil {
+		return "", errwg
 	}
 	imgs, err := loadFirstFrames(c, 16)
 	if err != nil {
@@ -251,24 +237,21 @@ func ken(cc *context, value ...string) (string, error) {
 func pai(cc *context, value ...string) (string, error) {
 	_ = value
 	var wg sync.WaitGroup
-	var err error
+	var errwg error
 	var m sync.Mutex
 	name := cc.usrdir + "拍.gif"
 	c := dlrange("pai", 2, &wg, func(e error) {
 		m.Lock()
-		err = e
+		errwg = e
 		m.Unlock()
 	})
-	if err != nil {
-		return "", err
-	}
 	tou, err := cc.getLogo(30, 30)
 	if err != nil {
 		return "", err
 	}
 	wg.Wait()
-	if err != nil {
-		return "", err
+	if errwg != nil {
+		return "", errwg
 	}
 	imgs, err := loadFirstFrames(c, 2)
 	if err != nil {
@@ -285,24 +268,21 @@ func pai(cc *context, value ...string) (string, error) {
 func xqe(cc *context, value ...string) (string, error) {
 	_ = value
 	var wg sync.WaitGroup
-	var err error
+	var errwg error
 	var m sync.Mutex
 	name := cc.usrdir + "冲.gif"
 	c := dlrange("xqe", 2, &wg, func(e error) {
 		m.Lock()
-		err = e
+		errwg = 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
+	if errwg != nil {
+		return "", errwg
 	}
 	imgs, err := loadFirstFrames(c, 2)
 	if err != nil {
@@ -319,24 +299,21 @@ func xqe(cc *context, value ...string) (string, error) {
 func diu(cc *context, value ...string) (string, error) {
 	_ = value
 	var wg sync.WaitGroup
-	var err error
+	var errwg error
 	var m sync.Mutex
 	name := cc.usrdir + "丢.gif"
 	c := dlrange("diu", 8, &wg, func(e error) {
 		m.Lock()
-		err = e
+		errwg = 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
+	if errwg != nil {
+		return "", errwg
 	}
 	imgs, err := loadFirstFrames(c, 8)
 	if err != nil {
@@ -368,10 +345,10 @@ func kiss(cc *context, value ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	tou, err := cc.getLogo(0, 0)
 	if err != nil {
 		return "", err
@@ -407,10 +384,10 @@ func garbage(cc *context, value ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 79, 79)
 	if err != nil {
 		return "", err
@@ -440,10 +417,10 @@ func thump(cc *context, value ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 0, 0)
 	if err != nil {
 		return "", err
@@ -473,10 +450,10 @@ func jiujiu(cc *context, value ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 75, 51)
 	if err != nil {
 		return "", err
@@ -505,10 +482,10 @@ func knock(cc *context, value ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 0, 0)
 	if err != nil {
 		return "", err
@@ -538,10 +515,10 @@ func listenMusic(cc *context, value ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	face, err := cc.getLogo(0, 0)
 	if err != nil {
 		return "", err
@@ -570,10 +547,10 @@ func loveYou(cc *context, value ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 0, 0)
 	if err != nil {
 		return "", err
@@ -603,10 +580,10 @@ func pat(cc *context, value ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 0, 0)
 	if err != nil {
 		return "", err
@@ -645,10 +622,10 @@ func jackUp(cc *context, value ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 0, 0)
 	if err != nil {
 		return "", err
@@ -688,10 +665,10 @@ func pound(cc *context, value ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 0, 0)
 	if err != nil {
 		return "", err
@@ -721,10 +698,10 @@ func punch(cc *context, value ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 260, 260)
 	if err != nil {
 		return "", err
@@ -754,10 +731,10 @@ func roll(cc *context, value ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 210, 210)
 	if err != nil {
 		return "", err
@@ -787,10 +764,10 @@ func suck(cc *context, value ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 0, 0)
 	if err != nil {
 		return "", err
@@ -820,10 +797,10 @@ func hammer(cc *context, value ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 0, 0)
 	if err != nil {
 		return "", err
@@ -853,10 +830,10 @@ func tightly(cc *context, value ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 0, 0)
 	if err != nil {
 		return "", err
@@ -896,24 +873,21 @@ func turn(cc *context, value ...string) (string, error) {
 func taiguan(cc *context, value ...string) (string, error) {
 	_ = value
 	var wg sync.WaitGroup
-	var err error
+	var errwg error
 	var m sync.Mutex
 	name := cc.usrdir + "taiguan.gif"
 	c := dlrange("taiguan", 20, &wg, func(e error) {
 		m.Lock()
-		err = e
+		errwg = 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
+	if errwg != nil {
+		return "", errwg
 	}
 	imgs, err := loadFirstFrames(c, 20)
 	if err != nil {
@@ -948,17 +922,14 @@ func taiguan(cc *context, value ...string) (string, error) {
 func zou(cc *context, value ...string) (string, error) {
 	_ = value
 	var wg sync.WaitGroup
-	var err error
+	var errwg error
 	var m sync.Mutex
 	name := cc.usrdir + "zou.gif"
 	c := dlrange("zou", 3, &wg, func(e error) {
 		m.Lock()
-		err = e
+		errwg = e
 		m.Unlock()
 	})
-	if err != nil {
-		return "", err
-	}
 	tou, err := cc.getLogo(100, 100)
 	if err != nil {
 		return "", err
@@ -968,8 +939,8 @@ func zou(cc *context, value ...string) (string, error) {
 		return "", err
 	}
 	wg.Wait()
-	if err != nil {
-		return "", err
+	if errwg != nil {
+		return "", errwg
 	}
 	imgs, err := loadFirstFrames(c, 3)
 	if err != nil {
@@ -987,24 +958,21 @@ func zou(cc *context, value ...string) (string, error) {
 func ci(cc *context, value ...string) (string, error) {
 	_ = value
 	var wg sync.WaitGroup
-	var err error
+	var errwg error
 	var m sync.Mutex
 	name := cc.usrdir + "ci.gif"
 	c := dlrange("ci", 26, &wg, func(e error) {
 		m.Lock()
-		err = e
+		errwg = 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
+	if errwg != nil {
+		return "", errwg
 	}
 	imgs, err := loadFirstFrames(c, 26)
 	if err != nil {
@@ -1053,6 +1021,7 @@ func worship(cc *context, value ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
@@ -1060,10 +1029,6 @@ func worship(cc *context, value ...string) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
-	if err != nil {
-		return "", err
-	}
 	imgs, err := loadFirstFrames(c, 9)
 	if err != nil {
 		return "", err
@@ -1086,24 +1051,21 @@ func worship(cc *context, value ...string) (string, error) {
 func ceng2(cc *context, value ...string) (string, error) {
 	_ = value
 	var wg sync.WaitGroup
-	var err error
+	var errwg error
 	var m sync.Mutex
 	name := cc.usrdir + "ceng2.gif"
 	c := dlrange("ceng2", 4, &wg, func(e error) {
 		m.Lock()
-		err = e
+		errwg = 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
+	if errwg != nil {
+		return "", errwg
 	}
 	imgs, err := loadFirstFrames(c, 4)
 	if err != nil {
@@ -1122,24 +1084,21 @@ func ceng2(cc *context, value ...string) (string, error) {
 func dun(cc *context, value ...string) (string, error) {
 	_ = value
 	var wg sync.WaitGroup
-	var err error
+	var errwg error
 	var m sync.Mutex
 	name := cc.usrdir + "dun.gif"
 	c := dlrange("dun", 5, &wg, func(e error) {
 		m.Lock()
-		err = e
+		errwg = 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
+	if errwg != nil {
+		return "", errwg
 	}
 	imgs, err := loadFirstFrames(c, 5)
 	if err != nil {
@@ -1168,10 +1127,10 @@ func push(cc *context, value ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	tou, err := cc.getLogo(0, 0)
 	if err != nil {
 		return "", err
@@ -1191,17 +1150,14 @@ func push(cc *context, value ...string) (string, error) {
 func peng(cc *context, value ...string) (string, error) {
 	_ = value
 	var wg sync.WaitGroup
-	var err error
+	var errwg error
 	var m sync.Mutex
 	name := cc.usrdir + "peng.gif"
 	c := dlrange("peng", 25, &wg, func(e error) {
 		m.Lock()
-		err = e
+		errwg = e
 		m.Unlock()
 	})
-	if err != nil {
-		return "", err
-	}
 	tou, err := cc.getLogo(100, 100)
 	if err != nil {
 		return "", err
@@ -1210,10 +1166,9 @@ func peng(cc *context, value ...string) (string, error) {
 	m2 := img.Rotate(tou, 30, 80, 80)
 	m3 := img.Rotate(tou, 45, 85, 85)
 	m4 := img.Rotate(tou, 90, 80, 80)
-
 	wg.Wait()
-	if err != nil {
-		return "", err
+	if errwg != nil {
+		return "", errwg
 	}
 	imgs, err := loadFirstFrames(c, 25)
 	if err != nil {
@@ -1262,10 +1217,10 @@ func klee(cc *context, value ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 82, 83)
 	if err != nil {
 		return "", err
@@ -1286,24 +1241,21 @@ func klee(cc *context, value ...string) (string, error) {
 func hutaoken(cc *context, value ...string) (string, error) {
 	_ = value
 	var wg sync.WaitGroup
-	var err error
+	var errwg error
 	var m sync.Mutex
 	name := cc.usrdir + "hutaoken.gif"
 	c := dlrange("hutaoken", 2, &wg, func(e error) {
 		m.Lock()
-		err = e
+		errwg = e
 		m.Unlock()
 	})
-	if err != nil {
-		return "", err
-	}
 	tou, err := cc.getLogo(55, 55)
 	if err != nil {
 		return "", err
 	}
 	wg.Wait()
-	if err != nil {
-		return "", err
+	if errwg != nil {
+		return "", errwg
 	}
 	imgs, err := loadFirstFrames(c, 2)
 	if err != nil {
@@ -1320,21 +1272,22 @@ func hutaoken(cc *context, value ...string) (string, error) {
 func lick(cc *context, value ...string) (string, error) {
 	_ = value
 	var wg sync.WaitGroup
-	var err error
+	var errwg error
 	var m sync.Mutex
 	name := cc.usrdir + "lick.gif"
 	c := dlrange("lick", 2, &wg, func(e error) {
 		m.Lock()
-		err = e
+		errwg = e
 		m.Unlock()
 	})
-	if err != nil {
-		return "", err
-	}
 	tou, err := cc.getLogo(100, 100)
 	if err != nil {
 		return "", err
 	}
+	wg.Wait()
+	if errwg != nil {
+		return "", errwg
+	}
 	imgs, err := loadFirstFrames(c, 2)
 	if err != nil {
 		return "", err
@@ -1359,10 +1312,10 @@ func tiqiu(cc *context, value ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	tou, err := cc.getLogo(78, 78)
 	if err != nil {
 		return "", err
@@ -1383,24 +1336,21 @@ func tiqiu(cc *context, value ...string) (string, error) {
 func cai(cc *context, value ...string) (string, error) {
 	_ = value
 	var wg sync.WaitGroup
-	var err error
+	var errwg error
 	var m sync.Mutex
 	name := cc.usrdir + "cai.gif"
 	c := dlrange("cai", 5, &wg, func(e error) {
 		m.Lock()
-		err = e
+		errwg = 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
+	if errwg != nil {
+		return "", errwg
 	}
 	imgs, err := loadFirstFrames(c, 5)
 	if err != nil {
@@ -1430,10 +1380,10 @@ func whirl(cc *context, value ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	tou, err := cc.getLogo(0, 0)
 	if err != nil {
 		return "", err
@@ -1448,3 +1398,52 @@ func whirl(cc *context, value ...string) (string, error) {
 	}
 	return "file:///" + name, writer.SaveGIF2Path(name, img.MergeGif(7, whirl))
 }
+
+// always 一直
+func alwaysDoGif(cc *context, value ...string) (string, error) {
+	_ = value
+	var err error
+	var face []*image.NRGBA
+	name := cc.usrdir + "AlwaysDo.gif"
+	face, err = img.LoadAllFrames(cc.headimgsdir[0], 500, 500)
+	if err != nil {
+		// 载入失败尝试载入第一帧
+		face = make([]*image.NRGBA, 0)
+		first, err := img.LoadFirstFrame(cc.headimgsdir[0], 500, 500)
+		if err != nil {
+			return "", err
+		}
+		face = append(face, first.Im)
+	}
+	canvas := gg.NewContext(500, 600)
+	canvas.SetColor(color.Black)
+	_, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true)
+	if err != nil {
+		return "", err
+	}
+	err = canvas.LoadFontFace(text.BoldFontFile, 40)
+	if err != nil {
+		return "", err
+	}
+	length := len(face)
+	if length > 50 {
+		length = 50
+	}
+	arg := "要我一直"
+	l, _ := canvas.MeasureString(arg)
+	if l > 500 {
+		return "", errors.New("文字消息太长了")
+	}
+	turn := make([]*image.NRGBA, length)
+	for i, f := range face {
+		canvas := gg.NewContext(500, 600)
+		canvas.DrawImage(f, 0, 0)
+		canvas.SetColor(color.Black)
+		_ = canvas.LoadFontFace(text.BoldFontFile, 40)
+		canvas.DrawString(arg, 280-l, 560)
+		canvas.DrawImage(img.Size(f, 90, 90).Im, 280, 505)
+		canvas.DrawString("吗", 370, 560)
+		turn[i] = img.Size(canvas.Image(), 0, 0).Im
+	}
+	return "file:///" + name, writer.SaveGIF2Path(name, img.MergeGif(8, turn))
+}

plugin/gif/logo.go

@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/FloatTech/zbputils/file"
+	"github.com/FloatTech/floatbox/file"
 	"github.com/FloatTech/zbputils/img"
 )
 

plugin/gif/png.go

@@ -9,10 +9,11 @@ import (
 	"sync"
 
 	"github.com/Coloured-glaze/gg"
-	"github.com/FloatTech/zbputils/file"
+	"github.com/FloatTech/floatbox/file"
+	"github.com/FloatTech/floatbox/img/writer"
+	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/img"
 	"github.com/FloatTech/zbputils/img/text"
-	"github.com/FloatTech/zbputils/img/writer"
 )
 
 // pa 爬
@@ -204,10 +205,10 @@ func alike(cc *context, args ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	imgs, err := loadFirstFrames(c, 1)
 	if err != nil {
 		return "", err
@@ -232,10 +233,10 @@ func marriage(cc *context, args ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	imgs, err := loadFirstFrames(c, 2)
 	if err != nil {
 		return "", err
@@ -260,10 +261,10 @@ func anyasuki(cc *context, args ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	name := cc.usrdir + "Anyasuki.png"
 	back, err := gg.LoadImage(c[0])
 	if err != nil {
@@ -277,7 +278,7 @@ func anyasuki(cc *context, args ...string) (string, error) {
 	canvas.DrawImage(img.Size(face, 347, 267).Im, 82, 53)
 	canvas.DrawImage(back, 0, 0)
 	canvas.SetColor(color.Black)
-	_, err = file.GetLazyData(text.BoldFontFile, true)
+	_, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true)
 	if err != nil {
 		return "", err
 	}
@@ -306,10 +307,10 @@ func alwaysLike(cc *context, args ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	name := cc.usrdir + "AlwaysLike.png"
 	back, err := gg.LoadImage(c[0])
 	if err != nil {
@@ -323,7 +324,7 @@ func alwaysLike(cc *context, args ...string) (string, error) {
 	canvas.DrawImage(back, 0, 0)
 	canvas.DrawImage(img.Size(face, 380, 380).Im, 44, 74)
 	canvas.SetColor(color.Black)
-	_, err = file.GetLazyData(text.BoldFontFile, true)
+	_, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true)
 	if err != nil {
 		return "", err
 	}
@@ -353,10 +354,10 @@ func decentKiss(cc *context, args ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	imgs, err := loadFirstFrames(c, 1)
 	if err != nil {
 		return "", err
@@ -381,10 +382,10 @@ func chinaFlag(cc *context, args ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	imgs, err := loadFirstFrames(c, 1)
 	if err != nil {
 		return "", err
@@ -409,10 +410,10 @@ func dontTouch(cc *context, args ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	imgs, err := loadFirstFrames(c, 1)
 	if err != nil {
 		return "", err
@@ -437,7 +438,7 @@ func universal(cc *context, args ...string) (string, error) {
 	canvas := gg.NewContext(500, 550)
 	canvas.DrawImage(img.Size(face, 500, 500).Im, 0, 0)
 	canvas.SetColor(color.Black)
-	_, err = file.GetLazyData(text.BoldFontFile, true)
+	_, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true)
 	if err != nil {
 		return "", err
 	}
@@ -466,10 +467,10 @@ func interview(cc *context, args ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	name := cc.usrdir + "Interview.png"
 	huaji, err := gg.LoadImage(c[0])
 	if err != nil {
@@ -488,7 +489,7 @@ func interview(cc *context, args ...string) (string, error) {
 	canvas.DrawImage(huaji, 376, 50)
 	canvas.DrawImage(microphone, 300, 50)
 	canvas.SetColor(color.Black)
-	_, err = file.GetLazyData(text.BoldFontFile, true)
+	_, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true)
 	if err != nil {
 		return "", err
 	}
@@ -517,10 +518,10 @@ func need(cc *context, args ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	imgs, err := loadFirstFrames(c, 1)
 	if err != nil {
 		return "", err
@@ -545,10 +546,10 @@ func paint(cc *context, args ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	imgs, err := loadFirstFrames(c, 1)
 	if err != nil {
 		return "", err
@@ -573,10 +574,10 @@ func painter(cc *context, args ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	imgs, err := loadFirstFrames(c, 1)
 	if err != nil {
 		return "", err
@@ -601,10 +602,10 @@ func perfect(cc *context, args ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	imgs, err := loadFirstFrames(c, 1)
 	if err != nil {
 		return "", err
@@ -629,10 +630,10 @@ func playGame(cc *context, args ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	name := cc.usrdir + "PlayGame.png"
 	back, err := gg.LoadImage(c[0])
 	if err != nil {
@@ -646,7 +647,7 @@ func playGame(cc *context, args ...string) (string, error) {
 	canvas.DrawImage(img.Rotate(face, 10, 225, 160).Im, 161, 117)
 	canvas.DrawImage(back, 0, 0)
 	canvas.SetColor(color.Black)
-	_, err = file.GetLazyData(text.BoldFontFile, true)
+	_, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true)
 	if err != nil {
 		return "", err
 	}
@@ -675,10 +676,10 @@ func police(cc *context, args ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	imgs, err := loadFirstFrames(c, 2)
 	if err != nil {
 		return "", err
@@ -703,10 +704,10 @@ func police1(cc *context, args ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	imgs, err := loadFirstFrames(c, 2)
 	if err != nil {
 		return "", err
@@ -731,10 +732,10 @@ func prpr(cc *context, args ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	imgs, err := loadFirstFrames(c, 1)
 	if err != nil {
 		return "", err
@@ -759,10 +760,10 @@ func safeSense(cc *context, args ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	name := cc.usrdir + "SafeSense.png"
 	back, err := gg.LoadImage(c[0])
 	if err != nil {
@@ -776,7 +777,7 @@ func safeSense(cc *context, args ...string) (string, error) {
 	canvas.DrawImage(back, 0, 0)
 	canvas.DrawImage(img.Size(face, 215, 343).Im, 215, 135)
 	canvas.SetColor(color.Black)
-	_, err = file.GetLazyData(text.BoldFontFile, true)
+	_, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true)
 	if err != nil {
 		return "", err
 	}
@@ -807,10 +808,10 @@ func support(cc *context, args ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	imgs, err := loadFirstFrames(c, 1)
 	if err != nil {
 		return "", err
@@ -835,10 +836,10 @@ func thinkwhat(cc *context, args ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	imgs, err := loadFirstFrames(c, 1)
 	if err != nil {
 		return "", err
@@ -863,10 +864,10 @@ func wallpaper(cc *context, args ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	imgs, err := loadFirstFrames(c, 1)
 	if err != nil {
 		return "", err
@@ -891,10 +892,10 @@ func whyatme(cc *context, args ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	imgs, err := loadFirstFrames(c, 1)
 	if err != nil {
 		return "", err
@@ -919,10 +920,10 @@ func makeFriend(cc *context, args ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	name := cc.usrdir + "MakeFriend.png"
 	back, err := gg.LoadImage(c[0])
 	if err != nil {
@@ -938,7 +939,7 @@ func makeFriend(cc *context, args ...string) (string, error) {
 	canvas.DrawImage(img.Rotate(face, 9, 55, 55).Im, 836, 722)
 	canvas.DrawImage(back, 0, 0)
 	canvas.SetColor(color.White)
-	_, err = file.GetLazyData(text.BoldFontFile, true)
+	_, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true)
 	if err != nil {
 		return "", err
 	}
@@ -968,10 +969,10 @@ func backToWork(cc *context, args ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	imgs, err := loadFirstFrames(c, 1)
 	if err != nil {
 		return "", err
@@ -996,10 +997,10 @@ func coupon(cc *context, args ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	name := cc.usrdir + "Coupon.png"
 	if args[0] == "" {
 		args[0] = "群主陪睡券"
@@ -1017,7 +1018,7 @@ func coupon(cc *context, args ...string) (string, error) {
 	canvas.Rotate(gg.Radians(-22))
 	canvas.DrawImage(img.Size(face, 60, 60).Im, 100, 163)
 	canvas.SetColor(color.Black)
-	_, err = file.GetLazyData(text.BoldFontFile, true)
+	_, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true)
 	if err != nil {
 		return "", err
 	}
@@ -1047,10 +1048,10 @@ func distracted(cc *context, args ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	imgs, err := loadFirstFrames(c, 2)
 	if err != nil {
 		return "", err
@@ -1075,10 +1076,10 @@ func throw(cc *context, args ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	imgs, err := loadFirstFrames(c, 1)
 	if err != nil {
 		return "", err
@@ -1103,10 +1104,10 @@ func yuanli(cc *context, args ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	imgs, err := loadFirstFrames(c, 1)
 	if err != nil {
 		return "", err
@@ -1131,10 +1132,10 @@ func nowife(cc *context, args ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	imgs, err := loadFirstFrames(c, 1)
 	if err != nil {
 		return "", err
@@ -1159,10 +1160,10 @@ func youer(cc *context, args ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	name := cc.usrdir + "youer.png"
 	back, err := gg.LoadImage(c[0])
 	if err != nil {
@@ -1172,15 +1173,11 @@ func youer(cc *context, args ...string) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
-	if err != nil {
-		return "", err
-	}
 	canvas := gg.NewContext(690, 690)
 	canvas.DrawImage(back, 0, 0)
 	canvas.DrawImage(img.Size(tou, 350, 350).Im, 55, 165)
 	canvas.SetColor(color.Black)
-	_, err = file.GetLazyData(text.BoldFontFile, true)
+	_, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true)
 	if err != nil {
 		return "", err
 	}
@@ -1210,10 +1207,10 @@ func xiaotianshi(cc *context, args ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	name := cc.usrdir + "xiaotianshi.png"
 	back, err := gg.LoadImage(c[0])
 	if err != nil {
@@ -1223,15 +1220,11 @@ func xiaotianshi(cc *context, args ...string) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
-	if err != nil {
-		return "", err
-	}
 	canvas := gg.NewContext(522, 665)
 	canvas.DrawImage(back, 0, 0)
 	canvas.DrawImage(img.Size(face, 480, 480).Im, 20, 80)
 	canvas.SetColor(color.Black)
-	_, err = file.GetLazyData(text.BoldFontFile, true)
+	_, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true)
 	if err != nil {
 		return "", err
 	}
@@ -1261,10 +1254,10 @@ func neko(cc *context, args ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	imgs, err := loadFirstFrames(c, 1)
 	if err != nil {
 		return "", err
@@ -1290,10 +1283,10 @@ func bian(cc *context, args ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	imgs, err := loadFirstFrames(c, 1)
 	if err != nil {
 		return "", err
@@ -1318,10 +1311,10 @@ func van(cc *context, args ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	name := cc.usrdir + "van.png"
 	back, err := gg.LoadImage(c[0])
 	if err != nil {
@@ -1331,15 +1324,11 @@ func van(cc *context, args ...string) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
-	if err != nil {
-		return "", err
-	}
 	canvas := gg.NewContext(522, 665)
 	canvas.DrawImage(back, 0, 0)
 	canvas.DrawImage(img.Size(face, 480, 480).Im, 20, 80)
 	canvas.SetColor(color.Black)
-	_, err = file.GetLazyData(text.BoldFontFile, true)
+	_, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true)
 	if err != nil {
 		return "", err
 	}
@@ -1369,10 +1358,10 @@ func eihei(cc *context, args ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	imgs, err := loadFirstFrames(c, 1)
 	if err != nil {
 		return "", err
@@ -1397,10 +1386,10 @@ func fanfa(cc *context, args ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	imgs, err := loadFirstFrames(c, 1)
 	if err != nil {
 		return "", err
@@ -1426,10 +1415,10 @@ func huai(cc *context, args ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	imgs, err := loadFirstFrames(c, 1)
 	if err != nil {
 		return "", err
@@ -1454,10 +1443,10 @@ func haowan(cc *context, args ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	imgs, err := loadFirstFrames(c, 1)
 	if err != nil {
 		return "", err
@@ -1482,10 +1471,10 @@ func mengbi(cc *context, args ...string) (string, error) {
 		err = e
 		m.Unlock()
 	})
+	wg.Wait()
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
 	name := cc.usrdir + "mengbi.png"
 	back, err := gg.LoadImage(c[0])
 	if err != nil {
@@ -1495,16 +1484,12 @@ func mengbi(cc *context, args ...string) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	wg.Wait()
-	if err != nil {
-		return "", err
-	}
 	canvas := gg.NewContext(1080, 1080)
 	canvas.DrawImage(back, 0, 0)
 	canvas.DrawImage(img.Size(face, 100, 100).Im, 392, 460)
 	canvas.DrawImage(img.Size(face, 100, 100).Im, 606, 443)
 	canvas.SetColor(color.Black)
-	_, err = file.GetLazyData(text.BoldFontFile, true)
+	_, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true)
 	if err != nil {
 		return "", err
 	}

plugin/gif/run.go

@@ -5,10 +5,10 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/FloatTech/floatbox/file"
 	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"
 )
@@ -118,6 +118,7 @@ var (
 		"我老婆":    nowife,
 		"远离":     yuanli,
 		"抬棺":     taiguan,
+		"一直":     alwaysDoGif,
 	}
 )
 
@@ -127,7 +128,8 @@ func init() { // 插件主体
 	}
 	en := control.Register("gif", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
-		Help: "GIF制图，命令后艾特群友/QQ号/一张图方可触发命令\n其中XXX可以为任何文字，可以不写\n对机器人操作请先艾特机器人再执行命令\n" +
+		Brief:            "制图",
+		Help: "下为制图命令: " +
 			"- 搓|-冲|-摸|-拍|-丢|-吃|-敲|-啃|-蹭|-爬|-撕|-灰度|-上翻|-下翻\n" +
 			"- 左翻|-右翻|-反色|-浮雕|- 打码|- 负片|- 旋转|- 变形|- 亲\n" +
 			"- 结婚申请|结婚登记|- 阿尼亚喜欢XXX|- 像只|- 我永远喜欢XXX\n" +
@@ -140,7 +142,10 @@ func init() { // 插件主体
 			"- 抬棺|- 远离|- 我老婆|- 小天使XXX|- 你的XXX|- 不要看\n" +
 			"- 玩一下XXX|- 给我变|- 揍|- 吞|- 膜拜|- 诶嘿|- 2蹭|- 你犯法了\n" +
 			"- 砰|- 注意力涣散|- 蒙蔽|- 踩|- 好玩|- 2转|- 踢球|- 2舔|\n" +
-			"- 可莉吃|- 胡桃啃|- 怀",
+			"- 可莉吃|- 胡桃啃|- 怀|- 一直(支持动图)\n" +
+			"例: 制图命令XXX[@用户|QQ号|图片]" +
+			"Tips: XXX可以为限制长度的任何文字\n" +
+			"对Bot使用为 @Bot制图命令[XXX]@Bot",
 		PrivateDataFolder: "gif",
 	}).ApplySingle(ctxext.DefaultSingle)
 	datapath = file.BOTPATH + "/" + en.DataFolder()
@@ -150,13 +155,13 @@ func init() { // 插件主体
 		list := ctx.State["regex_matched"].([]string)
 		err := c.prepareLogos(list[4]+list[5]+list[6], strconv.FormatInt(ctx.Event.UserID, 10))
 		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
+			ctx.SendChain(message.Text("ERROR: ", err))
 			return
 		}
 		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))
+			ctx.SendChain(message.Text("ERROR: ", err))
 			return
 		}
 		ctx.SendChain(message.Image(picurl))

plugin/github/repo_searcher.go

@@ -20,8 +20,8 @@ import (
 func init() { // 插件主体
 	control.Register("github", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
-		Help: "GitHub仓库搜索\n" +
-			"- >github [xxx]\n" +
+		Brief:            "GitHub仓库搜索",
+		Help: "- >github [xxx]\n" +
 			"- >github -p [xxx]",
 	}).OnRegex(`^>github\s(-.{1,10}? )?(.*)$`).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
@@ -35,12 +35,12 @@ func init() { // 插件主体
 			}.Encode()
 			body, err := netGet(api.String(), header)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
+				ctx.SendChain(message.Text("ERROR: ", err))
 			}
 			// 解析请求
 			info := gjson.ParseBytes(body)
 			if info.Get("total_count").Int() == 0 {
-				ctx.SendChain(message.Text("ERROR:没有找到这样的仓库"))
+				ctx.SendChain(message.Text("ERROR: 没有找到这样的仓库"))
 				return
 			}
 			repo := info.Get("items.0")

plugin/guessmusic/apiservice.go

@@ -0,0 +1,473 @@
+package guessmusic
+
+import (
+	"encoding/json"
+	"math/rand"
+	"net/url"
+	"os"
+	"strconv"
+	"strings"
+	"time"
+
+	wyy "github.com/FloatTech/AnimeAPI/neteasemusic"
+	"github.com/FloatTech/floatbox/file"
+	"github.com/FloatTech/floatbox/web"
+	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/pkg/errors"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+)
+
+func init() {
+	// API配置
+	engine.OnPrefix("设置猜歌API", zero.SuperUserPermission).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			option := ctx.State["args"].(string)
+			if option == "帮助" {
+				ctx.SendChain(message.Text(
+					"项目地址:binaryify.github.io/NeteaseCloudMusicApi" +
+						"\n网上有基于该框架的API,可以自行搜索白嫖。\n" +
+						"添加API指令:\n设置猜歌API [API首页网址]"))
+				return
+			}
+			if !strings.HasSuffix(option, "/") {
+				option += "/"
+			}
+			cfg.APIURL = option
+			err := saveConfig(cfgFile)
+			if err == nil {
+				ctx.SendChain(message.Text("成功！"))
+			} else {
+				ctx.SendChain(message.Text(serviceErr, err))
+			}
+		})
+	// API配置
+	engine.OnRegex(`^猜歌(开启|关闭)(歌单|歌词)自动下载`, zero.SuperUserPermission).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			swtich := ctx.State["regex_matched"].([]string)[1]
+			option := ctx.State["regex_matched"].([]string)[2]
+			chose := true
+			if swtich == "关闭" {
+				chose = false
+			}
+			if option == "歌单" {
+				cfg.API = chose
+			} else {
+				cfg.Local = chose
+			}
+			err := saveConfig(cfgFile)
+			if err == nil {
+				ctx.SendChain(message.Text("成功！"))
+			} else {
+				ctx.SendChain(message.Text(serviceErr, 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 := cfg.APIURL + "login/qr/key"
+			data, err := web.GetData(keyURL)
+			if err != nil {
+				ctx.SendChain(message.Text(serviceErr, "获取网易云key失败,", err))
+				return
+			}
+			var keyInfo keyInfo
+			err = json.Unmarshal(data, &keyInfo)
+			if err != nil {
+				ctx.SendChain(message.Text(serviceErr, "解析网易云key失败,", err))
+				return
+			}
+			qrURL := cfg.APIURL + "login/qr/create?key=" + keyInfo.Data.Unikey + "&qrimg=1"
+			data, err = web.GetData(qrURL)
+			if err != nil {
+				ctx.SendChain(message.Text(serviceErr, "获取网易云二维码失败,", err))
+				return
+			}
+			var qrInfo qrInfo
+			err = json.Unmarshal(data, &qrInfo)
+			if err != nil {
+				ctx.SendChain(message.Text(serviceErr, "解析网易云二维码失败,", 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 := cfg.APIURL + "login/qr/check?key=" + url.QueryEscape(keyInfo.Data.Unikey)
+				data, err := web.GetData(APIURL)
+				if err != nil {
+					ctx.SendChain(message.Text(serviceErr, "无法获取登录状态,", err))
+					return
+				}
+				var cookiesInfo cookyInfo
+				err = json.Unmarshal(data, &cookiesInfo)
+				if err != nil {
+					ctx.SendChain(message.Text(serviceErr, "解析登录状态失败,", 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(serviceErr, 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*((https:\/\/music\.163\.com\/#\/playlist\?id=)?(\d+)|http:\/\/music\.163\.com\/playlist\/(\d+).*)$`).SetBlock(true).Limit(ctxext.LimitByGroup).
+		Handle(func(ctx *zero.Ctx) {
+			listID := ctx.State["regex_matched"].([]string)[3] + ctx.State["regex_matched"].([]string)[4]
+			_, err := strconv.ParseInt(listID, 10, 64)
+			if err != nil {
+				ctx.SendChain(message.Text("请输入正确的歌单ID或者歌单连接"))
+				return
+			}
+			APIURL := cfg.APIURL + "playlist/detail?id=" + listID
+			data, err := web.GetData(APIURL)
+			if err != nil {
+				ctx.SendChain(message.Text("无法连接歌单,", err))
+				return
+			}
+			var parsed listInfoOfAPI
+			err = json.Unmarshal(data, &parsed)
+			if err != nil {
+				ctx.SendChain(message.Text("无法解析歌单ID内容,", 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"),
+				))
+		})
+	// 本地绑定网易云歌单ID
+	engine.OnRegex(`^(.*)绑定网易云\s*((https:\/\/music\.163\.com\/#\/playlist\?id=)?(\d+)|http:\/\/music\.163\.com\/playlist\/(\d+).*)$`, zero.SuperUserPermission).SetBlock(true).Limit(ctxext.LimitByGroup).
+		Handle(func(ctx *zero.Ctx) {
+			listName := ctx.State["regex_matched"].([]string)[1]
+			listID := ctx.State["regex_matched"].([]string)[4] + ctx.State["regex_matched"].([]string)[5]
+			ctx.SendChain(message.Text("正在校验歌单信息,请稍等"))
+			pathOfMusic := cfg.MusicPath + listName + "/"
+			if file.IsNotExist(pathOfMusic) {
+				ctx.SendChain(message.Text(serviceErr, "歌单不存在于本地"))
+				return
+			}
+			// 是否存在该歌单
+			APIURL := cfg.APIURL + "playlist/track/all?id=" + listID
+			data, err := web.GetData(APIURL)
+			if err != nil {
+				ctx.SendChain(message.Text(serviceErr, err))
+				return
+			}
+			var parsed musicListOfApI
+			err = json.Unmarshal(data, &parsed)
+			if err != nil {
+				ctx.SendChain(message.Text(serviceErr, "无法解析歌单ID内容,", err))
+				return
+			}
+			if parsed.Code != 200 {
+				ctx.SendChain(message.Text(serviceErr, parsed.Code))
+				return
+			}
+			mid, _ := strconv.ParseInt(listID, 10, 64)
+			cfg.Playlist = append(cfg.Playlist, listRaw{
+				Name: listName,
+				ID:   mid,
+			})
+			err = saveConfig(cfgFile)
+			if err == nil {
+				ctx.SendChain(message.Text("成功！"))
+			} else {
+				ctx.SendChain(message.Text(serviceErr, err))
+			}
+		})
+	engine.OnPrefix("解除绑定", zero.SuperUserPermission).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			delList := ctx.State["args"].(string)
+			filelist, err := getlist(cfg.MusicPath)
+			if err != nil {
+				ctx.SendChain(message.Text(serviceErr, err))
+				return
+			}
+			var playID int64
+			for _, listinfo := range filelist {
+				if delList == listinfo.Name {
+					playID = listinfo.ID
+					break
+				}
+			}
+			// 删除ID
+			if playID == 0 { // 如果ID没有且没删除文件
+				ctx.SendChain(message.Text("歌单名称错误或者该歌单并没有绑定网易云,可以发送“歌单列表”获取歌单名称"))
+				return
+			}
+			index := -1
+			for i, list := range cfg.Playlist {
+				if playID == list.ID {
+					index = i
+					break
+				}
+			}
+			if index == -1 {
+				ctx.SendChain(message.Text("歌单名称错误或者该歌单并没有绑定网易云,可以发送“歌单列表”获取歌单名称"))
+				return
+			}
+			cfg.Playlist = append(cfg.Playlist[:index], cfg.Playlist[index+1:]...)
+			err = saveConfig(cfgFile)
+			if err != nil {
+				ctx.SendChain(message.Text(serviceErr, err))
+				return
+			}
+			if err == nil {
+				ctx.SendChain(message.Text("成功！"))
+			} else {
+				ctx.SendChain(message.Text(serviceErr, err))
+			}
+		})
+	// 下载歌曲到对应的歌单里面
+	engine.OnRegex(`^下载歌单\s*((https:\/\/music\.163\.com\/#\/playlist\?id=)?(\d+)|http:\/\/music\.163\.com\/playlist\/(\d+).*[^\s$])\s*到\s*(.*)$`, zero.SuperUserPermission).SetBlock(true).Limit(ctxext.LimitByGroup).
+		Handle(func(ctx *zero.Ctx) {
+			keyword := ctx.State["regex_matched"].([]string)[3] + ctx.State["regex_matched"].([]string)[4]
+			listName := ctx.State["regex_matched"].([]string)[5]
+			ctx.SendChain(message.Text("正在校验歌单信息,请稍等"))
+			// 是否存在该歌单
+			if file.IsNotExist(cfg.MusicPath + listName) {
+				ctx.SendChain(message.Text("歌单不存在,是否创建？(是/否)"))
+				next := zero.NewFutureEvent("message", 999, false, zero.OnlyGroup, zero.RegexRule(`(是|否)`), ctx.CheckSession())
+				recv, cancel := next.Repeat()
+				defer cancel()
+				wait := time.NewTimer(120 * time.Second)
+				answer := ""
+				for {
+					select {
+					case <-wait.C:
+						wait.Stop()
+						ctx.SendChain(message.Text("等待超时,取消下载"))
+						return
+					case c := <-recv:
+						wait.Stop()
+						answer = c.Event.Message.String()
+					}
+					if answer == "否" {
+						ctx.SendChain(message.Text("下载已经取消"))
+						return
+					}
+					if answer != "" {
+						break
+					}
+				}
+				err := os.MkdirAll(cfg.MusicPath+listName, 0755)
+				if err != nil {
+					ctx.SendChain(message.Text(serviceErr, err))
+					return
+				}
+			}
+			ctx.SendChain(message.Text("开始下载歌曲,需要一定时间下载,请稍等"))
+			listID, err := strconv.ParseInt(keyword, 10, 64)
+			if err == nil {
+				err = downloadlist(listID, cfg.MusicPath+listName+"/")
+			}
+			if err == nil {
+				ctx.SendChain(message.Text("成功！"))
+			} else {
+				ctx.SendChain(message.Text(serviceErr, err))
+			}
+		})
+}
+
+// 随机从歌单下载歌曲(歌单ID, 音乐保存路径)
+func drawByAPI(playlistID int64, musicPath string) (musicName string, err error) {
+	APIURL := cfg.APIURL + "playlist/track/all?id=" + strconv.FormatInt(playlistID, 10)
+	data, err := web.GetData(APIURL)
+	if err != nil {
+		err = errors.Errorf("无法获取歌单列表\n%s", err)
+		return
+	}
+	var parsed musicListOfApI
+	err = json.Unmarshal(data, &parsed)
+	if err != nil {
+		err = errors.Errorf("无法读取歌单列表\n%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
+	}
+	if cource != "" {
+		name += " - " + artistName + " - " + cource
+	} else {
+		name += " - " + artistName
+	}
+	// 下载歌曲
+	err = wyy.DownloadMusic(musicID, name, musicPath)
+	if err == nil {
+		musicName = name + ".mp3"
+		if cfg.Local {
+			// 下载歌词
+			_ = wyy.DownloadLrc(musicID, name, musicPath+"歌词/")
+		}
+	}
+	return
+}
+
+// 下载歌单歌曲(歌单ID, 音乐保存路径)
+func downloadlist(playlistID int64, musicPath string) error {
+	APIURL := cfg.APIURL + "playlist/track/all?id=" + strconv.FormatInt(playlistID, 10)
+	data, err := web.GetData(APIURL)
+	if err != nil {
+		return err
+	}
+	var parsed musicListOfApI
+	err = json.Unmarshal(data, &parsed)
+	if err != nil {
+		return err
+	}
+	if parsed.Code != 200 {
+		err = errors.Errorf("requset code : %d", parsed.Code)
+		return err
+	}
+	for _, info := range parsed.Songs {
+		// 将"/"符号去除,不然无法生成文件
+		musicName := strings.ReplaceAll(info.Name, "/", "·")
+		musicID := info.ID
+		artistName := ""
+		for i, ARInfo := range info.Ar {
+			if i != 0 {
+				artistName += "&" + ARInfo.Name
+			} else {
+				artistName += ARInfo.Name
+			}
+		}
+		cource := ""
+		if info.Alia != nil {
+			cource = strings.Join(info.Alia, "&")
+			// 将"/"符号去除,不然无法下载
+			cource = strings.ReplaceAll(cource, "/", "&")
+		}
+		if musicName == "" || musicID == 0 {
+			err = errors.New("无法获API取歌曲信息")
+			return err
+		}
+		if cource != "" {
+			musicName += " - " + artistName + " - " + cource
+		} else {
+			musicName += " - " + artistName
+		}
+		// 下载歌曲
+		err = wyy.DownloadMusic(musicID, musicName, musicPath)
+		if err == nil {
+			if cfg.Local {
+				// 下载歌词
+				_ = wyy.DownloadLrc(musicID, musicName, musicPath+"歌词/")
+			}
+		}
+	}
+	return nil
+}
+
+/*****************************************************************/
+/**************************独角兽API*******************************/
+/*****************************************************************/
+// 下载从独角兽抽到的歌曲ID(歌单ID, 音乐保存路径, 歌词保存路径)
+func downloadByOvooa(playlistID int64, musicPath string) (musicName string, err error) {
+	// 抽取歌曲
+	mid, err := drawByOvooa(playlistID)
+	if err != nil {
+		err = errors.Errorf("API%s", err)
+		return
+	}
+	// 获取完成的歌名
+	musiclist, err := wyy.SearchMusic(strconv.Itoa(mid), 1)
+	if err != nil {
+		err = errors.Errorf("API歌曲下载ERROR: %s", err)
+		return
+	}
+	// 歌曲ID理论是唯一的
+	mun := len(musiclist)
+	if mun == 1 {
+		// 拉取歌名
+		musicList := make([]string, mun)
+		i := 0
+		for musicName := range musiclist {
+			musicList[i] = musicName
+		}
+		name := musicList[0]
+		// 下载歌曲
+		err = wyy.DownloadMusic(mid, name, musicPath)
+		if err == nil {
+			musicName = name + ".mp3"
+			if cfg.Local {
+				// 下载歌词
+				_ = wyy.DownloadLrc(mid, name, musicPath+"歌词/")
+			}
+		}
+	} else {
+		err = errors.Errorf("music IDThis music ID sreached munber is %d", mun)
+	}
+	return
+}
+
+// 通过独角兽API随机抽取歌单歌曲ID(参数：歌单ID)
+func drawByOvooa(playlistID int64) (musicID int, err error) {
+	APIURL := "https://ovooa.com/API/163_Music_Rand/api.php?id=" + strconv.FormatInt(playlistID, 10)
+	data, err := web.GetData(APIURL)
+	if err != nil {
+		return
+	}
+	var parsed ovooaData
+	err = json.Unmarshal(data, &parsed)
+	if err != nil {
+		return
+	}
+	if parsed.Code != 1 {
+		return
+	}
+	return parsed.Data.ID, nil
+}

plugin/guessmusic/guessmusic.go

@@ -0,0 +1,336 @@
+package guessmusic
+
+import (
+	"bytes"
+	"io/fs"
+	"math/rand"
+	"os"
+	"os/exec"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/FloatTech/floatbox/file"
+	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/pkg/errors"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+)
+
+var cuttime = [...]string{"00:00:05", "00:00:30", "00:01:00"} // 音乐切割时间点,可自行调节时间（时：分：秒）
+
+func init() {
+	engine.OnRegex(`^(个人|团队)猜歌(-(.*))?$`, zero.OnlyGroup).SetBlock(true).Limit(ctxext.LimitByGroup).
+		Handle(func(ctx *zero.Ctx) {
+			mode := ctx.State["regex_matched"].([]string)[3]
+			gid := ctx.Event.GroupID
+			// 获取本地列表
+			filelist, err := getlist(cfg.MusicPath)
+			if err != nil {
+				ctx.SendChain(message.Text(serviceErr, err))
+				return
+			}
+			// 加载默认歌单
+			if mode == "" {
+				index := -1
+				for i, dlist := range cfg.Defaultlist {
+					if dlist.GroupID == gid {
+						index = i
+						break
+					}
+				}
+				if index == -1 {
+					// 如果没有设置就默认第一个文件夹
+					mode = filelist[0].Name
+				} else {
+					mode = cfg.Defaultlist[index].Name
+					ok := true
+					for _, listinfo := range filelist {
+						if mode == listinfo.Name {
+							ok = false
+							break
+						}
+					}
+					// 如果默认的歌单不存在了清空设置
+					if ok {
+						cfg.Defaultlist = append(cfg.Defaultlist[:index], cfg.Defaultlist[index+1:]...)
+						_ = saveConfig(cfgFile)
+						mode = filelist[0].Name
+					}
+				}
+			}
+			ctx.SendChain(message.Text("正在准备歌曲,请稍等\n回答“-[歌曲信息(歌名歌手等)|提示|取消]”\n一共3段语音,6次机会"))
+			// 随机抽歌
+			pathOfMusic, musicName, err := musicLottery(cfg.MusicPath, mode)
+			if err != nil {
+				ctx.SendChain(message.Text(serviceErr, 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 + strconv.FormatInt(gid, 10) + "/"
+			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, "\n\n\n下面欣赏猜歌的歌曲")))
+							ctx.SendChain(message.Record("file:///" + pathOfMusic + musicName))
+							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, "\n\n下面欣赏猜歌的歌曲")))
+						ctx.SendChain(message.Record("file:///" + pathOfMusic + musicName))
+						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, "\n\n下面欣赏猜歌的歌曲")))
+						ctx.SendChain(message.Record("file:///" + pathOfMusic + musicName))
+						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, "\n\n下面欣赏猜歌的歌曲")))
+						ctx.SendChain(message.Record("file:///" + pathOfMusic + musicName))
+						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, "\n\n下面欣赏猜歌的歌曲")))
+							ctx.SendChain(message.Record("file:///" + pathOfMusic + musicName))
+							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 musicLottery(musicPath, listName string) (pathOfMusic, musicName string, err error) {
+	// 读取歌单文件
+	pathOfMusic = musicPath + listName + "/"
+	if file.IsNotExist(pathOfMusic) {
+		err = errors.New("指定的歌单不存在")
+		return
+	}
+	files, err := os.ReadDir(pathOfMusic)
+	if err != nil {
+		return
+	}
+	// 获取绑定的网易云
+	var playlistID int64
+	for _, listinfo := range cfg.Playlist {
+		if listinfo.Name == listName {
+			playlistID = listinfo.ID
+		}
+	}
+	// 如果本地列表为空
+	if len(files) == 0 {
+		if playlistID == 0 || !cfg.API {
+			err = errors.New("本地歌单数据为0")
+			return
+		}
+		// 如果绑定了歌单ID
+		if cfg.APIURL == "" {
+			// 如果没有配置过API地址,尝试连接独角兽
+			musicName, err = downloadByOvooa(playlistID, pathOfMusic)
+			if err != nil {
+				err = errors.Errorf("本地歌单数据为0,API下载歌曲失败\n%s", err)
+			}
+		} else {
+			// 从API中抽取歌曲
+			musicName, err = drawByAPI(playlistID, pathOfMusic)
+			if err != nil {
+				err = errors.Errorf("本地歌单数据为0,API下载歌曲失败\n%s", err)
+			}
+		}
+		return
+	}
+	// 进行随机抽取
+	if playlistID == 0 || !cfg.API {
+		musicName = getLocalMusic(files)
+	} else {
+		switch rand.Intn(3) { // 三分二概率抽取API的
+		case 1:
+			musicName = getLocalMusic(files)
+		default:
+			if cfg.APIURL == "" {
+				// 如果没有配置过API地址,尝试连接独角兽
+				musicName, err = downloadByOvooa(playlistID, pathOfMusic)
+			} else {
+				// 从API中抽取歌曲
+				musicName, err = drawByAPI(playlistID, pathOfMusic)
+			}
+			if err != nil {
+				musicName = getLocalMusic(files)
+				err = nil
+				return
+			}
+		}
+	}
+	return
+}
+
+// 从本地列表中随机抽取一首
+func getLocalMusic(files []fs.DirEntry) (musicName string) {
+	if len(files) > 1 {
+		music := files[rand.Intn(len(files))]
+		// 如果是文件夹就递归
+		if music.IsDir() {
+			musicName = getLocalMusic(files)
+		} else {
+			musicName = music.Name()
+		}
+	} else {
+		music := files[0]
+		if !music.IsDir() {
+			musicName = files[0].Name()
+		}
+	}
+	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

@@ -1,18 +1,39 @@
 package guessmusic
 
-type listRaw struct {
-	Name string `json:"name"`
-	ID   int64  `json:"id"`
-}
-
+// config内容
 type config struct {
-	MusicPath string    `json:"musicPath"`
-	Local     bool      `json:"local"`
-	API       bool      `json:"api"`
-	Cookie    string    `json:"cookie"`
-	Playlist  []listRaw `json:"playlist"`
+	MusicPath   string    `json:"musicPath"`
+	APIURL      string    `json:"apiURL"`
+	Playlist    []listRaw `json:"playlist"`
+	Defaultlist []dlist   `json:"defaultlist"`
+	Local       bool      `json:"local"`
+	API         bool      `json:"api"`
+	Cookie      string    `json:"cookie"`
 }
 
+// 记录歌单绑定的网易云歌单ID
+type listRaw struct {
+	Name string `json:"name"` // 歌单名称
+	ID   int64  `json:"id"`   // 歌单绑定的网易云ID
+}
+
+// 记录群默认猜歌
+type dlist struct {
+	GroupID int64  `json:"gid"`  // 群号
+	Name    string `json:"name"` // 歌单名称
+}
+
+// 本地歌单列表信息
+type listinfo struct {
+	Name   string `json:"name"` // 歌单名称
+	Number int    // 歌曲数量
+	ID     int64  // 歌单绑定的歌曲ID
+}
+
+/*****************************************************************/
+/***************NeteaseCloudMusicApi框架API************************/
+/*****************************************************************/
+// 获取登陆信息
 type keyInfo struct {
 	Data struct {
 		Code   int    `json:"code"`
@@ -32,7 +53,9 @@ type qrInfo struct {
 		Qrimg string `json:"qrimg"`
 	} `json:"data"`
 }
-type topList struct {
+
+// 获取歌单信息
+type listInfoOfAPI struct {
 	Code          int         `json:"code"`
 	RelatedVideos interface{} `json:"relatedVideos"`
 	Playlist      struct {
@@ -285,7 +308,8 @@ type topList struct {
 	ResEntrance     interface{} `json:"resEntrance"`
 }
 
-type topMusicInfo struct {
+// 获取歌单列表
+type musicListOfApI struct {
 	Songs []struct {
 		Name string `json:"name"`
 		ID   int    `json:"id"`
@@ -404,3 +428,19 @@ type topMusicInfo struct {
 	} `json:"privileges"`
 	Code int `json:"code"`
 }
+
+/*****************************************************************/
+/*********************独角兽API随机抽歌信息**************************/
+/*****************************************************************/
+// 独角兽API随机抽歌信息
+type ovooaData struct {
+	Code int    `json:"code"`
+	Text string `json:"text"`
+	Data struct {
+		Song   string `json:"song"`
+		Singer string `json:"singer"`
+		Cover  string `json:"cover"`
+		Music  string `json:"Music"`
+		ID     int    `json:"id"`
+	} `json:"data"`
+}

plugin/heisi/heisi.go

@@ -0,0 +1,88 @@
+// Package heisi 黑丝
+package heisi
+
+import (
+	"math/rand"
+	"strconv"
+	"unsafe"
+
+	fbctxext "github.com/FloatTech/floatbox/ctxext"
+	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 (
+	heisiPic []item
+	baisiPic []item
+	jkPic    []item
+	jurPic   []item
+	zukPic   []item
+	mcnPic   []item
+	fileList = [...]string{"heisi.bin", "baisi.bin", "jk.bin", "jur.bin", "zuk.bin", "mcn.bin"}
+)
+
+func init() { // 插件主体
+	engine := control.Register("heisi", &ctrl.Options[*zero.Ctx]{
+		DisableOnDefault: false,
+		Brief:            "黑丝",
+		Help:             "- 来点黑丝\n- 来点白丝\n- 来点jk\n- 来点巨乳\n- 来点足控\n- 来点网红",
+		PublicDataFolder: "Heisi",
+	})
+
+	engine.OnFullMatchGroup([]string{"来点黑丝", "来点白丝", "来点jk", "来点巨乳", "来点足控", "来点网红"}, zero.OnlyGroup, fbctxext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool {
+		for i, filePath := range fileList {
+			data, err := engine.GetLazyData(filePath, true)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return false
+			}
+			if len(data)%10 != 0 {
+				ctx.SendChain(message.Text("ERROR: invalid data " + strconv.Itoa(i)))
+				return false
+			}
+			s := (*slice)(unsafe.Pointer(&data))
+			s.len /= 10
+			s.cap /= 10
+			switch i {
+			case 0:
+				heisiPic = *(*[]item)(unsafe.Pointer(s))
+			case 1:
+				baisiPic = *(*[]item)(unsafe.Pointer(s))
+			case 2:
+				jkPic = *(*[]item)(unsafe.Pointer(s))
+			case 3:
+				jurPic = *(*[]item)(unsafe.Pointer(s))
+			case 4:
+				zukPic = *(*[]item)(unsafe.Pointer(s))
+			case 5:
+				mcnPic = *(*[]item)(unsafe.Pointer(s))
+			}
+		}
+		return true
+	})).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			matched := ctx.State["matched"].(string)
+			var pic item
+			switch matched {
+			case "来点黑丝":
+				pic = heisiPic[rand.Intn(len(heisiPic))]
+			case "来点白丝":
+				pic = baisiPic[rand.Intn(len(baisiPic))]
+			case "来点jk":
+				pic = jkPic[rand.Intn(len(jkPic))]
+			case "来点巨乳":
+				pic = jurPic[rand.Intn(len(jurPic))]
+			case "来点足控":
+				pic = zukPic[rand.Intn(len(zukPic))]
+			case "来点网红":
+				pic = mcnPic[rand.Intn(len(mcnPic))]
+			}
+			m := message.Message{ctxext.FakeSenderForwardNode(ctx, message.Image(pic.String()))}
+			if id := ctx.Send(m).ID(); id == 0 {
+				ctx.SendChain(message.Text("ERROR: 可能被风控或下载图片用时过长，请耐心等待"))
+			}
+		})
+}

plugin/heisi/packer.go

@@ -0,0 +1,48 @@
+package heisi
+
+import (
+	"encoding/binary"
+	"encoding/hex"
+	"fmt"
+	"math/bits"
+)
+
+const (
+	template2021    = "http://hs.heisiwu.com/wp-content/uploads/%4d/%02d/%4d%02d16%06d-611a3%8s.jpg"
+	templategeneral = "http://hs.heisiwu.com/wp-content/uploads/%4d/%02d/%015x"
+)
+
+type item [10]byte
+
+// String item to url
+func (it item) String() string {
+	year, month := int((it[0]>>4)&0x0f), int(it[0]&0x0f)
+	year += 2021
+	if year == 2021 {
+		num := binary.BigEndian.Uint32(it[1:5])
+		dstr := hex.EncodeToString(it[5:9])
+		return fmt.Sprintf(template2021, year, month, year, month, num, dstr)
+	}
+	d := binary.BigEndian.Uint64(it[1:9])
+	isscaled := it[9]&0x80 > 0
+	num := int(it[9] & 0x7f)
+	trestore := fmt.Sprintf(templategeneral, year, month, d&0x0fffffff_ffffffff)
+	if num > 0 {
+		trestore += fmt.Sprintf("-%d", num)
+	}
+	if isscaled {
+		trestore += "-scaled"
+	}
+	d = bits.RotateLeft64(d, 4) & 0x0f
+	switch d {
+	case 0:
+		trestore += ".jpg"
+	case 1:
+		trestore += ".png"
+	case 2:
+		trestore += ".webp"
+	default:
+		return "invalid ext"
+	}
+	return trestore
+}

plugin/heisi/slice.go

@@ -0,0 +1,15 @@
+package heisi
+
+import "unsafe"
+
+// slice is the runtime representation of a slice.
+// It cannot be used safely or portably and its representation may
+// change in a later release.
+//
+// Unlike reflect.SliceHeader, its Data field is sufficient to guarantee the
+// data it references will not be garbage collected.
+type slice struct {
+	data unsafe.Pointer
+	len  int
+	cap  int
+}

plugin/hs/run.go

@@ -11,11 +11,11 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
+	"github.com/FloatTech/floatbox/file"
+	"github.com/FloatTech/floatbox/web"
 	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"
 )
 
 var reqconf = [...]string{"GET", "https://hs.fbigame.com",
@@ -43,8 +43,8 @@ const (
 func init() {
 	engine := control.Register("hs", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
-		Help: "炉石\n" +
-			"- 搜卡[xxxx]\n" +
+		Brief:            "炉石搜卡",
+		Help: "- 搜卡[xxxx]\n" +
 			"- [卡组代码xxx]\n" +
 			"- 更多搜卡指令参数：https://hs.fbigame.com/misc/searchhelp",
 		PrivateDataFolder: "hs",
@@ -81,7 +81,7 @@ func init() {
 			ctx.Event.GroupID,
 			sk,
 		).Get("message_id").Int(); id == 0 {
-			ctx.SendChain(message.Text("ERROR:可能被风控了"))
+			ctx.SendChain(message.Text("ERROR: 可能被风控了"))
 		}
 	})
 	// 卡组

plugin/hyaku/main.go

@@ -4,24 +4,25 @@ package hyaku
 import (
 	"encoding/csv"
 	"fmt"
+	"io"
 	"math/rand"
 	"os"
 	"reflect"
 	"strconv"
 	"unsafe"
 
+	"github.com/FloatTech/floatbox/binary"
+	"github.com/FloatTech/floatbox/file"
+	"github.com/FloatTech/floatbox/web"
 	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
 }
@@ -54,23 +55,36 @@ var lines [100]*line
 func init() {
 	engine := control.Register("hyaku", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
-		Help: "百人一首\n" +
-			"- 百人一首(随机发一首)\n" +
+		Brief:            "百人一首",
+		Help: "- 百人一首(随机发一首)\n" +
 			"- 百人一首之n",
 		PrivateDataFolder: "hyaku",
 	})
 	csvfile := engine.DataFolder() + "hyaku.csv"
+	err := os.MkdirAll(engine.DataFolder()+"img", 0755)
+	if err != nil {
+		panic(err)
+	}
 	go func() {
+		var f *os.File
 		if file.IsNotExist(csvfile) {
-			err := file.DownloadTo(bed+"小倉百人一首.csv", csvfile, true)
+			data, err := web.RequestDataWith(web.NewTLS12Client(), bed+"小倉百人一首.csv", "GET", "gitcode.net", web.RandUA())
 			if err != nil {
 				_ = os.Remove(csvfile)
 				panic(err)
 			}
-		}
-		f, err := os.Open(csvfile)
-		if err != nil {
-			panic(err)
+			f, err = os.Create(csvfile)
+			if err != nil {
+				panic(err)
+			}
+			_, _ = f.Write(data)
+			_, _ = f.Seek(0, io.SeekStart)
+		} else {
+			var err error
+			f, err = os.Open(csvfile)
+			if err != nil {
+				panic(err)
+			}
 		}
 		records, err := csv.NewReader(f).ReadAll()
 		if err != nil {
@@ -98,26 +112,46 @@ func init() {
 	}()
 	engine.OnFullMatch("百人一首").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
 		i := rand.Intn(100)
+		img0, err := engine.GetCustomLazyData(bed, fmt.Sprintf("img/%03d.jpg", i+1))
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR: ", err))
+			return
+		}
+		img1, err := engine.GetCustomLazyData(bed, fmt.Sprintf("img/%03d.png", i+1))
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR: ", err))
+			return
+		}
 		ctx.SendChain(
-			message.Image(fmt.Sprintf(bed+"img/%03d.jpg", i+1)),
+			message.ImageBytes(img0),
 			message.Text("\n", lines[i]),
-			message.Image(fmt.Sprintf(bed+"img/%03d.png", i+1)),
+			message.ImageBytes(img1),
 		)
 	})
 	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))
+			ctx.SendChain(message.Text("ERROR: ", err))
 			return
 		}
 		if i > 100 || i < 1 {
-			ctx.SendChain(message.Text("ERROR:超出范围"))
+			ctx.SendChain(message.Text("ERROR: 超出范围"))
+			return
+		}
+		img0, err := engine.GetCustomLazyData(bed, fmt.Sprintf("img/%03d.jpg", i))
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR: ", err))
+			return
+		}
+		img1, err := engine.GetCustomLazyData(bed, fmt.Sprintf("img/%03d.png", i))
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR: ", err))
 			return
 		}
 		ctx.SendChain(
-			message.Image(fmt.Sprintf(bed+"img/%03d.jpg", i)),
+			message.ImageBytes(img0),
 			message.Text("\n", lines[i-1]),
-			message.Image(fmt.Sprintf(bed+"img/%03d.png", i)),
+			message.ImageBytes(img1),
 		)
 	})
 }

plugin/image_finder/keyword.go

@@ -18,12 +18,12 @@ import (
 
 	"github.com/FloatTech/AnimeAPI/pixiv"
 
+	"github.com/FloatTech/floatbox/binary"
+	"github.com/FloatTech/floatbox/web"
 	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/pool"
-	"github.com/FloatTech/zbputils/web"
 )
 
 type resultjson struct {
@@ -64,21 +64,21 @@ var hrefre = regexp.MustCompile(`<a href=".*">`)
 func init() {
 	control.Register("imgfinder", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
-		Help: "关键字搜图\n" +
-			"- 来张 [xxx]",
+		Brief:            "关键字搜图",
+		Help:             "- 来张 [xxx]",
 	}).OnRegex(`^来张\s?(.*)$`, zero.AdminPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			keyword := ctx.State["regex_matched"].([]string)[1]
 			soutujson, err := soutuapi(keyword)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
+				ctx.SendChain(message.Text("ERROR: ", err))
 				return
 			}
 			rannum := rand.Intn(len(soutujson.Data.Illusts))
 			il := soutujson.Data.Illusts[rannum]
 			illust, err := pixiv.Works(il.ID)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
+				ctx.SendChain(message.Text("ERROR: ", err))
 				return
 			}
 			u := illust.ImageUrls[0]
@@ -101,7 +101,7 @@ func init() {
 				),
 			), ctxext.GetFirstMessageInForward(ctx))
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
+				ctx.SendChain(message.Text("ERROR: ", err))
 				return
 			}
 		})

plugin/inject/main.go

@@ -11,8 +11,8 @@ import (
 func init() {
 	en := control.Register("inject", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
-		Help: "注入指令\n" +
-			"- run[CQ码]",
+		Brief:            "注入指令",
+		Help:             "- run[CQ码]",
 	})
 	// 运行 CQ 码
 	en.OnPrefix("run", zero.SuperUserPermission).SetBlock(true).

plugin/jandan/jandan.go

@@ -8,10 +8,10 @@ import (
 	"strconv"
 	"time"
 
+	"github.com/FloatTech/floatbox/binary"
+	fcext "github.com/FloatTech/floatbox/ctxext"
 	ctrl "github.com/FloatTech/zbpctrl"
-	"github.com/FloatTech/zbputils/binary"
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/antchfx/htmlquery"
 	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
@@ -25,26 +25,27 @@ const (
 func init() {
 	engine := control.Register("jandan", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
-		Help:             "煎蛋网无聊图\n- 来份[屌|弔|吊]图\n- 更新[屌|弔|吊]图\n",
+		Brief:            "煎蛋网无聊图",
+		Help:             "- 来份[屌|弔|吊]图\n- 更新[屌|弔|吊]图\n",
 		PublicDataFolder: "Jandan",
 	})
 
-	getdb := ctxext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool {
+	getdb := fcext.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 {
-			ctx.SendChain(message.Text("ERROR:", err))
+			ctx.SendChain(message.Text("ERROR: ", err))
 			return false
 		}
 		err = db.Create("picture", &picture{})
 		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
+			ctx.SendChain(message.Text("ERROR: ", err))
 			return false
 		}
 		n, err := db.Count("picture")
 		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
+			ctx.SendChain(message.Text("ERROR: ", err))
 			return false
 		}
 		logrus.Printf("[jandan]读取%d张图片", n)
@@ -55,7 +56,7 @@ func init() {
 		Handle(func(ctx *zero.Ctx) {
 			u, err := getRandomPicture()
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
+				ctx.SendChain(message.Text("ERROR: ", err))
 				return
 			}
 			ctx.SendChain(message.Image(u))
@@ -67,13 +68,13 @@ func init() {
 			webpageURL := api
 			doc, err := htmlquery.LoadURL(webpageURL)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
+				ctx.SendChain(message.Text("ERROR: ", err))
 				return
 			}
 			re := regexp.MustCompile(`\d+`)
 			pageTotal, err := strconv.Atoi(re.FindString(htmlquery.FindOne(doc, "//*[@id='comments']/div[2]/div/span[@class='current-comment-page']/text()").Data))
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
+				ctx.SendChain(message.Text("ERROR: ", err))
 				return
 			}
 		LOOP:
@@ -81,12 +82,12 @@ func init() {
 				logrus.Debugln("[jandan]", fmt.Sprintf("处理第%d/%d页...", i, pageTotal))
 				doc, err = htmlquery.LoadURL(webpageURL)
 				if err != nil {
-					ctx.SendChain(message.Text("ERROR:", err))
+					ctx.SendChain(message.Text("ERROR: ", err))
 					return
 				}
 				picList, err := htmlquery.QueryAll(doc, "//*[@class='view_img_link']")
 				if err != nil {
-					ctx.SendChain(message.Text("ERROR:", err))
+					ctx.SendChain(message.Text("ERROR: ", err))
 					return
 				}
 				if len(picList) != 0 {

plugin/jiami/jiami.go

@@ -0,0 +1,65 @@
+// Package jiami 兽语加密与解密
+package jiami
+
+import (
+	"encoding/json"
+	"fmt"
+
+	"github.com/FloatTech/floatbox/web"
+	ctrl "github.com/FloatTech/zbpctrl"
+	"github.com/FloatTech/zbputils/control"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+)
+
+const (
+	jiami1 = "http://ovooa.com/API/sho_u/?msg=%v"          // 加密api地址
+	jiami2 = "http://ovooa.com/API/sho_u/?format=1&msg=%v" // 解密api地址
+
+)
+
+type nmd struct { // struct解析格式大概是
+	Data struct {
+		Message string
+	} `json:"data"`
+}
+
+func init() { // 主函数
+	en := control.Register("jiami", &ctrl.Options[*zero.Ctx]{
+		DisableOnDefault: false,
+		Brief:            "兽语加解密",
+		Help: "兽语加解密\n" +
+			"- 兽语加密xxx\n- 兽语解密xxx",
+	})
+	en.OnRegex(`^兽语加密\s*(.+)$`).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+		str := ctx.State["regex_matched"].([]string)[1]
+		es, err := web.GetData(fmt.Sprintf(jiami1, str)) // 将网站返回结果赋值
+		if err != nil {
+			ctx.SendChain(message.Text("出现错误捏：", err))
+			return
+		}
+		var r nmd                    // r数组
+		err = json.Unmarshal(es, &r) // 填api返回结果，struct地址
+		if err != nil {
+			ctx.SendChain(message.Text("出现错误捏：", err))
+			return
+		}
+		ctx.SendChain(message.Text(r.Data.Message)) // 输出提取后的结果
+	})
+
+	en.OnRegex(`^兽语解密\s*(.+)$`).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+		str := ctx.State["regex_matched"].([]string)[1]
+		es, err := web.GetData(fmt.Sprintf(jiami2, str)) // 将网站返回结果赋值
+		if err != nil {
+			ctx.SendChain(message.Text("出现错误捏：", err))
+			return
+		}
+		var n nmd                    // r数组
+		err = json.Unmarshal(es, &n) // 填api返回结果，struct地址
+		if err != nil {
+			ctx.SendChain(message.Text("出现错误捏：", err))
+			return
+		}
+		ctx.SendChain(message.Text(n.Data.Message)) // 输出提取后的结果
+	})
+}

plugin/jikipedia/main.go

@@ -0,0 +1,121 @@
+// Package jikipedia 小鸡词典
+// 修改自https://github.com/TeamPGM/PagerMaid_Plugins_Pyro ，非常感谢！！
+package jikipedia
+
+import (
+	"bytes"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"net/http"
+	"strings"
+
+	"github.com/FloatTech/floatbox/binary"
+	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"
+)
+
+const (
+	url = "https://api.jikipedia.com/go/search_entities"
+)
+
+type value struct {
+	Phrase string `json:"phrase"`
+	Page   int    `json:"page"`
+	Size   int    `json:"size"`
+}
+
+func init() {
+	// 初始化engine
+	engine := control.Register("jikipedia", &ctrl.Options[*zero.Ctx]{
+		DisableOnDefault: false,
+		Brief:            "小鸡词典",
+		Help:             "- [查梗|小鸡词典][梗]",
+	},
+	)
+	engine.OnPrefixGroup([]string{"小鸡词典", "查梗"}).Limit(ctxext.LimitByGroup).SetBlock(true).Handle(
+		func(ctx *zero.Ctx) {
+			keyWord := strings.Trim(ctx.State["args"].(string), " ")
+
+			definition, err := parseKeyword(keyWord)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+			if definition.String() == "" {
+				ctx.SendChain(message.Text("好像什么都没查到，换个关键词试一试？"))
+				return
+			}
+			imgURL := definition.Get("images.0.scaled.path").String()
+			ctx.SendChain(message.Text("【标题】:", definition.Get("term.title"),
+				"\n【释义】:", definition.Get("plaintext"),
+				"\n【原文】:https://jikipedia.com/definition/", definition.Get("id")),
+				message.Image(imgURL))
+		},
+	)
+}
+
+func parseKeyword(keyWord string) (definition gjson.Result, err error) {
+	client := &http.Client{}
+
+	values := value{Phrase: keyWord, Page: 1, Size: 10}
+	jsonData, err := json.Marshal(values)
+	if err != nil {
+		return
+	}
+	var request *http.Request
+	request, err = http.NewRequest("POST", url, bytes.NewBuffer(jsonData))
+	if err != nil {
+		return
+	}
+	request.Header = http.Header{
+		"Accept":             {"application/json, text/plain, */*"},
+		"Accept-Encoding":    {"gzip, deflate, br"},
+		"Accept-Language":    {"zh-CN,zh-TW;q=0.9,zh;q=0.8"},
+		"Client":             {"web"},
+		"Client-Version":     {"2.7.2g"},
+		"Connection":         {"keep-alive"},
+		"Host":               {"api.jikipedia.com"},
+		"Origin":             {"https://jikipedia.com"},
+		"Referer":            {"https://jikipedia.com/"},
+		"Sec-Fetch-Dest":     {"empty"},
+		"Sec-Fetch-Mode":     {"cors"},
+		"Sec-Fetch-Site":     {"same-site"},
+		"Token":              {""},
+		"User-Agent":         {"Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.0.0 Mobile Safari/537.36"},
+		"XID":                {"uNo5bL1nyNCp/Gm7lJAHQ91220HLbMT8jqk9IJYhtHA4ofP+zgxwM6lSDIKiYoppP2k1IW/1Vxc2vOVGxOOVReebsLmWPHhTs7NCRygfDkE="},
+		"sec-ch-ua":          {`" Not A;Brand";v="99", "Chromium";v="102", "Google Chrome";v="102"`},
+		"sec-ch-ua-mobile":   {"?1"},
+		"sec-ch-ua-platform": {`"Android"`},
+	}
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	var response *http.Response
+	response, err = client.Do(request)
+	if err != nil {
+		return
+	}
+	defer response.Body.Close()
+	if response.StatusCode != http.StatusOK {
+		extraInfo := ""
+		if response.StatusCode == 423 {
+			extraInfo = "\n调用过多被网站暂时封禁，请等待数个小时后使用该功能~"
+		}
+		s := fmt.Sprintf("status code: %d%s", response.StatusCode, extraInfo)
+		err = errors.New(s)
+		return
+	}
+	data, err := io.ReadAll(response.Body)
+	if err != nil {
+		return
+	}
+	gjson.Get(binary.BytesToString(data), "data").ForEach(func(key, value gjson.Result) bool {
+		definition = value.Get("definitions.0")
+		return definition.String() == ""
+	})
+	return
+}

plugin/jptingroom/jptingroom.go

@@ -0,0 +1,105 @@
+// Package jptingroom 日语听力学习材料
+package jptingroom
+
+import (
+	"time"
+
+	"github.com/FloatTech/floatbox/binary"
+	fcext "github.com/FloatTech/floatbox/ctxext"
+	ctrl "github.com/FloatTech/zbpctrl"
+	"github.com/FloatTech/zbputils/control"
+	"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("jptingroom", &ctrl.Options[*zero.Ctx]{
+		DisableOnDefault: false,
+		Brief:            "日语听力学习材料",
+		Help: "- 随机日语听力\n" +
+			"- 随机日语歌曲\n" +
+			"- 日语听力 xxx\n" +
+			"- 日语歌曲 xxx\n",
+		PublicDataFolder: "Jptingroom",
+	})
+
+	getdb := fcext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool {
+		db.DBPath = engine.DataFolder() + "item.db"
+		_, err := engine.GetLazyData("item.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("item", &item{})
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR: ", err))
+			return false
+		}
+		n, err := db.Count("item")
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR: ", err))
+			return false
+		}
+		log.Infof("[jptingroom]读取%d条日语听力材料", n)
+		return true
+	})
+	// 开启
+	engine.OnFullMatchGroup([]string{"随机日语听力", "随机日语歌曲"}, getdb).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			matched := ctx.State["matched"].(string)
+			var t item
+			switch matched {
+			case "随机日语听力":
+				t = getRandomAudioByCategory("tingli")
+			case "随机日语歌曲":
+				t = getRandomAudioByCategory("gequ")
+			default:
+			}
+			if t.AudioURL == "" {
+				ctx.SendChain(message.Text("未能找到相关材料"))
+				return
+			}
+			ctx.SendChain(message.Record(t.AudioURL))
+			content := t.Title + "\n\n" + t.Content
+			data, err := text.RenderToBase64(content, 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: 可能被风控了"))
+			}
+		})
+	engine.OnRegex(`日语(听力|歌曲)\s?([一-龥A-Za-z0-9ぁ-んァ-ヶ]{1,50})$`, getdb).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			regexMatched := ctx.State["regex_matched"].([]string)
+			var t item
+			switch regexMatched[1] {
+			case "听力":
+				t = getRandomAudioByCategoryAndKeyword("tingli", regexMatched[2])
+			case "歌曲":
+				t = getRandomAudioByCategoryAndKeyword("gequ", regexMatched[2])
+			default:
+			}
+			if t.AudioURL == "" {
+				ctx.SendChain(message.Text("未能找到相关材料"))
+				return
+			}
+			content := t.Title + "\n\n" + t.Content
+			data, err := text.RenderToBase64(content, 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/jptingroom/model.go

@@ -0,0 +1,30 @@
+package jptingroom
+
+import (
+	"time"
+
+	sql "github.com/FloatTech/sqlite"
+)
+
+type item struct {
+	ID       int64     `db:"id"`
+	Title    string    `db:"title"`
+	PageURL  string    `db:"page_url"`
+	Category string    `db:"category"`
+	Intro    string    `db:"intro"`
+	AudioURL string    `db:"audio_url"`
+	Content  string    `db:"content"`
+	Datetime time.Time `db:"datetime"`
+}
+
+var db = &sql.Sqlite{}
+
+func getRandomAudioByCategory(category string) (t item) {
+	_ = db.Find("item", &t, "where category = '"+category+"' ORDER BY RANDOM() limit 1")
+	return
+}
+
+func getRandomAudioByCategoryAndKeyword(category string, keyword string) (t item) {
+	_ = db.Find("item", &t, "where category = '"+category+"' and (title like '%"+keyword+"%' or content like '%"+keyword+"%') ORDER BY RANDOM() limit 1")
+	return
+}

plugin/juejuezi/juejuezi.go

@@ -25,8 +25,8 @@ const (
 func init() {
 	control.Register("juejuezi", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
-		Help: "绝绝子生成器\n" +
-			"- 喝奶茶绝绝子 | 绝绝子吃饭",
+		Brief:            "绝绝子生成器",
+		Help:             "例: 喝奶茶绝绝子\n绝绝子吃饭",
 	}).OnRegex("[\u4E00-\u9FA5]{0,10}绝绝子[\u4E00-\u9FA5]{0,10}").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
 		toDealStr := []rune(strings.ReplaceAll(ctx.ExtractPlainText(), "绝绝子", ""))
 		switch len(toDealStr) {
@@ -35,7 +35,7 @@ func init() {
 		case 2:
 			data, err := juejuezi(string(toDealStr[0]), string(toDealStr[1]))
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
+				ctx.SendChain(message.Text("ERROR: ", err))
 				return
 			}
 			ctx.SendChain(message.Text(gjson.Get(helper.BytesToString(data), "text").String()))
@@ -43,7 +43,7 @@ func init() {
 			params := ctx.GetWordSlices(string(toDealStr)).Get("slices").Array()
 			data, err := juejuezi(params[0].String(), params[1].String())
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
+				ctx.SendChain(message.Text("ERROR: ", err))
 				return
 			}
 			ctx.SendChain(message.Text(gjson.Get(helper.BytesToString(data), "text").String()))

plugin/lolicon/lolicon.go

@@ -3,6 +3,8 @@ package lolicon
 
 import (
 	"encoding/base64"
+	"errors"
+	"net/url"
 	"strings"
 	"time"
 
@@ -10,13 +12,13 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
+	"github.com/FloatTech/floatbox/math"
+	"github.com/FloatTech/floatbox/process"
+	"github.com/FloatTech/floatbox/web"
 	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"
+	imagepool "github.com/FloatTech/zbputils/img/pool"
 )
 
 const (
@@ -25,66 +27,69 @@ const (
 )
 
 var (
-	queue   = make(chan string, capacity)
-	custapi = ""
+	queue     = make(chan string, capacity)
+	customapi = ""
 )
 
 func init() {
 	en := control.Register("lolicon", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
-		Help: "lolicon\n" +
-			"- 来份萝莉\n" +
+		Brief:            "随机图片",
+		Help: "- 随机图片\n" +
+			"- 随机图片 萝莉|少女\n" +
 			"- 设置随机图片地址[http...]",
 	}).ApplySingle(ctxext.DefaultSingle)
-	en.OnFullMatch("来份萝莉").Limit(ctxext.LimitByGroup).SetBlock(true).
+	en.OnPrefix("随机图片").Limit(ctxext.LimitByUser).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
+			if imgtype := strings.TrimSpace(ctx.State["args"].(string)); imgtype != "" {
+				imageurl, err := getimgurl(api + "?tag=" + url.QueryEscape(imgtype))
+				if err != nil {
+					ctx.SendChain(message.Text("ERROR: ", err))
+					return
+				}
+				if id := ctx.Send(message.Message{ctxext.FakeSenderForwardNode(ctx, message.Image(imageurl))}).ID(); id == 0 {
+					ctx.SendChain(message.Text("ERROR: 可能被风控了"))
+				}
+				return
+			}
 			go func() {
 				for i := 0; i < math.Min(cap(queue)-len(queue), 2); i++ {
-					if custapi != "" {
-						data, err := web.GetData(custapi)
+					if customapi != "" {
+						data, err := web.GetData(customapi)
 						if err != nil {
-							ctx.SendChain(message.Text("ERROR:", err))
+							ctx.SendChain(message.Text("ERROR: ", err))
 							continue
 						}
 						queue <- "base64://" + base64.StdEncoding.EncodeToString(data)
 						continue
 					}
-					data, err := web.GetData(api)
+					imageurl, err := getimgurl(api)
 					if err != nil {
-						ctx.SendChain(message.Text("ERROR:", err))
+						ctx.SendChain(message.Text("ERROR: ", err))
 						continue
 					}
-					json := gjson.ParseBytes(data)
-					if e := json.Get("error").Str; e != "" {
-						ctx.SendChain(message.Text("ERROR:", e))
-						continue
-					}
-					url := json.Get("data.0.urls.original").Str
-					url = strings.ReplaceAll(url, "i.pixiv.cat", "i.pixiv.re")
-					name := url[strings.LastIndex(url, "/")+1 : len(url)-4]
-					m, err := pool.GetImage(name)
+					name := imageurl[strings.LastIndex(imageurl, "/")+1 : len(imageurl)-4]
+					m, err := imagepool.GetImage(name)
 					if err != nil {
-						m.SetFile(url)
-						_, err = m.Push(ctxext.SendToSelf(ctx), ctxext.GetMessage(ctx))
+						m.SetFile(imageurl)
+						_, _ = m.Push(ctxext.SendToSelf(ctx), ctxext.GetMessage(ctx))
 						process.SleepAbout1sTo2s()
 					}
 					if err == nil {
 						queue <- m.String()
 					} else {
-						queue <- url
+						queue <- imageurl
 					}
 				}
 			}()
 			select {
 			case <-time.After(time.Minute):
-				ctx.SendChain(message.Text("ERROR:等待填充，请稍后再试......"))
+				ctx.SendChain(message.Text("ERROR: 等待填充，请稍后再试......"))
 			case img := <-queue:
-				id := ctx.SendChain(message.Image(img))
-				if id.ID() == 0 {
+				if id := ctx.Send(message.Message{ctxext.FakeSenderForwardNode(ctx, message.Image(img))}).ID(); id == 0 {
 					process.SleepAbout1sTo2s()
-					id = ctx.SendChain(message.Image(img).Add("cache", "0"))
-					if id.ID() == 0 {
-						ctx.SendChain(message.Text("ERROR:图片发送失败，可能被风控了~"))
+					if id := ctx.Send(message.Message{ctxext.FakeSenderForwardNode(ctx, message.Image(img).Add("cache", "0"))}).ID(); id == 0 {
+						ctx.SendChain(message.Text("ERROR: 可能被风控或下载图片用时过长，请耐心等待"))
 					}
 				}
 			}
@@ -92,10 +97,23 @@ 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
+			ctx.SendChain(message.Text("成功设置随机图片地址为", u))
+			customapi = u
 		})
 }
+
+func getimgurl(url string) (string, error) {
+	data, err := web.GetData(url)
+	if err != nil {
+		return "", err
+	}
+	json := gjson.ParseBytes(data)
+	if e := json.Get("error").Str; e != "" {
+		return "", errors.New(e)
+	}
+	var imageurl string
+	if imageurl = json.Get("data.0.urls.original").Str; imageurl == "" {
+		return "", errors.New("未找到相关内容, 换个tag试试吧")
+	}
+	return strings.ReplaceAll(imageurl, "i.pixiv.cat", "i.pixiv.re"), nil
+}

plugin/magicprompt/magicprompt.go

@@ -0,0 +1,91 @@
+// Package magicprompt MagicPrompt-Stable-Diffusion吟唱提示
+package magicprompt
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"strings"
+	"time"
+
+	hf "github.com/FloatTech/AnimeAPI/huggingface"
+	ctrl "github.com/FloatTech/zbpctrl"
+	"github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/RomiChan/websocket"
+	"github.com/tidwall/gjson"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+)
+
+const (
+	magicpromptRepo = "Gustavosta/MagicPrompt-Stable-Diffusion"
+)
+
+func init() { // 插件主体
+	engine := control.Register("magicprompt", &ctrl.Options[*zero.Ctx]{
+		DisableOnDefault:  false,
+		Brief:             "MagicPrompt-Stable-Diffusion吟唱提示",
+		Help:              "- 吟唱提示 xxx",
+		PrivateDataFolder: "magicprompt",
+	})
+
+	// 开启
+	engine.OnPrefixGroup([]string{`吟唱提示`, "吟唱补全"}).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			_ctx, _cancel := context.WithTimeout(context.Background(), hf.TimeoutMax*time.Second)
+			defer _cancel()
+			ctx.SendChain(message.Text("少女祈祷中..."))
+
+			magicpromptURL := fmt.Sprintf(hf.WssJoinPath, magicpromptRepo)
+			args := ctx.State["args"].(string)
+			c, _, err := websocket.DefaultDialer.Dial(magicpromptURL, nil)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+			defer c.Close()
+
+			r := hf.PushRequest{
+				FnIndex: 0,
+				Data:    []interface{}{args},
+			}
+			b, err := json.Marshal(r)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+
+			err = c.WriteMessage(websocket.TextMessage, b)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+			t := time.NewTicker(time.Second * 1)
+			defer t.Stop()
+			for {
+				select {
+				case <-t.C:
+					_, data, err := c.ReadMessage()
+					if err != nil {
+						ctx.SendChain(message.Text("ERROR: ", err))
+						return
+					}
+					j := gjson.ParseBytes(data)
+					if j.Get("msg").String() == hf.WssCompleteStatus {
+						m := message.Message{}
+						for _, v := range strings.Split(j.Get("output.data.0").String(), "\n\n") {
+							m = append(m, ctxext.FakeSenderForwardNode(ctx, message.Text(v)))
+						}
+						if id := ctx.Send(m).ID(); id == 0 {
+							ctx.SendChain(message.Text("ERROR: 可能被风控或下载图片用时过长，请耐心等待"))
+						}
+						return
+					}
+				case <-_ctx.Done():
+					ctx.SendChain(message.Text("ERROR: 吟唱提示指令超时"))
+					return
+				}
+			}
+		})
+}

plugin/manager/gist.go

@@ -10,8 +10,8 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
-	"github.com/FloatTech/zbputils/math"
-	"github.com/FloatTech/zbputils/web"
+	"github.com/FloatTech/floatbox/math"
+	"github.com/FloatTech/floatbox/web"
 )
 
 // user hash file

plugin/manager/manager.go

@@ -13,12 +13,12 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
+	"github.com/FloatTech/floatbox/math"
+	"github.com/FloatTech/floatbox/process"
 	sql "github.com/FloatTech/sqlite"
 	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/ZeroBot-Plugin/plugin/manager/timer"
 )
@@ -47,11 +47,15 @@ const (
 		"- 取消在\"cron\"的提醒\n" +
 		"- 列出所有提醒\n" +
 		"- 翻牌\n" +
-		"- 设置欢迎语XXX 可选添加 [{at}] [{nickname}] [{avatar}] [{uid}] [{gid}] [{groupname}] {at}可在发送时艾特被欢迎者 {nickname}是被欢迎者名字 {avatar}是被欢迎者头像 {uid}是被欢迎者QQ号 {gid}是当前群群号 {groupname} 是当前群群名\n" +
+		"- 设置欢迎语XXX 可选添加 [{at}] [{nickname}] [{avatar}] [{uid}] [{gid}] [{groupname}]\n" +
 		"- 测试欢迎语\n" +
 		"- 设置告别辞 参数同设置欢迎语\n" +
 		"- 测试告别辞\n" +
-		"- [开启 | 关闭]入群验证"
+		"- [开启 | 关闭]入群验证\n" +
+		"- 对信息回复:[设置 | 取消]精华\n" +
+		"- 取消精华 [信息ID]\n" +
+		"- /精华列表\n" +
+		"Tips: {at}可在发送时艾特被欢迎者 {nickname}是被欢迎者名字 {avatar}是被欢迎者头像 {uid}是被欢迎者QQ号 {gid}是当前群群号 {groupname} 是当前群群名"
 )
 
 var (
@@ -62,6 +66,7 @@ var (
 func init() { // 插件主体
 	engine := control.Register("manager", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault:  false,
+		Brief:             "群管插件",
 		Help:              hint,
 		PrivateDataFolder: "manager",
 	})
@@ -217,7 +222,7 @@ func init() { // 插件主体
 			ctx.SendChain(message.Text("那我就不手下留情了~"))
 		})
 	// 修改名片
-	engine.OnRegex(`^修改名片.*?(\d+).*?\s(.*)`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).
+	engine.OnRegex(`^修改名片.*(\d+).*\s+(.*)`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			if len(ctx.State["regex_matched"].([]string)[2]) > 60 {
 				ctx.SendChain(message.Text("名字太长啦！"))
@@ -231,7 +236,7 @@ func init() { // 插件主体
 			ctx.SendChain(message.Text("嗯！已经修改了"))
 		})
 	// 修改头衔
-	engine.OnRegex(`^修改头衔.*?(\d+).*?\s(.*)`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).
+	engine.OnRegex(`^修改头衔.*(\d+).*\s+(.*)$`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			if len(ctx.State["regex_matched"].([]string)[1]) > 18 {
 				ctx.SendChain(message.Text("头衔太长啦！"))
@@ -245,7 +250,7 @@ func init() { // 插件主体
 			ctx.SendChain(message.Text("嗯！已经修改了"))
 		})
 	// 申请头衔
-	engine.OnRegex(`^申请头衔(.*)`, zero.OnlyGroup).SetBlock(true).
+	engine.OnRegex(`^申请头衔\s+(.*)$`, zero.OnlyGroup).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			if len(ctx.State["regex_matched"].([]string)[1]) > 18 {
 				ctx.SendChain(message.Text("头衔太长啦！"))
@@ -258,6 +263,16 @@ func init() { // 插件主体
 			)
 			ctx.SendChain(message.Text("嗯！不错的头衔呢~"))
 		})
+	// 撤回
+	// 群聊中直接回复消息结尾带上撤回
+	// 权限够的话，可以把请求撤回的消息也一并撤回
+	engine.OnRegex(`^\[CQ:reply,id=(-?\d+)\].*撤回$`, zero.AdminPermission, zero.OnlyGroup).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			// 删除需要撤回的消息ID
+			ctx.DeleteMessage(message.NewMessageIDFromString(ctx.State["regex_matched"].([]string)[1]))
+			// 删除请求撤回的消息ID
+			// ctx.DeleteMessage(message.NewMessageIDFromInteger(ctx.Event.MessageID.(int64)))
+		})
 	// 群聊转发
 	engine.OnRegex(`^群聊转发.*?(\d+)\s(.*)`, zero.SuperUserPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
@@ -553,12 +568,9 @@ func init() { // 插件主体
 	// 根据 gist 自动同意加群
 	// 加群请在github新建一个gist，其文件名为本群群号的字符串的md5(小写)，内容为一行，是当前unix时间戳(10分钟内有效)。
 	// 然后请将您的用户名和gist哈希(小写)按照username/gisthash的格式填写到回答即可。
-	engine.OnRequest().SetBlock(false).Handle(func(ctx *zero.Ctx) {
-		/*if ctx.Event.RequestType == "friend" {
-			ctx.SetFriendAddRequest(ctx.Event.Flag, true, "")
-		}*/
+	engine.On("request/group/add").SetBlock(false).Handle(func(ctx *zero.Ctx) {
 		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" {
+		if ok && c.GetData(ctx.Event.GroupID)&0x10 == 0x10 {
 			// gist 文件名是群号的 ascii 编码的 md5
 			// gist 内容是当前 uinx 时间戳，在 10 分钟内视为有效
 			ans := ctx.Event.Comment[strings.Index(ctx.Event.Comment, "答案：")+len("答案："):]
@@ -580,6 +592,72 @@ func init() { // 插件主体
 			}
 		}
 	})
+	// 设精
+	engine.OnRegex(`^\[CQ:reply,id=(-?\d+)\][\s\S]*(设置|取消)精华$`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
+		essenceID, _ := strconv.ParseInt(ctx.State["regex_matched"].([]string)[1], 10, 64)
+		option := ctx.State["regex_matched"].([]string)[2]
+		var rsp zero.APIResponse
+		switch option {
+		case "设置":
+			rsp = ctx.SetGroupEssenceMessage(essenceID)
+		case "取消":
+			rsp = ctx.DeleteGroupEssenceMessage(essenceID)
+		}
+		if rsp.RetCode == 0 {
+			ctx.SendChain(message.Text(option, "成功"))
+		} else {
+			ctx.SendChain(message.Text(option, "失败, 信息: ", rsp.Msg, "解释: ", rsp.Wording))
+		}
+	})
+	engine.OnCommand("精华列表", zero.OnlyGroup, zero.AdminPermission).SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
+		list := ctx.GetGroupEssenceMessageList(ctx.Event.GroupID).Array()
+		msg := message.Message{ctxext.FakeSenderForwardNode(ctx, message.Text("本群精华列表："))}
+		n := len(list)
+		if n > 30 {
+			ctx.SendChain(message.Text("精华内容太多,仅显示前30个"))
+			n = 30
+		}
+		for _, info := range list[:n] {
+			msg = append(msg, ctxext.FakeSenderForwardNode(ctx,
+				message.Text(fmt.Sprintf(
+					"信息ID: %d\n发送者昵称: %s\n发送者QQ 号: %d\n消息发送时间: %s\n操作者昵称: %s\n操作者QQ 号: %d\n精华设置时间: %s",
+					info.Get("message_id").Int(),
+					info.Get("sender_nick").String(),
+					info.Get("sender_id").Int(),
+					time.Unix(info.Get("sender_time").Int(), 0).Format("2006/01/02 15:04:05"),
+					info.Get("operator_nick").String(),
+					info.Get("operator_id").Int(),
+					time.Unix(info.Get("operator_time").Int(), 0).Format("2006/01/02 15:04:05"),
+				))),
+			)
+			msgData := ctx.GetMessage(message.NewMessageIDFromInteger(info.Get("message_id").Int())).Elements
+			if msgData != nil {
+				msg = append(msg,
+					message.CustomNode(info.Get("sender_nick").String(), info.Get("sender_id").Int(), msgData),
+				)
+			} else {
+				msg = append(msg,
+					message.CustomNode(info.Get("sender_nick").String(), info.Get("sender_id").Int(), "[error]信息久远，无法获取,如需查看原始内容请在“精华信息”中查看"),
+				)
+			}
+		}
+		if id := ctx.Send(msg).ID(); id == 0 {
+			ctx.SendChain(message.Text("ERROR: 可能被风控了"))
+		}
+	})
+	engine.OnPrefix("取消精华", zero.OnlyGroup, zero.AdminPermission).SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
+		essenceID, err := strconv.ParseInt(strings.TrimSpace(ctx.State["args"].(string)), 10, 64)
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR: 请输入正确的设精ID"))
+			return
+		}
+		rsp := ctx.DeleteGroupEssenceMessage(essenceID)
+		if rsp.RetCode == 0 {
+			ctx.SendChain(message.Text("取消成功"))
+		} else {
+			ctx.SendChain(message.Text("取消失败, 信息: ", rsp.Msg, "解释: ", rsp.Wording))
+		}
+	})
 }
 
 // 传入 ctx 和 welcome格式string 返回cq格式string  使用方法:welcometocq(ctx,w.Msg)

plugin/manager/timer/timer.go

@@ -7,8 +7,8 @@ import (
 	"sync"
 	"time"
 
+	"github.com/FloatTech/floatbox/process"
 	sql "github.com/FloatTech/sqlite"
-	"github.com/FloatTech/zbputils/process"
 	"github.com/fumiama/cron"
 	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"