🔖 v1.7.3

* fix bilibili

* 1

* fix

* 123

* 做了一下修改的提交

* 1

* make master happy

* 最后一次

.github/workflows/nightly.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Setup Go environment
         uses: actions/setup-go@master
         with:
-          go-version: 1.19
+          go-version: '1.20'
       - 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.19
+          go-version: '1.20'
 
       - 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.19
+          go-version: '1.20'
 
       - name: Check out code into the Go module directory
         uses: actions/checkout@master
@@ -17,3 +17,17 @@ jobs:
         uses: golangci/golangci-lint-action@master
         with:
           version: latest
+
+      - name: Commit back
+        if: ${{ !github.head_ref }}
+        continue-on-error: true
+        run: |
+          git config --local user.name 'github-actions[bot]'
+          git config --local user.email '41898282+github-actions[bot]@users.noreply.github.com'
+          git add --all
+          git commit -m "🎨 改进代码样式"
+
+      - name: Create Pull Request
+        if: ${{ !github.head_ref }}
+        continue-on-error: true
+        uses: peter-evans/create-pull-request@v4

.github/workflows/release.yml

@@ -16,12 +16,12 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@master
         with:
-          go-version: '1.19'
+          go-version: '1.20'
 
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@master
         with:
           version: latest
-          args: release --rm-dist
+          args: release --clean
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -7,3 +7,4 @@ go-zero*
 nohup.out
 zerobot
 ZeroBot-Plugin*
+*.syso

.golangci.yml

@@ -18,8 +18,7 @@ linters:
   fast: false
   enable:
     - bodyclose
-    - deadcode
-    - depguard
+    #- depguard
     - dogsled
     - errcheck
     - exportloopref
@@ -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.19'
+  go: '1.20'
 
 # 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\+.*'

.goreleaser.yml

@@ -4,6 +4,8 @@ env:
 before:
   hooks:
     - go mod tidy
+    - go install github.com/tc-hib/go-winres@latest
+    - go-winres make
 builds:
   - id: nowin
     env:
@@ -64,7 +66,7 @@ archives:
         format: zip
 
 nfpms:
-  - license: GPL 3.0
+  - license: AGPL 3.0
     homepage: https://github.com/FloatTech/ZeroBot-Plugin
     file_name_template: "zbp_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}"
     formats:

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

@@ -1,13 +1,15 @@
 <div align="center">
-  <a href="https://crypko.ai/crypko/5k8HyUVTq5421/">
-  <img src=".github/黒金.jpg" alt="看板娘" width = "400">
-  </a><br>
+  <img src=".github/hua_nobg_512.gif" alt="椛" width = "400">
+  <br>
 
   <h1>ZeroBot-Plugin</h1>
+
+  “椛椛是[真寻](https://github.com/HibiKier/zhenxun_bot)的好朋友！”
+  
   ZeroBot-Plugin 是 ZeroBot 的 实用插件合集<br><br>
 
 
-  <img src="http://cmoe.azurewebsites.net/cmoe?name=ZeroBot-Plugin&theme=r34" /><br>
+  <img src="https://counter.seku.su/cmoe?name=ZeroBot-Plugin&theme=r34" /><br>
 
   [![miraigo](https://img.shields.io/badge/OneBot-MiraiGo-green.svg?style=social&logo=appveyor)](https://github.com/Mrs4s/MiraiGo)
   [![oicq](https://img.shields.io/badge/OneBot-OICQ-green.svg?style=social&logo=appveyor)](https://github.com/takayama-lily/oicq)
@@ -15,7 +17,7 @@
 
   [![go](https://goreportcard.com/badge/github.com/FloatTech/ZeroBot-Plugin?style=flat-square&logo=go)](https://goreportcard.com/badge/github.com/FloatTech/ZeroBot-Plugin)
   [![onebot](https://img.shields.io/badge/onebot-v11-black?style=flat-square&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHAAAABwCAMAAADxPgR5AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAAxQTFRF////29vbr6+vAAAAk1hCcwAAAAR0Uk5T////AEAqqfQAAAKcSURBVHja7NrbctswDATQXfD//zlpO7FlmwAWIOnOtNaTM5JwDMa8E+PNFz7g3waJ24fviyDPgfhz8fHP39cBcBL9KoJbQUxjA2iYqHL3FAnvzhL4GtVNUcoSZe6eSHizBcK5LL7dBr2AUZlev1ARRHCljzRALIEog6H3U6bCIyqIZdAT0eBuJYaGiJaHSjmkYIZd+qSGWAQnIaz2OArVnX6vrItQvbhZJtVGB5qX9wKqCMkb9W7aexfCO/rwQRBzsDIsYx4AOz0nhAtWu7bqkEQBO0Pr+Ftjt5fFCUEbm0Sbgdu8WSgJ5NgH2iu46R/o1UcBXJsFusWF/QUaz3RwJMEgngfaGGdSxJkE/Yg4lOBryBiMwvAhZrVMUUvwqU7F05b5WLaUIN4M4hRocQQRnEedgsn7TZB3UCpRrIJwQfqvGwsg18EnI2uSVNC8t+0QmMXogvbPg/xk+Mnw/6kW/rraUlvqgmFreAA09xW5t0AFlHrQZ3CsgvZm0FbHNKyBmheBKIF2cCA8A600aHPmFtRB1XvMsJAiza7LpPog0UJwccKdzw8rdf8MyN2ePYF896LC5hTzdZqxb6VNXInaupARLDNBWgI8spq4T0Qb5H4vWfPmHo8OyB1ito+AysNNz0oglj1U955sjUN9d41LnrX2D/u7eRwxyOaOpfyevCWbTgDEoilsOnu7zsKhjRCsnD/QzhdkYLBLXjiK4f3UWmcx2M7PO21CKVTH84638NTplt6JIQH0ZwCNuiWAfvuLhdrcOYPVO9eW3A67l7hZtgaY9GZo9AFc6cryjoeFBIWeU+npnk/nLE0OxCHL1eQsc1IciehjpJv5mqCsjeopaH6r15/MrxNnVhu7tmcslay2gO2Z1QfcfX0JMACG41/u0RrI9QAAAABJRU5ErkJggg==)](https://t.me/zerobotplugin)
-  [![zerobot](https://img.shields.io/badge/zerobot-v1.5.1-black?style=flat-square&logo=go)](https://github.com/wdvxdr1123/ZeroBot)
+  [![zerobot](https://img.shields.io/badge/zerobot-v1.7.4-black?style=flat-square&logo=go)](https://github.com/wdvxdr1123/ZeroBot)
   [![license](https://img.shields.io/github/license/FloatTech/ZeroBot-Plugin.svg?style=flat-square&logo=gnu)](https://raw.githubusercontent.com/FloatTech/ZeroBot-Plugin/master/LICENSE)
   [![tencent-qq](https://img.shields.io/badge/group-1048452984-red?style=flat-square&logo=tencent-qq)](https://jq.qq.com/?_wv=1027&k=QMb7x1mM)
   [![telegram](https://img.shields.io/badge/Telegram-click%20me-informational?style=flat-square&logo=telegram)](https://t.me/zerobotplugin)
@@ -23,9 +25,9 @@
   本项目符合 [OneBot](https://github.com/howmanybots/onebot) 标准，可基于以下项目与机器人框架/平台进行交互
   | 项目地址 | 平台 | 核心作者 |
   | --- | --- | --- |
-  | [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 |
+  | [go-cqhttp](https://github.com/Mrs4s/go-cqhttp) | [MiraiGo](https://github.com/Mrs4s/MiraiGo) | Mrs4s |
+  | [onebot-kotlin](https://github.com/yyuueexxiinngg/onebot-kotlin) | [Mirai](https://github.com/mamoe/mirai) | yyuueexxiinngg |
+  | [oicq/http-api](https://github.com/takayama-lily/oicq/tree/master/http-api) | [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)
 
@@ -35,21 +37,25 @@
 
 > 如果您对开发插件感兴趣，欢迎加入[ZeroBot-Plugin-Playground](https://github.com/FloatTech/ZeroBot-Plugin-Playground)
 
+> webui持续开发中, 欢迎加入[ZeroBot-Plugin-Webui](https://github.com/FloatTech/ZeroBot-Plugin-Webui)
+
 ## 命令行参数
 > `[]`代表是可选参数
 ```bash
-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 ...] [&]
+zerobot [-h] [-m] [-n nickname] [-t token] [-u url] [-g url] [-p prefix] [-d|w] [-c|s config.json] [-l latency] [-r ringlen] [-x max process time] [qq1 qq2 qq3 ...] [&]
 ```
 - **-h**: 显示帮助
+- **-m**: 不自动标记消息为已读
 - **-n nickname**: 设置默认昵称，默认为`椛椛`
 - **-t token**: 设置`AccessToken`，默认为空
 - **-u url**: 设置`Url`，默认为`ws://127.0.0.1:6700`
+- ~~**-g url**~~(默认禁用): 设置`webui url`，默认为`127.0.0.1:3000`
 - **-p prefix**: 设置命令前缀，默认为`/`
 - **-d|w**: 开启 debug | warning 级别及以上日志输出
 - **-c config.json**: 从`config.json`加载`bot`配置
 - **-s config.json**: 保存现在`bot`配置到`config.json`
 - **-l latency**: 全局处理延时 (ms)
-- **-r ringlen**: 接收消息环缓冲区大小
+- **-r ringlen**: 接收消息环缓冲区大小，`0`为不设缓冲，并发处理
 - **-x max process time**: 最大处理时间 (min)
 - **qqs**: superusers 的 qq 号
 - **&**: 驻留在后台，必须放在最后，仅`Linux`下有效
@@ -57,33 +63,28 @@ zerobot [-h] [-n nickname] [-t token] [-u url] [-p prefix] [-d|w] [-c|s config.j
 默认配置文件格式如下。当选择从配置文件加载时，将忽略相应命令行参数。
 ```json
 {
-    "zero": {
-        "nickname": [
-            "椛椛",
-            "ATRI",
-            "atri",
-            "亚托莉",
-            "アトリ"
-        ],
-        "command_prefix": "/",
-        "super_users": [],
-        "ring_len": 4096,
-        "latency": 233000000,
-        "max_process_time": 240000000000
-    },
-    "ws": [
-        {
-            "Url": "ws://127.0.0.1:6700",
-            "AccessToken": ""
-        }
-    ]
+  "zero": {
+    "nickname": ["椛椛", "ATRI", "atri", "亚托莉", "アトリ"],
+    "command_prefix": "/",
+    "super_users": [],
+    "ring_len": 4096,
+    "latency": 233000000,
+    "max_process_time": 240000000000,
+    "mark_message": true
+  },
+  "ws": [{ "Url": "ws://127.0.0.1:6700", "AccessToken": "" }],
+  "wss": null
 }
 ```
 
 ## 功能
 > 在编译时，以下功能除插件控制外，均可通过注释`main.go`中的相应`import`而物理禁用，减小插件体积。
+
 > 通过插件控制，还可动态管理某个功能在某个群的打开/关闭。
-> 插件的优先级为`import`的先后顺序
+
+> 插件的优先级为`import`的先后顺序。
+
+> `webui`默认禁用不编译，打开后会增加程序体积。
 
 <details>
   <summary>插件控制</summary>
@@ -100,6 +101,10 @@ zerobot [-h] [-n nickname] [-t token] [-u url] [-p prefix] [-d|w] [-c|s config.j
 
   - [x] /禁用 xxx (在发送的群/用户禁用xxx)
 
+  - [x] /此处启用所有插件
+
+  - [x] /此处禁用所有插件
+
   - [x] /全局启用 xxx
 
   - [x] /全局禁用 xxx
@@ -122,7 +127,13 @@ zerobot [-h] [-n nickname] [-t token] [-u url] [-p prefix] [-d|w] [-c|s config.j
 
   - [x] /服务列表
 
-  - [x] /服务详情
+  - [x] /设置服务列表显示行数 xx (默认值为 9, 该设置仅运行时有效, zbp 重启后重置)
+
+  - [x] (默认禁用) /设置webui用户名 zerobot 密码 123456
+
+  - [x] (默认禁用) /webui启动
+
+  - [x] (默认禁用) /webui停止
 
   - [x] @Bot 插件冲突检测 (会在本群发送一条消息并在约 1s 后撤回以检测其它同类 bot 中已启用的插件并禁用)
 
@@ -236,7 +247,7 @@ zerobot [-h] [-n nickname] [-t token] [-u url] [-p prefix] [-d|w] [-c|s config.j
 
   - [ ] 同意好友请求
 
-  - [ ] 撤回[@xxx] [xxx]
+  - [x] 对信息回复: 撤回
 
   - [ ] 警告[@xxx]
 
@@ -244,14 +255,6 @@ zerobot [-h] [-n nickname] [-t token] [-u url] [-p prefix] [-d|w] [-c|s config.j
 
   - 设置欢迎语可选添加参数说明：{at}可在发送时艾特被欢迎者 {nickname}是被欢迎者名字 {avatar}是被欢迎者头像 {uid}是被欢迎者QQ号 {gid}是当前群群号 {groupname} 是当前群群名
 
-</details>
-<details>
-  <summary>词典匹配回复</summary>
-
-  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/thesaurus"`
-
-  - [x] @Bot 关键词
-
 </details>
 <details>
   <summary>定时指令触发器</summary>
@@ -400,6 +403,14 @@ print("run[CQ:image,file="+j["img"]+"]")
 
   - [x] 支付宝到账 1
 
+</details>
+<details>
+  <summary>触发者撤回时也自动撤回</summary>
+
+  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/autowithdraw"`
+
+  - [x] 撤回一条消息
+
 </details>
 <details>
   <summary>base16384加解密</summary>
@@ -416,11 +427,11 @@ print("run[CQ:image,file="+j["img"]+"]")
 
 </details>
 <details>
-  <summary>百度一下</summary>
+  <summary>百科</summary>
 
   `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/baidu"`
 
-  - [x] 百度下[xxx]
+  - [x] 百度/百科/维基/wiki[xxx]
 
 </details>
 <details>
@@ -539,7 +550,7 @@ print("run[CQ:image,file="+j["img"]+"]")
   
   - [x] b站推送列表
   
-  - [x] 拉取b站推送 (使用job执行定时任务------记录在"@every 10s"触发的指令) 
+  - [x] 拉取b站推送 (使用job执行定时任务------记录在"@every 5m"触发的指令) 
 
 </details>
 <details>
@@ -551,14 +562,6 @@ 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>
@@ -611,6 +614,14 @@ print("run[CQ:image,file="+j["img"]+"]")
 
   - [x] 磕cp大老师 雪乃
 
+</details>
+<details>
+  <summary>今日早报</summary>
+
+  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/dailynews"`
+
+  - [x] 今日早报
+
 </details>
 <details>
   <summary>DeepDanbooru二次元图标签识别</summary>
@@ -631,6 +642,48 @@ print("run[CQ:image,file="+j["img"]+"]")
 
   - [x] 教你一篇小作文[作文]
 
+</details>
+<details>
+  <summary>程序员做饭指南</summary>
+
+  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/dish"`
+
+  - [x] 怎么做 | 烹饪[菜名]
+
+  - [x] 随机菜谱 | 随便做点菜
+
+</details>
+<details>
+  <summary>多功能抽签</summary>
+
+  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/drawlots"`
+
+  支持图包文件夹和gif抽签
+
+  - [x] (刷新)抽签列表
+  
+  - [x] 抽[签名]签
+  
+  - [x] 看签[gif签名]
+	
+  - [x] 加签[签名][gif图片]
+	
+  - [x] 删签[gif签名]
+
+</details>
+<details>
+  <summary>女装</summary>
+
+  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/dress"`
+
+  - [x] 女装
+
+  - [x] 男装
+  
+  - [x] 随机女装
+  
+  - [x] 随机男装
+
 </details>
 <details>
   <summary>漂流瓶</summary>
@@ -649,14 +702,6 @@ print("run[CQ:image,file="+j["img"]+"]")
 
   - [x] [emoji][emoji]
 
-</details>
-<details>
-  <summary>城市疫情查询</summary>
-
-  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/epidemic"`
-
-  - [x] xxx疫情
-
 </details>
 <details>
   <summary>好友申请及群聊邀请事件处理</summary>
@@ -675,7 +720,8 @@ print("run[CQ:image,file="+j["img"]+"]")
 
   `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/font"`
 
-  - [x] (用[终末体|终末变体|紫罗兰体|樱酥体|Consolas体|苹方体])渲染文字xxx
+  - [x] (用[终末体|终末变体|紫罗兰体|樱酥体|Consolas体|粗苹方体|未来荧黑体|Gugi体|八丸体|Impact体|猫啃体|苹方体])渲染(抖动)文字xxx
+
 </details>
 <details>
   <summary>每日运势</summary>
@@ -684,7 +730,7 @@ print("run[CQ:image,file="+j["img"]+"]")
 
   - [x] 运势 | 抽签
 
-  - [x] 设置底图[车万 DC4 爱因斯坦 星空列车 樱云之恋 富婆妹 李清歌 公主连结 原神 明日方舟 碧蓝航线 碧蓝幻想 战双 阴阳师 赛马娘 东方归言录 奇异恩典 夏日口袋 ASoul]
+  - [x] 设置底图[车万 DC4 爱因斯坦 星空列车 樱云之恋 富婆妹 李清歌 公主连结 原神 明日方舟 碧蓝航线 碧蓝幻想 战双 阴阳师 赛马娘 东方归言录 奇异恩典 夏日口袋 ASoul Hololive]
 
 </details>
 <details>
@@ -751,7 +797,7 @@ print("run[CQ:image,file="+j["img"]+"]")
 	
   ------插 件 扩 展------
 	
-NeteaseCloudMusicApi项目地址:https://binaryify.github.io/NeteaseCloudMusicApi/#/
+  - 本插件内置了[NeteaseCloudMusicApi](https://binaryify.github.io/NeteaseCloudMusicApi/#/)框架的一些功能
   - [x] 设置猜歌API帮助
   - [x] 设置猜歌API [API首页网址]
   - [x] 猜歌[开启/关闭][歌单/歌词]自动下载
@@ -769,6 +815,16 @@ NeteaseCloudMusicApi项目地址:https://binaryify.github.io/NeteaseCloudMusicAp
 
   - [x] 来点黑丝/白丝/jk/巨乳/足控/网红
 
+</details>
+<details>
+  <summary>一言</summary>
+
+  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/hitokoto"`
+
+  - [x] 一言[xxx]
+  
+  - [x] 系列一言
+
 </details>
 <details>
   <summary>炉石</summary>
@@ -857,6 +913,26 @@ NeteaseCloudMusicApi项目地址:https://binaryify.github.io/NeteaseCloudMusicAp
 
   - [x] 喝奶茶绝绝子 | 绝绝子吃饭
 
+</details>
+<details>
+  <summary>疯狂星期四</summary>
+
+  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/kfccrazythursday"`
+
+  - [x] 疯狂星期四
+
+</details>
+<details>
+  <summary>kokomi原神面板</summary>
+
+  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/kokomi"`
+
+  - [x] kokomi菜单
+
+  - [x] XX面板
+
+  - 注:本插件未并入主仓库,需自行安装(须源码方式运行才能添加插件),安装地址[kokomi-原神面板查询插件](https://github.com/lianhong2758/kokomi-plugin) 
+
 </details>
 <details>
   <summary>lolicon</summary>
@@ -915,6 +991,8 @@ NeteaseCloudMusicApi项目地址:https://binaryify.github.io/NeteaseCloudMusicAp
 
   - [x] 让[수아|미미르|아린|연화|유화|선배]说(韩语)
 
+  - [x] 让[派蒙|空|荧|阿贝多|枫原万叶|温迪|八重神子|纳西妲|钟离|诺艾尔|凝光|托马|北斗|莫娜|荒泷一斗|提纳里|芭芭拉|艾尔海森|雷电将军|赛诺|琴|班尼特|五郎|神里绫华|迪希雅|夜兰|辛焱|安柏|宵宫|云堇|妮露|烟绯|鹿野院平藏|凯亚|达达利亚|迪卢克|可莉|早柚|香菱|重云|刻晴|久岐忍|珊瑚宫心海|迪奥娜|戴因斯雷布|魈|神里绫人|丽莎|优菈|凯瑟琳|雷泽|菲谢尔|九条裟罗|甘雨|行秋|胡桃|迪娜泽黛|柯莱|申鹤|砂糖|萍姥姥|奥兹|罗莎莉亚|式大将|哲平|坎蒂丝|托克|留云借风真君|昆钧|塞琉斯|多莉|大肉丸|莱依拉|散兵|拉赫曼|杜拉夫|阿守|玛乔丽|纳比尔|海芭夏|九条镰治|阿娜耶|阿晃|阿扎尔|七七|博士|白术|埃洛伊|大慈树王|女士|丽塔|失落迷迭|缭乱星棘|伊甸|伏特加女孩|狂热蓝调|莉莉娅|萝莎莉娅|八重樱|八重霞|卡莲|第六夜想曲|卡萝尔|姬子|极地战刃|布洛妮娅|次生银翼|理之律者|迷城骇兔|希儿|魇夜星渊|黑希儿|帕朵菲莉丝|天元骑英|幽兰黛尔|德丽莎|月下初拥|朔夜观星|暮光骑士|明日香|李素裳|格蕾修|梅比乌斯|渡鸦|人之律者|爱莉希雅|爱衣|天穹游侠|琪亚娜|空之律者|薪炎之律者|云墨丹心|符华|识之律者|维尔薇|芽衣|雷之律者|阿波尼亚]说(中文)
+
 </details>
 <details>
   <summary>摸鱼</summary>
@@ -1019,6 +1097,12 @@ NeteaseCloudMusicApi项目地址:https://binaryify.github.io/NeteaseCloudMusicAp
 
   - [x] 小说[xxx]
 
+  - 设置小说配置 zerobot 123456
+
+  - 下载小说30298
+
+  - 注: 建议去https://www.23qb.com/ 注册一个账号, 小说下载有积分限制
+
 </details>
 <details>
   <summary>nsfw图片识别</summary>
@@ -1065,8 +1149,23 @@ NeteaseCloudMusicApi项目地址:https://binaryify.github.io/NeteaseCloudMusicAp
 
   - [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>
@@ -1142,6 +1241,7 @@ NeteaseCloudMusicApi项目地址:https://binaryify.github.io/NeteaseCloudMusicAp
 
   - [x] 签到
   - [x] 获得签到背景[@xxx] | 获得签到背景
+  - [x] 设置签到预设(0~3)
   - [x] 查看等级排名
   - 注:跨群排行
   - [x] 查看我的钱包
@@ -1174,10 +1274,26 @@ NeteaseCloudMusicApi项目地址:https://binaryify.github.io/NeteaseCloudMusicAp
 
   - [x] 卖萌[@xxx]
 
-  - [x] 抽老婆[@xxx]
+  - [x] 今日老婆[@xxx]
 
   - [x] 黄油角色[@xxx]
 
+</details>
+<details>
+  <summary>steam</summary>
+
+  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/steam"`
+
+  - [x] steam[添加|删除]订阅xxxxx
+
+  - [x] steam查询订阅
+
+  - [x] steam绑定 api key xxxxxxx
+
+  - [x] 查看apikey
+
+  - [x] 拉取steam订阅 (使用job执行定时任务------记录在"@every 1m"触发的指令) 
+
 </details>
 <details>
   <summary>抽塔罗牌</summary>
@@ -1233,6 +1349,26 @@ NeteaseCloudMusicApi项目地址:https://binaryify.github.io/NeteaseCloudMusicAp
 
   - [x] 更新vtb
 
+</details>
+<details>
+  <summary>vtb点歌</summary>
+
+  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/vtbmusic"`
+
+  - [x] vtb点歌
+
+  - [x] vtb随机点歌
+
+</details>
+<details>
+  <summary>钱包</summary>
+
+  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/wallet"`
+
+  - [x] 查看我的钱包
+
+  - [x] 查看钱包排名
+
 </details>
 <details>
   <summary>网易云音乐热评</summary>
@@ -1241,6 +1377,33 @@ NeteaseCloudMusicApi项目地址:https://binaryify.github.io/NeteaseCloudMusicAp
 
   - [x] 来份网易云热评
 
+</details>
+<details>
+  <summary>据意查句</summary>
+
+  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/wantquotes"`
+
+  - [x] 据意查句 大海
+  
+  - [x] 登录据意查句 
+
+</details>
+<details>
+  <summary>星际战甲</summary>
+
+  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/warframeapi"`
+
+  - [x] wf时间同步
+  
+  - [x] [金星|地球|火卫二]平原状态
+  
+  - [x] .wm [物品名称]
+  
+  - [x] 仲裁
+  
+  - [x] 警报
+  
+  - [x] 每日特惠
   </details>
 <details>
   <summary>天气/拼音查询-名言</summary>
@@ -1301,19 +1464,11 @@ NeteaseCloudMusicApi项目地址:https://binaryify.github.io/NeteaseCloudMusicAp
 
 </details>
 <details>
-  <summary>月幕galgame图</summary>
+  <summary>抽老婆</summary>
 
-  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/ymgal"`
+  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/wife"`
 
-  - [x] 随机galCG
-
-  - [x] 随机gal表情包
-
-  - [x] galCG[xxx]
-
-  - [x] gal表情包[xxx]
-
-  - [x] 更新gal
+  - [x] 抽老婆
 
 </details>
 <details>
@@ -1337,6 +1492,45 @@ NeteaseCloudMusicApi项目地址:https://binaryify.github.io/NeteaseCloudMusicAp
 
   - [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>月幕galgame图</summary>
+
+  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/ymgal"`
+
+  - [x] 随机galCG
+
+  - [x] 随机gal表情包
+
+  - [x] galCG[xxx]
+
+  - [x] gal表情包[xxx]
+
+  - [x] 更新gal
+
 </details>
 <details>
   <summary>鬼东西</summary>
@@ -1370,7 +1564,27 @@ NeteaseCloudMusicApi项目地址:https://binaryify.github.io/NeteaseCloudMusicAp
 
   - [x] @Bot 任意文本(任意一句话回复)
 
-  - [x] 设置回复模式[青云客 | 小爱]
+  - [x] 设置回复模式[青云客 | 小爱 | ChatGPT]
+
+  - [x] 设置 ChatGPT api key xxx
+
+</details>
+<details>
+  <summary>词典匹配回复</summary>
+
+  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/thesaurus"`
+
+  - [x] 切换[kimo|傲娇|可爱]词库
+  - [x] 设置词库触发概率0.x (0<x<9)
+
+</details>
+<details>
+  <summary>打断复读</summary>
+
+  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/breakrepeat"`
+
+  - [x] (打断三次以上的复读)
+
 </details>
 
 ## 三种使用方法，推荐第一种
@@ -1435,3 +1649,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>

console/console_ansi.go

@@ -0,0 +1,14 @@
+//go:build !windows
+
+// Package console sets console's behavior on init
+package console
+
+import (
+	"fmt"
+
+	"github.com/FloatTech/ZeroBot-Plugin/kanban/banner"
+)
+
+func init() {
+	fmt.Print("\033]0;ZeroBot-Blugin " + banner.Version + " " + banner.Copyright + "\007")
+}

console/console_windows.go

@@ -0,0 +1,144 @@
+// Package console sets console's behavior on init
+package console
+
+import (
+	"bytes"
+	"os"
+	"strings"
+	"syscall"
+	"unsafe"
+
+	"golang.org/x/sys/windows"
+
+	"github.com/sirupsen/logrus"
+
+	"github.com/FloatTech/ZeroBot-Plugin/kanban/banner"
+)
+
+var (
+	//go:linkname modkernel32 golang.org/x/sys/windows.modkernel32
+	modkernel32         *windows.LazyDLL
+	procSetConsoleTitle = modkernel32.NewProc("SetConsoleTitleW")
+)
+
+//go:linkname errnoErr golang.org/x/sys/windows.errnoErr
+func errnoErr(e syscall.Errno) error
+
+func setConsoleTitle(title string) (err error) {
+	var p0 *uint16
+	p0, err = syscall.UTF16PtrFromString(title)
+	if err != nil {
+		return
+	}
+	r1, _, e1 := syscall.Syscall(procSetConsoleTitle.Addr(), 1, uintptr(unsafe.Pointer(p0)), 0, 0)
+	if r1 == 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+func init() {
+	stdin := windows.Handle(os.Stdin.Fd())
+
+	var mode uint32
+	err := windows.GetConsoleMode(stdin, &mode)
+	if err != nil {
+		panic(err)
+	}
+
+	mode &^= windows.ENABLE_QUICK_EDIT_MODE // 禁用快速编辑模式
+	mode |= windows.ENABLE_EXTENDED_FLAGS   // 启用扩展标志
+
+	mode &^= windows.ENABLE_MOUSE_INPUT    // 禁用鼠标输入
+	mode |= windows.ENABLE_PROCESSED_INPUT // 启用控制输入
+
+	mode &^= windows.ENABLE_INSERT_MODE                           // 禁用插入模式
+	mode |= windows.ENABLE_ECHO_INPUT | windows.ENABLE_LINE_INPUT // 启用输入回显&逐行输入
+
+	mode &^= windows.ENABLE_WINDOW_INPUT           // 禁用窗口输入
+	mode &^= windows.ENABLE_VIRTUAL_TERMINAL_INPUT // 禁用虚拟终端输入
+
+	err = windows.SetConsoleMode(stdin, mode)
+	if err != nil {
+		panic(err)
+	}
+
+	stdout := windows.Handle(os.Stdout.Fd())
+	err = windows.GetConsoleMode(stdout, &mode)
+	if err != nil {
+		panic(err)
+	}
+
+	mode |= windows.ENABLE_VIRTUAL_TERMINAL_PROCESSING // 启用虚拟终端处理
+	mode |= windows.ENABLE_PROCESSED_OUTPUT            // 启用处理后的输出
+
+	err = windows.SetConsoleMode(stdout, mode)
+	// windows 带颜色 log 自定义格式
+	logrus.SetFormatter(&logFormat{hasColor: err == nil})
+	if err != nil {
+		logrus.Warnln("VT100设置失败, 将以无色模式输出")
+	}
+
+	err = setConsoleTitle("ZeroBot-Plugin " + banner.Version + " " + banner.Copyright)
+	if err != nil {
+		panic(err)
+	}
+}
+
+const (
+	colorCodePanic = "\x1b[1;31m" // color.Style{color.Bold, color.Red}.String()
+	colorCodeFatal = "\x1b[1;31m" // color.Style{color.Bold, color.Red}.String()
+	colorCodeError = "\x1b[31m"   // color.Style{color.Red}.String()
+	colorCodeWarn  = "\x1b[33m"   // color.Style{color.Yellow}.String()
+	colorCodeInfo  = "\x1b[37m"   // color.Style{color.White}.String()
+	colorCodeDebug = "\x1b[32m"   // color.Style{color.Green}.String()
+	colorCodeTrace = "\x1b[36m"   // color.Style{color.Cyan}.String()
+	colorReset     = "\x1b[0m"
+)
+
+// logFormat specialize for zbp
+type logFormat struct {
+	hasColor bool
+}
+
+// Format implements logrus.Formatter
+func (f logFormat) Format(entry *logrus.Entry) ([]byte, error) {
+	buf := new(bytes.Buffer)
+
+	buf.WriteByte('[')
+	if f.hasColor {
+		buf.WriteString(getLogLevelColorCode(entry.Level))
+	}
+	buf.WriteString(strings.ToUpper(entry.Level.String()))
+	if f.hasColor {
+		buf.WriteString(colorReset)
+	}
+	buf.WriteString("] ")
+	buf.WriteString(entry.Message)
+	buf.WriteString(" \n")
+
+	return buf.Bytes(), nil
+}
+
+// getLogLevelColorCode 获取日志等级对应色彩code
+func getLogLevelColorCode(level logrus.Level) string {
+	switch level {
+	case logrus.PanicLevel:
+		return colorCodePanic
+	case logrus.FatalLevel:
+		return colorCodeFatal
+	case logrus.ErrorLevel:
+		return colorCodeError
+	case logrus.WarnLevel:
+		return colorCodeWarn
+	case logrus.InfoLevel:
+		return colorCodeInfo
+	case logrus.DebugLevel:
+		return colorCodeDebug
+	case logrus.TraceLevel:
+		return colorCodeTrace
+
+	default:
+		return colorCodeInfo
+	}
+}

go.mod

@@ -1,88 +1,98 @@
 module github.com/FloatTech/ZeroBot-Plugin
 
-go 1.19
+go 1.20
 
 require (
 	github.com/Baidu-AIP/golang-sdk v1.1.1
-	github.com/Coloured-glaze/gg v1.3.4
-	github.com/FloatTech/AnimeAPI v1.5.2-0.20221112090201-4a200d6330d5
-	github.com/FloatTech/floatbox v0.0.0-20221110070748-e0d0b3af3e57
-	github.com/FloatTech/sqlite v0.5.1
+	github.com/FloatTech/AnimeAPI v1.6.1-0.20230827161910-7e6a3d93a0ba
+	github.com/FloatTech/floatbox v0.0.0-20230827160415-f0865337a824
+	github.com/FloatTech/gg v1.1.3-0.20230226151425-6ea91286ba08
+	github.com/FloatTech/imgfactory v0.2.2-0.20230413152719-e101cc3606ef
+	github.com/FloatTech/rendercard v0.0.10-0.20230223064326-45d29fa4ede9
+	github.com/FloatTech/sqlite v1.6.2
 	github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b
-	github.com/FloatTech/zbpctrl v1.5.3-0.20221110070900-b2888434e9fc
-	github.com/FloatTech/zbputils v1.5.1-0.20221115024335-1bd5b91a870e
-	github.com/RomiChan/syncx v0.0.0-20220404072119-d7ea0ae15a4c
-	github.com/RomiChan/websocket v1.4.3-0.20220123145318-307a86b127bc
+	github.com/FloatTech/zbpctrl v1.5.3-0.20230514154630-b74e6fcca380
+	github.com/FloatTech/zbputils v1.6.2-0.20230728081122-94d4d957f3bf
+	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.1.0
+	github.com/davidscholberg/go-durationfmt v0.0.0-20170122144659-64843a2083d3
+	github.com/disintegration/imaging v1.6.2
 	github.com/fumiama/ahsai v0.1.0
 	github.com/fumiama/cron v1.3.0
-	github.com/fumiama/go-base16384 v1.6.1
-	github.com/fumiama/go-registry v0.2.2
+	github.com/fumiama/go-base16384 v1.7.0
+	github.com/fumiama/go-registry v0.2.6
 	github.com/fumiama/gotracemoe v0.0.3
-	github.com/fumiama/sqlite3 v1.14.6
-	github.com/fumiama/unibase2n v0.0.0-20221003115227-e7db987de949
+	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.29.0
-	github.com/mroth/weightedrand v0.4.1
+	github.com/lithammer/fuzzysearch v1.1.5
+	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.8
+	github.com/quic-go/quic-go v0.38.1
+	github.com/shirou/gopsutil/v3 v3.23.1
 	github.com/sirupsen/logrus v1.9.0
-	github.com/tidwall/gjson v1.14.3
+	github.com/tidwall/gjson v1.14.4
 	github.com/wcharczuk/go-chart/v2 v2.1.0
-	github.com/wdvxdr1123/ZeroBot v1.6.3
+	github.com/wdvxdr1123/ZeroBot v1.7.4
 	gitlab.com/gomidi/midi/v2 v2.0.25
-	golang.org/x/image v0.1.0
+	golang.org/x/image v0.3.0
+	golang.org/x/sys v0.8.0
+	golang.org/x/text v0.9.0
+	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
-	github.com/FloatTech/rendercard v0.0.1 // indirect
 	github.com/antchfx/xpath v1.2.1 // indirect
-	github.com/disintegration/imaging v1.6.2 // indirect
 	github.com/ericpauley/go-quantize v0.0.0-20200331213906-ae555eb2afa4 // indirect
 	github.com/faiface/beep v1.1.0 // indirect
-	github.com/fsnotify/fsnotify v1.4.9 // indirect
 	github.com/fumiama/go-simple-protobuf v0.1.0 // indirect
 	github.com/fumiama/gofastTEA v0.0.10 // indirect
+	github.com/fumiama/imgsz v0.0.2 // 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-20200121045136-8c9f03a8e57e // indirect
+	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // 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-18 v0.1.2 // indirect
-	github.com/marten-seemann/qtls-go1-19 v0.1.0 // 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.9.5 // indirect
+	github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
+	github.com/pkumza/numcn v1.0.0 // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
+	github.com/quic-go/qpack v0.4.0 // indirect
+	github.com/quic-go/qtls-go1-20 v0.3.3 // 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-20210921155107-089bfa567519 // indirect
-	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
-	golang.org/x/exp/shiny v0.0.0-20221004215720-b9f4876ce741 // indirect
+	golang.org/x/crypto v0.4.0 // indirect
+	golang.org/x/exp v0.0.0-20221205204356-47842c84f3db // 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-20220722155237-a158d28d115b // indirect
-	golang.org/x/sys v0.0.0-20220915200043-7b5979e65e41 // indirect
-	golang.org/x/text v0.4.0 // indirect
-	golang.org/x/tools v0.1.12 // indirect
-	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
-	modernc.org/libc v1.19.0 // indirect
+	golang.org/x/mod v0.10.0 // indirect
+	golang.org/x/net v0.10.0 // indirect
+	golang.org/x/tools v0.9.1 // indirect
+	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // 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,71 +1,81 @@
 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.5.2-0.20221112090201-4a200d6330d5 h1:1SpesC37urPid5ChljT7fnq+kyJLDrCuHva9usiJptU=
-github.com/FloatTech/AnimeAPI v1.5.2-0.20221112090201-4a200d6330d5/go.mod h1:D3VwaTmT25UM+x/0AULJtJw4Mzyhob5YOa90J5QAX/w=
-github.com/FloatTech/floatbox v0.0.0-20221110070748-e0d0b3af3e57 h1:1H1QSxBPqq7o4S5/xtl0cI/GOqaiajoBg+156cuK1e4=
-github.com/FloatTech/floatbox v0.0.0-20221110070748-e0d0b3af3e57/go.mod h1:72tI2fKLhrNpuj4AlE2HSjJOAtEnUEKOx/+dEYSc4FE=
-github.com/FloatTech/rendercard v0.0.1 h1:BouAX5P7VFBf0HIqoD9OFUzsGt8ClKGlYm0GoHVQhvM=
-github.com/FloatTech/rendercard v0.0.1/go.mod h1:e2M5OWspdblwq182zbVgRefiOc+gXtB1XzTW/2z86/I=
-github.com/FloatTech/sqlite v0.5.1 h1:IjTdnqMVIVIoIEFXhvh/KKBfYxFvG0tk7Rghz65/DAU=
-github.com/FloatTech/sqlite v0.5.1/go.mod h1:i33d92OtR8jcp5fBUvQtospf27+MkfUxnGwnZ95E/dA=
+github.com/FloatTech/AnimeAPI v1.6.1-0.20230827161910-7e6a3d93a0ba h1:0tqYkIc6RK8P3/cGEMSoBBwhiEHKPJC+1F7xlVkikgY=
+github.com/FloatTech/AnimeAPI v1.6.1-0.20230827161910-7e6a3d93a0ba/go.mod h1:6vYu7bW5gPQsBnXB+I6yk+eJQaaAwusoQ/I/wQMwOAI=
+github.com/FloatTech/floatbox v0.0.0-20230827160415-f0865337a824 h1:w72fzQg1Y9+VLSRl7iKzaZ6fG3myyMJfpOSajcjaMDM=
+github.com/FloatTech/floatbox v0.0.0-20230827160415-f0865337a824/go.mod h1:FwQm6wk+b4wuW54KCKn3zccMX47Q5apnHD/Yakzv0fI=
+github.com/FloatTech/gg v1.1.3-0.20230226151425-6ea91286ba08 h1:dPLeoiTVSBlgls+66EB/UJ2e38BaASmBN5nANaycSBU=
+github.com/FloatTech/gg v1.1.3-0.20230226151425-6ea91286ba08/go.mod h1:uzPzAeT35egARdRuu+1oyjU3CmTwCceoq3Vvje7LpcI=
+github.com/FloatTech/imgfactory v0.2.2-0.20230413152719-e101cc3606ef h1:CJbK/2FRwPuZpeb6M4sWK2d7oXDnBEGhpkQuQrgc91A=
+github.com/FloatTech/imgfactory v0.2.2-0.20230413152719-e101cc3606ef/go.mod h1:el5hGpj1C1bDRxcTXYRwEivDCr40zZeJpcrLrB1fajs=
+github.com/FloatTech/rendercard v0.0.10-0.20230223064326-45d29fa4ede9 h1:hffajvmQFfP68U6wUwHemPuuwCUoss+SEFfoLYwbGwE=
+github.com/FloatTech/rendercard v0.0.10-0.20230223064326-45d29fa4ede9/go.mod h1:NBFPhWae4hqVMeG8ELBBnUQkKce3nDjkljVn6PdiUNs=
+github.com/FloatTech/sqlite v1.6.2 h1:FytbExjpvYalZxxITtmSenHiPGLPUvlz47LY/P0SCCw=
+github.com/FloatTech/sqlite v1.6.2/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.5.3-0.20221110070900-b2888434e9fc h1:jNHQsG7kKKkRwey4u9XpQIIBfNXX3SLBCeiTyjhBRQc=
-github.com/FloatTech/zbpctrl v1.5.3-0.20221110070900-b2888434e9fc/go.mod h1:zfrIWujK6ORPhOuUUzeKGNOLGI/XXz+78FRHRF9zEFo=
-github.com/FloatTech/zbputils v1.5.1-0.20221115024335-1bd5b91a870e h1:ifyggYG2sXRfOkRiqlUbyKmBj4ZhRL5ZqgUcwCOr96w=
-github.com/FloatTech/zbputils v1.5.1-0.20221115024335-1bd5b91a870e/go.mod h1:rUPVSKwfD65Nsve3gWSMQy6b78SYEB1vGKW1e5I3lqM=
+github.com/FloatTech/zbpctrl v1.5.3-0.20230514154630-b74e6fcca380 h1:qmwoT8xVaND01aCdwy+5/j6z490nehQWZAVyTBN8ahU=
+github.com/FloatTech/zbpctrl v1.5.3-0.20230514154630-b74e6fcca380/go.mod h1:gkGC1C1eEUd/Ld/ja68zas5j2ZktIZCdnj2FMaM+Au0=
+github.com/FloatTech/zbputils v1.6.2-0.20230728081122-94d4d957f3bf h1:PwH9aMnmN+m204cVIqUrI3e7nsdQi/IGW012Fjzb1bs=
+github.com/FloatTech/zbputils v1.6.2-0.20230728081122-94d4d957f3bf/go.mod h1:JRnGR7EGeEQgxOs+c0rZAhrS9Es2BTcGHdIDHXIPRzQ=
 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/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/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=
+github.com/davidscholberg/go-durationfmt v0.0.0-20170122144659-64843a2083d3 h1:qshMBFxVjYjzI+kwvWvgoByF3uMCvnJiaK8KslWAbr8=
+github.com/davidscholberg/go-durationfmt v0.0.0-20170122144659-64843a2083d3/go.mod h1:M9fx6rAdHSYLKxXPgUXGgblb586CA7ceNrpu4DEc2No=
 github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd h1:83Wprp6ROGeiHFAP8WJdI2RoxALQYgdllERc3N5N2DM=
 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/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/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
-github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/fumiama/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.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.2 h1:BAA/pltg/Ryq3oj4CRJBenVZM6EowOQvtHbv/rPp2LY=
-github.com/fumiama/go-registry v0.2.2/go.mod h1:GP45kejHuDLFxcWdksrt75r5rHBqYwtfeUl3JzGWxfQ=
+github.com/fumiama/go-base16384 v1.7.0 h1:6fep7XPQWxRlh4Hu+KsdH+6+YdUp+w6CwRXtMWSsXCA=
+github.com/fumiama/go-base16384 v1.7.0/go.mod h1:OEn+947GV5gsbTAnyuUW/SrfxJYUdYupSIQXOuGOcXM=
+github.com/fumiama/go-registry v0.2.6 h1:+vEeBUwa1+GC87ujW3Km42fi8O/H7QcpVJWu1iuGNh0=
+github.com/fumiama/go-registry v0.2.6/go.mod h1:HjYagPZXzR2xCCxaSQerqX7JRzC0yiv2kslDdBiTq/g=
 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/unibase2n v0.0.0-20221003115227-e7db987de949 h1:VAzR8aoS2SCEBmRF9rqCPyXgXoP8mZ1viNL4mLWUg0Q=
-github.com/fumiama/unibase2n v0.0.0-20221003115227-e7db987de949/go.mod h1:lEaZsT4FRSqcjnQ5q8y+mkenkzR/r1D3BJmfdp0vqDg=
+github.com/fumiama/imgsz v0.0.2 h1:fAkC0FnIscdKOXwAxlyw3EUba5NzxZdSxGaq3Uyfxak=
+github.com/fumiama/imgsz v0.0.2/go.mod h1:dR71mI3I2O5u6+PCpd47M9TZptzP+39tRBcbdIkoqM4=
+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/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg=
@@ -73,43 +83,36 @@ github.com/gdamore/tcell v1.3.0/go.mod h1:Hjvr+Ofd+gLglo7RYKxxnzCBmev3BzsS67MebK
 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-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
 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.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/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
+github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
 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/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
+github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/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.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 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
-github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-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/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
-github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+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/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/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+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=
@@ -124,21 +127,20 @@ github.com/jinzhu/now v1.0.1 h1:HjfetcXq097iXP0uoPCdnM4Efp5/9MsM0/M+XOTeR3M=
 github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/jozsefsallai/gophersauce v1.0.1 h1:BA3ovtQRrAb1qYU9JoRLbDHpxnDunlNcEkEfhCvDDCM=
 github.com/jozsefsallai/gophersauce v1.0.1/go.mod h1:YVEI7djliMTmZ1Vh01YPF8bUHi+oKhe3yXgKf1T49vg=
-github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+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.29.0 h1:Vw0mGTfmWqGzh4jx/kMymsIkFK6rErFVmg+t9RLrnZE=
-github.com/lucas-clemente/quic-go v0.29.0/go.mod h1:CTcNfLYJS2UuRNB+zcNlgvkjBhxX6Hm3WUxxAQx2mgE=
+github.com/lithammer/fuzzysearch v1.1.5 h1:Ag7aKU08wp0R9QCfF4GoGST9HbmAIeLP7xwMrOBEp1c=
+github.com/lithammer/fuzzysearch v1.1.5/go.mod h1:1R1LRNk7yKid1BaQkmuLQaHruxcC4HmAH30Dh61Ih1Q=
 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/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-18 v0.1.2 h1:JH6jmzbduz0ITVQ7ShevK10Av5+jBEKAHMntXmIV7kM=
-github.com/marten-seemann/qtls-go1-18 v0.1.2/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
-github.com/marten-seemann/qtls-go1-19 v0.1.0 h1:rLFKD/9mp/uq1SYGYuVZhm83wkmU95pK5df3GufyYYU=
-github.com/marten-seemann/qtls-go1-19 v0.1.0/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI=
-github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 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=
@@ -146,21 +148,16 @@ github.com/mattn/go-sqlite3 v1.14.0 h1:mLyGNKR8+Vv9CAU7PphKa2hkEqxxhn8i32J6FPj1/
 github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus=
 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 v0.4.1 h1:rHcbUBopmi/3x4nnrvwGJBhX9d0vk+KgoLUZeDP6YyI=
-github.com/mroth/weightedrand v0.4.1/go.mod h1:3p2SIcC8al1YMzGhAIoXD+r9olo/g/cdJgAD905gyNE=
+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.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/ginkgo/v2 v2.9.5 h1:+6Hr4uxzP4XIUyAkg61dWBw8lb/gc4/X5luuxN/EC+Q=
+github.com/onsi/ginkgo/v2 v2.9.5/go.mod h1:tvAoo1QUJwNEU2ITftXTpR7R1RbCzoZUOs3RonqW57k=
+github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE=
+github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 h1:onHthvaw9LFnH4t2DcNVpwGmV9E1BkGknEliJkfwQj0=
+github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58/go.mod h1:DXv8WO4yhMYhSNPKjeNKa5WY9YCIEBRbNzFFPJbWO6Y=
+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=
@@ -170,34 +167,41 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 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/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk=
-github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
-github.com/shirou/gopsutil/v3 v3.22.8 h1:a4s3hXogo5mE2PfdfJIonDbstO/P+9JszdfhAHSzD9Y=
-github.com/shirou/gopsutil/v3 v3.22.8/go.mod h1:s648gW4IywYzUfE/KjXxUsqrqx/T2xO5VqOXxONeRfI=
+github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
+github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
+github.com/quic-go/qtls-go1-20 v0.3.3 h1:17/glZSLI9P9fDAeyCHBFSWSqJcwx1byhLwP5eUIDCM=
+github.com/quic-go/qtls-go1-20 v0.3.3/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k=
+github.com/quic-go/quic-go v0.38.1 h1:M36YWA5dEhEeT+slOu/SwMEucbYd0YFidxG3KlGPZaE=
+github.com/quic-go/quic-go v0.38.1/go.mod h1:ijnZM7JsFIkp4cRyjxJNIzdSfCLmUMg9wdyhGmg+SN4=
+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.23.1 h1:a9KKO+kGLKEvcPIs4W62v0nu3sciVDOOOPUD0Hz7z/4=
+github.com/shirou/gopsutil/v3 v3.23.1/go.mod h1:NN6mnm5/0k8jw4cBfCnJtr5L7ErOTg18tMNpgFkn0hA=
 github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
 github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 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/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/tidwall/gjson v1.14.3 h1:9jvXn7olKEHU1S9vwoMGliaT8jq1vJ7IH/n9zD9Dnlw=
-github.com/tidwall/gjson v1.14.3/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
+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/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.6.3 h1:Xf+rM8fR9Etc7ydcGHuqCk0ulAAn7Oa7nD9Zy/qZ6Pk=
-github.com/wdvxdr1123/ZeroBot v1.6.3/go.mod h1:shG/ruauisKaVcov4amrFJtkeDl7nl+Q00IXB2PqFsc=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/wdvxdr1123/ZeroBot v1.7.4 h1:+148rELpf/FCDW2EuvKqpb9bNKcwKRtoh16s2sIb5SE=
+github.com/wdvxdr1123/ZeroBot v1.7.4/go.mod h1:y29UIOy0RD3P+0meDNIWRhcJF3jtWPN9xP9hgt/AJAU=
 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=
@@ -209,22 +213,22 @@ golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACk
 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-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-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/crypto v0.4.0 h1:UVQgzMY87xqpKNgb+kDsll2Igd33HszWHFLmpaRMq/8=
+golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80=
 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-20221004215720-b9f4876ce741 h1:b7y8iQCnzOE0NhgpMj2yHw17Us+lhXxFbdzKlTpqm5I=
-golang.org/x/exp/shiny v0.0.0-20221004215720-b9f4876ce741/go.mod h1:VjAR7z0ngyATZTELrBSkxOOHhhlnVUxDye4mcjx5h/8=
+golang.org/x/exp v0.0.0-20221205204356-47842c84f3db h1:D/cFflL63o2KSLJIwjlcIt8PR064j/xsmdEJL/YvY/o=
+golang.org/x/exp v0.0.0-20221205204356-47842c84f3db/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
+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.1.0 h1:r8Oj8ZA2Xy12/b5KZYj3tuv7NG/fBz3TwQVvpJ9l8Rk=
-golang.org/x/image v0.1.0/go.mod h1:iyPr49SD/G/TBxYVB/9RRtGUT5eNbo2u4NamWeQcD5c=
+golang.org/x/image v0.3.0 h1:HTDXbdK9bjfSWkPzDJIw89W8CAtfFGduujWs33NLLsg=
+golang.org/x/image v0.3.0/go.mod h1:fXd9211C/0VTlYuAcOhW8dY/RtEJqODXOWBDpmYBf+A=
 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=
@@ -232,12 +236,11 @@ golang.org/x/mobile v0.0.0-20201217150744-e6ae53a27f4f/go.mod h1:skQtrUTUwhdJvXM
 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.3.0/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/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
+golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-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-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -245,203 +248,65 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-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-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 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/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-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-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-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-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-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-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-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-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.0.0-20220915200043-7b5979e65e41 h1:ohgcoMbSofXygzo6AD2I1kz3BFmW1QArPYTtwEM3UXc=
-golang.org/x/sys v0.0.0-20220915200043-7b5979e65e41/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
+golang.org/x/sys v0.8.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.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.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-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/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 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-20200117012304-6edc0a871e69/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-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/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/tools v0.9.1 h1:8WMNJAz3zrtPmnYC7ISf5dEn3MT0gY7jBJfw27yrrLo=
+golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
 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/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-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 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM=
-google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
-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/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 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=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-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.19.0 h1:bXyVhGQg6KIClTr8FMVIDPl7jtbcs7aS5WP7vLDaxPs=
-modernc.org/libc v1.19.0/go.mod h1:ZRfIaEkgrYgZDl6pa4W39HgN5G/yDW+NRmNKZBDFrk0=
-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/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
+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.0.4/go.mod h1:nV2OApxradM3/OVbs2/0OsP6nPfakXpi50C7dcoHXlc=
-modernc.org/memory v1.0.5/go.mod h1:B7OYswTRnfGg+4tDH1t1OeUNnsy2viGTdME4tzd+IjM=
 modernc.org/memory v1.4.0 h1:crykUfNSnMAXaOJnnxcSzbUGMqkLWjklJKkBK2nwZwk=
 modernc.org/memory v1.4.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU=
-modernc.org/opt v0.1.1/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
-modernc.org/strutil v1.1.1/go.mod h1:DE+MQQ/hjKBZS2zNInV5hhcipt5rLPWkmpbGeW5mmdw=
-modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=

kanban/banner.go

@@ -1,41 +0,0 @@
-package kanban
-
-import (
-	"fmt"
-
-	"github.com/fumiama/go-registry"
-)
-
-var (
-	// Banner ...
-	Banner = "* OneBot + ZeroBot + Golang\n" +
-		"* Version 1.6.0-beta1 - 2022-11-15 11:13:42 +0800 CST\n" +
-		"* Copyright © 2020 - 2022 FloatTech. All Rights Reserved.\n" +
-		"* Project: https://github.com/FloatTech/ZeroBot-Plugin"
-	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
-}

kanban/banner/banner.go

@@ -0,0 +1,15 @@
+// Code generated by kanban/gen. DO NOT EDIT.
+
+package banner
+
+// Version ...
+var Version = "v1.7.3"
+
+// Copyright ...
+var Copyright = "© 2020 - 2023 FloatTech"
+
+// Banner ...
+var Banner = "* OneBot + ZeroBot + Golang\n" +
+	"* Version " + Version + " - 2023-08-28 16:14:08 +0800 CST\n" +
+	"* Copyright " + Copyright + ". All Rights Reserved.\n" +
+	"* Project: https://github.com/FloatTech/ZeroBot-Plugin"

kanban/gen/banner.go

@@ -0,0 +1,51 @@
+// Package main generates banner.go
+package main
+
+import (
+	"bytes"
+	"fmt"
+	"os"
+	"os/exec"
+	"strings"
+	"time"
+)
+
+const banner = `// Code generated by kanban/gen. DO NOT EDIT.
+
+package banner
+
+// Version ...
+var Version = "%s"
+
+// Copyright ...
+var Copyright = "© 2020 - %d FloatTech"
+
+// Banner ...
+var Banner = "* OneBot + ZeroBot + Golang\n" +
+	"* Version " + Version + " - %s\n" +
+	"* Copyright " + Copyright + ". 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/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.Year(), now.Format(timeformat))
+	if err != nil {
+		panic(err)
+	}
+}

kanban/init.go

@@ -2,11 +2,43 @@
 package kanban
 
 import (
-	"sync"
+	"fmt"
+
+	"github.com/FloatTech/zbputils/control"
+	"github.com/fumiama/go-registry"
+
+	"github.com/FloatTech/ZeroBot-Plugin/kanban/banner"
 )
 
-var once sync.Once
+//go:generate go run github.com/FloatTech/ZeroBot-Plugin/kanban/gen
 
 func init() {
-	once.Do(PrintBanner)
+	PrintBanner()
+}
+
+var reg = registry.NewRegReader("reilia.fumiama.top:32664", control.Md5File, "fumiama")
+
+// PrintBanner ...
+func PrintBanner() {
+	fmt.Print(
+		"\n======================[ZeroBot-Plugin]======================",
+		"\n", banner.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
 }

kanban/version_less_than_1.21.go

@@ -0,0 +1,5 @@
+//go:build go1.21
+
+package kanban
+
+const Error int = "请使用小于1.21版本的Go"

main.go

@@ -7,10 +7,14 @@ import (
 	"fmt"
 	"math/rand"
 	"os"
+	"runtime"
 	"strconv"
+	"strings"
 	"time"
 
-	"github.com/FloatTech/ZeroBot-Plugin/kanban" // 在最前打印 banner
+	_ "github.com/FloatTech/ZeroBot-Plugin/console" // 更改控制台属性
+
+	"github.com/FloatTech/ZeroBot-Plugin/kanban" // 打印 banner
 
 	// ---------以下插件均可通过前面加 // 注释，注释后停用并不加载插件--------- //
 	// ----------------------插件优先级按顺序从高到低---------------------- //
@@ -36,8 +40,6 @@ import (
 
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/manager" // 群管
 
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/thesaurus" // 词典匹配回复
-
 	_ "github.com/FloatTech/zbputils/job" // 定时指令触发器
 
 	//                               ^^^^                               //
@@ -58,86 +60,99 @@ 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/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/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"         // 笑话
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/genshin"       // 原神抽卡
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/gif"           // 制图
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/github"        // 搜索GitHub仓库
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/guessmusic"    // 猜歌
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/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"          // 摸鱼
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/moyu_calendar" // 摸鱼人日历
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/music"         // 点歌
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/nativesetu"    // 本地涩图
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/nativewife"    // 本地老婆
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/nbnhhsh"       // 拼音首字母缩写释义工具
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/nihongo"       // 日语语法学习
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/novel"         // 铅笔小说网搜索
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/nsfw"          // nsfw图片识别
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/omikuji"       // 浅草寺求签
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/qqwife"        // 一群一天一夫一妻制群老婆
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/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"      // 以图搜图
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/scale"         // 叔叔的AI二次元图片放大
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/score"         // 分数
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/setutime"      // 来份涩图
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/shadiao"       // 沙雕app
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/shindan"       // 测定
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/tarot"         // 抽塔罗牌
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/tiangou"       // 舔狗日记
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/tracemoe"      // 搜番
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/translation"   // 翻译
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/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/ymgal"         // 月幕galgame
+	_ "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/autowithdraw"     // 触发者撤回时也自动撤回
+	_ "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/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/dailynews"        // 今日早报
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/danbooru"         // DeepDanbooru二次元图标签识别
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/diana"            // 嘉心糖发病
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/dish"             // 程序员做饭指南
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/drawlots"         // 多功能抽签
+	_ "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/event"            // 好友申请群聊邀请事件处理
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/font"             // 渲染任意文字到图片
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/fortune"          // 运势
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/funny"            // 笑话
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/genshin"          // 原神抽卡
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/gif"              // 制图
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/github"           // 搜索GitHub仓库
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/guessmusic"       // 猜歌
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/heisi"            // 黑丝
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/hitokoto"         // 一言
+	_ "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/jptingroom"       // 日语听力学习材料
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/juejuezi"         // 绝绝子生成器
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/kfccrazythursday" // 疯狂星期四
+	_ "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"             // 摸鱼
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/moyu_calendar"    // 摸鱼人日历
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/music"            // 点歌
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/nativesetu"       // 本地涩图
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/nativewife"       // 本地老婆
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/nbnhhsh"          // 拼音首字母缩写释义工具
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/nihongo"          // 日语语法学习
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/novel"            // 铅笔小说网搜索
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/nsfw"             // nsfw图片识别
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/omikuji"          // 浅草寺求签
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/qqwife"           // 一群一天一夫一妻制群老婆
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/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"         // 以图搜图
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/scale"            // 叔叔的AI二次元图片放大
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/score"            // 分数
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/setutime"         // 来份涩图
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/shadiao"          // 沙雕app
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/shindan"          // 测定
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/steam"            // steam相关
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/tarot"            // 抽塔罗牌
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/tiangou"          // 舔狗日记
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/tracemoe"         // 搜番
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/translation"      // 翻译
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/vitsnyaru"        // vits猫雷
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/vtb_quotation"    // vtb语录
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/vtbmusic"         // vtb点歌
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/wallet"           // 钱包
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/wangyiyun"        // 网易云音乐热评
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/wantquotes"       // 据意查句
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/warframeapi"      // warframeAPI插件
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/wenben"           // 文本指令大全
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/wenxinAI"         // 百度文心AI画图
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/wife"             // 抽老婆
+	_ "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"            // 鬼东西
+	// _ "github.com/FloatTech/ZeroBot-Plugin/plugin/wtf"           // 鬼东西
 
 	//                               ^^^^                               //
 	//                          ^^^^^^^^^^^^^^                          //
@@ -161,6 +176,8 @@ import (
 
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/ai_reply" // 人工智能回复
 
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/thesaurus" // 词典匹配回复
+
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/breakrepeat" // 打断复读
 
 	//                               ^^^^                               //
@@ -180,12 +197,17 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/driver"
 	"github.com/wdvxdr1123/ZeroBot/message"
+
+	// webctrl "github.com/FloatTech/zbputils/control/web"
+
+	"github.com/FloatTech/ZeroBot-Plugin/kanban/banner"
 	// -----------------------以上为内置依赖，勿动------------------------ //
 )
 
 type zbpcfg struct {
 	Z zero.Config        `json:"zero"`
 	W []*driver.WSClient `json:"ws"`
+	S []*driver.WSServer `json:"wss"`
 }
 
 var config zbpcfg
@@ -196,6 +218,7 @@ func init() {
 	d := flag.Bool("d", false, "Enable debug level log and higher.")
 	w := flag.Bool("w", false, "Enable warning level log and higher.")
 	h := flag.Bool("h", false, "Display this help.")
+	// g := flag.String("g", "127.0.0.1:3000", "Set webui url.")
 	// 直接写死 AccessToken 时，请更改下面第二个参数
 	token := flag.String("t", "", "Set AccessToken of WSClient.")
 	// 直接写死 URL 时，请更改下面第二个参数
@@ -208,6 +231,7 @@ func init() {
 	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).")
+	markmsg := flag.Bool("m", false, "Don't mark message as read automatically")
 
 	flag.Parse()
 
@@ -215,13 +239,12 @@ func init() {
 		fmt.Println("Usage:")
 		flag.PrintDefaults()
 		os.Exit(0)
-	} else {
-		if *d && !*w {
-			logrus.SetLevel(logrus.DebugLevel)
-		}
-		if *w {
-			logrus.SetLevel(logrus.WarnLevel)
-		}
+	}
+	if *d && !*w {
+		logrus.SetLevel(logrus.DebugLevel)
+	}
+	if *w {
+		logrus.SetLevel(logrus.WarnLevel)
 	}
 
 	for _, s := range flag.Args() {
@@ -236,6 +259,9 @@ func init() {
 	// sus = append(sus, 12345678)
 	// sus = append(sus, 87654321)
 
+	// 启用 webui
+	// go webctrl.RunGui(*g)
+
 	if *runcfg != "" {
 		f, err := os.Open(*runcfg)
 		if err != nil {
@@ -247,14 +273,16 @@ func init() {
 		if err != nil {
 			panic(err)
 		}
-		config.Z.Driver = make([]zero.Driver, len(config.W))
+		config.Z.Driver = make([]zero.Driver, len(config.W)+len(config.S))
 		for i, w := range config.W {
 			config.Z.Driver[i] = w
 		}
+		for i, s := range config.S {
+			config.Z.Driver[i+len(config.W)] = s
+		}
 		logrus.Infoln("[main] 从", *runcfg, "读取配置文件")
 		return
 	}
-
 	config.W = []*driver.WSClient{driver.NewWebSocketClient(*url, *token)}
 	config.Z = zero.Config{
 		NickName:       append([]string{*adana}, "ATRI", "atri", "亚托莉", "アトリ"),
@@ -263,6 +291,7 @@ func init() {
 		RingLen:        *rsz,
 		Latency:        time.Duration(*late) * time.Millisecond,
 		MaxProcessTime: time.Duration(*maxpt) * time.Minute,
+		MarkMessage:    !*markmsg,
 		Driver:         []zero.Driver{config.W[0]},
 	}
 
@@ -282,15 +311,17 @@ func init() {
 }
 
 func main() {
-	rand.Seed(time.Now().UnixNano()) // 全局 seed，其他插件无需再 seed
+	if !strings.Contains(runtime.Version(), "go1.2") { // go1.20之前版本需要全局 seed，其他插件无需再 seed
+		rand.Seed(time.Now().UnixNano()) //nolint: staticcheck
+	}
 	// 帮助
-	zero.OnFullMatchGroup([]string{"/help", ".help", "菜单"}, zero.OnlyToMe).SetBlock(true).
+	zero.OnFullMatchGroup([]string{"help", "/help", ".help", "菜单"}, zero.OnlyToMe).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			ctx.SendChain(message.Text(kanban.Banner, "\n可发送\"/服务列表\"查看 bot 功能"))
+			ctx.SendChain(message.Text(banner.Banner, "\n管理发送\"/服务列表\"查看 bot 功能\n发送\"/用法name\"查看功能用法"))
 		})
 	zero.OnFullMatch("查看zbp公告", zero.OnlyToMe, zero.AdminPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			ctx.SendChain(message.Text(kanban.Kanban()))
+			ctx.SendChain(message.Text(strings.ReplaceAll(kanban.Kanban(), "\t", "")))
 		})
 	zero.RunAndBlock(&config.Z, process.GlobalInitMutex.Unlock)
 }

main_win.go

@@ -1,70 +0,0 @@
-//go:build windows
-// +build windows
-
-package main
-
-import (
-	"bytes"
-	"strings"
-
-	"github.com/sirupsen/logrus"
-)
-
-func init() {
-	// windows 带颜色 log 自定义格式
-	logrus.SetFormatter(&LogFormat{})
-}
-
-const (
-	colorCodePanic = "\x1b[1;31m" // color.Style{color.Bold, color.Red}.String()
-	colorCodeFatal = "\x1b[1;31m" // color.Style{color.Bold, color.Red}.String()
-	colorCodeError = "\x1b[31m"   // color.Style{color.Red}.String()
-	colorCodeWarn  = "\x1b[33m"   // color.Style{color.Yellow}.String()
-	colorCodeInfo  = "\x1b[37m"   // color.Style{color.White}.String()
-	colorCodeDebug = "\x1b[32m"   // color.Style{color.Green}.String()
-	colorCodeTrace = "\x1b[36m"   // color.Style{color.Cyan}.String()
-	colorReset     = "\x1b[0m"
-)
-
-// LogFormat specialize for zbp
-type LogFormat struct{}
-
-// Format implements logrus.Formatter
-func (f LogFormat) Format(entry *logrus.Entry) ([]byte, error) {
-	buf := new(bytes.Buffer)
-
-	buf.WriteString(getLogLevelColorCode(entry.Level))
-
-	buf.WriteByte('[')
-	buf.WriteString(strings.ToUpper(entry.Level.String()))
-	buf.WriteString("] ")
-	buf.WriteString(entry.Message)
-	buf.WriteString(" \n")
-
-	buf.WriteString(colorReset)
-
-	return buf.Bytes(), nil
-}
-
-// getLogLevelColorCode 获取日志等级对应色彩code
-func getLogLevelColorCode(level logrus.Level) string {
-	switch level {
-	case logrus.PanicLevel:
-		return colorCodePanic
-	case logrus.FatalLevel:
-		return colorCodeFatal
-	case logrus.ErrorLevel:
-		return colorCodeError
-	case logrus.WarnLevel:
-		return colorCodeWarn
-	case logrus.InfoLevel:
-		return colorCodeInfo
-	case logrus.DebugLevel:
-		return colorCodeDebug
-	case logrus.TraceLevel:
-		return colorCodeTrace
-
-	default:
-		return colorCodeInfo
-	}
-}

plugin/ahsai/ahsai.go

@@ -30,7 +30,7 @@ func init() {
 	engine := control.Register("ahsai", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault:  false,
 		Brief:             "フリーテキスト音声合成",
-		Help:              "- 使[伊織弓鶴|紲星あかり|結月ゆかり|京町セイカ|東北きりたん|東北イタコ|ついなちゃん標準語|ついなちゃん関西弁|音街ウナ|琴葉茜|吉田くん|民安ともえ|桜乃そら|月読アイ|琴葉葵|東北ずん子|月読ショウタ|水奈瀬コウ]说(日语)\n",
+		Help:              "- 使[伊織弓鶴|紲星あかり|結月ゆかり|京町セイカ|東北きりたん|東北イタコ|ついなちゃん標準語|ついなちゃん関西弁|音街ウナ|琴葉茜|吉田くん|民安ともえ|桜乃そら|月読アイ|琴葉葵|東北ずん子|月読ショウタ|水奈瀬コウ]说(日语)",
 		PrivateDataFolder: "ahsai",
 	})
 	cachePath := engine.DataFolder() + "cache/"

plugin/ai_false/ai_false.go

@@ -2,23 +2,54 @@
 package aifalse
 
 import (
-	"fmt"
+	"bytes"
+	"errors"
+	"image"
 	"math"
+	"runtime"
 	"strconv"
+	"strings"
+	"sync"
+	"sync/atomic"
 	"time"
+	"unsafe"
 
+	"github.com/FloatTech/AnimeAPI/bilibili"
+	"github.com/FloatTech/floatbox/file"
+	"github.com/FloatTech/floatbox/web"
+	"github.com/FloatTech/gg"
+	"github.com/FloatTech/imgfactory"
+	"github.com/FloatTech/rendercard"
 	ctrl "github.com/FloatTech/zbpctrl"
 	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/img/text"
+	"github.com/disintegration/imaging"
 	"github.com/shirou/gopsutil/v3/cpu"
 	"github.com/shirou/gopsutil/v3/disk"
+	"github.com/shirou/gopsutil/v3/host"
 	"github.com/shirou/gopsutil/v3/mem"
 	"github.com/sirupsen/logrus"
+	"golang.org/x/text/cases"
+	"golang.org/x/text/language"
+
+	"github.com/FloatTech/ZeroBot-Plugin/kanban/banner"
 
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 )
 
+const (
+	backgroundURL = "https://iw233.cn/api.php?sort=mp"
+	referer       = "https://weibo.com/"
+)
+
+var (
+	boottime = time.Now()
+	bgdata   *[]byte
+	bgcount  uintptr
+)
+
 func init() { // 插件主体
 	engine := control.Register("aifalse", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
@@ -39,12 +70,19 @@ func init() { // 插件主体
 	}
 	engine.OnFullMatchGroup([]string{"检查身体", "自检", "启动自检", "系统状态"}, zero.AdminPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			ctx.SendChain(message.Text(
-				"* CPU占用: ", cpuPercent(), "%\n",
-				"* RAM占用: ", memPercent(), "%\n",
-				"* 硬盘使用: ", diskPercent(),
-			),
-			)
+			img, err := drawstatus(ctx.State["manager"].(*ctrl.Control[*zero.Ctx]), ctx.Event.SelfID, zero.BotConfig.NickName[0])
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+			sendimg, err := imgfactory.ToBytes(img)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+			if id := ctx.SendChain(message.ImageBytes(sendimg)); id.ID() == 0 {
+				ctx.SendChain(message.Text("ERROR: 可能被风控了"))
+			}
 		})
 	engine.OnRegex(`^设置默认限速为每\s*(\d+)\s*(分钟|秒)\s*(\d+)\s*次触发$`, zero.SuperUserPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
@@ -84,38 +122,493 @@ func init() { // 插件主体
 		})
 }
 
-func cpuPercent() float64 {
+func drawstatus(m *ctrl.Control[*zero.Ctx], uid int64, botname string) (sendimg image.Image, err error) {
+	diskstate, err := diskstate()
+	if err != nil {
+		return
+	}
+	diskcardh := 40 + (20+50)*len(diskstate) + 40 - 20
+
+	moreinfo, err := moreinfo(m)
+	if err != nil {
+		return
+	}
+	moreinfocardh := 30 + (20+32*72/96)*len(moreinfo) + 30 - 20
+
+	basicstate, err := basicstate()
+	if err != nil {
+		return
+	}
+
+	dldata := (*[]byte)(atomic.LoadPointer((*unsafe.Pointer)(unsafe.Pointer(&bgdata))))
+	if dldata == (*[]byte)(nil) || uintptr(time.Since(boottime).Hours()/24) >= atomic.LoadUintptr(&bgcount) {
+		url, err1 := bilibili.GetRealURL(backgroundURL)
+		if err1 != nil {
+			return nil, err1
+		}
+		data, err1 := web.RequestDataWith(web.NewDefaultClient(), url, "", referer, "", nil)
+		if err1 != nil {
+			return nil, err1
+		}
+		atomic.AddUintptr(&bgcount, 1)
+		atomic.StorePointer((*unsafe.Pointer)(unsafe.Pointer(&bgdata)), unsafe.Pointer(&data))
+		dldata = &data
+	}
+	data := *dldata
+
+	back, _, err := image.Decode(bytes.NewReader(data))
+	if err != nil {
+		return
+	}
+
+	data, err = web.GetData("http://q4.qlogo.cn/g?b=qq&nk=" + strconv.FormatInt(uid, 10) + "&s=640")
+	if err != nil {
+		return
+	}
+	avatar, _, err := image.Decode(bytes.NewReader(data))
+	if err != nil {
+		return
+	}
+	avatarf := imgfactory.Size(avatar, 200, 200)
+
+	fontbyte, err := file.GetLazyData(text.GlowSansFontFile, control.Md5File, true)
+	if err != nil {
+		return
+	}
+
+	canvas := gg.NewContext(1280, 70+250+40+380+diskcardh+40+moreinfocardh+40+70)
+
+	bh, bw, ch, cw := float64(back.Bounds().Dy()), float64(back.Bounds().Dx()), float64(canvas.H()), float64(canvas.W())
+
+	if bh/bw < ch/cw {
+		back = imgfactory.Size(back, int(bw*ch/bh), int(bh*ch/bh)).Image()
+		canvas.DrawImageAnchored(back, canvas.W()/2, canvas.H()/2, 0.5, 0.5)
+	} else {
+		back = imgfactory.Size(back, int(bw*cw/bw), int(bh*cw/bw)).Image()
+		canvas.DrawImage(back, 0, 0)
+	}
+	var blurback image.Image
+	bwg := &sync.WaitGroup{}
+	bwg.Add(1)
+	go func() {
+		defer bwg.Done()
+		blurback = imaging.Blur(canvas.Image(), 8)
+	}()
+	wg := &sync.WaitGroup{}
+	wg.Add(5)
+
+	cardw := canvas.W() - 70 - 70
+
+	titlecardh := 250
+	basiccardh := 380
+
+	var titleimg, basicimg, diskimg, moreinfoimg, shadowimg image.Image
+	go func() {
+		defer wg.Done()
+		titlecard := gg.NewContext(cardw, titlecardh)
+		bwg.Wait()
+		titlecard.DrawImage(blurback, -70, -70)
+
+		titlecard.DrawRoundedRectangle(1, 1, float64(titlecard.W()-1*2), float64(titlecardh-1*2), 16)
+		titlecard.SetLineWidth(3)
+		titlecard.SetRGBA255(255, 255, 255, 100)
+		titlecard.StrokePreserve()
+		titlecard.SetRGBA255(255, 255, 255, 140)
+		titlecard.Fill()
+
+		titlecard.DrawImage(avatarf.Circle(0).Image(), (titlecardh-avatarf.H())/2, (titlecardh-avatarf.H())/2)
+
+		err = titlecard.ParseFontFace(fontbyte, 72)
+		if err != nil {
+			return
+		}
+		fw, _ := titlecard.MeasureString(botname)
+
+		titlecard.SetRGBA255(30, 30, 30, 255)
+
+		titlecard.DrawStringAnchored(botname, float64(titlecardh)+fw/2, float64(titlecardh)*0.5/2, 0.5, 0.5)
+
+		err = titlecard.ParseFontFace(fontbyte, 24)
+		if err != nil {
+			return
+		}
+		titlecard.SetRGBA255(30, 30, 30, 180)
+
+		titlecard.NewSubPath()
+		titlecard.MoveTo(float64(titlecardh), float64(titlecardh)/2)
+		titlecard.LineTo(float64(titlecard.W()-titlecardh), float64(titlecardh)/2)
+		titlecard.Stroke()
+
+		brt, err := botruntime()
+		if err != nil {
+			return
+		}
+		fw, _ = titlecard.MeasureString(brt)
+
+		titlecard.DrawStringAnchored(brt, float64(titlecardh)+fw/2, float64(titlecardh)*(0.5+0.25/2), 0.5, 0.5)
+
+		bs, err := botstatus()
+		if err != nil {
+			return
+		}
+		fw, _ = titlecard.MeasureString(bs)
+
+		titlecard.DrawStringAnchored(bs, float64(titlecardh)+fw/2, float64(titlecardh)*(0.5+0.5/2), 0.5, 0.5)
+		titleimg = rendercard.Fillet(titlecard.Image(), 16)
+	}()
+	go func() {
+		defer wg.Done()
+		basiccard := gg.NewContext(cardw, basiccardh)
+		bwg.Wait()
+		basiccard.DrawImage(blurback, -70, -70-titlecardh-40)
+
+		basiccard.DrawRoundedRectangle(1, 1, float64(basiccard.W()-1*2), float64(basiccardh-1*2), 16)
+		basiccard.SetLineWidth(3)
+		basiccard.SetRGBA255(255, 255, 255, 100)
+		basiccard.StrokePreserve()
+		basiccard.SetRGBA255(255, 255, 255, 140)
+		basiccard.Fill()
+
+		bslen := len(basicstate)
+		for i, v := range basicstate {
+			offset := float64(i) * ((float64(basiccard.W())-200*float64(bslen))/float64(bslen+1) + 200)
+
+			basiccard.SetRGBA255(235, 235, 235, 255)
+			basiccard.DrawCircle((float64(basiccard.W())-200*float64(bslen))/float64(bslen+1)+200/2+offset, 20+200/2, 100)
+			basiccard.Fill()
+
+			switch {
+			case v.precent > 90:
+				basiccard.SetRGBA255(255, 70, 0, 255)
+			case v.precent > 70:
+				basiccard.SetRGBA255(255, 165, 0, 255)
+			default:
+				basiccard.SetRGBA255(145, 240, 145, 255)
+			}
+
+			basiccard.NewSubPath()
+			basiccard.MoveTo((float64(basiccard.W())-200*float64(bslen))/float64(bslen+1)+200/2+offset, 20+200/2)
+			basiccard.DrawEllipticalArc((float64(basiccard.W())-200*float64(bslen))/float64(bslen+1)+200/2+offset, 20+200/2, 100, 100, -0.5*math.Pi, -0.5*math.Pi+2*v.precent*0.01*math.Pi)
+			basiccard.Fill()
+
+			basiccard.SetRGBA255(255, 255, 255, 255)
+			basiccard.DrawCircle((float64(basiccard.W())-200*float64(bslen))/float64(bslen+1)+200/2+offset, 20+200/2, 80)
+			basiccard.Fill()
+
+			err = basiccard.ParseFontFace(fontbyte, 42)
+			if err != nil {
+				return
+			}
+
+			basiccard.SetRGBA255(213, 213, 213, 255)
+			basiccard.DrawStringAnchored(strconv.FormatFloat(v.precent, 'f', 0, 64)+"%", (float64(basiccard.W())-200*float64(bslen))/float64(bslen+1)+200/2+offset, 20+200/2, 0.5, 0.5)
+
+			basiccard.SetRGBA255(30, 30, 30, 255)
+			_, fw := basiccard.MeasureString(v.name)
+			basiccard.DrawStringAnchored(v.name, (float64(basiccard.W())-200*float64(bslen))/float64(bslen+1)+200/2+offset, 20+200+15+basiccard.FontHeight()/2, 0.5, 0.5)
+
+			err = basiccard.ParseFontFace(fontbyte, 20)
+			if err != nil {
+				return
+			}
+			basiccard.SetRGBA255(30, 30, 30, 180)
+
+			textoffsety := basiccard.FontHeight() + 10
+			for k, s := range v.text {
+				basiccard.DrawStringAnchored(s, (float64(basiccard.W())-200*float64(bslen))/float64(bslen+1)+200/2+offset, 20+200+15+fw+15+basiccard.FontHeight()/2+float64(k)*textoffsety, 0.5, 0.5)
+			}
+		}
+		basicimg = rendercard.Fillet(basiccard.Image(), 16)
+	}()
+	go func() {
+		defer wg.Done()
+		diskcard := gg.NewContext(cardw, diskcardh)
+		bwg.Wait()
+		diskcard.DrawImage(blurback, -70, -70-titlecardh-40-basiccardh-40)
+
+		diskcard.DrawRoundedRectangle(1, 1, float64(diskcard.W()-1*2), float64(diskcardh-1*2), 16)
+		diskcard.SetLineWidth(3)
+		diskcard.SetRGBA255(255, 255, 255, 100)
+		diskcard.StrokePreserve()
+		diskcard.SetRGBA255(255, 255, 255, 140)
+		diskcard.Fill()
+
+		err = diskcard.ParseFontFace(fontbyte, 32)
+		if err != nil {
+			return
+		}
+
+		dslen := len(diskstate)
+		if dslen == 1 {
+			diskcard.SetRGBA255(192, 192, 192, 255)
+			diskcard.DrawRoundedRectangle(40, 40, float64(diskcard.W())-40-100, 50, 12)
+			diskcard.ClipPreserve()
+			diskcard.Fill()
+
+			switch {
+			case diskstate[0].precent > 90:
+				diskcard.SetRGBA255(255, 70, 0, 255)
+			case diskstate[0].precent > 70:
+				diskcard.SetRGBA255(255, 165, 0, 255)
+			default:
+				diskcard.SetRGBA255(145, 240, 145, 255)
+			}
+
+			diskcard.DrawRoundedRectangle(40, 40, (float64(diskcard.W())-40-100)*diskstate[0].precent*0.01, 50, 12)
+			diskcard.Fill()
+			diskcard.ResetClip()
+			diskcard.SetRGBA255(30, 30, 30, 255)
+
+			fw, _ := diskcard.MeasureString(diskstate[0].name)
+			fw1, _ := diskcard.MeasureString(diskstate[0].text[0])
+
+			diskcard.DrawStringAnchored(diskstate[0].name, 40+10+fw/2, 40+50/2, 0.5, 0.5)
+			diskcard.DrawStringAnchored(diskstate[0].text[0], (float64(diskcard.W())-100-10)-fw1/2, 40+50/2, 0.5, 0.5)
+			diskcard.DrawStringAnchored(strconv.FormatFloat(diskstate[0].precent, 'f', 0, 64)+"%", float64(diskcard.W())-100/2, 40+50/2, 0.5, 0.5)
+		} else {
+			for i, v := range diskstate {
+				offset := float64(i)*(50+20) - 20
+
+				diskcard.SetRGBA255(192, 192, 192, 255)
+				diskcard.DrawRoundedRectangle(40, 40+(float64(diskcardh-40*2)-50*float64(dslen))/float64(dslen-1)+offset, float64(diskcard.W())-40-100, 50, 12)
+				diskcard.Fill()
+
+				switch {
+				case v.precent > 90:
+					diskcard.SetRGBA255(255, 70, 0, 255)
+				case v.precent > 70:
+					diskcard.SetRGBA255(255, 165, 0, 255)
+				default:
+					diskcard.SetRGBA255(145, 240, 145, 255)
+				}
+
+				diskcard.DrawRoundedRectangle(40, 40+(float64(diskcardh-40*2)-50*float64(dslen))/float64(dslen-1)+offset, (float64(diskcard.W())-40-100)*v.precent*0.01, 50, 12)
+				diskcard.Fill()
+
+				diskcard.SetRGBA255(30, 30, 30, 255)
+
+				fw, _ := diskcard.MeasureString(v.name)
+				fw1, _ := diskcard.MeasureString(v.text[0])
+
+				diskcard.DrawStringAnchored(v.name, 40+10+fw/2, 40+(float64(diskcardh-40*2)-50*float64(dslen))/float64(dslen-1)+50/2+offset, 0.5, 0.5)
+				diskcard.DrawStringAnchored(v.text[0], (float64(diskcard.W())-100-10)-fw1/2, 40+(float64(diskcardh-40*2)-50*float64(dslen))/float64(dslen-1)+50/2+offset, 0.5, 0.5)
+				diskcard.DrawStringAnchored(strconv.FormatFloat(v.precent, 'f', 0, 64)+"%", float64(diskcard.W())-100/2, 40+(float64(diskcardh-40*2)-50*float64(dslen))/float64(dslen-1)+50/2+offset, 0.5, 0.5)
+			}
+		}
+		diskimg = rendercard.Fillet(diskcard.Image(), 16)
+	}()
+	go func() {
+		defer wg.Done()
+		moreinfocard := gg.NewContext(cardw, moreinfocardh)
+		bwg.Wait()
+		moreinfocard.DrawImage(blurback, -70, -70-titlecardh-40-basiccardh-40-diskcardh-40)
+
+		moreinfocard.DrawRoundedRectangle(1, 1, float64(moreinfocard.W()-1*2), float64(moreinfocard.H()-1*2), 16)
+		moreinfocard.SetLineWidth(3)
+		moreinfocard.SetRGBA255(255, 255, 255, 100)
+		moreinfocard.StrokePreserve()
+		moreinfocard.SetRGBA255(255, 255, 255, 140)
+		moreinfocard.Fill()
+
+		err = moreinfocard.ParseFontFace(fontbyte, 32)
+		if err != nil {
+			return
+		}
+
+		milen := len(moreinfo)
+		for i, v := range moreinfo {
+			offset := float64(i)*(20+moreinfocard.FontHeight()) - 20
+
+			moreinfocard.SetRGBA255(30, 30, 30, 255)
+
+			fw, _ := moreinfocard.MeasureString(v.name)
+			fw1, _ := moreinfocard.MeasureString(v.text[0])
+
+			moreinfocard.DrawStringAnchored(v.name, 20+fw/2, 30+(float64(moreinfocardh-30*2)-moreinfocard.FontHeight()*float64(milen))/float64(milen-1)+moreinfocard.FontHeight()/2+offset, 0.5, 0.5)
+			moreinfocard.DrawStringAnchored(v.text[0], float64(moreinfocard.W())-20-fw1/2, 30+(float64(moreinfocardh-30*2)-moreinfocard.FontHeight()*float64(milen))/float64(milen-1)+moreinfocard.FontHeight()/2+offset, 0.5, 0.5)
+		}
+		moreinfoimg = rendercard.Fillet(moreinfocard.Image(), 16)
+	}()
+	go func() {
+		defer wg.Done()
+		shadow := gg.NewContext(canvas.W(), canvas.H())
+		shadow.SetRGBA255(0, 0, 0, 100)
+		shadow.SetLineWidth(12)
+		shadow.DrawRoundedRectangle(70, 70, float64(cardw), float64(titlecardh), 16)
+		shadow.Stroke()
+		shadow.DrawRoundedRectangle(70, float64(70+titlecardh+40), float64(cardw), float64(basiccardh), 16)
+		shadow.Stroke()
+		shadow.DrawRoundedRectangle(70, float64(70+titlecardh+40+basiccardh+40), float64(cardw), float64(diskcardh), 16)
+		shadow.Stroke()
+		shadow.DrawRoundedRectangle(70, float64(70+titlecardh+40+basiccardh+40+diskcardh+40), float64(cardw), float64(moreinfocardh), 16)
+		shadow.Stroke()
+		shadowimg = imaging.Blur(shadow.Image(), 24)
+	}()
+
+	wg.Wait()
+	if shadowimg == nil || titleimg == nil || basicimg == nil || diskimg == nil || moreinfoimg == nil {
+		err = errors.New("图片渲染失败")
+		return
+	}
+	canvas.DrawImage(shadowimg, 0, 0)
+	canvas.DrawImage(titleimg, 70, 70)
+	canvas.DrawImage(basicimg, 70, 70+titlecardh+40)
+	canvas.DrawImage(diskimg, 70, 70+titlecardh+40+basiccardh+40)
+	canvas.DrawImage(moreinfoimg, 70, 70+titlecardh+40+basiccardh+40+diskcardh+40)
+
+	err = canvas.ParseFontFace(fontbyte, 28)
+	if err != nil {
+		return
+	}
+	canvas.SetRGBA255(0, 0, 0, 255)
+	canvas.DrawStringAnchored("Created By ZeroBot-Plugin "+banner.Version, float64(canvas.W())/2+3, float64(canvas.H())-70/2+3, 0.5, 0.5)
+	canvas.SetRGBA255(255, 255, 255, 255)
+	canvas.DrawStringAnchored("Created By ZeroBot-Plugin "+banner.Version, float64(canvas.W())/2, float64(canvas.H())-70/2, 0.5, 0.5)
+
+	sendimg = canvas.Image()
+	return
+}
+
+func botruntime() (string, error) {
+	hostinfo, err := host.Info()
+	if err != nil {
+		return "", err
+	}
+	t := &strings.Builder{}
+	t.WriteString("ZeroBot-Plugin 已运行 ")
+	t.WriteString(strconv.FormatInt((time.Now().Unix()-boottime.Unix())/86400, 10))
+	t.WriteString(" 天 ")
+	t.WriteString(time.Unix(time.Now().Unix()-boottime.Unix(), 0).UTC().Format("15:04:05"))
+	t.WriteString(" | 系统运行 ")
+	t.WriteString(strconv.FormatInt(int64(hostinfo.Uptime)/86400, 10))
+	t.WriteString(" 天 ")
+	t.WriteString(time.Unix(int64(hostinfo.Uptime), 0).UTC().Format("15:04:05"))
+	return t.String(), nil
+}
+
+func botstatus() (string, error) {
+	hostinfo, err := host.Info()
+	if err != nil {
+		return "", err
+	}
+	t := &strings.Builder{}
+	t.WriteString(time.Now().Format("2006-01-02 15:04:05"))
+	t.WriteString(" | Compiled by ")
+	t.WriteString(runtime.Version())
+	t.WriteString(" | ")
+	t.WriteString(cases.Title(language.English).String(hostinfo.OS))
+	return t.String(), nil
+}
+
+type status struct {
+	precent float64
+	name    string
+	text    []string
+}
+
+func basicstate() (stateinfo [3]*status, err error) {
 	percent, err := cpu.Percent(time.Second, false)
 	if err != nil {
-		return -1
+		return
 	}
-	return math.Round(percent[0])
+	cpuinfo, err := cpu.Info()
+	if err != nil {
+		return
+	}
+	cores := strconv.Itoa(int(cpuinfo[0].Cores)) + " Core"
+	times := "最大 " + strconv.FormatFloat(cpuinfo[0].Mhz/1000, 'f', 1, 64) + "Ghz"
+
+	stateinfo[0] = &status{
+		precent: math.Round(percent[0]),
+		name:    "CPU",
+		text:    []string{cores, times},
+	}
+
+	raminfo, err := mem.VirtualMemory()
+	if err != nil {
+		return
+	}
+	total := "总共 " + storagefmt(float64(raminfo.Total))
+	used := "已用 " + storagefmt(float64(raminfo.Used))
+	free := "剩余 " + storagefmt(float64(raminfo.Free))
+
+	stateinfo[1] = &status{
+		precent: math.Round(raminfo.UsedPercent),
+		name:    "RAM",
+		text:    []string{total, used, free},
+	}
+
+	swapinfo, err := mem.SwapMemory()
+	if err != nil {
+		return
+	}
+	total = "总共 " + storagefmt(float64(swapinfo.Total))
+	used = "已用 " + storagefmt(float64(swapinfo.Used))
+	free = "剩余 " + storagefmt(float64(swapinfo.Free))
+
+	stateinfo[2] = &status{
+		precent: math.Round(swapinfo.UsedPercent),
+		name:    "SWAP",
+		text:    []string{total, used, free},
+	}
+	return
 }
 
-func memPercent() float64 {
-	memInfo, err := mem.VirtualMemory()
-	if err != nil {
-		return -1
+func storagefmt(num float64) string {
+	if num /= 1024; num < 1 {
+		return strconv.FormatFloat(num*1024, 'f', 2, 64) + "B"
 	}
-	return math.Round(memInfo.UsedPercent)
+	if num /= 1024; num < 1 {
+		return strconv.FormatFloat(num*1024, 'f', 2, 64) + "KB"
+	}
+	if num /= 1024; num < 1 {
+		return strconv.FormatFloat(num*1024, 'f', 2, 64) + "MB"
+	}
+	if num /= 1024; num < 1 {
+		return strconv.FormatFloat(num*1024, 'f', 2, 64) + "GB"
+	}
+	return strconv.FormatFloat(num, 'f', 2, 64) + "TB"
 }
 
-func diskPercent() string {
-	parts, err := disk.Partitions(true)
+func diskstate() (stateinfo []*status, err error) {
+	parts, err := disk.Partitions(false)
 	if err != nil {
-		return err.Error()
+		return
 	}
-	msg := ""
-	for _, p := range parts {
-		diskInfo, err := disk.Usage(p.Mountpoint)
-		if err != nil {
-			msg += "\n  - " + err.Error()
+	stateinfo = make([]*status, 0, len(parts))
+	for _, v := range parts {
+		mp := v.Mountpoint
+		if strings.HasPrefix(mp, "/snap/") || strings.HasPrefix(mp, "/apex/") {
 			continue
 		}
-		pc := uint(math.Round(diskInfo.UsedPercent))
-		if pc > 0 {
-			msg += fmt.Sprintf("\n  - %s(%dM) %d%%", p.Mountpoint, diskInfo.Total/1024/1024, pc)
+		diskusage, err := disk.Usage(mp)
+		if err != nil {
+			continue
 		}
+		stateinfo = append(stateinfo, &status{
+			precent: math.Round(diskusage.UsedPercent),
+			name:    mp,
+			text:    []string{storagefmt(float64(diskusage.Used)) + " / " + storagefmt(float64(diskusage.Total))},
+		})
 	}
-	return msg
+	return stateinfo, nil
+}
+
+func moreinfo(m *ctrl.Control[*zero.Ctx]) (stateinfo []*status, err error) {
+	hostinfo, err := host.Info()
+	if err != nil {
+		return
+	}
+	cpuinfo, err := cpu.Info()
+	if err != nil {
+		return
+	}
+	count := len(m.Manager.M)
+	stateinfo = []*status{
+		{name: "OS", text: []string{hostinfo.Platform}},
+		{name: "CPU", text: []string{cpuinfo[0].ModelName}},
+		{name: "Version", text: []string{hostinfo.PlatformVersion}},
+		{name: "Plugin", text: []string{"共 " + strconv.Itoa(count) + " 个"}},
+	}
+	return
 }

plugin/ai_reply/ai_tts.go

@@ -2,100 +2,75 @@ package aireply
 
 import (
 	"errors"
-	"regexp"
-	"sync"
+	"strings"
 
+	"github.com/RomiChan/syncx"
 	zero "github.com/wdvxdr1123/ZeroBot"
 
+	"github.com/FloatTech/AnimeAPI/aireply"
+	"github.com/FloatTech/AnimeAPI/tts"
+	"github.com/FloatTech/AnimeAPI/tts/baidutts"
+	"github.com/FloatTech/AnimeAPI/tts/genshin"
+	"github.com/FloatTech/AnimeAPI/tts/ttscn"
 	ctrl "github.com/FloatTech/zbpctrl"
 	"github.com/FloatTech/zbputils/control"
 )
 
+// 数据结构: [4 bits] [4 bits] [8 bits] [8 bits]
+// 			[ttscn模式] [百度模式] [tts模式] [回复模式]
+
+// defaultttsindexkey
+// 数据结构: [4 bits] [4 bits] [8 bits]
+// 			[ttscn模式] [百度模式] [tts模式]
+
+// [tts模式]: 0~200 genshin 201 baidu 202 ttscn
+
 const (
-	cnapi = "https://genshin.azurewebsites.net/api/speak?format=mp3&id=%d&text=%s"
+	lastgsttsindex = 200 + iota
+	baiduttsindex
+	ttscnttsindex
 )
 
-// 每个角色的测试文案
-var testRecord = map[string]string{
-	"派蒙":    "哎，又是看不懂的东西。我完全不知道这些奇怪的问题和实验，能得到什么结果…",
-	"凯亚":    "真是个急性子啊你。",
-	"安柏":    "最初的鸟儿是不会飞翔的，飞翔是它们勇敢跃入峡谷的奖励。",
-	"丽莎":    "嗨，小可爱，你是新来的助理吗？",
-	"琴":     "蒲公英骑士，琴，申请入队。",
-	"香菱":    "我是来自璃月的厨师香菱，最擅长的是做各种捞…捞，料理…哎呀，练了那么多次，还是会紧张，嘿。",
-	"枫原万叶":  "飘摇风雨中，带刀归来赤脚行。",
-	"迪卢克":   "在黎明来临之前，总要有人照亮黑暗。",
-	"温迪":    "若你困于无风之地，我将为你奏响高天之歌。",
-	"可莉":    "西风骑士团，火花骑士，可莉，前来报到！…呃—后面该说什么词来着？可莉背不下来啦...",
-	"早柚":    "终末番,早柚，参上。 呼——",
-	"托马":    "初次见面，异乡的旅人，你的名字我可是早就听说了。只要你不嫌弃，我托马，从今天起就是你的朋友了。",
-	"芭芭拉":   "芭芭拉，闪耀登场~治疗就交给我吧，不会让你失望的！",
-	"优菈":    "沉沦是很容易的一件事，但我仍想冻住这股潮流。",
-	"云堇":    "曲高未必人不识，自有知音和清词。",
-	"钟离":    "人间归离复归离，借一浮生逃浮生。",
-	"魈":     "三眼五显仙人，魈，听召，前来守护",
-	"凝光":    "就算古玩价值连城，给人的快乐，也只有刚拥有的一瞬",
-	"雷电将军":  "浮世千百年来风景依旧，人之在世却如白露与泡影。",
-	"北斗":    "不知道如何向前的话，总之先迈出第一步，后面的道路就会自然而然地展开了。",
-	"甘雨":    "这项工作，该划掉了。",
-	"七七":    "椰羊的奶，好喝!比一般的羊奶，好喝!",
-	"刻晴":    "劳逸结合是不错，但也别放松过头。",
-	"神里绫华":  "若知是梦何须醒，不比真如一相会。",
-	"雷泽":    "你是朋友。我和你一起狩猎。",
-	"神里绫人":  "此前听绫华屡次提起阁下，不料公务繁忙，直至今日才有机会相见。",
-	"罗莎莉亚":  "哪怕如今你已经走上截然不同的道路，也不要否认从前的自己，从前的每一个你都是你脚下的基石，不要害怕过去，不要畏惧与它抗衡。",
-	"阿贝多":   "用自己的双脚丈量土地，将未知变为知识。",
-	"八重神子":  "我的神明，就托付给你了。",
-	"宵宫":    "即使只是片刻的火花，也能在仰望黑夜的人心中留下久久不灭的美丽光芒。",
-	"荒泷一斗":  "更好地活下去,绝不该靠牺牲同类换取，应该是,一起更好地活着,才对。",
-	"九条裟罗":  "想要留住雪花。但在手心里，它只会融化的更快。",
-	"夜兰":    "线人来信了，嗯，看来又出现了新的变数。",
-	"珊瑚宫心海": "成为了现任人神巫女之后，我也慢慢习惯了这样的生活，更重要的是我也因此和你相遇了，不是吗？",
-	"五郎":    "海祇岛反抗军大将，五郎，前来助阵！",
-	"达达利亚":  "许下的诺言就好好遵守，做错了事情就承担责任，这才是家人应有的样子吧。",
-	"莫娜":    "正是因为无法更改，无可违逆，只能接受，命运才会被称之为命运。",
-	"班尼特":   "只要有大家在，伤口就不会痛!",
-	"申鹤":    "不知道你是喜欢人间的灯火，还是山林的月光？",
-	"行秋":    "有时明月无人夜，独向昭潭制恶龙。",
-	"烟绯":    "律法即是约束，也是工具。",
-	"久岐忍":   "有麻烦事要处理的话，直接告诉我就好，我来摆平。",
-	"辛焱":    "马上就要演出了，你也一起来嗨吗？",
-	"砂糖":    "我是砂糖，炼金术的…研究员。",
-	"胡桃":    "阴阳有序，命运无常，死亡难以预测，却也有它的规矩。",
-	"重云":    "我名重云，家族久居璃月，世代以驱邪除魔为业。",
-	"菲谢尔":   "我即断罪之皇女，真名为菲谢尔。应命运的召唤降临在此间——哎？你也是，异世界的旅人吗…？",
-	"诺艾尔":   "我是诺艾尔，西风骑士团的女仆，从今天起会陪你一起去冒险。",
-	"迪奥娜":   "猫尾酒馆的招牌调酒师，迪奥娜，我的出场费可是很贵的。",
-	"鹿野院平藏": "我叫鹿野院平藏，是天领奉行里破案最多最快的侦探……",
+// extrattsname is the tts other than genshin vits
+var extrattsname = []string{"百度", "TTSCN"}
+
+var ttscnspeakers = [...]string{
+	"晓晓（女 - 年轻人）",
+	"云扬（男 - 年轻人）",
+	"晓辰（女 - 年轻人 - 抖音热门）",
+	"晓涵（女 - 年轻人）",
+	"晓墨（女 - 年轻人）",
+	"晓秋（女 - 中年人）",
+	"晓睿（女 - 老年）",
+	"晓双（女 - 儿童）",
+	"晓萱（女 - 年轻人）",
+	"晓颜（女 - 年轻人）",
+	"晓悠（女 - 儿童）",
+	"云希（男 - 年轻人 - 抖音热门）",
+	"云野（男 - 中年人）",
+	"晓梦（女 - 年轻人）",
+	"晓伊（女 - 儿童）",
+	"晓甄（女 - 年轻人）",
 }
 
+const defaultttsindexkey = -2905
+
 var (
-	re        = regexp.MustCompile(`(\-|\+)?\d+(\.\d+)?`)
-	soundList = [...]string{
-		"派蒙", "凯亚", "安柏", "丽莎", "琴",
-		"香菱", "枫原万叶", "迪卢克", "温迪", "可莉",
-		"早柚", "托马", "芭芭拉", "优菈", "云堇",
-		"钟离", "魈", "凝光", "雷电将军", "北斗",
-		"甘雨", "七七", "刻晴", "神里绫华", "雷泽",
-		"神里绫人", "罗莎莉亚", "阿贝多", "八重神子", "宵宫",
-		"荒泷一斗", "九条裟罗", "夜兰", "珊瑚宫心海", "五郎",
-		"达达利亚", "莫娜", "班尼特", "申鹤", "行秋",
-		"烟绯", "久岐忍", "辛焱", "砂糖", "胡桃",
-		"重云", "菲谢尔", "诺艾尔", "迪奥娜", "鹿野院平藏",
-	}
+	原  = newapikeystore("./data/tts/o.txt")
+	ཆཏ = newapikeystore("./data/tts/c.txt")
+	百  = newapikeystore("./data/tts/b.txt")
 )
 
-/*************************************************************
-*******************************AIreply************************
-*************************************************************/
-func setReplyMode(ctx *zero.Ctx, name string) error {
+type replymode []string
+
+func (r replymode) 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 {
+	for i, s := range r {
 		if s == name {
 			ok = true
 			index = int64(i)
@@ -109,31 +84,47 @@ func setReplyMode(ctx *zero.Ctx, name string) error {
 	if !ok {
 		return errors.New("no such plugin")
 	}
-	return m.SetData(gid, index)
+	return m.SetData(gid, (m.GetData(index)&^0xff)|(index&0xff))
 }
 
-func getReplyMode(ctx *zero.Ctx) (name string) {
+func (r replymode) 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 {
-		index := m.GetData(gid)
-		if int(index) < len(replyModes) {
-			return replyModes[index]
+		switch m.GetData(gid) & 0xff {
+		case 0:
+			return aireply.NewQYK(aireply.QYKURL, aireply.QYKBotName)
+		case 1:
+			return aireply.NewXiaoAi(aireply.XiaoAiURL, aireply.XiaoAiBotName)
+		case 2:
+			k := ཆཏ.k
+			if k != "" {
+				return aireply.NewChatGPT(aireply.ChatGPTURL, k)
+			}
+			return aireply.NewQYK(aireply.QYKURL, aireply.QYKBotName)
 		}
 	}
-	return "青云客"
+	return aireply.NewQYK(aireply.QYKURL, aireply.QYKBotName)
 }
 
-/*************************************************************
-***********************tts************************************
-*************************************************************/
-type ttsmode struct {
-	sync.RWMutex
-	mode map[int64]int64
-}
+var ttsins = func() map[string]tts.TTS {
+	m := make(map[string]tts.TTS, 512)
+	for _, mode := range append(genshin.SoundList[:], extrattsname...) {
+		m[mode] = nil
+	}
+	return m
+}()
+
+var ttsModes = func() []string {
+	s := append(genshin.SoundList[:], make([]string, lastgsttsindex-len(genshin.SoundList))...) // 0-200
+	s = append(s, extrattsname...)                                                              // 201 202 ...
+	return s
+}()
+
+type ttsmode syncx.Map[int64, int64]
 
 func list(list []string, num int) string {
 	s := ""
@@ -149,90 +140,127 @@ func list(list []string, num int) string {
 }
 
 func newttsmode() *ttsmode {
-	tts := &ttsmode{}
-	tts.Lock()
-	defer tts.Unlock()
+	t := &ttsmode{}
 	m, ok := control.Lookup("tts")
-	tts.mode = make(map[int64]int64, 2*len(soundList))
-	tts.mode[-2905] = 1
+	(*syncx.Map[int64, int64])(t).Store(defaultttsindexkey, 0)
 	if ok {
-		index := m.GetData(-2905)
-		if index > 0 && index < int64(len(soundList)) {
-			tts.mode[-2905] = index
+		index := m.GetData(defaultttsindexkey)
+		msk := index & 0xff
+		if msk >= 0 && (msk < int64(len(genshin.SoundList)) || msk == baiduttsindex || msk == ttscnttsindex) {
+			(*syncx.Map[int64, int64])(t).Store(defaultttsindexkey, index)
 		}
 	}
-	return tts
+	return t
 }
 
-func (tts *ttsmode) setSoundMode(ctx *zero.Ctx, name string) error {
+func (t *ttsmode) setSoundMode(ctx *zero.Ctx, name string, baiduper, mockingsynt int) error {
 	gid := ctx.Event.GroupID
 	if gid == 0 {
 		gid = -ctx.Event.UserID
 	}
-	var index int64
-	for i, s := range soundList {
+	_, ok := ttsins[name]
+	if !ok {
+		return errors.New("不支持设置语音人物" + name)
+	}
+	var index = int64(-1)
+	for i, s := range genshin.SoundList {
 		if s == name {
-			index = int64(i + 1)
+			index = int64(i)
 			break
 		}
 	}
-	if index == 0 {
-		return errors.New("不支持设置语音人物" + name)
+	if index == -1 {
+		switch name {
+		case extrattsname[0]:
+			index = baiduttsindex
+		case extrattsname[1]:
+			index = ttscnttsindex
+		default:
+			return errors.New("语音人物" + name + "未注册index")
+		}
 	}
 	m := ctx.State["manager"].(*ctrl.Control[*zero.Ctx])
-	tts.Lock()
-	defer tts.Unlock()
-	tts.mode[gid] = index
-	return m.SetData(gid, index)
+	(*syncx.Map[int64, int64])(t).Store(gid, index)
+	return m.SetData(gid, (m.GetData(gid)&^0xffff00)|((index<<8)&0xff00)|((int64(baiduper)<<16)&0x0f0000)|((int64(mockingsynt)<<20)&0xf00000))
 }
 
-func (tts *ttsmode) getSoundMode(ctx *zero.Ctx) int64 {
+func (t *ttsmode) getSoundMode(ctx *zero.Ctx) (tts.TTS, error) {
 	gid := ctx.Event.GroupID
 	if gid == 0 {
 		gid = -ctx.Event.UserID
 	}
-	tts.Lock()
-	defer tts.Unlock()
-	i, ok := tts.mode[gid]
+	i, ok := (*syncx.Map[int64, int64])(t).Load(gid)
 	if !ok {
 		m := ctx.State["manager"].(*ctrl.Control[*zero.Ctx])
-		i = m.GetData(gid)
+		i = m.GetData(gid) >> 8
 	}
-	if i <= 0 || i >= int64(len(soundList)) {
-		i = tts.mode[-2905]
+	m := i & 0xff
+	if m < 0 || (m >= int64(len(genshin.SoundList)) && m != baiduttsindex && m != ttscnttsindex) {
+		i, _ = (*syncx.Map[int64, int64])(t).Load(defaultttsindexkey)
+		m = i & 0xff
 	}
-	return i - 1
+	mode := ttsModes[m]
+	ins, ok := ttsins[mode]
+	if !ok || ins == nil {
+		switch mode {
+		case extrattsname[0]:
+			id, sec, _ := strings.Cut(百.k, ",")
+			ins = baidutts.NewBaiduTTS(int(i&0x0f00)>>8, id, sec)
+		case extrattsname[1]:
+			var err error
+			ins, err = ttscn.NewTTSCN("中文（普通话，简体）", ttscnspeakers[int(i&0xf000)>>12], ttscn.KBRates[0])
+			if err != nil {
+				return nil, err
+			}
+		default: // 原神
+			k := 原.k
+			if k != "" {
+				ins = genshin.NewGenshin(int(m), 原.k)
+				ttsins[mode] = ins
+			} else {
+				return nil, errors.New("no valid speaker")
+			}
+		}
+	}
+	return ins, nil
 }
 
-func (tts *ttsmode) resetSoundMode(ctx *zero.Ctx) error {
+func (t *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) // 重置数据
+	index := m.GetData(defaultttsindexkey)
+	return m.SetData(gid, (m.GetData(gid)&0xff)|((index&^0xff)<<8)) // 重置数据
 }
 
-func (tts *ttsmode) setDefaultSoundMode(name string) error {
-	var index int64
-	for i, s := range soundList {
+func (t *ttsmode) setDefaultSoundMode(name string, baiduper, mockingsynt int) error {
+	_, ok := ttsins[name]
+	if !ok {
+		return errors.New("不支持设置语音人物" + name)
+	}
+	index := int64(-1)
+	for i, s := range genshin.SoundList {
 		if s == name {
-			index = int64(i + 1)
+			index = int64(i)
 			break
 		}
 	}
-	if index == 0 {
-		return errors.New("不支持设置语音人物" + name)
+	if index == -1 {
+		switch name {
+		case extrattsname[0]:
+			index = baiduttsindex
+		case extrattsname[1]:
+			index = ttscnttsindex
+		default:
+			return errors.New("语音人物" + name + "未注册index")
+		}
 	}
-	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)
+	(*syncx.Map[int64, int64])(t).Store(defaultttsindexkey, index)
+	return m.SetData(defaultttsindexkey, (index&0xff)|((int64(baiduper)<<8)&0x0f00)|((int64(mockingsynt)<<12)&0xf000))
 }

plugin/ai_reply/main.go

@@ -2,46 +2,50 @@
 package aireply
 
 import (
-	"fmt"
-	"net/url"
+	"os"
+	"regexp"
 	"strconv"
 	"time"
 
-	"github.com/FloatTech/AnimeAPI/aireply"
+	"github.com/FloatTech/AnimeAPI/tts/genshin"
 	ctrl "github.com/FloatTech/zbpctrl"
 	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
-	"github.com/pkumza/numcn"
-	log "github.com/sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 )
 
-var replyModes = [...]string{"青云客", "小爱"}
+var replmd = replymode([]string{"青云客", "小爱", "ChatGPT"})
+
+var ttsmd = newttsmode()
 
 func init() { // 插件主体
-	enOftts := control.Register("tts", &ctrl.Options[*zero.Ctx]{
+	ent := control.Register("tts", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: true,
 		Brief:            "人工智能语音回复",
 		Help: "- @Bot 任意文本(任意一句话回复)\n" +
-			"- 设置语音模式[原神人物]\n" +
-			"- 设置默认语音模式[原神人物]\n" +
+			"- 设置语音模式[原神人物/百度/TTSCN] 数字(百度/TTSCN说话人)\n" +
+			"- 设置默认语音模式[原神人物/百度/TTSCN] 数字(百度/TTSCN说话人)\n" +
 			"- 恢复成默认语音模式\n" +
-			"当前适用的原神人物含有以下：\n" + list(soundList[:], 5),
+			"- 设置原神语音 api key xxxxxx (key请加开发群获得)\n" +
+			"- 设置百度语音 api id xxxxxx secret xxxxxx (请自行获得)\n" +
+			"当前适用的原神人物含有以下: \n" + list(genshin.SoundList[:], 5) +
+			"\n当前适用的TTSCN人物含有以下(以数字顺序代表): \n" + list(ttscnspeakers[:], 5),
+		PrivateDataFolder: "tts",
 	})
-	tts := newttsmode()
-	enOfreply := control.Register("aireply", &ctrl.Options[*zero.Ctx]{
-		DisableOnDefault: false,
-		Brief:            "人工智能回复",
-		Help:             "- @Bot 任意文本(任意一句话回复)\n- 设置回复模式[青云客|小爱]",
+
+	enr := control.Register("aireply", &ctrl.Options[*zero.Ctx]{
+		DisableOnDefault:  false,
+		Brief:             "人工智能回复",
+		Help:              "- @Bot 任意文本(任意一句话回复)\n- 设置回复模式[青云客|小爱|ChatGPT]\n- 设置 ChatGPT api key xxx",
+		PrivateDataFolder: "aireply",
 	})
-	/*************************************************************
-	*******************************AIreply************************
-	*************************************************************/
-	enOfreply.OnMessage(zero.OnlyToMe).SetBlock(true).Limit(ctxext.LimitByUser).
+
+	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 := replmd.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) {
@@ -51,95 +55,158 @@ func init() { // 插件主体
 			}
 			ctx.Send(reply)
 		})
-	enOfreply.OnPrefix("设置回复模式", zero.AdminPermission).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+
+	enr.OnPrefix("设置回复模式", zero.AdminPermission).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		param := ctx.State["args"].(string)
-		err := setReplyMode(ctx, param)
+		err := replmd.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************************************
-	*************************************************************/
-	enOftts.OnMessage(zero.OnlyToMe).SetBlock(true).Limit(ctxext.LimitByUser).
+
+	enr.OnRegex(`^设置\s*ChatGPT\s*api\s*key\s*(.*)$`, zero.OnlyPrivate, zero.SuperUserPermission).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+		err := ཆཏ.set(ctx.State["regex_matched"].([]string)[1])
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR: ", err))
+			return
+		}
+		ctx.SendChain(message.Text("设置成功"))
+	})
+
+	endpre := regexp.MustCompile(`\pP$`)
+	ttscachedir := ent.DataFolder() + "cache/"
+	_ = os.RemoveAll(ttscachedir)
+	err := os.MkdirAll(ttscachedir, 0755)
+	if err != nil {
+		panic(err)
+	}
+	ent.OnMessage(zero.OnlyToMe).SetBlock(true).Limit(ctxext.LimitByUser).
 		Handle(func(ctx *zero.Ctx) {
 			msg := ctx.ExtractPlainText()
 			// 获取回复模式
-			r := aireply.NewAIReply(getReplyMode(ctx))
+			r := replmd.getReplyMode(ctx)
 			// 获取回复的文本
-			reply := r.TalkPlain(msg, zero.BotConfig.NickName[0])
+			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 {
-						log.Errorln("[tts]:", err)
-						return s
-					}
-					return numcn.EncodeFromFloat64(f)
-				}),
-			))).Add("cache", 0)
+			speaker, err := ttsmd.getSoundMode(ctx)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+			rec, err := speaker.Speak(ctx.Event.UserID, func() string {
+				if !endpre.MatchString(reply) {
+					return reply + "。"
+				}
+				return reply
+			})
+			if err != nil {
+				ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(reply))
+				return
+			}
 			// 发送语音
-			if ID := ctx.SendChain(record); ID.ID() == 0 {
+			if id := ctx.SendChain(message.Record(rec)); id.ID() == 0 {
 				ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(reply))
 			}
 		})
-	enOftts.OnRegex(`^设置语音模式(.*)$`, zero.AdminPermission, func(ctx *zero.Ctx) bool {
+
+	ent.OnRegex(`^设置语音模式\s*([\S\D]*)\s+(\d*)$`, zero.AdminPermission).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		param := ctx.State["regex_matched"].([]string)[1]
-		if _, ok := testRecord[param]; !ok {
-			return false
+		num := ctx.State["regex_matched"].([]string)[2]
+		n := 0
+		var err error
+		if num != "" {
+			n, err = strconv.Atoi(num)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
 		}
-		return true
-	}).SetBlock(true).Handle(func(ctx *zero.Ctx) {
-		param := ctx.State["regex_matched"].([]string)[1]
 		// 保存设置
-		err := tts.setSoundMode(ctx, param)
+		logrus.Debugln("[tts] t.setSoundMode( ctx", param, n, n, ")")
+		err = ttsmd.setSoundMode(ctx, param, n, n)
 		if err != nil {
 			ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(err))
 			return
 		}
+		banner := genshin.TestRecord[param]
+		if banner == "" {
+			banner = genshin.TestRecord["默认"]
+		}
+		logrus.Debugln("[tts] banner:", banner, "get sound mode...")
 		// 设置验证
-		i := tts.getSoundMode(ctx)
-		if _, ok := testRecord[soundList[i]]; !ok {
-			ctx.SendChain(message.Text("配置的语音人物数据丢失！请重新设置语音人物。"))
+		speaker, err := ttsmd.getSoundMode(ctx)
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR: ", err))
 			return
 		}
-		record := message.Record(fmt.Sprintf(cnapi, i, url.QueryEscape(testRecord[soundList[i]]))).Add("cache", 0)
-		if ID := ctx.SendChain(record); ID.ID() == 0 {
-			ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("设置失败！无法发送测试语音，请重试。"))
+		logrus.Debugln("[tts] got sound mode, speaking...")
+		rec, err := speaker.Speak(ctx.Event.UserID, func() string { return banner })
+		if err != nil {
+			ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("无法发送测试语音，请重试。"))
+			return
+		}
+		logrus.Debugln("[tts] sending...")
+		if id := ctx.SendChain(message.Record(rec).Add("cache", 0)); 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("设置成功"))
 	})
-	enOftts.OnRegex(`^设置默认语音模式(.*)$`, zero.SuperUserPermission, func(ctx *zero.Ctx) bool {
+
+	ent.OnRegex(`^设置默认语音模式\s*([\S\D]*)\s+(\d*)$`, zero.SuperUserPermission).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		param := ctx.State["regex_matched"].([]string)[1]
-		if _, ok := testRecord[param]; !ok {
-			return false
+		num := ctx.State["regex_matched"].([]string)[2]
+		n := 0
+		var err error
+		if num != "" {
+			n, err = strconv.Atoi(num)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
 		}
-		return true
-	}).SetBlock(true).Handle(func(ctx *zero.Ctx) {
-		param := ctx.State["regex_matched"].([]string)[1]
 		// 保存设置
-		err := tts.setDefaultSoundMode(param)
+		err = ttsmd.setDefaultSoundMode(param, n, n)
 		if err != nil {
 			ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(err))
 			return
 		}
 		ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("设置成功"))
 	})
-	enOftts.OnFullMatch("恢复成默认语音模式", zero.AdminPermission).SetBlock(true).Handle(func(ctx *zero.Ctx) {
-		err := tts.resetSoundMode(ctx)
+
+	ent.OnFullMatch("恢复成默认语音模式", zero.AdminPermission).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+		err := ttsmd.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]))
+		speaker, err := ttsmd.getSoundMode(ctx)
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR: ", err))
+			return
+		}
+		ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("设置成功，当前为", speaker))
+	})
+
+	ent.OnRegex(`^设置原神语音\s*api\s*key\s*([0-9a-zA-Z-_]{54}==)$`, zero.OnlyPrivate, zero.SuperUserPermission).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+		err := 原.set(ctx.State["regex_matched"].([]string)[1])
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR: ", err))
+			return
+		}
+		ctx.SendChain(message.Text("设置成功"))
+	})
+
+	ent.OnRegex(`^设置百度语音\s*api\s*id\s*(.*)\s*secret\s*(.*)\s*$`, zero.OnlyPrivate, zero.SuperUserPermission).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+		err := 百.set(ctx.State["regex_matched"].([]string)[1] + "," + ctx.State["regex_matched"].([]string)[2])
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR: ", err))
+			return
+		}
+		ctx.SendChain(message.Text("设置成功"))
 	})
 }

plugin/ai_reply/model.go

@@ -0,0 +1,29 @@
+package aireply
+
+import (
+	"os"
+
+	"github.com/FloatTech/floatbox/binary"
+	"github.com/FloatTech/floatbox/file"
+)
+
+type apikeystore struct {
+	k string
+	p string
+}
+
+func newapikeystore(p string) (s apikeystore) {
+	s.p = p
+	if file.IsExist(p) {
+		data, err := os.ReadFile(p)
+		if err == nil {
+			s.k = binary.BytesToString(data)
+		}
+	}
+	return
+}
+
+func (s *apikeystore) set(k string) error {
+	s.k = k
+	return os.WriteFile(s.p, binary.StringToBytes(k), 0644)
+}

plugin/aipaint/aipaint.go

@@ -54,9 +54,9 @@ func init() { // 插件主体
 			"- 设置ai绘图配置 [server] [token]\n" +
 			"- 设置ai绘图撤回时间90s\n" +
 			"- 查看ai绘图配置\n" +
-			"例: 设置ai绘图配置 http://91.217.139.190:5010 abc\n" +
+			"Tips: 使用前请先前往 http://91.217.139.190:5010/token 按提示获取token" +
+			"设置token示例(请确保是主人并且响应): 设置ai绘图配置 http://91.217.139.190:5010 [token] (中括号无需输入)\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" +
 			"参数与参数内容用:连接,每个参数之间用回车分割",
@@ -146,7 +146,7 @@ func init() { // 插件主体
 			}
 			sendAiImg(ctx, data, cfg.Interval)
 		})
-	engine.OnRegex(`^设置ai绘图配置\s(.*[^\s$])\s(.+)$`, zero.SuperUserPermission).SetBlock(true).
+	engine.OnRegex(`^设置ai绘图配置\s(.*[^\s$])\s(.+)$`, zero.OnlyPrivate, zero.SuperUserPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			regexMatched := ctx.State["regex_matched"].([]string)
 			err := cfg.load()
@@ -159,8 +159,7 @@ func init() { // 插件主体
 				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))
+			ctx.SendChain(message.Text("成功设置\nbase_url: ", cfg.BaseURL, "\ntoken: ", cfg.Token, "\ninterval: ", cfg.Interval))
 		})
 	engine.OnRegex(`^设置ai绘图撤回时间(\d{1,3})s$`, zero.SuperUserPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
@@ -180,18 +179,16 @@ func init() { // 插件主体
 				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))
+			ctx.SendChain(message.Text("成功设置撤回时间为", cfg.Interval, "s"))
 		})
-	engine.OnFullMatch(`查看ai绘图配置`, zero.SuperUserPermission).SetBlock(true).
+	engine.OnFullMatch(`查看ai绘图配置`, zero.OnlyPrivate, 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))
+			ctx.SendChain(message.Text("base_url: ", cfg.BaseURL, "\ntoken: ", cfg.Token, "\ninterval: ", cfg.Interval))
 		})
 }
 

plugin/aipaint/context.go

@@ -6,6 +6,7 @@ import (
 	"strings"
 
 	"github.com/FloatTech/floatbox/file"
+	"github.com/FloatTech/floatbox/process"
 )
 
 type context struct {
@@ -27,13 +28,14 @@ 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)
+			err = file.DownloadTo("https://gchat.qpic.cn/gchatpic_new//--"+strings.ToUpper(v)+"/0", cc.usrdir+strconv.Itoa(i)+".gif")
 		} else {
-			err = file.DownloadTo("http://q4.qlogo.cn/g?b=qq&nk="+v+"&s=640", cc.usrdir+strconv.Itoa(i)+".gif", true)
+			err = file.DownloadTo("http://q4.qlogo.cn/g?b=qq&nk="+v+"&s=640", cc.usrdir+strconv.Itoa(i)+".gif")
 		}
 		if err != nil {
 			return err
 		}
+		process.SleepAbout1sTo2s()
 	}
 	return nil
 }

plugin/aipaint/img2img.go

@@ -11,8 +11,8 @@ import (
 	"strings"
 
 	"github.com/FloatTech/floatbox/file"
-	"github.com/FloatTech/floatbox/img/writer"
 	"github.com/FloatTech/floatbox/web"
+	"github.com/FloatTech/imgfactory"
 	ctrl "github.com/FloatTech/zbpctrl"
 	"github.com/FloatTech/zbputils/control"
 	zero "github.com/wdvxdr1123/ZeroBot"
@@ -73,7 +73,7 @@ func init() { // 插件主体
 			}
 
 			// 图片转base64
-			base64Bytes, err := writer.ToBase64(img)
+			base64Bytes, err := imgfactory.ToBase64(img)
 			if err != nil {
 				ctx.SendChain(message.Text("ERROR: ", err))
 				return

plugin/antiabuse/anti.go

@@ -70,7 +70,7 @@ func init() {
 			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.SetThisGroupBan(uid, int64(bandur.Minutes()))
 				ctx.SendChain(message.Text("检测到违禁词, 已封禁/屏蔽", bandur))
 				db.Lock()
 				defer db.Unlock()

plugin/atri/atri.go

@@ -6,18 +6,46 @@ Package atri 本文件基于 https://github.com/Kyomotoi/ATRI
 package atri
 
 import (
+	"encoding/base64"
 	"math/rand"
 	"time"
 
 	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"
 )
 
-const res = "https://gitcode.net/u011570312/zbpdata/-/raw/main/Atri/"
+type datagetter func(string, bool) ([]byte, error)
+
+func (dgtr datagetter) randImage(file ...string) message.MessageSegment {
+	data, err := dgtr(file[rand.Intn(len(file))], true)
+	if err != nil {
+		return message.Text("ERROR: ", err)
+	}
+	return message.ImageBytes(data)
+}
+
+func (dgtr datagetter) randRecord(file ...string) message.MessageSegment {
+	data, err := dgtr(file[rand.Intn(len(file))], true)
+	if err != nil {
+		return message.Text("ERROR: ", err)
+	}
+	return message.Record("base64://" + base64.StdEncoding.EncodeToString(data))
+}
+
+func randText(text ...string) message.MessageSegment {
+	return message.Text(text[rand.Intn(len(text))])
+}
+
+// isAtriSleeping 凌晨0点到6点，ATRI 在睡觉，不回应任何请求
+func isAtriSleeping(*zero.Ctx) bool {
+	if now := time.Now().Hour(); now >= 1 && now < 6 {
+		return false
+	}
+	return true
+}
 
 func init() { // 插件主体
 	engine := control.Register("atri", &ctrl.Options[*zero.Ctx]{
@@ -29,39 +57,36 @@ func init() { // 插件主体
 			"- 中午好 | 午安 | 午好\n- 晚安 | oyasuminasai | おやすみなさい | 晚好 | 晚上好\n- 高性能 | 太棒了 | すごい | sugoi | 斯国一 | よかった\n" +
 			"- 没事 | 没关系 | 大丈夫 | 还好 | 不要紧 | 没出大问题 | 没伤到哪\n- 好吗 | 是吗 | 行不行 | 能不能 | 可不可以\n- 啊这\n- 我好了\n- ？ | ? | ¿\n" +
 			"- 离谱\n- 答应我",
+		PublicDataFolder: "Atri",
 		OnEnable: func(ctx *zero.Ctx) {
-			process.SleepAbout1sTo2s()
 			ctx.SendChain(message.Text("嗯呜呜……夏生先生……？"))
 		},
 		OnDisable: func(ctx *zero.Ctx) {
-			process.SleepAbout1sTo2s()
 			ctx.SendChain(message.Text("Zzz……Zzz……"))
 		},
 	})
-	engine.OnFullMatch("萝卜子", isAtriSleeping).SetBlock(true).
+	engine.UsePreHandler(isAtriSleeping)
+	var dgtr datagetter = engine.GetLazyData
+	engine.OnFullMatch("萝卜子").SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			process.SleepAbout1sTo2s()
 			switch rand.Intn(2) {
 			case 0:
 				ctx.SendChain(randText("萝卜子是对机器人的蔑称！", "是亚托莉......萝卜子可是对机器人的蔑称"))
 			case 1:
-				ctx.SendChain(randRecord("RocketPunch.amr"))
+				ctx.SendChain(dgtr.randRecord("RocketPunch.amr"))
 			}
 		})
-	engine.OnFullMatchGroup([]string{"喜欢", "爱你", "爱", "suki", "daisuki", "すき", "好き", "贴贴", "老婆", "亲一个", "mua"}, isAtriSleeping, zero.OnlyToMe).SetBlock(true).
+	engine.OnFullMatchGroup([]string{"喜欢", "爱你", "爱", "suki", "daisuki", "すき", "好き", "贴贴", "老婆", "亲一个", "mua"}, zero.OnlyToMe).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			process.SleepAbout1sTo2s()
-			ctx.SendChain(randImage("SUKI.jpg", "SUKI1.jpg", "SUKI2.png"))
+			ctx.SendChain(dgtr.randImage("SUKI.jpg", "SUKI1.jpg", "SUKI2.png"))
 		})
-	engine.OnKeywordGroup([]string{"草你妈", "操你妈", "脑瘫", "废柴", "fw", "five", "废物", "战斗", "爬", "爪巴", "sb", "SB", "傻B"}, isAtriSleeping, zero.OnlyToMe).SetBlock(true).
+	engine.OnKeywordGroup([]string{"草你妈", "操你妈", "脑瘫", "废柴", "fw", "five", "废物", "战斗", "爬", "爪巴", "sb", "SB", "傻B"}, zero.OnlyToMe).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			process.SleepAbout1sTo2s()
-			ctx.SendChain(randImage("FN.jpg", "WQ.jpg", "WQ1.jpg"))
+			ctx.SendChain(dgtr.randImage("FN.jpg", "WQ.jpg", "WQ1.jpg"))
 		})
 	engine.OnFullMatchGroup([]string{"早安", "早哇", "早上好", "ohayo", "哦哈哟", "お早う", "早好", "早", "早早早"}).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			now := time.Now().Hour()
-			process.SleepAbout1sTo2s()
 			switch {
 			case now < 6: // 凌晨
 				ctx.SendChain(message.Reply(ctx.Event.MessageID), randText(
@@ -102,7 +127,6 @@ func init() { // 插件主体
 		Handle(func(ctx *zero.Ctx) {
 			now := time.Now().Hour()
 			if now > 11 && now < 15 { // 中午
-				process.SleepAbout1sTo2s()
 				ctx.SendChain(message.Reply(ctx.Event.MessageID), randText(
 					"午安w",
 					"午觉要好好睡哦，ATRI会陪伴在你身旁的w",
@@ -114,7 +138,6 @@ func init() { // 插件主体
 	engine.OnFullMatchGroup([]string{"晚安", "oyasuminasai", "おやすみなさい", "晚好", "晚上好"}).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			now := time.Now().Hour()
-			process.SleepAbout1sTo2s()
 			switch {
 			case now < 6: // 凌晨
 				ctx.SendChain(message.Reply(ctx.Event.MessageID), randText(
@@ -154,9 +177,8 @@ func init() { // 插件主体
 				))
 			}
 		})
-	engine.OnKeywordGroup([]string{"高性能", "太棒了", "すごい", "sugoi", "斯国一", "よかった"}, isAtriSleeping, zero.OnlyToMe).SetBlock(true).
+	engine.OnKeywordGroup([]string{"高性能", "太棒了", "すごい", "sugoi", "斯国一", "よかった"}, zero.OnlyToMe).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			process.SleepAbout1sTo2s()
 			ctx.SendChain(randText(
 				"当然，我是高性能的嘛~！",
 				"小事一桩，我是高性能的嘛",
@@ -175,9 +197,8 @@ func init() { // 插件主体
 				"呣......我的高性能，毫无遗憾地施展出来了......",
 			))
 		})
-	engine.OnKeywordGroup([]string{"没事", "没关系", "大丈夫", "还好", "不要紧", "没出大问题", "没伤到哪"}, isAtriSleeping, zero.OnlyToMe).SetBlock(true).
+	engine.OnKeywordGroup([]string{"没事", "没关系", "大丈夫", "还好", "不要紧", "没出大问题", "没伤到哪"}, zero.OnlyToMe).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			process.SleepAbout1sTo2s()
 			ctx.SendChain(randText(
 				"当然，我是高性能的嘛~！",
 				"没事没事，因为我是高性能的嘛！嗯哼！",
@@ -190,67 +211,42 @@ func init() { // 插件主体
 			))
 		})
 
-	engine.OnKeywordGroup([]string{"好吗", "是吗", "行不行", "能不能", "可不可以"}, isAtriSleeping).SetBlock(true).
+	engine.OnKeywordGroup([]string{"好吗", "是吗", "行不行", "能不能", "可不可以"}).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			process.SleepAbout1sTo2s()
 			if rand.Intn(2) == 0 {
-				ctx.SendChain(randImage("YES.png", "NO.jpg"))
+				ctx.SendChain(dgtr.randImage("YES.png", "NO.jpg"))
 			}
 		})
-	engine.OnKeywordGroup([]string{"啊这"}, isAtriSleeping).SetBlock(true).
+	engine.OnKeywordGroup([]string{"啊这"}).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			process.SleepAbout1sTo2s()
 			if rand.Intn(2) == 0 {
-				ctx.SendChain(randImage("AZ.jpg", "AZ1.jpg"))
+				ctx.SendChain(dgtr.randImage("AZ.jpg", "AZ1.jpg"))
 			}
 		})
-	engine.OnKeywordGroup([]string{"我好了"}, isAtriSleeping).SetBlock(true).
+	engine.OnKeywordGroup([]string{"我好了"}).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			process.SleepAbout1sTo2s()
 			ctx.SendChain(message.Reply(ctx.Event.MessageID), randText("不许好！", "憋回去！"))
 		})
-	engine.OnFullMatchGroup([]string{"？", "?", "¿"}, isAtriSleeping).SetBlock(true).
-		Handle(func(ctx *zero.Ctx) {
-			process.SleepAbout1sTo2s()
-			switch rand.Intn(5) {
-			case 0:
-				ctx.SendChain(randText("?", "？", "嗯？", "(。´・ω・)ん?", "ん？"))
-			case 1, 2:
-				ctx.SendChain(randImage("WH.jpg", "WH1.jpg", "WH2.jpg", "WH3.jpg"))
-			}
-		})
-	engine.OnKeyword("离谱", isAtriSleeping).SetBlock(true).
+	engine.OnFullMatchGroup([]string{"？", "?", "¿"}).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			switch rand.Intn(5) {
 			case 0:
 				ctx.SendChain(randText("?", "？", "嗯？", "(。´・ω・)ん?", "ん？"))
 			case 1, 2:
-				ctx.SendChain(randImage("WH.jpg"))
+				ctx.SendChain(dgtr.randImage("WH.jpg", "WH1.jpg", "WH2.jpg", "WH3.jpg"))
 			}
 		})
-	engine.OnKeyword("答应我", isAtriSleeping, zero.OnlyToMe).SetBlock(true).
+	engine.OnKeyword("离谱").SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			switch rand.Intn(5) {
+			case 0:
+				ctx.SendChain(randText("?", "？", "嗯？", "(。´・ω・)ん?", "ん？"))
+			case 1, 2:
+				ctx.SendChain(dgtr.randImage("WH.jpg"))
+			}
+		})
+	engine.OnKeyword("答应我", zero.OnlyToMe).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			process.SleepAbout1sTo2s()
 			ctx.SendChain(randText("我无法回应你的请求"))
 		})
 }
-
-func randText(text ...string) message.MessageSegment {
-	return message.Text(text[rand.Intn(len(text))])
-}
-
-func randImage(file ...string) message.MessageSegment {
-	return message.Image(res + file[rand.Intn(len(file))])
-}
-
-func randRecord(file ...string) message.MessageSegment {
-	return message.Record(res + file[rand.Intn(len(file))])
-}
-
-// isAtriSleeping 凌晨0点到6点，ATRI 在睡觉，不回应任何请求
-func isAtriSleeping(ctx *zero.Ctx) bool {
-	if now := time.Now().Hour(); now >= 1 && now < 6 {
-		return false
-	}
-	return true
-}

plugin/autowithdraw/main.go

@@ -0,0 +1,29 @@
+// Package autowithdraw 触发者撤回时也自动撤回
+package autowithdraw
+
+import (
+	"github.com/FloatTech/floatbox/process"
+	ctrl "github.com/FloatTech/zbpctrl"
+	"github.com/FloatTech/zbputils/control"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+)
+
+func init() {
+	control.Register("autowithdraw", &ctrl.Options[*zero.Ctx]{
+		DisableOnDefault: false,
+		Brief:            "触发者撤回时也自动撤回",
+		Help:             "- 撤回一条消息\n",
+	}).OnNotice(func(ctx *zero.Ctx) bool {
+		return ctx.Event.NoticeType == "group_recall" || ctx.Event.NoticeType == "friend_recall"
+	}).SetBlock(false).Handle(func(ctx *zero.Ctx) {
+		id, ok := ctx.Event.MessageID.(int64)
+		if !ok {
+			return
+		}
+		for _, msg := range zero.GetTriggeredMessages(message.NewMessageIDFromInteger(id)) {
+			process.SleepAbout1sTo2s()
+			ctx.DeleteMessage(msg)
+		}
+	})
+}

plugin/baidu/search.go

@@ -1,27 +1,60 @@
-// Package baidu 百度一下
+// Package baidu 百度百科
 package baidu
 
 import (
-	"net/url"
-
-	zero "github.com/wdvxdr1123/ZeroBot"
-	"github.com/wdvxdr1123/ZeroBot/message"
+	"encoding/json"
+	"fmt"
 
+	"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"
 )
 
-func init() {
-	control.Register("baidu", &ctrl.Options[*zero.Ctx]{
-		DisableOnDefault: false,
-		Brief:            "不会百度吗",
-		Help:             "- 百度下[xxx]",
-	}).OnPrefix("百度下").SetBlock(true).Limit(ctxext.LimitByGroup).
-		Handle(func(ctx *zero.Ctx) {
-			txt := ctx.State["args"].(string)
-			if txt != "" {
-				ctx.SendChain(message.Text("https://buhuibaidu.me/?s=" + url.QueryEscape(txt)))
-			}
-		})
+const (
+	duURL   = "https://api.a20safe.com/api.php?api=21&key=%s&text=%s" // api地址
+	wikiURL = "https://api.a20safe.com/api.php?api=23&key=%s&text=%s"
+	key     = "7d06a110e9e20a684e02934549db1d3d"
+)
+
+type result struct {
+	Code int    `json:"code"`
+	Msg  string `json:"msg"`
+	Data []struct {
+		Content string `json:"content"`
+	} `json:"data"`
+}
+
+func init() { // 主函数
+	en := control.Register("baidu", &ctrl.Options[*zero.Ctx]{
+		DisableOnDefault: false,
+		Help: "百科\n" +
+			"- 百度/百科/维基/wiki[关键字]",
+	})
+	en.OnRegex(`^(百度|维基|百科|wiki)\s*(.+)$`).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+		var es []byte
+		var err error
+		switch ctx.State["regex_matched"].([]string)[1] {
+		case "百度", "百科":
+			es, err = web.GetData(fmt.Sprintf(duURL, key, ctx.State["regex_matched"].([]string)[2])) // 将网站返回结果赋值
+		case "wiki", "维基":
+			es, err = web.GetData(fmt.Sprintf(wikiURL, key, ctx.State["regex_matched"].([]string)[2])) // 将网站返回结果赋值
+		}
+		if err != nil {
+			ctx.SendChain(message.Text("出现错误捏：", err))
+			return
+		}
+		var r result                 // r数组
+		err = json.Unmarshal(es, &r) // 填api返回结果，struct地址
+		if err != nil {
+			ctx.SendChain(message.Text("出现错误捏：", err))
+			return
+		}
+		if r.Code == 0 && len(r.Data) > 0 {
+			ctx.SendChain(message.Text(r.Data[0].Content)) // 输出提取后的结果
+		} else {
+			ctx.SendChain(message.Text("API访问错误"))
+		}
+	})
 }

plugin/baiduaudit/audit.go

@@ -4,115 +4,51 @@ package baiduaudit
 import (
 	"encoding/json"
 	"fmt"
-	"os"
 	"strconv"
+	"strings"
 
 	"github.com/Baidu-AIP/golang-sdk/aip/censor"
+	"github.com/sirupsen/logrus"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+
 	"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    // 配置路径
+	bdcli  *censor.ContentCensorClient // 百度云审核服务Client
+	txttyp = [...]string{
+		0: "默认违禁词库",
+		1: "违禁违规",
+		2: "文本色情",
+		3: "敏感信息",
+		4: "恶意推广",
+		5: "低俗辱骂",
+		6: "恶意推广-联系方式",
+		7: "恶意推广-软文推广",
+	} // 文本类型
+	config = newconfig() // 插件配置
 )
 
 func init() {
 	engine := control.Register("baiduaudit", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
 		Brief:            "百度内容审核",
-		Help: "##该功能来自百度内容审核，需购买相关服务，并创建app##\n" +
+		Help: "##该功能来自百度内容审核, 需购买相关服务, 并创建app##\n" +
 			"- 获取BDAKey\n" +
 			"- 配置BDAKey [API key] [Secret Key]\n" +
 			"- 开启/关闭内容审核\n" +
 			"- 开启/关闭撤回提示\n" +
 			"- 开启/关闭详细提示\n" +
 			"- 开启/关闭撤回禁言\n" +
-			"##禁言时间设置## 禁言时间计算方式为：禁言次数*每次禁言累加时间,当达到最大禁言时间时，再次触发按最大禁言时间计算\n" +
+			"##禁言时间设置## 禁言时间计算方式为：禁言次数*每次禁言累加时间,当达到最大禁言时间时, 再次触发按最大禁言时间计算\n" +
 			"- 开启/关闭禁言累加\n" +
-			"- 设置撤回禁言时间[分钟，默认:1]\n" +
-			"- 设置最大禁言时间[分钟，默认:60,最大43200]\n" +
-			"- 设置每次累加时间[分钟，默认:1]\n" +
+			"- 设置撤回禁言时间[分钟, 默认:1]\n" +
+			"- 设置最大禁言时间[分钟, 默认:60,最大43200]\n" +
+			"- 设置每次累加时间[分钟, 默认:1]\n" +
 			"##检测类型设置## 类型编号列表:[1:违禁违规、2:文本色情、3:敏感信息、4:恶意推广、5:低俗辱骂 6:恶意推广-联系方式、7:恶意推广-软文推广]\n" +
 			"- 查看检测类型\n" +
 			"- 查看检测配置\n" +
@@ -121,15 +57,19 @@ func init() {
 			"- 开启/关闭文本检测\n" +
 			"- 开启/关闭图像检测\n" +
 			"##测试功能##\n" +
-			"- 测试文本检测[文本内容]\n" +
-			"- 测试图像检测[图片]\n",
+			"- ^文本检测[文本内容]\n" +
+			"- ^图像检测[图片]\n",
 		PrivateDataFolder: "baiduaudit",
 	})
-	configpath = engine.DataFolder() + "config.json"
-	loadConfig()
-	if configinit {
+
+	configpath := engine.DataFolder() + "config.json"
+	err := config.load(configpath)
+	if err != nil {
+		logrus.Warnln("[baiduaudit] 加载配置错误:", err)
+	} else if config.Key1 != "" && config.Key2 != "" {
 		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" +
@@ -138,29 +78,33 @@ func init() {
 				"https://console.bce.baidu.com/ai/?_=1665977657185#/ai/antiporn/overview/resource/getFree"))
 		})
 
-	engine.OnRegex("^查看检测(类型|配置)$", zero.AdminPermission, clientCheck).SetBlock(true).
+	engine.OnRegex("^查看检测(类型|配置)$", zero.AdminPermission, hasinit).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			// 获取群配置
-			group := getGroup(ctx.Event.GroupID)
-			var msgs string
+			group := config.groupof(ctx.Event.GroupID)
+			msg := ""
 			k1 := ctx.State["regex_matched"].([]string)[1]
 			if k1 == "类型" {
-				msgs += "本群检测类型:"
-				find := false
+				sb := strings.Builder{}
+				sb.WriteString("本群检测类型:")
+				found := false
 				// 遍历群检测类型名单
-				for i, v := range group.WhiteListType {
+				for i, v := range group.copyWhiteListType() {
 					if !v {
-						find = true
-						msgs += fmt.Sprint("\n", i, ".", typetext[i])
+						found = true
+						sb.WriteByte('\n')
+						sb.WriteString(strconv.Itoa(i))
+						sb.WriteByte('.')
+						sb.WriteString(txttyp[i])
 					}
 				}
-				if !find {
-					msgs += "无"
+				if !found {
+					sb.WriteString("无")
 				}
-
+				msg = sb.String()
 			} else {
 				// 生成配置文本
-				msgs = fmt.Sprintf("本群配置:\n"+
+				msg = fmt.Sprintf("本群配置:\n"+
 					"内容审核:%s\n"+
 					"-文本:%s\n"+
 					"-图像:%s\n"+
@@ -172,138 +116,145 @@ func init() {
 					"-每次累加时间:%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)
+			b, err := text.RenderToBase64(msg, 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).
+
+	engine.OnRegex("^设置(不)?检测类型([0-7])$", zero.AdminPermission, hasinit).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)
+			group := config.groupof(ctx.Event.GroupID)
 			inputType, _ := strconv.Atoi(k2)
-			if k1 == "不" {
-				group.WhiteListType[inputType] = true //不检测：则进入类型白名单
-			} else {
-				group.WhiteListType[inputType] = false //检测：则退出白名单
+			group.setWhiteListType(inputType, k1 == "不")
+			err := config.saveto(configpath)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
 			}
-			config.Groups[ctx.Event.GroupID] = group
-			ctx.SendChain(message.At(ctx.Event.UserID), message.Text(fmt.Sprintf("本群将%s检测%s类型内容", k1, typetext[inputType])))
+			ctx.SendChain(message.At(ctx.Event.UserID), message.Text(fmt.Sprintf("本群将%s检测%s类型内容", k1, txttyp[inputType])))
 		})
-	engine.OnRegex("^设置(最大|每次|撤回)(累加|禁言)时间(\\d{1,5})$", zero.AdminPermission, clientCheck).SetBlock(true).
+
+	engine.OnRegex("^设置(最大|每次|撤回)(累加|禁言)时间(\\d{1,5})$", zero.AdminPermission, hasinit).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.groupof(ctx.Event.GroupID).set(func(g *group) {
+				switch k1 {
+				case "最大":
+					g.MaxBANTimeAddRange = time
+				case "每次":
+					g.BANTimeAddTime = time
+				case "撤回":
+					g.BANTime = time
+				}
+			})
+			err := config.saveto(configpath)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
 			}
-			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).
+
+	engine.OnRegex("^(开启|关闭)(内容审核|撤回提示|撤回禁言|禁言累加|详细提示|文本检测|图像检测)$", zero.AdminPermission, hasinit).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
+			isEnable := mark(k1 == "开启")
+			config.groupof(ctx.Event.GroupID).set(func(g *group) {
+				switch k2 {
+				case "内容审核":
+					g.Enable = isEnable
+				case "撤回提示":
+					g.DMRemind = isEnable
+				case "撤回禁言":
+					g.DMBAN = isEnable
+				case "禁言累加":
+					g.BANTimeAddEnable = isEnable
+				case "详细提示":
+					g.MoreRemind = isEnable
+				case "文本检测":
+					g.TextAudit = isEnable
+				case "图像检测":
+					g.ImageAudit = isEnable
+				}
+			})
+			err := config.saveto(configpath)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
 			}
-			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
+			config.setkey(k1, k2)
 			if bdcli != nil {
-				jsonSave(config, configpath)
+				err := config.saveto(configpath)
+				if err != nil {
+					ctx.SendChain(message.Text("ERROR: ", err))
+					return
+				}
 				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) {
+
+	engine.OnMessage(config.isgroupexist).SetBlock(false).Handle(func(ctx *zero.Ctx) {
+		group := config.groupof(ctx.Event.GroupID)
+		if !bool(group.Enable) {
 			return
 		}
+		var bdres baiduRes
+		var err error
 		for _, elem := range ctx.Event.Message {
 			switch elem.Type {
 			case "image":
-				if !group.ImageAudit {
-					return
+				if !group.ImageAudit || elem.Data["url"] == "" {
+					continue
 				}
 				res := bdcli.ImgCensorUrl(elem.Data["url"], nil)
-				bdres, err := jsonToBaiduRes(res)
+				bdres, err = parse2BaiduRes(res)
 				if err != nil {
-					ctx.SendChain(message.Text("Error:", bdres.ErrorMsg, "(", bdres.ErrorCode, ")"))
-					return
+					continue
 				}
-				banCheck(ctx, bdres)
-
 			case "text":
-				if !group.TextAudit {
-					return
+				if !group.TextAudit || elem.Data["text"] == "" {
+					continue
 				}
-				res := bdcli.TextCensor(elem.Data["text"])
-				bdres, err := jsonToBaiduRes(res)
+				bdres, err = parse2BaiduRes(bdcli.TextCensor(elem.Data["text"]))
 				if err != nil {
-					ctx.SendChain(message.Text("Error:", bdres.ErrorMsg, "(", bdres.ErrorCode, ")"))
-					return
+					continue
 				}
-				banCheck(ctx, bdres)
+			default:
+				continue
 			}
 		}
+		bdres.audit(ctx, configpath)
 	})
-	engine.OnPrefix("文本检测", clientCheck).SetBlock(false).
+
+	engine.OnPrefix("^文本检测", hasinit).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)
+			bdres, err := parse2BaiduRes(res)
 			if err != nil {
-				ctx.SendChain(message.Text("Error:", bdres.ErrorMsg, "(", bdres.ErrorCode, ")"))
+				ctx.SendChain(message.Text("ERROR: ", bdres.ErrorMsg, "(", bdres.ErrorCode, ")"))
 				return
 			}
-			group := getGroup(ctx.Event.GroupID)
-			ctx.SendChain(buildResp(bdres, group)...)
+			ctx.Send(config.groupof(ctx.Event.GroupID).reply(&bdres))
 		})
-	engine.OnPrefix("^图像检测", clientCheck).SetBlock(false).
+
+	engine.OnPrefix("^图像检测", hasinit).SetBlock(false).
 		Handle(func(ctx *zero.Ctx) {
 			var urls []string
 			for _, elem := range ctx.Event.Message {
@@ -317,106 +268,17 @@ func init() {
 				return
 			}
 			res := bdcli.ImgCensorUrl(urls[0], nil)
-			bdres, err := jsonToBaiduRes(res)
+			bdres, err := parse2BaiduRes(res)
 			if err != nil {
-				ctx.SendChain(message.Text("Error:", bdres.ErrorMsg, "(", bdres.ErrorCode, ")"))
+				ctx.SendChain(message.Text("ERROR: ", bdres.ErrorMsg, "(", bdres.ErrorCode, ")"))
 				return
 			}
-			group := getGroup(ctx.Event.GroupID)
-			ctx.SendChain(buildResp(bdres, group)...)
-
+			ctx.Send(config.groupof(ctx.Event.GroupID).reply(&bdres))
 		})
 }
 
-// 禁言检测
-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 {
+func hasinit(ctx *zero.Ctx) bool {
 	if bdcli == nil {
 		ctx.SendChain(message.Text("Key未配置"))
 		return false
@@ -424,79 +286,7 @@ func clientCheck(ctx *zero.Ctx) bool {
 	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
+func parse2BaiduRes(resjson string) (bdres baiduRes, err error) {
+	err = json.Unmarshal(binary.StringToBytes(resjson), &bdres)
+	return
 }

plugin/baiduaudit/model.go

@@ -0,0 +1,271 @@
+package baiduaudit
+
+import (
+	"encoding/json"
+	"os"
+	"sync"
+	"sync/atomic"
+
+	"github.com/FloatTech/floatbox/file"
+	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 {
+	mu sync.Mutex `json:"-"`
+	// 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"`  // 错误提示信息, 失败才返回, 成功不返回
+}
+
+// 禁言检测
+func (bdres *baiduRes) audit(ctx *zero.Ctx, configpath string) {
+	bdres.mu.Lock()
+	defer bdres.mu.Unlock()
+	// 如果返回类型为2（不合规）, 0为合规, 3为疑似
+	if bdres.ConclusionType != 2 {
+		return
+	}
+	// 创建消息ID
+	mid := message.NewMessageIDFromInteger(ctx.Event.MessageID.(int64))
+	// 获取群配置
+	group := config.groupof(ctx.Event.GroupID)
+	// 检测群配置里的不检测类型白名单, 忽略掉不检测的违规类型
+	for i, b := range group.copyWhiteListType() {
+		if i == bdres.Data[0].SubType && b {
+			return
+		}
+	}
+	// 生成回复文本
+	res := group.reply(bdres)
+	// 撤回消息
+	ctx.DeleteMessage(mid)
+	// 查看是否启用撤回后禁言
+	if group.DMBAN {
+		// 从历史违规记录中获取指定用户
+		user := group.historyof(ctx.Event.UserID)
+		// 用户违规次数自增
+		atomic.AddInt64(&user.Count, 1)
+		user.mu.Lock()
+		// 用户违规原因记录
+		user.ResList = append(user.ResList, bdres)
+		user.mu.Unlock()
+		// 保存到json
+		err := config.saveto(configpath)
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR: ", err))
+		}
+		var bantime int64
+		// 查看是否开启禁言累加功能, 并计算禁言时间
+		if group.BANTimeAddEnable {
+			bantime = atomic.LoadInt64(&user.Count) * group.BANTimeAddTime * 60
+		} else {
+			bantime = group.BANTime * 60
+		}
+		// 执行禁言
+		ctx.SetThisGroupBan(ctx.Event.UserID, bantime)
+	}
+	// 查看是否开启撤回提示
+	if group.DMRemind {
+		res = append(res, message.At(ctx.Event.Sender.ID))
+		ctx.Send(res)
+	}
+}
+
+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 auditHistory struct {
+	mu      sync.Mutex  `json:"-"`
+	Count   int64       `json:"key2"`    // 被禁次数
+	ResList []*baiduRes `json:"reslist"` // 禁言原因
+}
+
+type hit struct {
+	// DatasetName string   `json:"datasetName"`           // 违规项目所属数据集名称
+	Words []string `json:"words"` // 送检文本命中词库的关键词（备注：建议参考新字段“wordHitPositions”, 包含信息更丰富：关键词以及对应的位置及标签信息）
+	// Probability float64  `json:"probability,omitempty"` // 不合规项置信度
+} // 送检文本违规原因的详细信息
+
+type keyConfig struct {
+	mu     sync.Mutex       `json:"-"`
+	Key1   string           `json:"key1"`   // 百度云服务内容审核key存储
+	Key2   string           `json:"key2"`   // 百度云服务内容审核key存储
+	Groups map[int64]*group `json:"groups"` // 群配置存储
+}
+
+func newconfig() (kc keyConfig) {
+	kc.Groups = make(map[int64]*group, 64)
+	return
+}
+
+func (kc *keyConfig) setkey(k1, k2 string) {
+	kc.mu.Lock()
+	defer kc.mu.Unlock()
+	kc.Key1 = k1
+	kc.Key2 = k2
+}
+
+// 加载JSON配置文件
+func (kc *keyConfig) load(filename string) error {
+	if file.IsNotExist(filename) {
+		return nil
+	}
+	f, err := os.Open(filename)
+	if err != nil {
+		return err
+	}
+	kc.mu.Lock()
+	defer kc.mu.Unlock()
+	return json.NewDecoder(f).Decode(kc)
+}
+
+func (kc *keyConfig) isgroupexist(ctx *zero.Ctx) (ok bool) {
+	kc.mu.Lock()
+	defer kc.mu.Unlock()
+	_, ok = kc.Groups[ctx.Event.GroupID]
+	return
+}
+
+// 获取群配置
+func (kc *keyConfig) groupof(groupID int64) *group {
+	kc.mu.Lock()
+	defer kc.mu.Unlock()
+	g, ok := kc.Groups[groupID]
+	if ok {
+		return g
+	}
+	g = &group{
+		TextAudit:          true,
+		ImageAudit:         true,
+		BANTime:            1,
+		MaxBANTimeAddRange: 60,
+		BANTimeAddTime:     1,
+		AuditHistory:       map[int64]*auditHistory{},
+	}
+	kc.Groups[groupID] = g
+	return g
+}
+
+// 保存配置文件
+func (kc *keyConfig) saveto(filename string) error {
+	kc.mu.Lock()
+	defer kc.mu.Unlock()
+	f, err := os.Create(filename)
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+	return json.NewEncoder(f).Encode(kc)
+}
+
+type group struct {
+	mu                 sync.Mutex
+	Enable             mark                    // 是否启用内容审核
+	TextAudit          mark                    // 文本检测
+	ImageAudit         mark                    // 图像检测
+	DMRemind           mark                    // 撤回提示
+	MoreRemind         mark                    // 详细违规提示
+	DMBAN              mark                    // 撤回后禁言
+	BANTimeAddEnable   mark                    // 禁言累加
+	BANTime            int64                   // 标准禁言时间, 禁用累加, 但开启禁言的的情况下采用该值
+	MaxBANTimeAddRange int64                   // 最大禁言时间累加范围, 最高禁言时间
+	BANTimeAddTime     int64                   // 禁言累加时间, 该值是开启禁累加功能后, 再次触发时, 根据被禁次数X该值计算出的禁言时间
+	WhiteListType      [8]bool                 // 类型白名单, 处于白名单类型的违规, 不会被触发 0:含多种类型, 具体看官方链接, 1:违禁违规、2:文本色情、3:敏感信息、4:恶意推广、5:低俗辱骂 6:恶意推广-联系方式、7:恶意推广-软文推广
+	AuditHistory       map[int64]*auditHistory // 被封禁用户列表
+}
+
+func (g *group) set(f func(g *group)) {
+	g.mu.Lock()
+	f(g)
+	g.mu.Unlock()
+}
+
+func (g *group) setWhiteListType(typ int, ok bool) {
+	g.mu.Lock()
+	defer g.mu.Unlock()
+	g.WhiteListType[typ] = ok
+}
+
+func (g *group) copyWhiteListType() [8]bool {
+	g.mu.Lock()
+	defer g.mu.Unlock()
+	return g.WhiteListType
+}
+
+// 从群历史违规记录中获取用户
+func (g *group) historyof(userID int64) *auditHistory {
+	g.mu.Lock()
+	defer g.mu.Unlock()
+	audit, ok := g.AuditHistory[userID]
+	if ok {
+		return audit
+	}
+	// 如果没有用户, 则创建一个并返回
+	if g.AuditHistory == nil {
+		g.AuditHistory = make(map[int64]*auditHistory)
+	}
+	audit = &auditHistory{}
+	g.AuditHistory[userID] = audit
+	return audit
+}
+
+// 生成回复文本
+func (g *group) reply(bdres *baiduRes) message.Message {
+	g.mu.Lock()
+	defer g.mu.Unlock()
+	// 建立消息段
+	msgs := make([]message.MessageSegment, 0, 8)
+	// 生成简略审核结果回复
+	msgs = append(msgs, message.Text(bdres.Conclusion, "\n"))
+	// 查看是否开启详细审核内容提示, 并确定审核内容值为疑似, 或者不合规
+	if !g.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
+}
+
+type mark bool
+
+// String 打印启用状态
+func (em mark) String() string {
+	if em {
+		return "开启"
+	}
+	return "关闭"
+}

plugin/bilibili/bilibili.go

@@ -16,15 +16,14 @@ import (
 	"strconv"
 	"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"
+	"github.com/FloatTech/gg"
+	"github.com/FloatTech/imgfactory"
 	ctrl "github.com/FloatTech/zbpctrl"
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/img"
 	"github.com/FloatTech/zbputils/img/text"
 	log "github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
@@ -57,7 +56,7 @@ func init() {
 			"- 查成分 [xxx]\n" +
 			"- 查弹幕 [xxx]\n" +
 			"- 设置b站cookie b_ut=7;buvid3=0;i-wanna-go-back=-1;innersign=0;\n" +
-			"- 更新vup" +
+			"- 更新vup\n" +
 			"Tips: (412就是拦截的意思,建议私聊把cookie设全)\n",
 		PublicDataFolder: "Bilibili",
 	})
@@ -174,7 +173,7 @@ func init() {
 					ctx.SendChain(message.Text("ERROR: ", err))
 					return
 				}
-				back = img.Size(back, backX, backY).Im
+				back = imgfactory.Size(back, backX, backY).Image()
 			}
 			if len(vups) > 50 {
 				ctx.SendChain(message.Text(u.Name + "关注的up主太多了, 只展示前50个up"))
@@ -188,11 +187,11 @@ func init() {
 				canvas.DrawImage(back, 0, 0)
 			}
 			canvas.SetColor(color.Black)
-			_, err = file.GetLazyData(text.BoldFontFile, true)
+			data, 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 {
+			if err = canvas.ParseFontFace(data, fontSize); err != nil {
 				ctx.SendChain(message.Text("ERROR: ", err))
 				return
 			}
@@ -259,12 +258,15 @@ func init() {
 			f, err := os.Create(drawedFile)
 			if err != nil {
 				log.Errorln("[bilibili]", err)
-				data, cl := writer.ToBytes(canvas.Image())
+				data, err := imgfactory.ToBytes(canvas.Image())
+				if err != nil {
+					log.Errorln("[bilibili]", err)
+					return
+				}
 				ctx.SendChain(message.ImageBytes(data))
-				cl()
 				return
 			}
-			_, err = writer.WriteTo(canvas.Image(), f)
+			_, err = imgfactory.WriteTo(canvas.Image(), f)
 			_ = f.Close()
 			if err != nil {
 				ctx.SendChain(message.Text("ERROR: ", err))
@@ -291,7 +293,7 @@ func init() {
 		}
 
 		client := &http.Client{Transport: tr}
-		data, err := web.RequestDataWith(client, fmt.Sprintf(bz.DanmakuAPI, id, pagenum), "GET", "", web.RandUA())
+		data, err := web.RequestDataWith(client, fmt.Sprintf(bz.DanmakuAPI, id, pagenum), "GET", "", web.RandUA(), nil)
 		if err != nil {
 			ctx.SendChain(message.Text("ERROR: ", err))
 			return
@@ -318,15 +320,15 @@ func init() {
 				ctx.SendChain(message.Text("ERROR: ", err))
 				return
 			}
-			back = img.Size(back, backX, backY).Im
+			back = imgfactory.Size(back, backX, backY).Image()
 		}
 		canvas := gg.NewContext(100, 100)
 		fontSize := 50.0
-		_, err = file.GetLazyData(text.BoldFontFile, true)
+		data, 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 {
+		if err = canvas.ParseFontFace(data, fontSize); err != nil {
 			ctx.SendChain(message.Text("ERROR: ", err))
 			return
 		}
@@ -338,14 +340,14 @@ func init() {
 		for i := 0; i < len(danmaku.Data.Data); i++ {
 			totalDanmuku += len(danmaku.Data.Data[i].Danmakus) + 1
 		}
-		cw := 10000
+		cw := 3000
 		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 {
+		if err = canvas.ParseFontFace(data, fontSize); err != nil {
 			ctx.SendChain(message.Text("ERROR: ", err))
 			return
 		}
@@ -384,7 +386,7 @@ func init() {
 					ctx.SendChain(message.Text("ERROR: ", err))
 					return
 				}
-				back = img.Size(back, backX, backY).Im
+				back = imgfactory.Size(back, backX, backY).Image()
 			}
 			if back != nil {
 				canvas.DrawImage(back, facestart, int(channelStart))
@@ -520,12 +522,15 @@ func init() {
 		f, err := os.Create(drawedFile)
 		if err != nil {
 			log.Errorln("[bilibili]", err)
-			data, cl := writer.ToBytes(nim)
+			data, err := imgfactory.ToBytes(nim)
+			if err != nil {
+				log.Errorln("[bilibili]", err)
+				return
+			}
 			ctx.SendChain(message.ImageBytes(data))
-			cl()
 			return
 		}
-		_, err = writer.WriteTo(nim, f)
+		_, err = imgfactory.WriteTo(nim, f)
 		_ = f.Close()
 		if err != nil {
 			ctx.SendChain(message.Text("ERROR: ", err))

plugin/bilibili/bilibili_parse.go

@@ -35,7 +35,7 @@ func init() {
 	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 := bz.GetRealUrl("https://" + url)
+			realurl, err := bz.GetRealURL("https://" + url)
 			if err != nil {
 				ctx.SendChain(message.Text("ERROR: ", err))
 				return

plugin/bilibili/bilibilimodel.go

@@ -5,7 +5,6 @@ import (
 
 	"github.com/FloatTech/floatbox/binary"
 	"github.com/FloatTech/floatbox/web"
-	_ "github.com/fumiama/sqlite3" // use sql
 	"github.com/jinzhu/gorm"
 	"github.com/tidwall/gjson"
 )

plugin/bilibili/bilibilipush.go

@@ -3,37 +3,56 @@ package bilibili
 
 import (
 	"bytes"
+	"crypto/md5"
+	"encoding/hex"
 	"encoding/json"
 	"fmt"
+	"net/http"
+	"net/url"
+	"path/filepath"
+	"sort"
 	"strconv"
+	"strings"
 	"time"
 
-	"github.com/pkg/errors"
-	"github.com/tidwall/gjson"
-	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/control"
 	"github.com/FloatTech/zbputils/img/text"
+	"github.com/RomiChan/syncx"
+	"github.com/pkg/errors"
+	"github.com/tidwall/gjson"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 )
 
 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"
+	referer = "https://space.bilibili.com/%v"
+	infoURL = "https://api.bilibili.com/x/space/wbi/acc/info?mid=%v&token=&platform=web&web_location=1550101"
+	navURL  = "https://api.bilibili.com/x/web-interface/nav"
 )
 
 // bdb bilibili推送数据库
 var bdb *bilibilipushdb
 
 var (
-	lastTime   = map[int64]int64{}
-	liveStatus = map[int64]int{}
-	upMap      = map[int64]string{}
+	lastTime       = map[int64]int64{}
+	liveStatus     = map[int64]int{}
+	upMap          = map[int64]string{}
+	mixinKeyEncTab = [...]int{
+		46, 47, 18, 2, 53, 8, 23, 32, 15, 50, 10, 31, 58, 3, 45, 35, 27, 43, 5, 49,
+		33, 9, 42, 19, 29, 28, 14, 39, 12, 38, 41, 13, 37, 48, 7, 16, 24, 55, 40,
+		61, 26, 17, 0, 1, 60, 51, 30, 4, 22, 25, 54, 21, 56, 59, 6, 63, 57, 62, 11,
+		36, 20, 34, 44, 52,
+	}
+	cache          syncx.Map[string, string]
+	lastUpdateTime time.Time
+
+	replacements = [...]string{"!", "'", "(", ")", "*"}
 )
 
 func init() {
@@ -56,10 +75,10 @@ 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 {
+		if err != nil || name == "" {
 			ctx.SendChain(message.Text("ERROR: ", err))
 			return
 		}
@@ -73,7 +92,7 @@ func init() {
 		}
 		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 {
@@ -90,7 +109,7 @@ func init() {
 		}
 		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 {
@@ -107,7 +126,7 @@ func init() {
 		}
 		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 {
@@ -124,13 +143,13 @@ func init() {
 		}
 		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()
@@ -158,7 +177,7 @@ func init() {
 			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))
@@ -174,15 +193,17 @@ func init() {
 func getName(buid int64) (name string, err error) {
 	var ok bool
 	if name, ok = upMap[buid]; !ok {
-		var data []byte
-		data, err = web.RequestDataWith(web.NewDefaultClient(), fmt.Sprintf(infoURL, buid), "GET", referer, ua)
+		data, err := web.RequestDataWithHeaders(web.NewDefaultClient(), signURL(fmt.Sprintf(infoURL, buid)), "GET", func(r *http.Request) error {
+			r.Header.Set("User-Agent", ua)
+			return nil
+		}, nil)
 		if err != nil {
-			return
+			return "", err
 		}
 		status := int(gjson.Get(binary.BytesToString(data), "code").Int())
 		if status != 0 {
 			err = errors.New(gjson.Get(binary.BytesToString(data), "message").String())
-			return
+			return "", err
 		}
 		name = gjson.Get(binary.BytesToString(data), "data.name").String()
 		bdb.insertBilibiliUp(buid, name)
@@ -191,6 +212,103 @@ func getName(buid int64) (name string, err error) {
 	return
 }
 
+func getMixinKey(orig string) string {
+	var str strings.Builder
+	t := 0
+	for _, v := range mixinKeyEncTab {
+		if v < len(orig) {
+			str.WriteByte(orig[v])
+			t++
+		}
+		if t > 31 {
+			break
+		}
+	}
+	return str.String()
+}
+
+func wbiSign(params map[string]string, imgKey string, subKey string) map[string]string {
+	mixinKey := getMixinKey(imgKey + subKey)
+	currTime := strconv.FormatInt(time.Now().Unix(), 10)
+	params["wts"] = currTime
+	// Sort keys
+	keys := make([]string, 0, len(params))
+	for k, v := range params {
+		keys = append(keys, k)
+		for _, old := range replacements {
+			v = strings.ReplaceAll(v, old, "")
+		}
+		params[k] = v
+	}
+	sort.Strings(keys)
+	h := md5.New()
+	for k, v := range keys {
+		h.Write([]byte(v))
+		h.Write([]byte{'='})
+		h.Write([]byte(params[v]))
+		if k < len(keys)-1 {
+			h.Write([]byte{'&'})
+		}
+	}
+	h.Write([]byte(mixinKey))
+	params["w_rid"] = hex.EncodeToString(h.Sum(make([]byte, 0, md5.Size)))
+	return params
+}
+
+func getWbiKeysCached() (string, string) {
+	if time.Since(lastUpdateTime).Minutes() > 10 {
+		imgKey, subKey := getWbiKeys()
+		cache.Store("imgKey", imgKey)
+		cache.Store("subKey", subKey)
+		lastUpdateTime = time.Now()
+		return imgKey, subKey
+	}
+	imgKeyI, _ := cache.Load("imgKey")
+	subKeyI, _ := cache.Load("subKey")
+	return imgKeyI, subKeyI
+}
+
+func getWbiKeys() (string, string) {
+	data, _ := web.RequestDataWithHeaders(web.NewDefaultClient(), navURL, "GET", func(r *http.Request) error {
+		if cfg != nil {
+			cookie, err := cfg.Load()
+			if err == nil {
+				r.Header.Set("cookie", cookie)
+				return nil
+			}
+			return err
+		}
+		return errors.New("未配置-cookie")
+	}, nil)
+	json := helper.BytesToString(data)
+	imgURL := gjson.Get(json, "data.wbi_img.img_url").String()
+	subURL := gjson.Get(json, "data.wbi_img.sub_url").String()
+	imgKey := imgURL[strings.LastIndex(imgURL, "/")+1:]
+	imgKey = strings.TrimSuffix(imgKey, filepath.Ext(imgKey))
+	subKey := subURL[strings.LastIndex(subURL, "/")+1:]
+	subKey = strings.TrimSuffix(subKey, filepath.Ext(subKey))
+	return imgKey, subKey
+}
+
+func signURL(urlStr string) string {
+	urlObj, _ := url.Parse(urlStr)
+	imgKey, subKey := getWbiKeysCached()
+	query := urlObj.Query()
+	params := map[string]string{}
+	for k, v := range query {
+		if len(v) > 0 {
+			params[k] = v[0]
+		}
+	}
+	newParams := wbiSign(params, imgKey, subKey)
+	for k, v := range newParams {
+		query.Set(k, v)
+	}
+	urlObj.RawQuery = query.Encode()
+	newURL := urlObj.String()
+	return newURL
+}
+
 // subscribe 订阅
 func subscribe(buid, groupid int64) (err error) {
 	bpMap := map[string]any{
@@ -232,7 +350,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(bz.SpaceHistoryURL, buid, 0), "GET", referer, ua)
+	data, err := web.RequestDataWith(web.NewDefaultClient(), fmt.Sprintf(bz.SpaceHistoryURL, buid, 0), "GET", referer, ua, nil)
 	if err != nil {
 		return
 	}
@@ -263,7 +381,7 @@ func sendDynamic(ctx *zero.Ctx) error {
 			return err
 		}
 		if len(cardList) == 0 {
-			return errors.Errorf("%v的历史动态数为0", buid)
+			return nil
 		}
 		t, ok := lastTime[buid]
 		// 第一次先记录时间,啥也不做

plugin/bilibili/bilibilipushmodel.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"os"
 
-	_ "github.com/fumiama/sqlite3" // import sql
 	"github.com/jinzhu/gorm"
 )
 

plugin/book_review/book_review.go

@@ -27,7 +27,7 @@ func init() {
 		db.DBPath = engine.DataFolder() + "bookreview.db"
 		// os.RemoveAll(dbpath)
 		_, _ = engine.GetLazyData("bookreview.db", true)
-		err := db.Open(time.Hour * 24)
+		err := db.Open(time.Hour)
 		if err != nil {
 			ctx.SendChain(message.Text("ERROR: ", err))
 			return false

plugin/chouxianghua/chouxianghua.go

@@ -26,7 +26,7 @@ func init() {
 			db.DBPath = en.DataFolder() + "cxh.db"
 			// os.RemoveAll(dbpath)
 			_, _ = en.GetLazyData("cxh.db", true)
-			err := db.Open(time.Hour * 24)
+			err := db.Open(time.Hour)
 			if err != nil {
 				ctx.SendChain(message.Text("ERROR: ", err))
 				return false

plugin/coser/coser.go

@@ -2,7 +2,10 @@
 package coser
 
 import (
-	"regexp"
+	"errors"
+	"math/rand"
+	"os"
+	"time"
 
 	"github.com/tidwall/gjson"
 
@@ -10,6 +13,8 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
+	"github.com/FloatTech/AnimeAPI/setu"
+	"github.com/FloatTech/floatbox/file"
 	"github.com/FloatTech/floatbox/web"
 	ctrl "github.com/FloatTech/zbpctrl"
 	"github.com/FloatTech/zbputils/control"
@@ -19,35 +24,47 @@ import (
 var (
 	ua       = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.93 Safari/537.36"
 	coserURL = "http://ovooa.com/API/cosplay/api.php"
-	datestr  = regexp.MustCompile(`/\d{4}-\d{2}-\d{2}/`)
 )
 
 func init() {
+	p, err := setu.NewPool(setu.DefaultPoolDir,
+		func(s string) (string, error) {
+			if s != "coser" {
+				return "", errors.New("invalid call")
+			}
+			typ := setu.DefaultPoolDir + "/" + "coser"
+			if file.IsNotExist(typ) {
+				err := os.MkdirAll(typ, 0755)
+				if err != nil {
+					return "", err
+				}
+			}
+			data, err := web.RequestDataWith(web.NewDefaultClient(), coserURL, "GET", "", ua, nil)
+			if err != nil {
+				return "", err
+			}
+			arr := gjson.Get(helper.BytesToString(data), "data.data").Array()
+			if len(arr) == 0 {
+				return "", errors.New("data is empty")
+			}
+			pic := arr[rand.Intn(len(arr))]
+			return pic.String(), nil
+		}, web.GetData, time.Minute)
+	if err != nil {
+		panic(err)
+	}
 	control.Register("coser", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
 		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)
+			pic, err := p.Roll("coser")
 			if err != nil {
 				ctx.SendChain(message.Text("ERROR: ", err))
 				return
 			}
-			text := gjson.Get(helper.BytesToString(data), "data.Title").String()
-			m := message.Message{ctxext.FakeSenderForwardNode(ctx, message.Text(text))}
-			ds := ""
-			gjson.Get(helper.BytesToString(data), "data.data").ForEach(func(_, value gjson.Result) bool {
-				if ds == "" {
-					ds = datestr.FindString(value.String())
-				} else if ds != datestr.FindString(value.String()) {
-					return false
-				}
-				m = append(m, ctxext.FakeSenderForwardNode(ctx, message.Image(value.String())))
-				return true
-			})
-			if id := ctx.Send(m).ID(); id == 0 {
+			if id := ctx.Send(message.Message{ctxext.FakeSenderForwardNode(ctx, message.Image("file:///"+file.BOTPATH+"/"+pic))}).ID(); id == 0 {
 				ctx.SendChain(message.Text("ERROR: 可能被风控或下载图片用时过长，请耐心等待"))
 			}
 		})

plugin/cpstory/cpstory.go

@@ -27,7 +27,7 @@ func init() {
 		db.DBPath = engine.DataFolder() + "cp.db"
 		// os.RemoveAll(dbpath)
 		_, _ = engine.GetLazyData("cp.db", true)
-		err := db.Open(time.Hour * 24)
+		err := db.Open(time.Hour)
 		if err != nil {
 			ctx.SendChain(message.Text("ERROR: ", err))
 			return false
@@ -53,7 +53,7 @@ func init() {
 		text := strings.ReplaceAll(cs.Story, "<攻>", gong)
 		text = strings.ReplaceAll(text, "<受>", shou)
 		text = strings.ReplaceAll(text, cs.Gong, gong)
-		text = strings.ReplaceAll(text, cs.Shou, gong)
+		text = strings.ReplaceAll(text, cs.Shou, shou)
 		ctx.SendChain(message.Text(text))
 	})
 	engine.OnPrefix("磕cp", getdb).SetBlock(true).Handle(func(ctx *zero.Ctx) {

plugin/curse/curse.go

@@ -35,7 +35,7 @@ func init() {
 			ctx.SendChain(message.Text("ERROR: ", err))
 			return false
 		}
-		err = db.Open(time.Hour * 24)
+		err = db.Open(time.Hour)
 		if err != nil {
 			ctx.SendChain(message.Text("ERROR: ", err))
 			return false

plugin/dailynews/dailynews.go

@@ -0,0 +1,37 @@
+// Package dailynews 今日早报
+package dailynews
+
+import (
+	"github.com/FloatTech/floatbox/binary"
+	"github.com/FloatTech/floatbox/web"
+	ctrl "github.com/FloatTech/zbpctrl"
+	"github.com/FloatTech/zbputils/control"
+	"github.com/tidwall/gjson"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+)
+
+const api = "http://dwz.2xb.cn/zaob"
+
+func init() {
+	engine := control.Register("dailynews", &ctrl.Options[*zero.Ctx]{
+		DisableOnDefault:  false,
+		Brief:             "今日早报",
+		Help:              "- 今日早报",
+		PrivateDataFolder: "dailynews",
+	})
+
+	engine.OnFullMatch(`今日早报`).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			data, err := web.GetData(api)
+			if err != nil {
+				return
+			}
+			picURL := gjson.Get(binary.BytesToString(data), "imageUrl").String()
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+			ctx.SendChain(message.Image(picURL))
+		})
+}

plugin/danbooru/main.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	"github.com/FloatTech/floatbox/file"
-	"github.com/FloatTech/floatbox/img/writer"
+	"github.com/FloatTech/imgfactory"
 	ctrl "github.com/FloatTech/zbpctrl"
 	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
@@ -39,7 +39,7 @@ func init() { // 插件主体
 				digest := md5.Sum(helper.StringToBytes(url))
 				f := cachefolder + hex.EncodeToString(digest[:])
 				if file.IsNotExist(f) {
-					_ = writer.SavePNG2Path(f, t)
+					_ = imgfactory.SavePNG2Path(f, t)
 				}
 				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, ","))))

plugin/danbooru/tag.go

@@ -8,10 +8,11 @@ import (
 	"net/url"
 	"sort"
 
-	"github.com/Coloured-glaze/gg"
 	"github.com/FloatTech/floatbox/file"
 	"github.com/FloatTech/floatbox/web"
-	imgutils "github.com/FloatTech/zbputils/img"
+	"github.com/FloatTech/gg"
+	"github.com/FloatTech/imgfactory"
+	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/img/text" // jpg png gif
 	_ "golang.org/x/image/webp"              // webp
 )
@@ -75,11 +76,11 @@ func tagurl(name, u string) (im image.Image, st *sorttags, err error) {
 	st = newsorttags(tags)
 	sort.Sort(st)
 
-	_, err = file.GetLazyData(text.BoldFontFile, true)
+	boldfd, err := file.GetLazyData(text.BoldFontFile, control.Md5File, true)
 	if err != nil {
 		return
 	}
-	_, err = file.GetLazyData(text.ConsolasFontFile, true)
+	consfd, err := file.GetLazyData(text.ConsolasFontFile, control.Md5File, true)
 	if err != nil {
 		return
 	}
@@ -93,19 +94,19 @@ func tagurl(name, u string) (im image.Image, st *sorttags, err error) {
 		return
 	}
 
-	img = imgutils.Limit(img, 1280, 720)
+	img = imgfactory.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 {
+	if err = canvas.ParseFontFace(boldfd, 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 {
+	if err = canvas.ParseFontFace(consfd, float64(img.Bounds().Size().X)*0.04); err != nil {
 		return
 	}
 	rate := float64(img.Bounds().Size().X) * 0.04

plugin/diana/data/text.go

@@ -9,6 +9,7 @@ import (
 	binutils "github.com/FloatTech/floatbox/binary"
 	"github.com/FloatTech/floatbox/file"
 	sql "github.com/FloatTech/sqlite"
+	"github.com/FloatTech/zbputils/control"
 	"github.com/sirupsen/logrus"
 )
 
@@ -21,12 +22,12 @@ 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
 	}
-	err = db.Open(time.Hour * 24)
+	err = db.Open(time.Hour)
 	if err != nil {
 		return err
 	}

plugin/dish/dish.go

@@ -0,0 +1,115 @@
+// Package dish 程序员做饭指南zbp版，数据来源Anduin2017/HowToCook
+package dish
+
+import (
+	"fmt"
+	"strings"
+	"time"
+
+	"github.com/sirupsen/logrus"
+
+	sql "github.com/FloatTech/sqlite"
+	ctrl "github.com/FloatTech/zbpctrl"
+	zero "github.com/wdvxdr1123/ZeroBot"
+
+	"github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/wdvxdr1123/ZeroBot/message"
+)
+
+type dish struct {
+	ID        uint32 `db:"id"`
+	Name      string `db:"name"`
+	Materials string `db:"materials"`
+	Steps     string `db:"steps"`
+}
+
+var (
+	db          = &sql.Sqlite{}
+	initialized = false
+)
+
+func init() {
+	en := control.Register("dish", &ctrl.Options[*zero.Ctx]{
+		DisableOnDefault: false,
+		Brief:            "程序员做饭指南",
+		Help:             "-怎么做[xxx]|烹饪[xxx]|随机菜谱|随便做点菜",
+		PublicDataFolder: "Dish",
+	})
+
+	db.DBPath = en.DataFolder() + "dishes.db"
+
+	if _, err := en.GetLazyData("dishes.db", true); err != nil {
+		logrus.Warnln("[dish]获取菜谱数据库文件失败")
+	} else if err = db.Open(time.Hour); err != nil {
+		logrus.Warnln("[dish]连接菜谱数据库失败")
+	} else if err = db.Create("dish", &dish{}); err != nil {
+		logrus.Warnln("[dish]同步菜谱数据表失败")
+	} else if count, err := db.Count("dish"); err != nil {
+		logrus.Warnln("[dish]统计菜谱数据失败")
+	} else {
+		logrus.Infoln("[dish]加载", count, "条菜谱")
+		initialized = true
+	}
+
+	if !initialized {
+		logrus.Warnln("[dish]插件未能成功初始化")
+	}
+
+	en.OnPrefixGroup([]string{"怎么做", "烹饪"}).SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
+		if !initialized {
+			ctx.SendChain(message.Text("客官，本店暂未开业"))
+			return
+		}
+
+		name := ctx.NickName()
+		dishName := ctx.State["args"].(string)
+
+		if dishName == "" {
+			return
+		}
+
+		if strings.Contains(dishName, "'") ||
+			strings.Contains(dishName, "\"") ||
+			strings.Contains(dishName, "\\") ||
+			strings.Contains(dishName, ";") {
+			return
+		}
+
+		var d dish
+		if err := db.Find("dish", &d, fmt.Sprintf("WHERE name like %%%s%%", dishName)); err != nil {
+			return
+		}
+
+		ctx.SendChain(message.Text(fmt.Sprintf(
+			"已为客官%s找到%s的做法辣！\n"+
+				"原材料：%s\n"+
+				"步骤：\n"+
+				"%s",
+			name, dishName, d.Materials, d.Steps),
+		))
+	})
+
+	en.OnPrefixGroup([]string{"随机菜谱", "随便做点菜"}).SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
+		if !initialized {
+			ctx.SendChain(message.Text("客官，本店暂未开业"))
+			return
+		}
+
+		name := ctx.NickName()
+		var d dish
+		if err := db.Pick("dish", &d); err != nil {
+			ctx.SendChain(message.Text("小店好像出错了，暂时端不出菜来惹"))
+			logrus.Warnln("[dish]随机菜谱请求出错：" + err.Error())
+			return
+		}
+
+		ctx.SendChain(message.Text(fmt.Sprintf(
+			"已为客官%s送上%s的做法：\n"+
+				"原材料：%s\n"+
+				"步骤：\n"+
+				"%s",
+			name, d.Name, d.Materials, d.Steps),
+		))
+	})
+}

plugin/drawlots/main.go

@@ -0,0 +1,254 @@
+// Package drawlots 多功能抽签插件
+package drawlots
+
+import (
+	"bytes"
+	"errors"
+	"image"
+	"image/color"
+	"image/gif"
+	"math/rand"
+	"os"
+	"strconv"
+	"strings"
+
+	"github.com/FloatTech/floatbox/file"
+	"github.com/FloatTech/floatbox/web"
+	"github.com/FloatTech/imgfactory"
+	ctrl "github.com/FloatTech/zbpctrl"
+	control "github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/img/text"
+	"github.com/fumiama/jieba/util/helper"
+	"github.com/sirupsen/logrus"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+)
+
+type info struct {
+	lotsType string // 文件后缀
+	quantity int    // 签数
+}
+
+var (
+	lotsList = func() map[string]info {
+		lotsList, err := getList()
+		if err != nil {
+			logrus.Infoln("[drawlots]加载失败:", err)
+		} else {
+			logrus.Infoln("[drawlots]加载", len(lotsList), "个抽签")
+		}
+		return lotsList
+	}()
+	en = control.Register("drawlots", &ctrl.Options[*zero.Ctx]{
+		DisableOnDefault: false,
+		Brief:            "多功能抽签",
+		Help: "支持图包文件夹和gif抽签\n" +
+			"-------------\n" +
+			"- (刷新)抽签列表\n- 抽[签名]签\n- 看[gif签名]签\n- 加[签名]签[gif图片]\n- 删[gif签名]签",
+		PrivateDataFolder: "drawlots",
+	}).ApplySingle(ctxext.DefaultSingle)
+	datapath = file.BOTPATH + "/" + en.DataFolder()
+)
+
+func init() {
+	en.OnFullMatchGroup([]string{"抽签列表", "刷新抽签列表"}).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+		var err error
+		lotsList, err = getList() // 刷新列表
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR: ", err))
+			return
+		}
+		messageText := &strings.Builder{}
+		messageText.WriteString(" 签 名 [ 类 型 ]----签数\n")
+		messageText.WriteString("———————————\n")
+		for name, fileInfo := range lotsList {
+			messageText.WriteString(name + "[" + fileInfo.lotsType + "]----" + strconv.Itoa(fileInfo.quantity) + "\n")
+			messageText.WriteString("----------\n")
+		}
+		textPic, err := text.RenderToBase64(messageText.String(), text.BoldFontFile, 400, 50)
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR: ", err))
+			return
+		}
+		ctx.SendChain(message.Image("base64://" + helper.BytesToString(textPic)))
+	})
+	en.OnRegex(`^抽(.+)签$`).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+		lotsType := ctx.State["regex_matched"].([]string)[1]
+		fileInfo, ok := lotsList[lotsType]
+		if !ok {
+			ctx.Send(message.ReplyWithMessage(ctx.Event.MessageID, message.Text("才...才没有", lotsType, "签这种东西啦")))
+			return
+		}
+		if fileInfo.lotsType == "folder" {
+			picPath, err := randFile(lotsType, 3)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+			ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Image("file:///"+picPath))
+			return
+		}
+		lotsImg, err := randGif(lotsType + "." + fileInfo.lotsType)
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR: ", err))
+			return
+		}
+		// 生成图片
+		data, err := imgfactory.ToBytes(lotsImg)
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR: ", err))
+			return
+		}
+		ctx.SendChain(message.Reply(ctx.Event.MessageID), message.ImageBytes(data))
+	})
+	en.OnRegex(`^看(.+)签$`, zero.UserOrGrpAdmin).SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
+		id := ctx.Event.MessageID
+		lotsName := ctx.State["regex_matched"].([]string)[1]
+		fileInfo, ok := lotsList[lotsName]
+		if !ok {
+			ctx.Send(message.ReplyWithMessage(id, message.Text("才...才没有", lotsName, "签这种东西啦")))
+			return
+		}
+		if fileInfo.lotsType == "folder" {
+			ctx.Send(message.ReplyWithMessage(id, message.Text("只能查看gif签哦~")))
+			return
+		}
+		ctx.Send(message.ReplyWithMessage(id, message.Image("file:///"+datapath+lotsName+"."+fileInfo.lotsType)))
+	})
+	en.OnRegex(`^加(.+)签.*`, zero.SuperUserPermission, zero.MustProvidePicture).SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
+		id := ctx.Event.MessageID
+		lotsName := ctx.State["regex_matched"].([]string)[1]
+		if lotsName == "" {
+			ctx.Send(message.ReplyWithMessage(id, message.Text("请使用正确的指令形式哦~")))
+			return
+		}
+		picURL := ctx.State["image_url"].([]string)[0]
+		gifdata, err := web.GetData(picURL)
+		if err != nil {
+			return
+		}
+		im, err := gif.DecodeAll(bytes.NewReader(gifdata))
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR: ", err))
+			return
+		}
+		fileName := datapath + "/" + lotsName + ".gif"
+		err = file.DownloadTo(picURL, fileName)
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR: ", err))
+			return
+		}
+		lotsList[lotsName] = info{
+			lotsType: "gif",
+			quantity: len(im.Image),
+		}
+		ctx.Send(message.ReplyWithMessage(id, message.Text("成功！")))
+	})
+	en.OnRegex(`^删(.+)签$`, zero.SuperUserPermission).SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
+		id := ctx.Event.MessageID
+		lotsName := ctx.State["regex_matched"].([]string)[1]
+		fileInfo, ok := lotsList[lotsName]
+		if !ok {
+			ctx.Send(message.ReplyWithMessage(id, message.Text("才...才没有", lotsName, "签这种东西啦")))
+			return
+		}
+		if fileInfo.lotsType == "folder" {
+			ctx.Send(message.ReplyWithMessage(id, message.Text("为了防止误删图源，图包请手动移除哦~")))
+			return
+		}
+		err := os.Remove(datapath + lotsName + "." + fileInfo.lotsType)
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR: ", err))
+			return
+		}
+		delete(lotsList, lotsName)
+		ctx.Send(message.ReplyWithMessage(id, message.Text("成功！")))
+	})
+}
+
+func getList() (list map[string]info, err error) {
+	list = make(map[string]info, 100)
+	files, err := os.ReadDir(datapath)
+	if err != nil {
+		return
+	}
+	if len(files) == 0 {
+		err = errors.New("什么签也没有哦~")
+		return
+	}
+	for _, lots := range files {
+		if lots.IsDir() {
+			files, _ := os.ReadDir(datapath + "/" + lots.Name())
+			list[lots.Name()] = info{
+				lotsType: "folder",
+				quantity: len(files),
+			}
+			continue
+		}
+		before, after, ok := strings.Cut(lots.Name(), ".")
+		if !ok || before == "" {
+			continue
+		}
+		file, err := os.Open(datapath + "/" + lots.Name())
+		if err != nil {
+			return nil, err
+		}
+		im, err := gif.DecodeAll(file)
+		_ = file.Close()
+		if err != nil {
+			return nil, err
+		}
+		list[before] = info{
+			lotsType: after,
+			quantity: len(im.Image),
+		}
+	}
+	return
+}
+
+func randFile(path string, indexMax int) (string, error) {
+	picPath := datapath + path
+	files, err := os.ReadDir(picPath)
+	if err != nil {
+		return "", err
+	}
+	if len(files) > 0 {
+		drawFile := files[rand.Intn(len(files))]
+		// 如果是文件夹就递归
+		if drawFile.IsDir() {
+			indexMax--
+			if indexMax <= 0 {
+				return "", errors.New("图包[" + path + "]存在太多非图片文件,请清理~")
+			}
+			return randFile(path, indexMax)
+		}
+		return picPath + "/" + drawFile.Name(), err
+	}
+	return "", errors.New("图包[" + path + "]不存在签内容！")
+}
+
+func randGif(gifName string) (image.Image, error) {
+	name := datapath + gifName
+	file, err := os.Open(name)
+	if err != nil {
+		return nil, err
+	}
+	im, err := gif.DecodeAll(file)
+	_ = file.Close()
+	if err != nil {
+		return nil, err
+	}
+	/*
+		firstImg, err := imgfactory.Load(name)
+		if err != nil {
+			return nil, err
+		}
+		v := im.Image[rand.Intn(len(im.Image))]
+		return imgfactory.Size(firstImg, firstImg.Bounds().Dx(), firstImg.Bounds().Dy()).InsertUpC(v, 0, 0, firstImg.Bounds().Dx()/2, firstImg.Bounds().Dy()/2).Clone().Image(),err
+	/*/
+	// 如果gif图片出现信息缺失请使用上面注释掉的代码，把下面注释了(上面代码部分图存在bug)
+	v := im.Image[rand.Intn(len(im.Image))]
+	return imgfactory.NewFactoryBG(v.Rect.Dx(), v.Rect.Dy(), color.NRGBA{0, 0, 0, 255}).InsertUp(v, 0, 0, 0, 0).Clone().Image(), err
+	// */
+}

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

@@ -40,7 +40,7 @@ func init() {
 		PrivateDataFolder: "driftbottle",
 	})
 	seaSide.DBPath = en.DataFolder() + "sea.db"
-	err := seaSide.Open(time.Hour * 24)
+	err := seaSide.Open(time.Hour)
 	if err != nil {
 		panic(err)
 	}

plugin/epidemic/epidemic.go

@@ -1,120 +0,0 @@
-// Package epidemic 城市疫情查询
-package epidemic
-
-import (
-	"encoding/json"
-
-	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"
-)
-
-const txurl = "https://api.inews.qq.com/newsqa/v1/query/inner/publish/modules/list?modules=statisGradeCityDetail,diseaseh5Shelf"
-
-// result 疫情查询结果
-type result struct {
-	Data struct {
-		Epidemic epidemic `json:"diseaseh5Shelf"`
-	} `json:"data"`
-}
-
-// epidemic 疫情数据
-type epidemic struct {
-	LastUpdateTime string  `json:"lastUpdateTime"`
-	AreaTree       []*area `json:"areaTree"`
-}
-
-// area 城市疫情数据
-type area struct {
-	Name  string `json:"name"`
-	Today struct {
-		Confirm int `json:"confirm"`
-		Wzzadd  any `json:"wzz_add"`
-	} `json:"today"`
-	Total struct {
-		NowConfirm int    `json:"nowConfirm"`
-		Confirm    int    `json:"confirm"`
-		Dead       int    `json:"dead"`
-		Heal       int    `json:"heal"`
-		Grade      string `json:"grade"`
-		Wzz        int    `json:"wzz"`
-	} `json:"total"`
-	Children []*area `json:"children"`
-}
-
-func init() {
-	engine := control.Register("epidemic", &ctrl.Options[*zero.Ctx]{
-		DisableOnDefault: false,
-		Brief:            "城市疫情查询",
-		Help:             "- xxx疫情\n",
-	})
-	engine.OnSuffix("疫情").SetBlock(true).Limit(ctxext.LimitByUser).
-		Handle(func(ctx *zero.Ctx) {
-			city := ctx.State["args"].(string)
-			if city == "" {
-				ctx.SendChain(message.Text("你还没有输入城市名字呢！"))
-				return
-			}
-			data, time, err := queryEpidemic(city)
-			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
-				return
-			}
-			if data == nil {
-				ctx.SendChain(message.Text("没有找到【", city, "】城市的疫情数据."))
-				return
-			}
-			ctx.SendChain(
-				message.Text(
-					"【", data.Name, "】疫情数据\n",
-					"新增人数：", data.Today.Confirm, "\n",
-					"现有确诊：", data.Total.NowConfirm, "\n",
-					"累计确诊：", data.Total.Confirm, "\n",
-					"治愈人数：", data.Total.Heal, "\n",
-					"死亡人数：", data.Total.Dead, "\n",
-					"无症状人数：", data.Total.Wzz, "\n",
-					"新增无症状：", data.Today.Wzzadd, "\n",
-					"更新时间：\n『", time, "』",
-				),
-			)
-		})
-}
-
-// rcity 查找城市
-func rcity(a *area, cityName string) *area {
-	if a == nil {
-		return nil
-	}
-	if a.Name == cityName {
-		return a
-	}
-	for _, v := range a.Children {
-		if v.Name == cityName {
-			return v
-		}
-		c := rcity(v, cityName)
-		if c != nil {
-			return c
-		}
-	}
-	return nil
-}
-
-// queryEpidemic 查询城市疫情
-func queryEpidemic(findCityName string) (citydata *area, times string, err error) {
-	data, err := web.GetData(txurl)
-	if err != nil {
-		return
-	}
-	var r result
-	err = json.Unmarshal(data, &r)
-	if err != nil {
-		return
-	}
-	citydata = rcity(r.Data.Epidemic.AreaTree[0], findCityName)
-	return citydata, r.Data.Epidemic.LastUpdateTime, nil
-}

plugin/event/event.go

@@ -39,8 +39,8 @@ func init() {
 				userid := ctx.Event.UserID
 				username := ctx.CardOrNickName(userid)
 				data := (storage)(c.GetData(-su))
+				groupname := ctx.GetThisGroupInfo(true).Name
 				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, "")

plugin/font/main.go

@@ -2,7 +2,17 @@
 package font
 
 import (
+	"bytes"
+	"image"
+	"image/color"
+	"image/gif"
+	"math/rand"
+	"strings"
+
 	"github.com/FloatTech/floatbox/binary"
+	"github.com/FloatTech/floatbox/file"
+	"github.com/FloatTech/gg"
+	"github.com/FloatTech/imgfactory"
 	ctrl "github.com/FloatTech/zbpctrl"
 	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
@@ -15,10 +25,10 @@ func init() {
 	control.Register("font", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
 		Brief:            "渲染任意文字到图片",
-		Help:             "- (用[字体])渲染文字xxx\n可选字体: [终末体|终末变体|紫罗兰体|樱酥体|Consolas体|苹方体]",
-	}).OnRegex(`^(用.+)?渲染文字([\s\S]+)$`).SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
+		Help:             "- (用[字体])渲染(抖动)文字xxx\n可选字体: [终末体|终末变体|紫罗兰体|樱酥体|Consolas体|粗苹方体|未来荧黑体|Gugi体|八丸体|Impact体|猫啃体|苹方体]",
+	}).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]
+		txt := ctx.State["regex_matched"].([]string)[3]
 		switch fnt {
 		case "用终末体":
 			fnt = text.SyumatuFontFile
@@ -30,16 +40,73 @@ func init() {
 			fnt = text.SakuraFontFile
 		case "用Consolas体":
 			fnt = text.ConsolasFontFile
+		case "用粗苹方体":
+			fnt = text.BoldFontFile
+		case "用未来荧黑体":
+			fnt = text.GlowSansFontFile
+		case "用Gugi体":
+			fnt = text.GugiRegularFontFile
+		case "用八丸体":
+			fnt = text.HachiMaruPopRegularFontFile
+		case "用Impact体":
+			fnt = text.ImpactFontFile
+		case "用猫啃体":
+			fnt = text.MaokenFontFile
 		case "用苹方体":
 			fallthrough
 		default:
 			fnt = text.FontFile
 		}
-		b, err := text.RenderToBase64(txt, fnt, 400, 20)
+		if ctx.State["regex_matched"].([]string)[2] == "" {
+			b, err := text.RenderToBase64(txt, fnt, 400, 20)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+			ctx.SendChain(message.Image("base64://" + binary.BytesToString(b)))
+			return
+		}
+		nilx, nily := 1.0, 8.0
+		s := []*image.NRGBA{}
+		strlist := strings.Split(txt, "\n")
+		data, err := file.GetLazyData(fnt, control.Md5File, true)
 		if err != nil {
 			ctx.SendChain(message.Text("ERROR: ", err))
 			return
 		}
-		ctx.SendChain(message.Image("base64://" + binary.BytesToString(b)))
+		// 获得画布预计
+		testcov := gg.NewContext(1, 1)
+		if err = testcov.ParseFontFace(data, 30); err != nil {
+			ctx.SendChain(message.Text("ERROR: ", err))
+			return
+		}
+		// 取最长段
+		txt = ""
+		for _, v := range strlist {
+			if len([]rune(v)) > len([]rune(txt)) {
+				txt = v
+			}
+		}
+		w, h := testcov.MeasureString(txt)
+		for i := 0; i < 10; i++ {
+			cov := gg.NewContext(int(w+float64(len([]rune(txt)))*nilx)+40, int(h+nily)*len(strlist)+30)
+			cov.SetRGB(1, 1, 1)
+			cov.Clear()
+			if err = cov.ParseFontFace(data, 30); err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+			cov.SetColor(color.NRGBA{R: 0, G: 0, B: 0, A: 127})
+			for k, v := range strlist {
+				for kk, vv := range []rune(v) {
+					x, y := cov.MeasureString(string([]rune(v)[:kk]))
+					cov.DrawString(string(vv), x+float64(rand.Intn(5))+10+nilx, y+float64(rand.Intn(5))+15+float64(k)*(y+nily))
+				}
+			}
+			s = append(s, imgfactory.Size(cov.Image(), 0, 0).Image())
+		}
+		var buf bytes.Buffer
+		_ = gif.EncodeAll(&buf, imgfactory.MergeGif(5, s))
+		ctx.SendChain(message.ImageBytes(buf.Bytes()))
 	})
 }

plugin/fortune/fortune.go

@@ -11,7 +11,8 @@ import (
 	"os"
 	"strconv"
 
-	"github.com/Coloured-glaze/gg" // 注册了 jpg png gif
+	"github.com/FloatTech/gg" // 注册了 jpg png gif
+	"github.com/FloatTech/imgfactory"
 	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
@@ -19,7 +20,6 @@ import (
 
 	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"
@@ -32,19 +32,18 @@ const (
 	images = "data/Fortune/"
 	// 基础文件位置
 	omikujson = "data/Fortune/text.json"
-	// 字体文件位置
-	font = "data/Font/sakura.ttf"
 	// 生成图缓存位置
 	cache = images + "cache/"
 )
 
 var (
 	// 底图类型列表
-	table = [...]string{"车万", "DC4", "爱因斯坦", "星空列车", "樱云之恋", "富婆妹", "李清歌", "公主连结", "原神", "明日方舟", "碧蓝航线", "碧蓝幻想", "战双", "阴阳师", "赛马娘", "东方归言录", "奇异恩典", "夏日口袋", "ASoul"}
+	table = [...]string{"车万", "DC4", "爱因斯坦", "星空列车", "樱云之恋", "富婆妹", "李清歌", "公主连结", "原神", "明日方舟", "碧蓝航线", "碧蓝幻想", "战双", "阴阳师", "赛马娘", "东方归言录", "奇异恩典", "夏日口袋", "ASoul", "Hololive"}
 	// 映射底图与 index
 	index = make(map[string]uint8)
 	// 签文
 	omikujis []map[string]string
+	fontdata []byte
 )
 
 func init() {
@@ -53,7 +52,7 @@ func init() {
 		DisableOnDefault: false,
 		Brief:            "每日运势",
 		Help: "- 运势 | 抽签\n" +
-			"- 设置底图[车万 | DC4 | 爱因斯坦 | 星空列车 | 樱云之恋 | 富婆妹 | 李清歌 | 公主连结 | 原神 | 明日方舟 | 碧蓝航线 | 碧蓝幻想 | 战双 | 阴阳师 | 赛马娘 | 东方归言录 | 奇异恩典 | 夏日口袋 | ASoul]",
+			"- 设置底图[车万 | DC4 | 爱因斯坦 | 星空列车 | 樱云之恋 | 富婆妹 | 李清歌 | 公主连结 | 原神 | 明日方舟 | 碧蓝航线 | 碧蓝幻想 | 战双 | 阴阳师 | 赛马娘 | 东方归言录 | 奇异恩典 | 夏日口袋 | ASoul | Hololive]",
 		PublicDataFolder: "Fortune",
 	})
 	_ = os.RemoveAll(cache)
@@ -90,7 +89,7 @@ func init() {
 		})
 	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))
 				return false
@@ -100,10 +99,12 @@ func init() {
 				ctx.SendChain(message.Text("ERROR: ", err))
 				return false
 			}
-			_, err = file.GetLazyData(font, true)
-			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
-				return false
+			if fontdata == nil {
+				fontdata, err = file.GetLazyData("data/Font/sakura.ttf", control.Md5File, true)
+				if err != nil {
+					ctx.SendChain(message.Text("ERROR: ", err))
+					return false
+				}
 			}
 			return true
 		},
@@ -126,7 +127,7 @@ 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))
 				return
@@ -150,7 +151,7 @@ func init() {
 				if err != nil {
 					return err
 				}
-				_, err = draw(background, title, text, f)
+				_, err = draw(background, fontdata, title, text, f)
 				_ = f.Close()
 				return err
 			}, ctxext.Send(ctx), ctxext.GetMessage(ctx))
@@ -189,19 +190,19 @@ func randimage(path string, ctx *zero.Ctx) (im image.Image, index int, err error
 // @param title 签名
 // @param text 签文
 // @return 错误信息
-func draw(back image.Image, title, txt string, f io.Writer) (int64, error) {
+func draw(back image.Image, fontdata []byte, title, txt string, f io.Writer) (int64, error) {
 	canvas := gg.NewContext(back.Bounds().Size().Y, back.Bounds().Size().X)
 	canvas.DrawImage(back, 0, 0)
 	// 写标题
 	canvas.SetRGB(1, 1, 1)
-	if err := canvas.LoadFontFace(font, 45); err != nil {
+	if err := canvas.ParseFontFace(fontdata, 45); err != nil {
 		return -1, err
 	}
 	sw, _ := canvas.MeasureString(title)
 	canvas.DrawString(title, 140-sw/2, 112)
 	// 写正文
 	canvas.SetRGB(0, 0, 0)
-	if err := canvas.LoadFontFace(font, 23); err != nil {
+	if err := canvas.ParseFontFace(fontdata, 23); err != nil {
 		return -1, err
 	}
 	tw, th := canvas.MeasureString("测")
@@ -230,7 +231,7 @@ func draw(back image.Image, title, txt string, f io.Writer) (int64, error) {
 			}
 		}
 	}
-	return writer.WriteTo(canvas.Image(), f)
+	return imgfactory.WriteTo(canvas.Image(), f)
 }
 
 func offest(total, now int, distance float64) float64 {

plugin/funny/laugh.go

@@ -38,7 +38,7 @@ func init() {
 			ctx.SendChain(message.Text("ERROR: ", err))
 			return false
 		}
-		err = db.Open(time.Hour * 24)
+		err = db.Open(time.Hour)
 		if err != nil {
 			ctx.SendChain(message.Text("ERROR: ", err))
 			return false

plugin/genshin/ys.go

@@ -14,8 +14,8 @@ import (
 	"sync/atomic"
 
 	fcext "github.com/FloatTech/floatbox/ctxext"
-	"github.com/FloatTech/floatbox/img/writer"
 	"github.com/FloatTech/floatbox/process"
+	"github.com/FloatTech/imgfactory"
 	ctrl "github.com/FloatTech/zbpctrl"
 	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
@@ -100,7 +100,11 @@ func init() {
 				ctx.SendChain(message.Text("ERROR: ", err))
 				return
 			}
-			b, cl := writer.ToBytes(img)
+			b, err := imgfactory.ToBytes(img)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
 			if mode {
 				ctx.Send(message.ReplyWithMessage(ctx.Event.MessageID,
 					message.Text("恭喜你抽到了: \n", str), message.ImageBytes(b)))
@@ -108,7 +112,6 @@ func init() {
 				ctx.Send(message.ReplyWithMessage(ctx.Event.MessageID,
 					message.Text("十连成功~"), message.ImageBytes(b)))
 			}
-			cl()
 		})
 }
 

plugin/gif/context.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/FloatTech/floatbox/file"
 	"github.com/FloatTech/floatbox/web"
-	"github.com/FloatTech/zbputils/img"
+	"github.com/FloatTech/imgfactory"
 	"github.com/sirupsen/logrus"
 )
 
@@ -20,7 +20,7 @@ func dlchan(name string, s *string, wg *sync.WaitGroup, exit func(error)) {
 	defer wg.Done()
 	target := datapath + `materials/` + name
 	if file.IsNotExist(target) {
-		data, err := web.RequestDataWith(web.NewTLS12Client(), `https://gitcode.net/m0_60838134/imagematerials/-/raw/main/`+name, "GET", "gitcode.net", web.RandUA())
+		data, err := web.RequestDataWith(web.NewTLS12Client(), `https://gitcode.net/m0_60838134/imagematerials/-/raw/main/`+name, "GET", "gitcode.net", web.RandUA(), nil)
 		if err != nil {
 			_ = os.Remove(target)
 			exit(err)
@@ -48,7 +48,7 @@ func dlchan(name string, s *string, wg *sync.WaitGroup, exit func(error)) {
 func dlblock(name string) (string, error) {
 	target := datapath + `materials/` + name
 	if file.IsNotExist(target) {
-		data, err := web.RequestDataWith(web.NewTLS12Client(), `https://gitcode.net/m0_60838134/imagematerials/-/raw/main/`+name, "GET", "gitcode.net", web.RandUA())
+		data, err := web.RequestDataWith(web.NewTLS12Client(), `https://gitcode.net/m0_60838134/imagematerials/-/raw/main/`+name, "GET", "gitcode.net", web.RandUA(), nil)
 		if err != nil {
 			_ = os.Remove(target)
 			return "", err
@@ -97,10 +97,10 @@ func newContext(user int64) *context {
 	return c
 }
 
-func loadFirstFrames(paths []string, size int) (imgs []*img.Factory, err error) {
-	imgs = make([]*img.Factory, size)
+func loadFirstFrames(paths []string, size int) (imgs []*imgfactory.Factory, err error) {
+	imgs = make([]*imgfactory.Factory, size)
 	for i := range imgs {
-		imgs[i], err = img.LoadFirstFrame(paths[i], 0, 0)
+		imgs[i], err = imgfactory.LoadFirstFrame(paths[i], 0, 0)
 		if err != nil {
 			return nil, err
 		}

plugin/gif/logo.go

@@ -6,36 +6,38 @@ import (
 	"strings"
 
 	"github.com/FloatTech/floatbox/file"
-	"github.com/FloatTech/zbputils/img"
+	"github.com/FloatTech/floatbox/process"
+	"github.com/FloatTech/imgfactory"
 )
 
 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)
+			err = file.DownloadTo("https://gchat.qpic.cn/gchatpic_new//--"+strings.ToUpper(v)+"/0", cc.usrdir+strconv.Itoa(i)+".gif")
 		} else {
-			err = file.DownloadTo("http://q4.qlogo.cn/g?b=qq&nk="+v+"&s=640", cc.usrdir+strconv.Itoa(i)+".gif", true)
+			err = file.DownloadTo("http://q4.qlogo.cn/g?b=qq&nk="+v+"&s=640", cc.usrdir+strconv.Itoa(i)+".gif")
 		}
 		if err != nil {
 			return err
 		}
+		process.SleepAbout1sTo2s()
 	}
 	return nil
 }
 
 func (cc *context) getLogo(w int, h int) (*image.NRGBA, error) {
-	frame, err := img.LoadFirstFrame(cc.headimgsdir[0], w, h)
+	frame, err := imgfactory.LoadFirstFrame(cc.headimgsdir[0], w, h)
 	if err != nil {
 		return nil, err
 	}
-	return frame.Circle(0).Im, nil
+	return frame.Circle(0).Image(), nil
 }
 
 func (cc *context) getLogo2(w int, h int) (*image.NRGBA, error) {
-	frame, err := img.LoadFirstFrame(cc.headimgsdir[1], w, h)
+	frame, err := imgfactory.LoadFirstFrame(cc.headimgsdir[1], w, h)
 	if err != nil {
 		return nil, err
 	}
-	return frame.Circle(0).Im, nil
+	return frame.Circle(0).Image(), nil
 }

plugin/gif/png.go

@@ -8,10 +8,10 @@ import (
 	"strconv"
 	"sync"
 
-	"github.com/Coloured-glaze/gg"
 	"github.com/FloatTech/floatbox/file"
-	"github.com/FloatTech/floatbox/img/writer"
-	"github.com/FloatTech/zbputils/img"
+	"github.com/FloatTech/gg"
+	"github.com/FloatTech/imgfactory"
+	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/img/text"
 )
 
@@ -35,11 +35,11 @@ func pa(cc *context, args ...string) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	imgf, err := img.LoadFirstFrame(f, 0, 0)
+	imgf, err := imgfactory.LoadFirstFrame(f, 0, 0)
 	if err != nil {
 		return "", err
 	}
-	return "file:///" + name, writer.SavePNG2Path(name, imgf.InsertUp(tou, 100, 100, 0, 400).Im)
+	return "file:///" + name, imgfactory.SavePNG2Path(name, imgf.InsertUp(tou, 100, 100, 0, 400).Image())
 }
 
 // si 撕
@@ -50,8 +50,8 @@ func si(cc *context, args ...string) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	im1 := img.Rotate(tou, 20, 380, 380)
-	im2 := img.Rotate(tou, -12, 380, 380)
+	im1 := imgfactory.Rotate(tou, 20, 380, 380)
+	im2 := imgfactory.Rotate(tou, -12, 380, 380)
 	if file.IsNotExist(datapath + "materials/si") {
 		err = os.MkdirAll(datapath+"materials/si", 0755)
 		if err != nil {
@@ -62,11 +62,11 @@ func si(cc *context, args ...string) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	imgf, err := img.LoadFirstFrame(f, 0, 0)
+	imgf, err := imgfactory.LoadFirstFrame(f, 0, 0)
 	if err != nil {
 		return "", err
 	}
-	return "file:///" + name, writer.SavePNG2Path(name, imgf.InsertBottom(im1.Im, im1.W, im1.H, -3, 370).InsertBottom(im2.Im, im2.W, im2.H, 653, 310).Im)
+	return "file:///" + name, imgfactory.SavePNG2Path(name, imgf.InsertBottom(im1.Image(), im1.W(), im1.H(), -3, 370).InsertBottom(im2.Image(), im2.W(), im2.H(), 653, 310).Image())
 }
 
 // flipV 上翻,下翻
@@ -74,12 +74,12 @@ func flipV(cc *context, args ...string) (string, error) {
 	_ = args
 	name := cc.usrdir + "FlipV.png"
 	// 加载图片
-	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 0, 0)
+	im, err := imgfactory.LoadFirstFrame(cc.headimgsdir[0], 0, 0)
 	if err != nil {
 		return "", err
 	}
-	imgnrgba := im.FlipV().Im
-	return "file:///" + name, writer.SavePNG2Path(name, imgnrgba)
+	imgnrgba := im.FlipV().Image()
+	return "file:///" + name, imgfactory.SavePNG2Path(name, imgnrgba)
 }
 
 // flipH 左翻,右翻
@@ -87,12 +87,12 @@ func flipH(cc *context, args ...string) (string, error) {
 	_ = args
 	name := cc.usrdir + "FlipH.png"
 	// 加载图片
-	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 0, 0)
+	im, err := imgfactory.LoadFirstFrame(cc.headimgsdir[0], 0, 0)
 	if err != nil {
 		return "", err
 	}
-	imgnrgba := im.FlipH().Im
-	return "file:///" + name, writer.SavePNG2Path(name, imgnrgba)
+	imgnrgba := im.FlipH().Image()
+	return "file:///" + name, imgfactory.SavePNG2Path(name, imgnrgba)
 }
 
 // invert 反色
@@ -100,12 +100,12 @@ func invert(cc *context, args ...string) (string, error) {
 	_ = args
 	name := cc.usrdir + "Invert.png"
 	// 加载图片
-	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 0, 0)
+	im, err := imgfactory.LoadFirstFrame(cc.headimgsdir[0], 0, 0)
 	if err != nil {
 		return "", err
 	}
-	imgnrgba := im.Invert().Im
-	return "file:///" + name, writer.SavePNG2Path(name, imgnrgba)
+	imgnrgba := im.Invert().Image()
+	return "file:///" + name, imgfactory.SavePNG2Path(name, imgnrgba)
 }
 
 // blur 反色
@@ -113,12 +113,12 @@ func blur(cc *context, args ...string) (string, error) {
 	_ = args
 	name := cc.usrdir + "Blur.png"
 	// 加载图片
-	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 0, 0)
+	im, err := imgfactory.LoadFirstFrame(cc.headimgsdir[0], 0, 0)
 	if err != nil {
 		return "", err
 	}
-	imgnrgba := im.Blur(10).Im
-	return "file:///" + name, writer.SavePNG2Path(name, imgnrgba)
+	imgnrgba := im.Blur(10).Image()
+	return "file:///" + name, imgfactory.SavePNG2Path(name, imgnrgba)
 }
 
 // grayscale 灰度
@@ -126,12 +126,12 @@ func grayscale(cc *context, args ...string) (string, error) {
 	_ = args
 	name := cc.usrdir + "Grayscale.png"
 	// 加载图片
-	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 0, 0)
+	im, err := imgfactory.LoadFirstFrame(cc.headimgsdir[0], 0, 0)
 	if err != nil {
 		return "", err
 	}
-	imgnrgba := im.Grayscale().Im
-	return "file:///" + name, writer.SavePNG2Path(name, imgnrgba)
+	imgnrgba := im.Grayscale().Image()
+	return "file:///" + name, imgfactory.SavePNG2Path(name, imgnrgba)
 }
 
 // invertAndGrayscale 负片
@@ -139,12 +139,12 @@ func invertAndGrayscale(cc *context, args ...string) (string, error) {
 	_ = args
 	name := cc.usrdir + "InvertAndGrayscale.png"
 	// 加载图片
-	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 0, 0)
+	im, err := imgfactory.LoadFirstFrame(cc.headimgsdir[0], 0, 0)
 	if err != nil {
 		return "", err
 	}
-	imgnrgba := im.Invert().Grayscale().Im
-	return "file:///" + name, writer.SavePNG2Path(name, imgnrgba)
+	imgnrgba := im.Invert().Grayscale().Image()
+	return "file:///" + name, imgfactory.SavePNG2Path(name, imgnrgba)
 }
 
 // convolve3x3 浮雕
@@ -152,32 +152,32 @@ func convolve3x3(cc *context, args ...string) (string, error) {
 	_ = args
 	name := cc.usrdir + "Convolve3x3.png"
 	// 加载图片
-	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 0, 0)
+	im, err := imgfactory.LoadFirstFrame(cc.headimgsdir[0], 0, 0)
 	if err != nil {
 		return "", err
 	}
-	imgnrgba := im.Convolve3x3().Im
-	return "file:///" + name, writer.SavePNG2Path(name, imgnrgba)
+	imgnrgba := im.Relief().Image()
+	return "file:///" + name, imgfactory.SavePNG2Path(name, imgnrgba)
 }
 
 // rotate 旋转
 func rotate(cc *context, args ...string) (string, error) {
 	name := cc.usrdir + "Rotate.png"
 	// 加载图片
-	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 0, 0)
+	im, err := imgfactory.LoadFirstFrame(cc.headimgsdir[0], 0, 0)
 	if err != nil {
 		return "", err
 	}
 	r, _ := strconv.ParseFloat(args[0], 64)
-	imgnrgba := img.Rotate(im.Im, r, 0, 0).Im
-	return "file:///" + name, writer.SavePNG2Path(name, imgnrgba)
+	imgnrgba := imgfactory.Rotate(im.Image(), r, 0, 0).Image()
+	return "file:///" + name, imgfactory.SavePNG2Path(name, imgnrgba)
 }
 
 // deformation 变形
 func deformation(cc *context, args ...string) (string, error) {
 	name := cc.usrdir + "Deformation.png"
 	// 加载图片
-	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 0, 0)
+	im, err := imgfactory.LoadFirstFrame(cc.headimgsdir[0], 0, 0)
 	if err != nil {
 		return "", err
 	}
@@ -189,8 +189,8 @@ func deformation(cc *context, args ...string) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	imgnrgba := img.Size(im.Im, w, h).Im
-	return "file:///" + name, writer.SavePNG2Path(name, imgnrgba)
+	imgnrgba := imgfactory.Size(im.Image(), w, h).Image()
+	return "file:///" + name, imgfactory.SavePNG2Path(name, imgnrgba)
 }
 
 // alike 你像个xxx一样
@@ -213,12 +213,12 @@ func alike(cc *context, args ...string) (string, error) {
 		return "", err
 	}
 	name := cc.usrdir + "Anyasuki.png"
-	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 82, 69)
+	im, err := imgfactory.LoadFirstFrame(cc.headimgsdir[0], 82, 69)
 	if err != nil {
 		return "", err
 	}
-	imgnrgba := imgs[0].InsertUp(im.Im, 0, 0, 136, 21).Im
-	return "file:///" + name, writer.SavePNG2Path(name, imgnrgba)
+	imgnrgba := imgs[0].InsertUp(im.Image(), 0, 0, 136, 21).Image()
+	return "file:///" + name, imgfactory.SavePNG2Path(name, imgnrgba)
 }
 
 // marriage
@@ -241,12 +241,12 @@ func marriage(cc *context, args ...string) (string, error) {
 		return "", err
 	}
 	name := cc.usrdir + "Marriage.png"
-	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 1080, 1080)
+	im, err := imgfactory.LoadFirstFrame(cc.headimgsdir[0], 1080, 1080)
 	if err != nil {
 		return "", err
 	}
-	imgnrgba := im.InsertUp(imgs[0].Im, 0, 0, 0, 0).InsertUp(imgs[1].Im, 0, 0, 800, 0).Im
-	return "file:///" + name, writer.SavePNG2Path(name, imgnrgba)
+	imgnrgba := im.InsertUp(imgs[0].Image(), 0, 0, 0, 0).InsertUp(imgs[1].Image(), 0, 0, 800, 0).Image()
+	return "file:///" + name, imgfactory.SavePNG2Path(name, imgnrgba)
 }
 
 // anyasuki 阿尼亚喜欢
@@ -274,14 +274,14 @@ func anyasuki(cc *context, args ...string) (string, error) {
 		return "", err
 	}
 	canvas := gg.NewContext(475, 540)
-	canvas.DrawImage(img.Size(face, 347, 267).Im, 82, 53)
+	canvas.DrawImage(imgfactory.Size(face, 347, 267).Image(), 82, 53)
 	canvas.DrawImage(back, 0, 0)
 	canvas.SetColor(color.Black)
-	_, err = file.GetLazyData(text.BoldFontFile, true)
+	data, err := file.GetLazyData(text.BoldFontFile, control.Md5File, true)
 	if err != nil {
 		return "", err
 	}
-	if err = canvas.LoadFontFace(text.BoldFontFile, 30); err != nil {
+	if err = canvas.ParseFontFace(data, 30); err != nil {
 		return "", err
 	}
 	if args[0] == "" {
@@ -321,13 +321,13 @@ func alwaysLike(cc *context, args ...string) (string, error) {
 	}
 	canvas := gg.NewContext(830, 599)
 	canvas.DrawImage(back, 0, 0)
-	canvas.DrawImage(img.Size(face, 380, 380).Im, 44, 74)
+	canvas.DrawImage(imgfactory.Size(face, 380, 380).Image(), 44, 74)
 	canvas.SetColor(color.Black)
-	_, err = file.GetLazyData(text.BoldFontFile, true)
+	data, err := file.GetLazyData(text.BoldFontFile, control.Md5File, true)
 	if err != nil {
 		return "", err
 	}
-	if err = canvas.LoadFontFace(text.BoldFontFile, 56); err != nil {
+	if err = canvas.ParseFontFace(data, 56); err != nil {
 		return "", err
 	}
 	if args[0] == "" {
@@ -362,12 +362,12 @@ func decentKiss(cc *context, args ...string) (string, error) {
 		return "", err
 	}
 	name := cc.usrdir + "DecentKiss.png"
-	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 589, 577)
+	im, err := imgfactory.LoadFirstFrame(cc.headimgsdir[0], 589, 577)
 	if err != nil {
 		return "", err
 	}
-	imgnrgba := im.InsertUp(imgs[0].Im, 0, 0, 0, 0).Im
-	return "file:///" + name, writer.SavePNG2Path(name, imgnrgba)
+	imgnrgba := im.InsertUp(imgs[0].Image(), 0, 0, 0, 0).Image()
+	return "file:///" + name, imgfactory.SavePNG2Path(name, imgnrgba)
 }
 
 // chinaFlag 国旗
@@ -390,12 +390,12 @@ func chinaFlag(cc *context, args ...string) (string, error) {
 		return "", err
 	}
 	name := cc.usrdir + "ChinaFlag.png"
-	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 410, 410)
+	im, err := imgfactory.LoadFirstFrame(cc.headimgsdir[0], 410, 410)
 	if err != nil {
 		return "", err
 	}
-	imgnrgba := im.InsertUp(imgs[0].Im, 0, 0, 0, 0).Im
-	return "file:///" + name, writer.SavePNG2Path(name, imgnrgba)
+	imgnrgba := im.InsertUp(imgs[0].Image(), 0, 0, 0, 0).Image()
+	return "file:///" + name, imgfactory.SavePNG2Path(name, imgnrgba)
 }
 
 // dontTouch 不要靠近
@@ -418,12 +418,12 @@ func dontTouch(cc *context, args ...string) (string, error) {
 		return "", err
 	}
 	name := cc.usrdir + "DontTouch.png"
-	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 410, 410)
+	im, err := imgfactory.LoadFirstFrame(cc.headimgsdir[0], 410, 410)
 	if err != nil {
 		return "", err
 	}
-	imgnrgba := imgs[0].InsertUp(im.Im, 148, 148, 46, 238).Im
-	return "file:///" + name, writer.SavePNG2Path(name, imgnrgba)
+	imgnrgba := imgs[0].InsertUp(im.Image(), 148, 148, 46, 238).Image()
+	return "file:///" + name, imgfactory.SavePNG2Path(name, imgnrgba)
 }
 
 // universal 万能表情 空白表情
@@ -435,13 +435,13 @@ func universal(cc *context, args ...string) (string, error) {
 		return "", err
 	}
 	canvas := gg.NewContext(500, 550)
-	canvas.DrawImage(img.Size(face, 500, 500).Im, 0, 0)
+	canvas.DrawImage(imgfactory.Size(face, 500, 500).Image(), 0, 0)
 	canvas.SetColor(color.Black)
-	_, err = file.GetLazyData(text.BoldFontFile, true)
+	data, err := file.GetLazyData(text.BoldFontFile, control.Md5File, true)
 	if err != nil {
 		return "", err
 	}
-	if err = canvas.LoadFontFace(text.BoldFontFile, 40); err != nil {
+	if err = canvas.ParseFontFace(data, 40); err != nil {
 		return "", err
 	}
 	if args[0] == "" {
@@ -484,15 +484,15 @@ func interview(cc *context, args ...string) (string, error) {
 		return "", err
 	}
 	canvas := gg.NewContext(600, 300)
-	canvas.DrawImage(img.Size(face, 124, 124).Im, 100, 50)
+	canvas.DrawImage(imgfactory.Size(face, 124, 124).Image(), 100, 50)
 	canvas.DrawImage(huaji, 376, 50)
 	canvas.DrawImage(microphone, 300, 50)
 	canvas.SetColor(color.Black)
-	_, err = file.GetLazyData(text.BoldFontFile, true)
+	data, err := file.GetLazyData(text.BoldFontFile, control.Md5File, true)
 	if err != nil {
 		return "", err
 	}
-	if err = canvas.LoadFontFace(text.BoldFontFile, 40); err != nil {
+	if err = canvas.ParseFontFace(data, 40); err != nil {
 		return "", err
 	}
 	if args[0] == "" {
@@ -526,12 +526,12 @@ func need(cc *context, args ...string) (string, error) {
 		return "", err
 	}
 	name := cc.usrdir + "Need.png"
-	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 114, 114)
+	im, err := imgfactory.LoadFirstFrame(cc.headimgsdir[0], 114, 114)
 	if err != nil {
 		return "", err
 	}
-	imgnrgba := imgs[0].InsertBottom(im.Im, 0, 0, 327, 232).Im
-	return "file:///" + name, writer.SavePNG2Path(name, imgnrgba)
+	imgnrgba := imgs[0].InsertBottom(im.Image(), 0, 0, 327, 232).Image()
+	return "file:///" + name, imgfactory.SavePNG2Path(name, imgnrgba)
 }
 
 // paint 这像画吗
@@ -554,12 +554,12 @@ func paint(cc *context, args ...string) (string, error) {
 		return "", err
 	}
 	name := cc.usrdir + "Paint.png"
-	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 117, 135)
+	im, err := imgfactory.LoadFirstFrame(cc.headimgsdir[0], 117, 135)
 	if err != nil {
 		return "", err
 	}
-	imgnrgba := imgs[0].InsertBottom(img.Rotate(im.Im, 4, 0, 0).Im, 0, 0, 95, 107).Im
-	return "file:///" + name, writer.SavePNG2Path(name, imgnrgba)
+	imgnrgba := imgs[0].InsertBottom(imgfactory.Rotate(im.Image(), 4, 0, 0).Image(), 0, 0, 95, 107).Image()
+	return "file:///" + name, imgfactory.SavePNG2Path(name, imgnrgba)
 }
 
 // painter 小画家
@@ -582,12 +582,12 @@ func painter(cc *context, args ...string) (string, error) {
 		return "", err
 	}
 	name := cc.usrdir + "Painter.png"
-	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 240, 345)
+	im, err := imgfactory.LoadFirstFrame(cc.headimgsdir[0], 240, 345)
 	if err != nil {
 		return "", err
 	}
-	imgnrgba := imgs[0].InsertBottom(im.Im, 0, 0, 125, 91).Im
-	return "file:///" + name, writer.SavePNG2Path(name, imgnrgba)
+	imgnrgba := imgs[0].InsertBottom(im.Image(), 0, 0, 125, 91).Image()
+	return "file:///" + name, imgfactory.SavePNG2Path(name, imgnrgba)
 }
 
 // perfect 完美
@@ -610,12 +610,12 @@ func perfect(cc *context, args ...string) (string, error) {
 		return "", err
 	}
 	name := cc.usrdir + "Perfect.png"
-	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 310, 460)
+	im, err := imgfactory.LoadFirstFrame(cc.headimgsdir[0], 310, 460)
 	if err != nil {
 		return "", err
 	}
-	imgnrgba := imgs[0].InsertUp(im.Im, 0, 0, 313, 64).Im
-	return "file:///" + name, writer.SavePNG2Path(name, imgnrgba)
+	imgnrgba := imgs[0].InsertUp(im.Image(), 0, 0, 313, 64).Image()
+	return "file:///" + name, imgfactory.SavePNG2Path(name, imgnrgba)
 }
 
 // playGame 玩游戏
@@ -643,14 +643,14 @@ func playGame(cc *context, args ...string) (string, error) {
 		return "", err
 	}
 	canvas := gg.NewContext(526, 503)
-	canvas.DrawImage(img.Rotate(face, 10, 225, 160).Im, 161, 117)
+	canvas.DrawImage(imgfactory.Rotate(face, 10, 225, 160).Image(), 161, 117)
 	canvas.DrawImage(back, 0, 0)
 	canvas.SetColor(color.Black)
-	_, err = file.GetLazyData(text.BoldFontFile, true)
+	data, err := file.GetLazyData(text.BoldFontFile, control.Md5File, true)
 	if err != nil {
 		return "", err
 	}
-	if err = canvas.LoadFontFace(text.BoldFontFile, 40); err != nil {
+	if err = canvas.ParseFontFace(data, 40); err != nil {
 		return "", err
 	}
 	if args[0] == "" {
@@ -684,12 +684,12 @@ func police(cc *context, args ...string) (string, error) {
 		return "", err
 	}
 	name := cc.usrdir + "Police.png"
-	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 245, 245)
+	im, err := imgfactory.LoadFirstFrame(cc.headimgsdir[0], 245, 245)
 	if err != nil {
 		return "", err
 	}
-	imgnrgba := imgs[0].InsertBottom(im.Im, 0, 0, 224, 46).Im
-	return "file:///" + name, writer.SavePNG2Path(name, imgnrgba)
+	imgnrgba := imgs[0].InsertBottom(im.Image(), 0, 0, 224, 46).Image()
+	return "file:///" + name, imgfactory.SavePNG2Path(name, imgnrgba)
 }
 
 // police1 警察
@@ -712,12 +712,12 @@ func police1(cc *context, args ...string) (string, error) {
 		return "", err
 	}
 	name := cc.usrdir + "Police1.png"
-	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 60, 75)
+	im, err := imgfactory.LoadFirstFrame(cc.headimgsdir[0], 60, 75)
 	if err != nil {
 		return "", err
 	}
-	imgnrgba := imgs[1].InsertBottom(img.Rotate(im.Im, 16, 0, 0).Im, 0, 0, 37, 291).Im
-	return "file:///" + name, writer.SavePNG2Path(name, imgnrgba)
+	imgnrgba := imgs[1].InsertBottom(imgfactory.Rotate(im.Image(), 16, 0, 0).Image(), 0, 0, 37, 291).Image()
+	return "file:///" + name, imgfactory.SavePNG2Path(name, imgnrgba)
 }
 
 // prpr 舔 舔屏 prpr
@@ -740,12 +740,12 @@ func prpr(cc *context, args ...string) (string, error) {
 		return "", err
 	}
 	name := cc.usrdir + "Prpr.png"
-	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 330, 330)
+	im, err := imgfactory.LoadFirstFrame(cc.headimgsdir[0], 330, 330)
 	if err != nil {
 		return "", err
 	}
-	imgnrgba := imgs[0].InsertBottom(img.Rotate(im.Im, 8, 0, 0).Im, 0, 0, 46, 264).Im
-	return "file:///" + name, writer.SavePNG2Path(name, imgnrgba)
+	imgnrgba := imgs[0].InsertBottom(imgfactory.Rotate(im.Image(), 8, 0, 0).Image(), 0, 0, 46, 264).Image()
+	return "file:///" + name, imgfactory.SavePNG2Path(name, imgnrgba)
 }
 
 // safeSense 安全感
@@ -774,13 +774,13 @@ func safeSense(cc *context, args ...string) (string, error) {
 	}
 	canvas := gg.NewContext(430, 478)
 	canvas.DrawImage(back, 0, 0)
-	canvas.DrawImage(img.Size(face, 215, 343).Im, 215, 135)
+	canvas.DrawImage(imgfactory.Size(face, 215, 343).Image(), 215, 135)
 	canvas.SetColor(color.Black)
-	_, err = file.GetLazyData(text.BoldFontFile, true)
+	data, err := file.GetLazyData(text.BoldFontFile, control.Md5File, true)
 	if err != nil {
 		return "", err
 	}
-	if err = canvas.LoadFontFace(text.BoldFontFile, 30); err != nil {
+	if err = canvas.ParseFontFace(data, 30); err != nil {
 		return "", err
 	}
 	if args[0] == "" {
@@ -816,12 +816,12 @@ func support(cc *context, args ...string) (string, error) {
 		return "", err
 	}
 	name := cc.usrdir + "Support.png"
-	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 815, 815)
+	im, err := imgfactory.LoadFirstFrame(cc.headimgsdir[0], 815, 815)
 	if err != nil {
 		return "", err
 	}
-	imgnrgba := imgs[0].InsertBottom(img.Rotate(im.Im, 23, 0, 0).Im, 0, 0, -172, -17).Im
-	return "file:///" + name, writer.SavePNG2Path(name, imgnrgba)
+	imgnrgba := imgs[0].InsertBottom(imgfactory.Rotate(im.Image(), 23, 0, 0).Image(), 0, 0, -172, -17).Image()
+	return "file:///" + name, imgfactory.SavePNG2Path(name, imgnrgba)
 }
 
 // thinkwhat 想什么
@@ -844,12 +844,12 @@ func thinkwhat(cc *context, args ...string) (string, error) {
 		return "", err
 	}
 	name := cc.usrdir + "Thinkwhat.png"
-	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 534, 493)
+	im, err := imgfactory.LoadFirstFrame(cc.headimgsdir[0], 534, 493)
 	if err != nil {
 		return "", err
 	}
-	imgnrgba := imgs[0].InsertBottom(im.Im, 0, 0, 530, 0).Im
-	return "file:///" + name, writer.SavePNG2Path(name, imgnrgba)
+	imgnrgba := imgs[0].InsertBottom(im.Image(), 0, 0, 530, 0).Image()
+	return "file:///" + name, imgfactory.SavePNG2Path(name, imgnrgba)
 }
 
 // wallpaper 墙纸
@@ -872,12 +872,12 @@ func wallpaper(cc *context, args ...string) (string, error) {
 		return "", err
 	}
 	name := cc.usrdir + "Wallpaper.png"
-	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 775, 496)
+	im, err := imgfactory.LoadFirstFrame(cc.headimgsdir[0], 775, 496)
 	if err != nil {
 		return "", err
 	}
-	imgnrgba := imgs[0].InsertBottom(im.Im, 0, 0, 260, 580).Im
-	return "file:///" + name, writer.SavePNG2Path(name, imgnrgba)
+	imgnrgba := imgs[0].InsertBottom(im.Image(), 0, 0, 260, 580).Image()
+	return "file:///" + name, imgfactory.SavePNG2Path(name, imgnrgba)
 }
 
 // whyatme 为什么at我
@@ -900,12 +900,12 @@ func whyatme(cc *context, args ...string) (string, error) {
 		return "", err
 	}
 	name := cc.usrdir + "Whyatme.png"
-	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 265, 265)
+	im, err := imgfactory.LoadFirstFrame(cc.headimgsdir[0], 265, 265)
 	if err != nil {
 		return "", err
 	}
-	imgnrgba := imgs[0].InsertBottom(im.Im, 0, 0, 42, 13).Im
-	return "file:///" + name, writer.SavePNG2Path(name, imgnrgba)
+	imgnrgba := imgs[0].InsertBottom(im.Image(), 0, 0, 42, 13).Image()
+	return "file:///" + name, imgfactory.SavePNG2Path(name, imgnrgba)
 }
 
 // makeFriend 交个朋友
@@ -933,16 +933,16 @@ func makeFriend(cc *context, args ...string) (string, error) {
 		return "", err
 	}
 	canvas := gg.NewContext(1000, 1000)
-	canvas.DrawImage(img.Size(face, 1000, 1000).Im, 0, 0)
-	canvas.DrawImage(img.Rotate(face, 9, 250, 250).Im, 743, 845)
-	canvas.DrawImage(img.Rotate(face, 9, 55, 55).Im, 836, 722)
+	canvas.DrawImage(imgfactory.Size(face, 1000, 1000).Image(), 0, 0)
+	canvas.DrawImage(imgfactory.Rotate(face, 9, 250, 250).Image(), 743, 845)
+	canvas.DrawImage(imgfactory.Rotate(face, 9, 55, 55).Image(), 836, 722)
 	canvas.DrawImage(back, 0, 0)
 	canvas.SetColor(color.White)
-	_, err = file.GetLazyData(text.BoldFontFile, true)
+	data, err := file.GetLazyData(text.BoldFontFile, control.Md5File, true)
 	if err != nil {
 		return "", err
 	}
-	if err = canvas.LoadFontFace(text.BoldFontFile, 20); err != nil {
+	if err = canvas.ParseFontFace(data, 20); err != nil {
 		return "", err
 	}
 	if args[0] == "" {
@@ -977,12 +977,12 @@ func backToWork(cc *context, args ...string) (string, error) {
 		return "", err
 	}
 	name := cc.usrdir + "BackToWork.png"
-	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 220, 310)
+	im, err := imgfactory.LoadFirstFrame(cc.headimgsdir[0], 220, 310)
 	if err != nil {
 		return "", err
 	}
-	imgnrgba := imgs[0].InsertBottom(img.Rotate(im.Im, 25, 0, 0).Im, 0, 0, 56, 32).Im
-	return "file:///" + name, writer.SavePNG2Path(name, imgnrgba)
+	imgnrgba := imgs[0].InsertBottom(imgfactory.Rotate(im.Image(), 25, 0, 0).Image(), 0, 0, 56, 32).Image()
+	return "file:///" + name, imgfactory.SavePNG2Path(name, imgnrgba)
 }
 
 // coupon 兑换券
@@ -1015,13 +1015,13 @@ func coupon(cc *context, args ...string) (string, error) {
 	canvas := gg.NewContext(500, 355)
 	canvas.DrawImage(back, 0, 0)
 	canvas.Rotate(gg.Radians(-22))
-	canvas.DrawImage(img.Size(face, 60, 60).Im, 100, 163)
+	canvas.DrawImage(imgfactory.Size(face, 60, 60).Image(), 100, 163)
 	canvas.SetColor(color.Black)
-	_, err = file.GetLazyData(text.BoldFontFile, true)
+	data, err := file.GetLazyData(text.BoldFontFile, control.Md5File, true)
 	if err != nil {
 		return "", err
 	}
-	if err = canvas.LoadFontFace(text.BoldFontFile, 30); err != nil {
+	if err = canvas.ParseFontFace(data, 30); err != nil {
 		return "", err
 	}
 	if args[0] == "" {
@@ -1056,12 +1056,12 @@ func distracted(cc *context, args ...string) (string, error) {
 		return "", err
 	}
 	name := cc.usrdir + "Distracted.png"
-	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 500, 500)
+	im, err := imgfactory.LoadFirstFrame(cc.headimgsdir[0], 500, 500)
 	if err != nil {
 		return "", err
 	}
-	imgnrgba := im.InsertUp(imgs[0].Im, 0, 0, 140, 320).InsertUp(imgs[1].Im, 0, 0, 0, 0).Im
-	return "file:///" + name, writer.SavePNG2Path(name, imgnrgba)
+	imgnrgba := im.InsertUp(imgs[0].Image(), 0, 0, 140, 320).InsertUp(imgs[1].Image(), 0, 0, 0, 0).Image()
+	return "file:///" + name, imgfactory.SavePNG2Path(name, imgnrgba)
 }
 
 // throw 扔
@@ -1088,8 +1088,8 @@ func throw(cc *context, args ...string) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	imgnrgba := imgs[0].InsertUpC(img.Rotate(face, float64(rand.Intn(360)), 143, 143).Im, 0, 0, 86, 249).Im
-	return "file:///" + name, writer.SavePNG2Path(name, imgnrgba)
+	imgnrgba := imgs[0].InsertUpC(imgfactory.Rotate(face, float64(rand.Intn(360)), 143, 143).Image(), 0, 0, 86, 249).Image()
+	return "file:///" + name, imgfactory.SavePNG2Path(name, imgnrgba)
 }
 
 // 远离
@@ -1112,12 +1112,12 @@ func yuanli(cc *context, args ...string) (string, error) {
 		return "", err
 	}
 	name := cc.usrdir + "yuanli.png"
-	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 534, 493)
+	im, err := imgfactory.LoadFirstFrame(cc.headimgsdir[0], 534, 493)
 	if err != nil {
 		return "", err
 	}
-	imgnrgba := imgs[0].InsertBottom(im.Im, 420, 420, 45, 90).Im
-	return "file:///" + name, writer.SavePNG2Path(name, imgnrgba)
+	imgnrgba := imgs[0].InsertBottom(im.Image(), 420, 420, 45, 90).Image()
+	return "file:///" + name, imgfactory.SavePNG2Path(name, imgnrgba)
 }
 
 // 不是你老婆
@@ -1140,12 +1140,12 @@ func nowife(cc *context, args ...string) (string, error) {
 		return "", err
 	}
 	name := cc.usrdir + "nowife.png"
-	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 534, 493)
+	im, err := imgfactory.LoadFirstFrame(cc.headimgsdir[0], 534, 493)
 	if err != nil {
 		return "", err
 	}
-	imgnrgba := imgs[0].InsertBottom(im.Im, 400, 400, 112, 81).Im
-	return "file:///" + name, writer.SavePNG2Path(name, imgnrgba)
+	imgnrgba := imgs[0].InsertBottom(im.Image(), 400, 400, 112, 81).Image()
+	return "file:///" + name, imgfactory.SavePNG2Path(name, imgnrgba)
 }
 
 // youer 你老婆
@@ -1174,13 +1174,13 @@ func youer(cc *context, args ...string) (string, error) {
 	}
 	canvas := gg.NewContext(690, 690)
 	canvas.DrawImage(back, 0, 0)
-	canvas.DrawImage(img.Size(tou, 350, 350).Im, 55, 165)
+	canvas.DrawImage(imgfactory.Size(tou, 350, 350).Image(), 55, 165)
 	canvas.SetColor(color.Black)
-	_, err = file.GetLazyData(text.BoldFontFile, true)
+	data, err := file.GetLazyData(text.BoldFontFile, control.Md5File, true)
 	if err != nil {
 		return "", err
 	}
-	if err = canvas.LoadFontFace(text.BoldFontFile, 56); err != nil {
+	if err = canvas.ParseFontFace(data, 56); err != nil {
 		return "", err
 	}
 	if args[0] == "" {
@@ -1221,13 +1221,13 @@ func xiaotianshi(cc *context, args ...string) (string, error) {
 	}
 	canvas := gg.NewContext(522, 665)
 	canvas.DrawImage(back, 0, 0)
-	canvas.DrawImage(img.Size(face, 480, 480).Im, 20, 80)
+	canvas.DrawImage(imgfactory.Size(face, 480, 480).Image(), 20, 80)
 	canvas.SetColor(color.Black)
-	_, err = file.GetLazyData(text.BoldFontFile, true)
+	data, err := file.GetLazyData(text.BoldFontFile, control.Md5File, true)
 	if err != nil {
 		return "", err
 	}
-	if err = canvas.LoadFontFace(text.BoldFontFile, 35); err != nil {
+	if err = canvas.ParseFontFace(data, 35); err != nil {
 		return "", err
 	}
 	if args[0] == "" {
@@ -1262,12 +1262,12 @@ func neko(cc *context, args ...string) (string, error) {
 		return "", err
 	}
 	name := cc.usrdir + "neko.png"
-	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 712, 949)
+	im, err := imgfactory.LoadFirstFrame(cc.headimgsdir[0], 712, 949)
 	if err != nil {
 		return "", err
 	}
-	imgnrgba := imgs[0].InsertBottom(img.Rotate(im.Im, 0, 0, 0).Im, 450, 450, 0, 170).Im
-	return "file:///" + name, writer.SavePNG2Path(name, imgnrgba)
+	imgnrgba := imgs[0].InsertBottom(imgfactory.Rotate(im.Image(), 0, 0, 0).Image(), 450, 450, 0, 170).Image()
+	return "file:///" + name, imgfactory.SavePNG2Path(name, imgnrgba)
 }
 
 // 给我变
@@ -1291,12 +1291,12 @@ func bian(cc *context, args ...string) (string, error) {
 		return "", err
 	}
 	name := cc.usrdir + "bian.png"
-	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 640, 550)
+	im, err := imgfactory.LoadFirstFrame(cc.headimgsdir[0], 640, 550)
 	if err != nil {
 		return "", err
 	}
-	imgnrgba := imgs[0].InsertBottom(img.Rotate(im.Im, 0, 0, 0).Im, 380, 380, 225, -20).Im
-	return "file:///" + name, writer.SavePNG2Path(name, imgnrgba)
+	imgnrgba := imgs[0].InsertBottom(imgfactory.Rotate(im.Image(), 0, 0, 0).Image(), 380, 380, 225, -20).Image()
+	return "file:///" + name, imgfactory.SavePNG2Path(name, imgnrgba)
 }
 
 // van 玩一下
@@ -1325,13 +1325,13 @@ func van(cc *context, args ...string) (string, error) {
 	}
 	canvas := gg.NewContext(522, 665)
 	canvas.DrawImage(back, 0, 0)
-	canvas.DrawImage(img.Size(face, 480, 480).Im, 20, 80)
+	canvas.DrawImage(imgfactory.Size(face, 480, 480).Image(), 20, 80)
 	canvas.SetColor(color.Black)
-	_, err = file.GetLazyData(text.BoldFontFile, true)
+	data, err := file.GetLazyData(text.BoldFontFile, control.Md5File, true)
 	if err != nil {
 		return "", err
 	}
-	if err = canvas.LoadFontFace(text.BoldFontFile, 35); err != nil {
+	if err = canvas.ParseFontFace(data, 35); err != nil {
 		return "", err
 	}
 	if args[0] == "" {
@@ -1366,12 +1366,12 @@ func eihei(cc *context, args ...string) (string, error) {
 		return "", err
 	}
 	name := cc.usrdir + "eihei.png"
-	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 690, 690)
+	im, err := imgfactory.LoadFirstFrame(cc.headimgsdir[0], 690, 690)
 	if err != nil {
 		return "", err
 	}
-	imgnrgba := imgs[0].InsertBottom(im.Im, 450, 450, 121, 162).Im
-	return "file:///" + name, writer.SavePNG2Path(name, imgnrgba)
+	imgnrgba := imgs[0].InsertBottom(im.Image(), 450, 450, 121, 162).Image()
+	return "file:///" + name, imgfactory.SavePNG2Path(name, imgnrgba)
 }
 
 // fanfa 犯法
@@ -1398,9 +1398,9 @@ func fanfa(cc *context, args ...string) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	m1 := img.Rotate(face, 45, 110, 110)
-	imgnrgba := imgs[0].InsertUp(m1.Im, 0, 0, 125, 360).Im
-	return "file:///" + name, writer.SavePNG2Path(name, imgnrgba)
+	m1 := imgfactory.Rotate(face, 45, 110, 110)
+	imgnrgba := imgs[0].InsertUp(m1.Image(), 0, 0, 125, 360).Image()
+	return "file:///" + name, imgfactory.SavePNG2Path(name, imgnrgba)
 }
 
 // huai 怀
@@ -1423,12 +1423,12 @@ func huai(cc *context, args ...string) (string, error) {
 		return "", err
 	}
 	name := cc.usrdir + "huai.png"
-	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 640, 640)
+	im, err := imgfactory.LoadFirstFrame(cc.headimgsdir[0], 640, 640)
 	if err != nil {
 		return "", err
 	}
-	imgnrgba := imgs[0].InsertBottom(im.Im, 640, 640, 0, 0).Im
-	return "file:///" + name, writer.SavePNG2Path(name, imgnrgba)
+	imgnrgba := imgs[0].InsertBottom(im.Image(), 640, 640, 0, 0).Image()
+	return "file:///" + name, imgfactory.SavePNG2Path(name, imgnrgba)
 }
 
 // haowan 好玩
@@ -1455,8 +1455,8 @@ func haowan(cc *context, args ...string) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	imgnrgba := imgs[0].InsertBottom(face, 90, 90, 321, 172).Im
-	return "file:///" + name, writer.SavePNG2Path(name, imgnrgba)
+	imgnrgba := imgs[0].InsertBottom(face, 90, 90, 321, 172).Image()
+	return "file:///" + name, imgfactory.SavePNG2Path(name, imgnrgba)
 }
 
 // mengbi 蒙蔽
@@ -1485,14 +1485,14 @@ func mengbi(cc *context, args ...string) (string, error) {
 	}
 	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.DrawImage(imgfactory.Size(face, 100, 100).Image(), 392, 460)
+	canvas.DrawImage(imgfactory.Size(face, 100, 100).Image(), 606, 443)
 	canvas.SetColor(color.Black)
-	_, err = file.GetLazyData(text.BoldFontFile, true)
+	data, err := file.GetLazyData(text.BoldFontFile, control.Md5File, true)
 	if err != nil {
 		return "", err
 	}
-	if err = canvas.LoadFontFace(text.BoldFontFile, 80); err != nil {
+	if err = canvas.ParseFontFace(data, 80); err != nil {
 		return "", err
 	}
 	if args[0] == "" {

plugin/gif/run.go

@@ -129,21 +129,22 @@ func init() { // 插件主体
 	en := control.Register("gif", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
 		Brief:            "制图",
-		Help: "下为制图命令: " +
-			"- 搓|-冲|-摸|-拍|-丢|-吃|-敲|-啃|-蹭|-爬|-撕|-灰度|-上翻|-下翻\n" +
-			"- 左翻|-右翻|-反色|-浮雕|- 打码|- 负片|- 旋转|- 变形|- 亲\n" +
-			"- 结婚申请|结婚登记|- 阿尼亚喜欢XXX|- 像只|- 我永远喜欢XXX\n" +
-			"- 像样的亲亲|- 国旗|- 不要靠近|- 万能表情|-空白表情|- 采访\n" +
-			"- 需要|-你可能需要|- 这像画吗|- 小画家|- 完美|- 玩游戏|- 出警\n" +
-			"- 警察|- 舔|舔屏|prpr|- 安全感|- 精神支柱|- 想什么|- 墙纸\n" +
-			"- 为什么at我|- 交个朋友|- 打工人|-继续干活|- 兑换券|- 炖\n" +
-			"- 垃圾桶|- 垃圾|- 捶|- 啾啾|- 2敲|- 听音乐|- 永远爱你|- 2拍\n" +
-			"- 顶|- 捣|- 打拳|- 滚|- 吸|- 嗦|- 扔|- 锤|- 紧贴|紧紧贴着|- 转\n" +
-			"- 抬棺|- 远离|- 我老婆|- 小天使XXX|- 你的XXX|- 不要看\n" +
-			"- 玩一下XXX|- 给我变|- 揍|- 吞|- 膜拜|- 诶嘿|- 2蹭|- 你犯法了\n" +
-			"- 砰|- 注意力涣散|- 蒙蔽|- 踩|- 好玩|- 2转|- 踢球|- 2舔|\n" +
-			"- 可莉吃|- 胡桃啃|- 怀|- 一直(支持动图)\n" +
-			"例: 制图命令XXX[@用户|QQ号|图片]" +
+		Help: "下为制图命令:\n" +
+			"- 搓|- 冲|- 摸|-拍|- 丢|- 吃|- 敲|- 啃|- 蹭|- 爬|- 撕\n" +
+			"- 吸|- 嗦|- 扔|- 锤|- 紧贴|紧紧贴着|- 转|- 抬棺|- 远离\n" +
+			"- 揍|- 吞|- 膜拜|- 诶嘿|- 2蹭|- 你犯法了|- 砰|- 注意力涣散\n" +
+			"- 2敲|- 听音乐|- 永远爱你|- 2拍|- 顶|- 捣|- 打拳|- 滚\n" +
+			"- 灰度|- 上翻|- 下翻|- 左翻|- 右翻|- 反色|- 浮雕|- 打码\n" +
+			"- 负片|- 旋转|- 变形|- 亲|- 结婚申请|结婚登记|- 阿尼亚喜欢XXX\n" +
+			"- 像只|- 我永远喜欢XXX|- 像样的亲亲|- 国旗|- 不要靠近\n" +
+			"- 蒙蔽|- 踩|- 好玩|- 2转|- 踢球|- 2舔|- 可莉吃|- 胡桃啃|- 怀\n" +
+			"- 小画家|- 完美|- 玩游戏|- 出警|- 警察|- 舔|舔屏|prpr\n" +
+			"- 安全感|- 精神支柱|- 想什么|- 墙纸|- 为什么at我|- 交个朋友\n" +
+			"- 打工人|- 继续干活|- 兑换券|- 炖|- 垃圾桶|- 垃圾|- 捶|- 啾啾\n" +
+			"- 我老婆|- 小天使XXX|- 你的XXX|- 不要看|- 玩一下XXX|- 给我变\n" +
+			"- 万能表情|- 空白表情|- 采访|- 需要|- 你可能需要|- 这像画吗\n" +
+			"- 一直(支持动图)\n" +
+			"例: 制图命令XXX[@用户|QQ号|图片]\n" +
 			"Tips: XXX可以为限制长度的任何文字\n" +
 			"对Bot使用为 @Bot制图命令[XXX]@Bot",
 		PrivateDataFolder: "gif",

plugin/guessmusic/apiservice.go

@@ -259,19 +259,7 @@ func init() {
 			listName := ctx.State["regex_matched"].([]string)[5]
 			ctx.SendChain(message.Text("正在校验歌单信息,请稍等"))
 			// 是否存在该歌单
-			filelist, err := getlist(cfg.MusicPath)
-			if err != nil {
-				ctx.SendChain(message.Text(serviceErr, "获取歌单列表ERROR:", err))
-				return
-			}
-			ok := true
-			for _, listinfo := range filelist {
-				if listName == listinfo.Name {
-					ok = false
-					break
-				}
-			}
-			if ok {
+			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()
@@ -296,12 +284,13 @@ func init() {
 						break
 					}
 				}
-				err = os.MkdirAll(cfg.MusicPath+listName, 0755)
+				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+"/")

plugin/guessmusic/guessmusic.go

@@ -8,6 +8,7 @@ import (
 	"os/exec"
 	"strconv"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/FloatTech/floatbox/file"
@@ -84,11 +85,11 @@ func init() {
 				return
 			}
 			answerString := "歌名:" + musicInfo[0] + "\n歌手:" + musicInfo[1]
-			musicAlia := ""
 			if infoNum > 2 {
-				musicAlia = musicInfo[2]
-				answerString += "\n其他信息:\n" + strings.ReplaceAll(musicAlia, "&", "\n")
+				musicInfo[2] = strings.ReplaceAll(musicInfo[2], "&", "\n")
+				answerString += "\n其他信息:\n" + musicInfo[2]
 			}
+			musicInfo = append(musicInfo, answerString)
 			// 切割音频,生成3个10秒的音频
 			outputPath := cachePath + strconv.FormatInt(gid, 10) + "/"
 			err = cutMusic(musicName, pathOfMusic, outputPath)
@@ -104,13 +105,18 @@ func init() {
 			} 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)
+			wg := sync.WaitGroup{}
+			var (
+				messageStr  message.MessageSegment // 文本信息
+				tickCount   = 0                    // 音频数量
+				answerCount = 0                    // 问答次数
+				win         bool                   // 是否赢得游戏
+			)
 			for {
 				select {
 				case <-tick.C:
@@ -121,107 +127,41 @@ func init() {
 					return
 				case <-wait.C:
 					wait.Reset(40 * time.Second)
-					musicCount++
-					if musicCount > 2 {
+					tickCount++
+					if tickCount > 2 {
 						wait.Stop()
 						continue
 					}
 					ctx.SendChain(
 						message.Text("好像有些难度呢,再听这段音频,要仔细听哦"),
 					)
-					ctx.SendChain(message.Record("file:///" + file.BOTPATH + "/" + outputPath + strconv.Itoa(musicCount) + ".wav"))
+					ctx.SendChain(message.Record("file:///" + file.BOTPATH + "/" + outputPath + strconv.Itoa(tickCount) + ".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 {
+					wg.Add(1)
+					go func() {
+						messageStr, answerCount, tickCount, win = gameMatch(c, ctx.Event.UserID, musicInfo, answerCount, tickCount)
+						if win { // 游戏结束的话
 							wait.Stop()
 							tick.Stop()
 							after.Stop()
-							ctx.Send(message.ReplyWithMessage(ctx.Event.MessageID,
-								message.Text("游戏已取消,猜歌答案是\n", answerString, "\n\n\n下面欣赏猜歌的歌曲")))
+							ctx.SendChain(message.Reply(c.Event.MessageID), messageStr)
 							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:
+						} else {
 							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"))
+							tick.Reset(105 * time.Second)
+							after.Reset(120 * time.Second)
+							if tickCount > 2 || messageStr.Data["text"] == "你无权限取消" {
+								ctx.SendChain(message.Reply(c.Event.MessageID), messageStr)
+							} else {
+								ctx.SendChain(message.Reply(c.Event.MessageID), messageStr)
+								ctx.SendChain(message.Record("file:///" + file.BOTPATH + "/" + outputPath + strconv.Itoa(tickCount) + ".wav"))
+							}
 						}
+						wg.Done()
+					}()
+					wg.Wait()
+					if win {
+						return
 					}
 				}
 			}
@@ -233,7 +173,7 @@ func musicLottery(musicPath, listName string) (pathOfMusic, musicName string, er
 	// 读取歌单文件
 	pathOfMusic = musicPath + listName + "/"
 	if file.IsNotExist(pathOfMusic) {
-		err = errors.New("指定的歌单不存在")
+		err = errors.New("指定的歌单不存在,可发送“歌单列表”查看歌单列表")
 		return
 	}
 	files, err := os.ReadDir(pathOfMusic)
@@ -271,11 +211,11 @@ func musicLottery(musicPath, listName string) (pathOfMusic, musicName string, er
 	}
 	// 进行随机抽取
 	if playlistID == 0 || !cfg.API {
-		musicName = getLocalMusic(files)
+		musicName = getLocalMusic(files, 10)
 	} else {
 		switch rand.Intn(3) { // 三分二概率抽取API的
 		case 1:
-			musicName = getLocalMusic(files)
+			musicName = getLocalMusic(files, 10)
 		default:
 			if cfg.APIURL == "" {
 				// 如果没有配置过API地址,尝试连接独角兽
@@ -285,22 +225,27 @@ func musicLottery(musicPath, listName string) (pathOfMusic, musicName string, er
 				musicName, err = drawByAPI(playlistID, pathOfMusic)
 			}
 			if err != nil {
-				musicName = getLocalMusic(files)
-				err = nil
-				return
+				musicName = getLocalMusic(files, 10)
 			}
 		}
 	}
+	if musicName == "" {
+		err = errors.New("抽取歌曲轮空了,请重试")
+	}
 	return
 }
 
-// 从本地列表中随机抽取一首
-func getLocalMusic(files []fs.DirEntry) (musicName string) {
+// 从本地列表中随机抽取一首( indexMax : 最大递归次数 )
+func getLocalMusic(files []fs.DirEntry, indexMax int) (musicName string) {
 	if len(files) > 1 {
 		music := files[rand.Intn(len(files))]
 		// 如果是文件夹就递归
 		if music.IsDir() {
-			musicName = getLocalMusic(files)
+			indexMax--
+			if indexMax <= 0 {
+				return
+			}
+			musicName = getLocalMusic(files, indexMax)
 		} else {
 			musicName = music.Name()
 		}
@@ -334,3 +279,38 @@ func cutMusic(musicName, pathOfMusic, outputPath string) (err error) {
 	}
 	return
 }
+
+// 数据匹配（结果信息，答题次数，提示次数，是否结束游戏）
+func gameMatch(c *zero.Ctx, beginner int64, musicInfo []string, answerTimes, tickTimes int) (message.MessageSegment, int, int, bool) {
+	answer := strings.Replace(c.Event.Message.String(), "-", "", 1)
+	switch {
+	case answer == "取消":
+		if c.Event.UserID == beginner {
+			return message.Text("游戏已取消,猜歌答案是\n", musicInfo[len(musicInfo)-1], "\n\n\n下面欣赏猜歌的歌曲"), answerTimes, tickTimes, true
+		}
+		return message.Text("你无权限取消"), answerTimes, tickTimes, false
+	case answer == "提示":
+		tickTimes++
+		if tickTimes > 2 {
+			return message.Text("已经没有提示了哦"), answerTimes, tickTimes, false
+		}
+		return message.Text("再听这段音频,要仔细听哦"), answerTimes, tickTimes, false
+	case strings.Contains(musicInfo[0], answer) || strings.EqualFold(musicInfo[0], answer):
+		return message.Text("太棒了,你猜对歌曲名了！答案是\n", musicInfo[len(musicInfo)-1], "\n\n下面欣赏猜歌的歌曲"), answerTimes, tickTimes, true
+	case strings.Contains(musicInfo[1], answer) || strings.EqualFold(musicInfo[1], answer):
+		return message.Text("太棒了,你猜对歌手名了！答案是\n", musicInfo[len(musicInfo)-1], "\n\n下面欣赏猜歌的歌曲"), answerTimes, tickTimes, true
+	case len(musicInfo) == 4 && (strings.Contains(musicInfo[2], answer) || strings.EqualFold(musicInfo[2], answer)):
+		return message.Text("太棒了,你猜对相关信息了！答案是\n", musicInfo[len(musicInfo)-1], "\n\n下面欣赏猜歌的歌曲"), answerTimes, tickTimes, true
+	default:
+		answerTimes++
+		tickTimes++
+		switch {
+		case tickTimes > 2 && answerTimes < 6:
+			return message.Text("答案不对哦,还有", 6-answerTimes, "次答题,加油啊~"), answerTimes, tickTimes, false
+		case tickTimes > 2:
+			return message.Text("次数到了,没能猜出来。答案是\n", musicInfo[len(musicInfo)-1], "\n\n下面欣赏猜歌的歌曲"), answerTimes, tickTimes, true
+		default:
+			return message.Text("答案不对,再听这段音频,要仔细听哦"), answerTimes, tickTimes, false
+		}
+	}
+}

plugin/guessmusic/main.go

@@ -9,6 +9,7 @@ import (
 	"time"
 
 	wyy "github.com/FloatTech/AnimeAPI/neteasemusic"
+	"github.com/FloatTech/imgfactory"
 	ctrl "github.com/FloatTech/zbpctrl"
 	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
@@ -18,9 +19,9 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"
 
 	// 图片输出
-	"github.com/Coloured-glaze/gg"
 	"github.com/FloatTech/floatbox/file"
-	"github.com/FloatTech/floatbox/img/writer"
+	"github.com/FloatTech/floatbox/process"
+	"github.com/FloatTech/gg"
 	"github.com/FloatTech/zbputils/img/text"
 )
 
@@ -380,8 +381,9 @@ func init() {
 					break
 				}
 			}
-			err = file.DownloadTo(fileURL, cfg.MusicPath+listName+"/"+fileSearchName, true)
+			err = file.DownloadTo(fileURL, cfg.MusicPath+listName+"/"+fileSearchName)
 			if err == nil {
+				process.SleepAbout1sTo2s()
 				ctx.SendChain(message.Text("成功！"))
 			} else {
 				ctx.SendChain(message.Text(serviceErr, err))
@@ -404,18 +406,18 @@ func init() {
 			canvas.SetRGB(1, 1, 1) // 白色
 			canvas.Clear()
 			/***********下载字体，可以注销掉***********/
-			_, err = file.GetLazyData(text.BoldFontFile, true)
+			boldfd, err := file.GetLazyData(text.BoldFontFile, control.Md5File, true)
 			if err != nil {
 				ctx.SendChain(message.Text(serviceErr, err))
 			}
-			_, err = file.GetLazyData(text.FontFile, true)
+			fd, err := file.GetLazyData(text.FontFile, control.Md5File, true)
 			if err != nil {
 				ctx.SendChain(message.Text(serviceErr, err))
 			}
 			/***********设置字体颜色为黑色***********/
 			canvas.SetRGB(0, 0, 0)
 			/***********设置字体大小,并获取字体高度用来定位***********/
-			if err = canvas.LoadFontFace(text.BoldFontFile, fontSize); err != nil {
+			if err = canvas.ParseFontFace(boldfd, fontSize); err != nil {
 				ctx.SendChain(message.Text(serviceErr, err))
 				return
 			}
@@ -424,7 +426,7 @@ func init() {
 			canvas.DrawString("序号\t\t歌单名\t\t歌曲数量\t\t网易云歌单ID", 20, 50-h) // 放置在中间位置
 			canvas.DrawString("——————————————————————", 20, 70-h)
 			/***********设置字体大小,并获取字体高度用来定位***********/
-			if err = canvas.LoadFontFace(text.FontFile, fontSize); err != nil {
+			if err = canvas.ParseFontFace(fd, fontSize); err != nil {
 				ctx.SendChain(message.Text(serviceErr, err))
 				return
 			}
@@ -444,11 +446,14 @@ func init() {
 					canvas.DrawString("当前设置的默认歌单为: "+dlist.Name, 80, float64(85+20*j)-h)
 				}
 			}
-			data, cl := writer.ToBytes(canvas.Image())
+			data, err := imgfactory.ToBytes(canvas.Image())
+			if err != nil {
+				ctx.SendChain(message.Text(serviceErr, err))
+				return
+			}
 			if id := ctx.SendChain(message.ImageBytes(data)); id.ID() == 0 {
 				ctx.SendChain(message.Text("ERROR: 可能被风控了"))
 			}
-			cl()
 		})
 	engine.OnPrefix("设置猜歌默认歌单", zero.AdminPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
@@ -522,7 +527,7 @@ func getlist(pathOfMusic string) (list []listinfo, err error) {
 
 // 遍历群文件
 func getFileURLbyFileName(ctx *zero.Ctx, fileName string) (fileSearchName, fileURL string) {
-	filesOfGroup := ctx.GetThisGroupRootFiles(ctx.Event.GroupID)
+	filesOfGroup := ctx.GetThisGroupRootFiles()
 	files := filesOfGroup.Get("files").Array()
 	folders := filesOfGroup.Get("folders").Array()
 	// 遍历当前目录的文件名

plugin/heisi/heisi.go

@@ -2,11 +2,17 @@
 package heisi
 
 import (
+	"errors"
 	"math/rand"
+	"os"
 	"strconv"
+	"time"
 	"unsafe"
 
+	"github.com/FloatTech/AnimeAPI/setu"
 	fbctxext "github.com/FloatTech/floatbox/ctxext"
+	"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"
@@ -25,6 +31,41 @@ var (
 )
 
 func init() { // 插件主体
+	p, err := setu.NewPool(setu.DefaultPoolDir,
+		func(s string) (string, error) {
+			if s != "黑丝" && s != "白丝" && s != "jk" && s != "巨乳" && s != "足控" && s != "网红" {
+				return "", errors.New("invalid call")
+			}
+			typ := setu.DefaultPoolDir + "/" + s
+			if file.IsNotExist(typ) {
+				err := os.MkdirAll(typ, 0755)
+				if err != nil {
+					return "", err
+				}
+			}
+			var pic item
+			switch s {
+			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))]
+			}
+			return pic.String(), nil
+		}, func(s string) ([]byte, error) {
+			return web.RequestDataWith(web.NewTLS12Client(), s, "GET", "http://hs.heisiwu.com/", web.RandUA(), nil)
+		}, time.Minute)
+	if err != nil {
+		panic(err)
+	}
+
 	engine := control.Register("heisi", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
 		Brief:            "黑丝",
@@ -65,22 +106,12 @@ func init() { // 插件主体
 	})).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))]
+			pic, err := p.Roll(matched[3*2:])
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
 			}
-			m := message.Message{ctxext.FakeSenderForwardNode(ctx, message.Image(pic.String()))}
+			m := message.Message{ctxext.FakeSenderForwardNode(ctx, message.Image("file:///"+file.BOTPATH+"/"+pic))}
 			if id := ctx.Send(m).ID(); id == 0 {
 				ctx.SendChain(message.Text("ERROR: 可能被风控或下载图片用时过长，请耐心等待"))
 			}

plugin/hitokoto/hitokoto.go

@@ -0,0 +1,174 @@
+// Package hitokoto 一言
+package hitokoto
+
+import (
+	"math/rand"
+	"strconv"
+	"strings"
+	"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/ctxext"
+	"github.com/FloatTech/zbputils/img/text"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+)
+
+func init() { // 插件主体
+	engine := control.Register("hitokoto", &ctrl.Options[*zero.Ctx]{
+		DisableOnDefault: false,
+		Brief:            "一言",
+		Help: "- 一言[xxx]\n" +
+			"- 系列一言",
+		PublicDataFolder: "Hitokoto",
+	})
+	getdb := fcext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool {
+		dbfile := engine.DataFolder() + "hitokoto.db"
+		_, err := engine.GetLazyData("hitokoto.db", false)
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR: ", err))
+			return false
+		}
+		hdb, err = initialize(dbfile)
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR: ", err))
+			return false
+		}
+		return true
+	})
+	engine.OnPrefix(`一言`, getdb).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			ctx.SendChain(message.Text("少女祈祷中..."))
+			args := ctx.State["args"].(string)
+			blist, err := hdb.getByKey(strings.TrimSpace(args))
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+			if len(blist) == 0 {
+				ctx.SendChain(message.Text("ERROR: hitokoto empty"))
+				return
+			}
+			m := make(message.Message, 0, 10)
+			text := strings.Builder{}
+			if len(blist) <= 10 {
+				for _, b := range blist {
+					text.WriteString(b.Hitokoto)
+					text.WriteString("\n——")
+					text.WriteString(b.From)
+					m = append(m, ctxext.FakeSenderForwardNode(ctx, message.Text(text.String())))
+					text.Reset()
+				}
+			} else {
+				indexes := map[int]struct{}{}
+				for i := 0; i < 10; i++ {
+					ind := rand.Intn(len(blist))
+					if _, ok := indexes[ind]; ok {
+						i--
+						continue
+					}
+					indexes[ind] = struct{}{}
+				}
+				for k := range indexes {
+					b := blist[k]
+					text.WriteString(b.Hitokoto)
+					text.WriteString("\n——")
+					text.WriteString(b.From)
+					m = append(m, ctxext.FakeSenderForwardNode(ctx, message.Text(text.String())))
+					text.Reset()
+				}
+			}
+			if id := ctx.Send(m).ID(); id == 0 {
+				ctx.SendChain(message.Text("ERROR: 可能被风控或下载图片用时过长，请耐心等待"))
+			}
+		})
+	engine.OnFullMatch(`系列一言`, getdb).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			next := zero.NewFutureEvent("message", 999, false, ctx.CheckSession())
+			recv, cancel := next.Repeat()
+			defer cancel()
+			results, err := hdb.getAllCategory()
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+			tex := strings.Builder{}
+			tex.WriteString("请输入系列一言序号\n")
+			for i, v := range results {
+				tex.WriteString(strconv.Itoa(i))
+				tex.WriteString(". ")
+				tex.WriteString(v.Category)
+				tex.WriteString("\n")
+			}
+			base64Str, err := text.RenderToBase64(tex.String(), 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("系列一言指令过期"))
+					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(results) {
+						ctx.SendChain(message.Text("序号非法!"))
+						continue
+					}
+					ctx.SendChain(message.Text("请欣赏系列一言: ", results[num].Category))
+					hlist, err := hdb.getByCategory(results[num].Category)
+					if err != nil {
+						ctx.SendChain(message.Text("ERROR: ", err))
+						return
+					}
+					if len(hlist) == 0 {
+						ctx.SendChain(message.Text("ERROR: hitokoto empty"))
+						return
+					}
+					m := make(message.Message, 0, 10)
+					text := strings.Builder{}
+					if len(hlist) <= 10 {
+						for _, b := range hlist {
+							text.WriteString(b.Hitokoto)
+							text.WriteString("\n——")
+							text.WriteString(b.From)
+							m = append(m, ctxext.FakeSenderForwardNode(ctx, message.Text(text.String())))
+							text.Reset()
+						}
+					} else {
+						indexes := map[int]struct{}{}
+						for i := 0; i < 10; i++ {
+							ind := rand.Intn(len(hlist))
+							if _, ok := indexes[ind]; ok {
+								i--
+								continue
+							}
+							indexes[ind] = struct{}{}
+						}
+						for k := range indexes {
+							b := hlist[k]
+							text.WriteString(b.Hitokoto)
+							text.WriteString("\n——")
+							text.WriteString(b.From)
+							m = append(m, ctxext.FakeSenderForwardNode(ctx, message.Text(text.String())))
+							text.Reset()
+						}
+					}
+					if id := ctx.Send(m).ID(); id == 0 {
+						ctx.SendChain(message.Text("ERROR: 可能被风控或下载图片用时过长，请耐心等待"))
+					}
+					return
+				}
+			}
+		})
+}

plugin/hitokoto/model.go

@@ -0,0 +1,73 @@
+package hitokoto
+
+import (
+	"os"
+
+	"github.com/jinzhu/gorm"
+)
+
+// hdb 表情包数据库全局变量
+var hdb *hitokotodb
+
+// hitokotodb 表情包数据库
+type hitokotodb gorm.DB
+
+// initialize 初始化
+func initialize(dbpath string) (db *hitokotodb, err error) {
+	if _, err = os.Stat(dbpath); err != nil || os.IsNotExist(err) {
+		// 生成文件
+		f, err := os.Create(dbpath)
+		if err != nil {
+			return nil, err
+		}
+		_ = f.Close()
+	}
+	gdb, err := gorm.Open("sqlite3", dbpath)
+	if err != nil {
+		return
+	}
+	gdb.AutoMigrate(&hitokoto{})
+	return (*hitokotodb)(gdb), nil
+}
+
+type hitokoto struct {
+	ID         int    `json:"id" gorm:"column:id;primary_key"`
+	Hitokoto   string `json:"hitokoto" gorm:"column:hitokoto"`
+	Type       string `json:"type" gorm:"column:type"`
+	From       string `json:"from" gorm:"column:from"`
+	FromWho    string `json:"from_who" gorm:"column:from_who"`
+	Creator    string `json:"creator" gorm:"column:creator"`
+	CreatorUID int    `json:"creator_uid" gorm:"column:creator_uid"`
+	Reviewer   int    `json:"reviewer" gorm:"column:reviewer"`
+	UUID       string `json:"uuid" gorm:"column:uuid"`
+	CreatedAt  string `json:"created_at" gorm:"column:created_at"`
+	Category   string `json:"catogory" gorm:"column:category"`
+}
+
+// TableName 表名
+func (hitokoto) TableName() string {
+	return "hitokoto"
+}
+
+func (hdb *hitokotodb) getByKey(key string) (b []hitokoto, err error) {
+	db := (*gorm.DB)(hdb)
+	err = db.Where("hitokoto like ?", "%"+key+"%").Find(&b).Error
+	return
+}
+
+type result struct {
+	Category string
+	Count    int
+}
+
+func (hdb *hitokotodb) getAllCategory() (results []result, err error) {
+	db := (*gorm.DB)(hdb)
+	err = db.Table("hitokoto").Select("category, count(1) as count").Group("category").Scan(&results).Error
+	return
+}
+
+func (hdb *hitokotodb) getByCategory(category string) (h []hitokoto, err error) {
+	db := (*gorm.DB)(hdb)
+	err = db.Where("category = ?", category).Find(&h).Error
+	return
+}

plugin/hs/run.go

@@ -67,7 +67,7 @@ func init() {
 				data, err := web.RequestDataWith(web.NewDefaultClient(),
 					`https://res.fbigame.com/hs/v13/`+cid+`.png?auth_key=`+
 						gjson.Get(g, `list.`+strconv.Itoa(i)+`.auth_key`).String(),
-					reqconf[0], reqconf[1], reqconf[2])
+					reqconf[0], reqconf[1], reqconf[2], nil)
 				if err == nil {
 					err = os.WriteFile(cachefile, data, 0644)
 				}
@@ -95,10 +95,10 @@ func init() {
 }
 
 func sh(s string) string {
-	data, err := web.RequestDataWith(web.NewDefaultClient(), "https://hs.fbigame.com", reqconf[0], reqconf[1], reqconf[2])
+	data, err := web.RequestDataWith(web.NewDefaultClient(), "https://hs.fbigame.com", reqconf[0], reqconf[1], reqconf[2], nil)
 	if err == nil {
 		url := hs + para + "&hash=" + strings.SplitN(strings.SplitN(helper.BytesToString(data), `var hash = "`, 2)[1], `"`, 2)[0] + "&search=" + s
-		r, err := web.RequestDataWith(web.NewDefaultClient(), url, reqconf[0], reqconf[1], reqconf[2])
+		r, err := web.RequestDataWith(web.NewDefaultClient(), url, reqconf[0], reqconf[1], reqconf[2], nil)
 		if err == nil {
 			return helper.BytesToString(r)
 		}
@@ -107,10 +107,10 @@ func sh(s string) string {
 }
 
 func kz(s string) string {
-	data, err := web.RequestDataWith(web.NewDefaultClient(), "https://hs.fbigame.com", reqconf[0], reqconf[1], reqconf[2])
+	data, err := web.RequestDataWith(web.NewDefaultClient(), "https://hs.fbigame.com", reqconf[0], reqconf[1], reqconf[2], nil)
 	if err == nil {
 		url := hs + para + "mod=general_deck_image&deck_code=" + s + "&deck_text=&hash=" + strings.SplitN(strings.SplitN(helper.BytesToString(data), `var hash = "`, 2)[1], `"`, 2)[0] + "&search=" + s
-		r, err := web.RequestDataWith(web.NewDefaultClient(), url, reqconf[0], reqconf[1], reqconf[2])
+		r, err := web.RequestDataWith(web.NewDefaultClient(), url, reqconf[0], reqconf[1], reqconf[2], nil)
 		if err == nil {
 			return "base64://" + gjson.Get(helper.BytesToString(r), "img").String()
 		}

plugin/hyaku/main.go

@@ -2,9 +2,9 @@
 package hyaku
 
 import (
+	"bytes"
 	"encoding/csv"
 	"fmt"
-	"io"
 	"math/rand"
 	"os"
 	"reflect"
@@ -12,8 +12,6 @@ import (
 	"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/control"
 	"github.com/FloatTech/zbputils/ctxext"
@@ -23,7 +21,6 @@ import (
 
 const bed = "https://gitcode.net/u011570312/OguraHyakuninIsshu/-/raw/master/"
 
-// nolint: asciicheck
 type line struct {
 	番号, 歌人, 上の句, 下の句, 上の句ひらがな, 下の句ひらがな string
 }
@@ -61,56 +58,36 @@ func init() {
 			"- 百人一首之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) {
-			data, err := web.RequestDataWith(web.NewTLS12Client(), bed+"小倉百人一首.csv", "GET", "gitcode.net", web.RandUA())
-			if err != nil {
-				_ = os.Remove(csvfile)
-				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)
-			}
+	data, err := engine.GetCustomLazyData(bed, "小倉百人一首.csv")
+	if err != nil {
+		panic(err)
+	}
+	records, err := csv.NewReader(bytes.NewReader(data)).ReadAll()
+	if err != nil {
+		panic(err)
+	}
+	records = records[1:] // skip title
+	if len(records) != 100 {
+		panic("invalid csvfile")
+	}
+	for j, r := range records {
+		if len(r) != 6 {
+			panic("invalid csvfile")
 		}
-		records, err := csv.NewReader(f).ReadAll()
+		i, err := strconv.Atoi(r[0])
 		if err != nil {
 			panic(err)
 		}
-		_ = f.Close()
-		records = records[1:] // skip title
-		if len(records) != 100 {
+		i--
+		if j != i {
 			panic("invalid csvfile")
 		}
-		for j, r := range records {
-			if len(r) != 6 {
-				panic("invalid csvfile")
-			}
-			i, err := strconv.Atoi(r[0])
-			if err != nil {
-				panic(err)
-			}
-			i--
-			if j != i {
-				panic("invalid csvfile")
-			}
-			lines[i] = (*line)(*(*unsafe.Pointer)(unsafe.Pointer(&r)))
-		}
-	}()
+		lines[i] = (*line)(*(*unsafe.Pointer)(unsafe.Pointer(&r)))
+	}
 	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))

plugin/image_finder/keyword.go

@@ -11,7 +11,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/lucas-clemente/quic-go/http3"
+	"github.com/quic-go/quic-go/http3"
 
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
@@ -81,6 +81,10 @@ func init() {
 				ctx.SendChain(message.Text("ERROR: ", err))
 				return
 			}
+			if len(illust.ImageUrls) == 0 {
+				ctx.SendChain(message.Text("ERROR: nil image url"))
+				return
+			}
 			u := illust.ImageUrls[0]
 			n := u[strings.LastIndex(u, "/")+1 : len(u)-4]
 			f := illust.Path(0)
@@ -94,7 +98,7 @@ func init() {
 					"标题: ", il.Title, "\n",
 					"副标题: ", il.AltTitle, "\n",
 					"ID: ", il.ID, "\n",
-					"画师: ", illust.UserName, " (", illust.UserId, ")", "\n",
+					"画师: ", illust.UserName, " (", illust.UserID, ")", "\n",
 					"分级:", il.Sanity, "\n",
 					hrefre.ReplaceAllString(strings.ReplaceAll(strings.ReplaceAll(il.Description, "<br />", "\n"), "</a>", ""), ""),
 					printtags(reflect.ValueOf(&il.Tags)),
@@ -115,6 +119,7 @@ func soutuapi(keyword string) (r resultjson, err error) {
 		"GET",
 		"https://pixivel.moe/",
 		"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.61 Safari/537.36",
+		nil,
 	)
 	if err != nil {
 		return

plugin/jandan/jandan.go

@@ -33,7 +33,7 @@ func init() {
 	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)
+		err := db.Open(time.Hour)
 		if err != nil {
 			ctx.SendChain(message.Text("ERROR: ", err))
 			return false

plugin/jiami/jiami.go

@@ -13,8 +13,8 @@ import (
 )
 
 const (
-	jiami1 = "http://ovooa.com/API/sho_u/?msg=%v"          // 加密api地址
-	jiami2 = "http://ovooa.com/API/sho_u/?format=1&msg=%v" // 解密api地址
+	jiami1 = "http://ovooa.caonm.net/API/sho_u/?msg=%v"          // 加密api地址
+	jiami2 = "http://ovooa.caonm.net/API/sho_u/?format=1&msg=%v" // 解密api地址
 
 )
 

plugin/jikipedia/main.go

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

@@ -32,7 +32,7 @@ func init() { // 插件主体
 			ctx.SendChain(message.Text("ERROR: ", err))
 			return false
 		}
-		err = db.Open(time.Hour * 24)
+		err = db.Open(time.Hour)
 		if err != nil {
 			ctx.SendChain(message.Text("ERROR: ", err))
 			return false

plugin/kfccrazythursday/kfccrazythursday.go

@@ -0,0 +1,31 @@
+// Package kfccrazythursday 疯狂星期四
+package kfccrazythursday
+
+import (
+	"github.com/FloatTech/floatbox/web"
+	ctrl "github.com/FloatTech/zbpctrl"
+	"github.com/FloatTech/zbputils/control"
+	"github.com/tidwall/gjson"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+)
+
+const (
+	crazyURL = "https://www.iculture.cc/demo/CrazyThursday/api/kfc.php"
+)
+
+func init() {
+	engine := control.Register("kfccrazythursday", &ctrl.Options[*zero.Ctx]{
+		DisableOnDefault: false,
+		Brief:            "疯狂星期四",
+		Help:             "疯狂星期四\n",
+	})
+	engine.OnFullMatch("疯狂星期四").SetBlock(true).Handle(func(ctx *zero.Ctx) {
+		data, err := web.GetData(crazyURL)
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR: ", err))
+			return
+		}
+		ctx.SendChain(message.Text(gjson.ParseBytes(data).Get("@this.0.content").String()))
+	})
+}

plugin/manager/manager.go

@@ -73,7 +73,7 @@ func init() { // 插件主体
 
 	go func() {
 		db.DBPath = engine.DataFolder() + "config.db"
-		err := db.Open(time.Hour * 24)
+		err := db.Open(time.Hour)
 		if err != nil {
 			panic(err)
 		}
@@ -95,13 +95,11 @@ func init() { // 插件主体
 	// 升为管理
 	engine.OnRegex(`^升为管理.*?(\d+)`, zero.OnlyGroup, zero.SuperUserPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			ctx.SetGroupAdmin(
-				ctx.Event.GroupID,
+			ctx.SetThisGroupAdmin(
 				math.Str2Int64(ctx.State["regex_matched"].([]string)[1]), // 被升为管理的人的qq
 				true,
 			)
-			nickname := ctx.GetGroupMemberInfo( // 被升为管理的人的昵称
-				ctx.Event.GroupID,
+			nickname := ctx.GetThisGroupMemberInfo( // 被升为管理的人的昵称
 				math.Str2Int64(ctx.State["regex_matched"].([]string)[1]), // 被升为管理的人的qq
 				false,
 			).Get("nickname").Str
@@ -110,13 +108,11 @@ func init() { // 插件主体
 	// 取消管理
 	engine.OnRegex(`^取消管理.*?(\d+)`, zero.OnlyGroup, zero.SuperUserPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			ctx.SetGroupAdmin(
-				ctx.Event.GroupID,
+			ctx.SetThisGroupAdmin(
 				math.Str2Int64(ctx.State["regex_matched"].([]string)[1]), // 被取消管理的人的qq
 				false,
 			)
-			nickname := ctx.GetGroupMemberInfo( // 被取消管理的人的昵称
-				ctx.Event.GroupID,
+			nickname := ctx.GetThisGroupMemberInfo( // 被取消管理的人的昵称
 				math.Str2Int64(ctx.State["regex_matched"].([]string)[1]), // 被取消管理的人的qq
 				false,
 			).Get("nickname").Str
@@ -125,13 +121,11 @@ func init() { // 插件主体
 	// 踢出群聊
 	engine.OnRegex(`^踢出群聊.*?(\d+)`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			ctx.SetGroupKick(
-				ctx.Event.GroupID,
+			ctx.SetThisGroupKick(
 				math.Str2Int64(ctx.State["regex_matched"].([]string)[1]), // 被踢出群聊的人的qq
 				false,
 			)
-			nickname := ctx.GetGroupMemberInfo( // 被踢出群聊的人的昵称
-				ctx.Event.GroupID,
+			nickname := ctx.GetThisGroupMemberInfo( // 被踢出群聊的人的昵称
 				math.Str2Int64(ctx.State["regex_matched"].([]string)[1]), // 被踢出群聊的人的qq
 				false,
 			).Get("nickname").Str
@@ -148,19 +142,13 @@ func init() { // 插件主体
 	// 开启全体禁言
 	engine.OnRegex(`^开启全员禁言$`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			ctx.SetGroupWholeBan(
-				ctx.Event.GroupID,
-				true,
-			)
+			ctx.SetThisGroupWholeBan(true)
 			ctx.SendChain(message.Text("全员自闭开始~"))
 		})
 	// 解除全员禁言
 	engine.OnRegex(`^解除全员禁言$`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			ctx.SetGroupWholeBan(
-				ctx.Event.GroupID,
-				false,
-			)
+			ctx.SetThisGroupWholeBan(false)
 			ctx.SendChain(message.Text("全员自闭结束~"))
 		})
 	// 禁言
@@ -180,8 +168,7 @@ func init() { // 插件主体
 			if duration >= 43200 {
 				duration = 43199 // qq禁言最大时长为一个月
 			}
-			ctx.SetGroupBan(
-				ctx.Event.GroupID,
+			ctx.SetThisGroupBan(
 				math.Str2Int64(ctx.State["regex_matched"].([]string)[1]), // 要禁言的人的qq
 				duration*60, // 要禁言的时间（分钟）
 			)
@@ -190,8 +177,7 @@ func init() { // 插件主体
 	// 解除禁言
 	engine.OnRegex(`^解除禁言.*?(\d+)`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			ctx.SetGroupBan(
-				ctx.Event.GroupID,
+			ctx.SetThisGroupBan(
 				math.Str2Int64(ctx.State["regex_matched"].([]string)[1]), // 要解除禁言的人的qq
 				0,
 			)
@@ -214,55 +200,69 @@ func init() { // 插件主体
 			if duration >= 43200 {
 				duration = 43199 // qq禁言最大时长为一个月
 			}
-			ctx.SetGroupBan(
-				ctx.Event.GroupID,
+			ctx.SetThisGroupBan(
 				ctx.Event.UserID,
 				duration*60, // 要自闭的时间（分钟）
 			)
 			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("名字太长啦！"))
 				return
 			}
-			ctx.SetGroupCard(
-				ctx.Event.GroupID,
+			ctx.SetThisGroupCard(
 				math.Str2Int64(ctx.State["regex_matched"].([]string)[1]), // 被修改群名片的人
 				ctx.State["regex_matched"].([]string)[2],                 // 修改成的群名片
 			)
 			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 {
+			sptitle := ctx.State["regex_matched"].([]string)[2]
+			if sptitle == "" {
+				ctx.SendChain(message.Text("头衔不能为空！"))
+				return
+			} else if len(sptitle) > 18 {
 				ctx.SendChain(message.Text("头衔太长啦！"))
 				return
 			}
-			ctx.SetGroupSpecialTitle(
-				ctx.Event.GroupID,
+			ctx.SetThisGroupSpecialTitle(
 				math.Str2Int64(ctx.State["regex_matched"].([]string)[1]), // 被修改群头衔的人
-				ctx.State["regex_matched"].([]string)[2],                 // 修改成的群头衔
+				sptitle, // 修改成的群头衔
 			)
 			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 {
+			sptitle := ctx.State["regex_matched"].([]string)[1]
+			if sptitle == "" {
+				ctx.SendChain(message.Text("头衔不能为空！"))
+				return
+			} else if len(sptitle) > 18 {
 				ctx.SendChain(message.Text("头衔太长啦！"))
 				return
 			}
-			ctx.SetGroupSpecialTitle(
-				ctx.Event.GroupID,
-				ctx.Event.UserID,                         // 被修改群头衔的人
-				ctx.State["regex_matched"].([]string)[1], // 修改成的群头衔
+			ctx.SetThisGroupSpecialTitle(
+				ctx.Event.UserID, // 被修改群头衔的人
+				sptitle,          // 修改成的群头衔
 			)
 			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) {
@@ -427,7 +427,7 @@ func init() { // 插件主体
 						case <-time.After(time.Minute):
 							cancel()
 							ctx.SendChain(message.Text("拜拜啦~"))
-							ctx.SetGroupKick(ctx.Event.GroupID, uid, false)
+							ctx.SetThisGroupKick(uid, false)
 						case <-recv:
 							cancel()
 							ctx.SendChain(message.Text("答对啦~"))
@@ -576,7 +576,7 @@ func init() { // 插件主体
 			if ok {
 				ctx.SetGroupAddRequest(ctx.Event.Flag, "add", true, "")
 				process.SleepAbout1sTo2s()
-				ctx.SetGroupCard(ctx.Event.GroupID, ctx.Event.UserID, ghun)
+				ctx.SetThisGroupCard(ctx.Event.UserID, ghun)
 			} else {
 				ctx.SetGroupAddRequest(ctx.Event.Flag, "add", false, reason)
 			}
@@ -600,7 +600,7 @@ func init() { // 插件主体
 		}
 	})
 	engine.OnCommand("精华列表", zero.OnlyGroup, zero.AdminPermission).SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
-		list := ctx.GetGroupEssenceMessageList(ctx.Event.GroupID).Array()
+		list := ctx.GetThisGroupEssenceMessageList().Array()
 		msg := message.Message{ctxext.FakeSenderForwardNode(ctx, message.Text("本群精华列表："))}
 		n := len(list)
 		if n > 30 {
@@ -657,7 +657,7 @@ func welcometocq(ctx *zero.Ctx, welcome string) string {
 	at := "[CQ:at,qq=" + uid + "]"                                                  // at用户
 	avatar := "[CQ:image,file=" + "http://q4.qlogo.cn/g?b=qq&nk=" + uid + "&s=640]" // 用户头像
 	gid := strconv.FormatInt(ctx.Event.GroupID, 10)                                 // 群id
-	groupname := ctx.GetGroupInfo(ctx.Event.GroupID, true).Name                     // 群名
+	groupname := ctx.GetThisGroupInfo(true).Name                                    // 群名
 	cqstring := strings.ReplaceAll(welcome, "{at}", at)
 	cqstring = strings.ReplaceAll(cqstring, "{nickname}", nickname)
 	cqstring = strings.ReplaceAll(cqstring, "{avatar}", avatar)

plugin/moegoe/main.go

@@ -2,12 +2,17 @@
 package moegoe
 
 import (
+	"crypto/md5"
+	"encoding/hex"
 	"fmt"
 	"net/url"
 
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
+	"github.com/FloatTech/AnimeAPI/tts/genshin"
+	"github.com/FloatTech/floatbox/binary"
+	"github.com/FloatTech/floatbox/file"
 	ctrl "github.com/FloatTech/zbpctrl"
 	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
@@ -16,22 +21,22 @@ import (
 const (
 	jpapi = "https://moegoe.azurewebsites.net/api/speak?text=%s&id=%d"
 	krapi = "https://moegoe.azurewebsites.net/api/speakkr?text=%s&id=%d"
-	cnapi = "https://genshin.azurewebsites.net/api/speak?format=mp3&text=%s&id=%d"
 )
 
 var speakers = map[string]uint{
 	"宁宁": 0, "爱瑠": 1, "芳乃": 2, "茉子": 3, "丛雨": 4, "小春": 5, "七海": 6,
 	"Sua": 0, "Mimiru": 1, "Arin": 2, "Yeonhwa": 3, "Yuhwa": 4, "Seonbae": 5,
-	"派蒙": 0, "凯亚": 1, "安柏": 2, "丽莎": 3, "琴": 4, "香菱": 5, "枫原万叶": 6, "迪卢克": 7, "温迪": 8, "可莉": 9, "早柚": 10, "托马": 11, "芭芭拉": 12, "优菈": 13, "云堇": 14, "钟离": 15, "魈": 16, "凝光": 17, "雷电将军": 18, "北斗": 19, "甘雨": 20, "七七": 21, "刻晴": 22, "神里绫华": 23, "戴因斯雷布": 24, "雷泽": 25, "神里绫人": 26, "罗莎莉亚": 27, "阿贝多": 28, "八重神子": 29, "宵宫": 30, "荒泷一斗": 31, "九条裟罗": 32, "夜兰": 33, "珊瑚宫心海": 34, "五郎": 35, "散兵": 36, "女士": 37, "达达利亚": 38, "莫娜": 39, "班尼特": 40, "申鹤": 41, "行秋": 42, "烟绯": 43, "久岐忍": 44, "辛焱": 45, "砂糖": 46, "胡桃": 47, "重云": 48, "菲谢尔": 49, "诺艾尔": 50, "迪奥娜": 51, "鹿野院平藏": 52,
 }
 
+var 原 = newapikeystore("./data/tts/o.txt")
+
 func init() {
 	en := control.Register("moegoe", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
 		Brief:            "日韩中 VITS 模型拟声",
 		Help: "- 让[宁宁|爱瑠|芳乃|茉子|丛雨|小春|七海]说(日语)\n" +
 			"- 让[Sua|Mimiru|Arin|Yeonhwa|Yuhwa|Seonbae]说(韩语)\n" +
-			"- 让[派蒙|凯亚|安柏|丽莎|琴|香菱|枫原万叶|迪卢克|温迪|可莉|早柚|托马|芭芭拉|优菈|云堇|钟离|魈|凝光|雷电将军|北斗|甘雨|七七|刻晴|神里绫华|雷泽|神里绫人|罗莎莉亚|阿贝多|八重神子|宵宫|荒泷一斗|九条裟罗|夜兰|珊瑚宫心海|五郎|达达利亚|莫娜|班尼特|申鹤|行秋|烟绯|久岐忍|辛焱|砂糖|胡桃|重云|菲谢尔|诺艾尔|迪奥娜|鹿野院平藏]说(中文)",
+			"- 让[空|荧|派蒙|纳西妲|阿贝多|温迪|枫原万叶|钟离|荒泷一斗|八重神子|艾尔海森|提纳里|迪希雅|卡维|宵宫|莱依拉|赛诺|诺艾尔|托马|凝光|莫娜|北斗|神里绫华|雷电将军|芭芭拉|鹿野院平藏|五郎|迪奥娜|凯亚|安柏|班尼特|琴|柯莱|夜兰|妮露|辛焱|珐露珊|魈|香菱|达达利亚|砂糖|早柚|云堇|刻晴|丽莎|迪卢克|烟绯|重云|珊瑚宫心海|胡桃|可莉|流浪者|久岐忍|神里绫人|甘雨|戴因斯雷布|优菈|菲谢尔|行秋|白术|九条裟罗|雷泽|申鹤|迪娜泽黛|凯瑟琳|多莉|坎蒂丝|萍姥姥|罗莎莉亚|留云借风真君|绮良良|瑶瑶|七七|奥兹|米卡|夏洛蒂|埃洛伊|博士|女士|大慈树王|三月七|娜塔莎|希露瓦|虎克|克拉拉|丹恒|希儿|布洛妮娅|瓦尔特|杰帕德|佩拉|姬子|艾丝妲|白露|星|穹|桑博|伦纳德|停云|罗刹|卡芙卡|彦卿|史瓦罗|螺丝咕姆|阿兰|银狼|素裳|丹枢|黑塔|景元|帕姆|可可利亚|半夏|符玄|公输师傅|奥列格|青雀|大毫|青镞|费斯曼|绿芙蓉|镜流|信使|丽塔|失落迷迭|缭乱星棘|伊甸|伏特加女孩|狂热蓝调|莉莉娅|萝莎莉娅|八重樱|八重霞|卡莲|第六夜想曲|卡萝尔|姬子|极地战刃|布洛妮娅|次生银翼|理之律者|真理之律者|迷城骇兔|希儿|魇夜星渊|黑希儿|帕朵菲莉丝|天元骑英|幽兰黛尔|德丽莎|月下初拥|朔夜观星|暮光骑士|明日香|李素裳|格蕾修|梅比乌斯|渡鸦|人之律者|爱莉希雅|爱衣|天穹游侠|琪亚娜|空之律者|终焉之律者|薪炎之律者|云墨丹心|符华|识之律者|维尔薇|始源之律者|芽衣|雷之律者|苏莎娜|阿波尼亚|陆景和|莫弈|夏彦|左然|标贝]说(中文)",
 	}).ApplySingle(ctxext.DefaultSingle)
 	en.OnRegex("^让(宁宁|爱瑠|芳乃|茉子|丛雨|小春|七海)说([A-Za-z\\s\\d\u3005\u3040-\u30ff\u4e00-\u9fff\uff11-\uff19\uff21-\uff3a\uff41-\uff5a\uff66-\uff9d\\pP]+)$").Limit(ctxext.LimitByGroup).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
@@ -45,10 +50,23 @@ func init() {
 			id := speakers[ctx.State["regex_matched"].([]string)[1]]
 			ctx.SendChain(message.Record(fmt.Sprintf(krapi, url.QueryEscape(text), id)))
 		})
-	en.OnRegex("^让(派蒙|凯亚|安柏|丽莎|琴|香菱|枫原万叶|迪卢克|温迪|可莉|早柚|托马|芭芭拉|优菈|云堇|钟离|魈|凝光|雷电将军|北斗|甘雨|七七|刻晴|神里绫华|雷泽|神里绫人|罗莎莉亚|阿贝多|八重神子|宵宫|荒泷一斗|九条裟罗|夜兰|珊瑚宫心海|五郎|达达利亚|莫娜|班尼特|申鹤|行秋|烟绯|久岐忍|辛焱|砂糖|胡桃|重云|菲谢尔|诺艾尔|迪奥娜|鹿野院平藏)说([\\s\u4e00-\u9fa5\\pP]+)$").Limit(ctxext.LimitByGroup).SetBlock(true).
+	en.OnRegex("^让(空|荧|派蒙|纳西妲|阿贝多|温迪|枫原万叶|钟离|荒泷一斗|八重神子|艾尔海森|提纳里|迪希雅|卡维|宵宫|莱依拉|赛诺|诺艾尔|托马|凝光|莫娜|北斗|神里绫华|雷电将军|芭芭拉|鹿野院平藏|五郎|迪奥娜|凯亚|安柏|班尼特|琴|柯莱|夜兰|妮露|辛焱|珐露珊|魈|香菱|达达利亚|砂糖|早柚|云堇|刻晴|丽莎|迪卢克|烟绯|重云|珊瑚宫心海|胡桃|可莉|流浪者|久岐忍|神里绫人|甘雨|戴因斯雷布|优菈|菲谢尔|行秋|白术|九条裟罗|雷泽|申鹤|迪娜泽黛|凯瑟琳|多莉|坎蒂丝|萍姥姥|罗莎莉亚|留云借风真君|绮良良|瑶瑶|七七|奥兹|米卡|夏洛蒂|埃洛伊|博士|女士|大慈树王|三月七|娜塔莎|希露瓦|虎克|克拉拉|丹恒|希儿|布洛妮娅|瓦尔特|杰帕德|佩拉|姬子|艾丝妲|白露|星|穹|桑博|伦纳德|停云|罗刹|卡芙卡|彦卿|史瓦罗|螺丝咕姆|阿兰|银狼|素裳|丹枢|黑塔|景元|帕姆|可可利亚|半夏|符玄|公输师傅|奥列格|青雀|大毫|青镞|费斯曼|绿芙蓉|镜流|信使|丽塔|失落迷迭|缭乱星棘|伊甸|伏特加女孩|狂热蓝调|莉莉娅|萝莎莉娅|八重樱|八重霞|卡莲|第六夜想曲|卡萝尔|姬子|极地战刃|布洛妮娅|次生银翼|理之律者|真理之律者|迷城骇兔|希儿|魇夜星渊|黑希儿|帕朵菲莉丝|天元骑英|幽兰黛尔|德丽莎|月下初拥|朔夜观星|暮光骑士|明日香|李素裳|格蕾修|梅比乌斯|渡鸦|人之律者|爱莉希雅|爱衣|天穹游侠|琪亚娜|空之律者|终焉之律者|薪炎之律者|云墨丹心|符华|识之律者|维尔薇|始源之律者|芽衣|雷之律者|苏莎娜|阿波尼亚|陆景和|莫弈|夏彦|左然|标贝)说([\\s\u4e00-\u9fa5\\pP]+)$").Limit(ctxext.LimitByGroup).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
+			if 原.k == "" {
+				return
+			}
 			text := ctx.State["regex_matched"].([]string)[2]
-			id := speakers[ctx.State["regex_matched"].([]string)[1]]
-			ctx.SendChain(message.Record(fmt.Sprintf(cnapi, url.QueryEscape(text), id)))
+			name := ctx.State["regex_matched"].([]string)[1]
+			rec := fmt.Sprintf(genshin.CNAPI, url.QueryEscape(name), url.QueryEscape(text), url.QueryEscape(原.k))
+			b := md5.Sum(binary.StringToBytes(rec))
+			fn := hex.EncodeToString(b[:])
+			fp := "data/tts/" + fn
+			if file.IsNotExist(fp) {
+				if file.DownloadTo(rec, fp) != nil {
+					return
+				}
+			}
+			rec = "file:///" + file.BOTPATH + "/" + fp
+			ctx.SendChain(message.Record(rec))
 		})
 }

plugin/moegoe/model.go

@@ -0,0 +1,24 @@
+package moegoe
+
+import (
+	"os"
+
+	"github.com/FloatTech/floatbox/binary"
+	"github.com/FloatTech/floatbox/file"
+)
+
+type apikeystore struct {
+	k string
+	p string
+}
+
+func newapikeystore(p string) (s apikeystore) {
+	s.p = p
+	if file.IsExist(p) {
+		data, err := os.ReadFile(p)
+		if err == nil {
+			s.k = binary.BytesToString(data)
+		}
+	}
+	return
+}

plugin/moyu/holiday_test.go

@@ -8,7 +8,7 @@ import (
 	reg "github.com/fumiama/go-registry"
 )
 
-var sr = reg.NewRegedit("reilia.fumiama.top:32664", "fumiama", "--")
+var sr = reg.NewRegedit("reilia.fumiama.top:32664", "", "fumiama", "--")
 
 func TestGetHoliday(t *testing.T) {
 	registry.Connect()

plugin/moyu/nowork.go

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

plugin/music/selecter.go

@@ -1,4 +1,4 @@
-// Package music QQ音乐、网易云、酷狗、酷我 点歌
+// Package music QQ音乐、网易云、酷狗、酷我、咪咕 点歌
 package music
 
 import (
@@ -28,11 +28,14 @@ func init() {
 		Help: "- 点歌[xxx]\n" +
 			"- 网易点歌[xxx]\n" +
 			"- 酷我点歌[xxx]\n" +
-			"- 酷狗点歌[xxx]",
+			"- 酷狗点歌[xxx]\n" +
+			"- 咪咕点歌[xxx]",
 	}).OnRegex(`^(.{0,2})点歌\s?(.{1,25})$`).SetBlock(true).Limit(ctxext.LimitByUser).
 		Handle(func(ctx *zero.Ctx) {
 			// switch 平台
 			switch ctx.State["regex_matched"].([]string)[1] {
+			case "咪咕":
+				ctx.SendChain(migu(ctx.State["regex_matched"].([]string)[2]))
 			case "酷我":
 				ctx.SendChain(kuwo(ctx.State["regex_matched"].([]string)[2]))
 			case "酷狗":
@@ -45,6 +48,32 @@ func init() {
 		})
 }
 
+// migu 返回咪咕音乐卡片
+func migu(keyword string) message.MessageSegment {
+	headers := http.Header{
+		"Cookie":     []string{"audioplayer_exist=1; audioplayer_open=0; migu_cn_cookie_id=3ad476db-f021-4bda-ab91-c485ac3d56a0; Hm_lvt_ec5a5474d9d871cb3d82b846d861979d=1671119573; Hm_lpvt_ec5a5474d9d871cb3d82b846d861979d=1671119573; WT_FPC=id=279ef92eaf314cbb8d01671116477485:lv=1671119583092:ss=1671116477485"},
+		"csrf":       []string{"LWKACV45JSQ"},
+		"User-Agent": []string{"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36"},
+		"Referer":    []string{"http://m.music.migu.cn"},
+		"proxy":      []string{"false"},
+	}
+	// 搜索音乐信息 第一首歌
+	search, _ := url.Parse("http://m.music.migu.cn/migu/remoting/scr_search_tag")
+	search.RawQuery = url.Values{
+		"keyword": []string{keyword},
+		"type":    []string{"2"},
+		"pgc":     []string{"1"},
+		"rows":    []string{"10"},
+	}.Encode()
+	info := gjson.ParseBytes(netGet(search.String(), headers)).Get("musics.0")
+	// 返回音乐卡片
+	return message.CustomMusic(
+		fmt.Sprintf("https://music.migu.cn/v3/music/song/%s", info.Get("copyrightId").String()),
+		info.Get("mp3").String(),
+		info.Get("songName").String(),
+	).Add("content", info.Get("artist").Str).Add("image", info.Get("cover").Str).Add("subtype", "migu")
+}
+
 // kuwo 返回酷我音乐卡片
 func kuwo(keyword string) message.MessageSegment {
 	headers := http.Header{
@@ -63,23 +92,20 @@ func kuwo(keyword string) message.MessageSegment {
 	}.Encode()
 	info := gjson.ParseBytes(netGet(search.String(), headers)).Get("data.list.0")
 	// 获得音乐直链
-	music, _ := url.Parse("http://www.kuwo.cn/url")
+	music, _ := url.Parse("http://www.kuwo.cn/api/v1/www/music/playUrl")
 	music.RawQuery = url.Values{
-		"format":      []string{"mp3"},
-		"rid":         []string{fmt.Sprintf("%d", info.Get("rid").Int())},
-		"response":    []string{"url"},
+		"mid":         []string{fmt.Sprintf("%d", info.Get("rid").Int())},
 		"type":        []string{"convert_url3"},
-		"br":          []string{"128kmp3"},
-		"from":        []string{"web"},
+		"br":          []string{"320kmp3"},
 		"httpsStatus": []string{"1"},
 	}.Encode()
 	audio := gjson.ParseBytes(netGet(music.String(), headers))
 	// 返回音乐卡片
 	return message.CustomMusic(
 		fmt.Sprintf("https://www.kuwo.cn/play_detail/%d", info.Get("rid").Int()),
-		audio.Get("url").Str,
+		audio.Get("data.url").Str,
 		info.Get("name").Str,
-	).Add("content", info.Get("artist").Str).Add("image", info.Get("pic").Str)
+	).Add("content", info.Get("artist").Str).Add("image", info.Get("pic").Str).Add("subtype", "kuwo")
 }
 
 // kugou 返回酷狗音乐卡片
@@ -133,7 +159,7 @@ func kugou(keyword string) message.MessageSegment {
 		"https://www.kugou.com/song/#hash="+audio.Get("hash").Str+"&album_id="+audio.Get("album_id").Str,
 		strings.ReplaceAll(audio.Get("play_backup_url").Str, "\\/", "/"),
 		audio.Get("audio_name").Str,
-	).Add("content", audio.Get("author_name").Str).Add("image", audio.Get("img").Str)
+	).Add("content", audio.Get("author_name").Str).Add("image", audio.Get("img").Str).Add("subtype", "kugou")
 }
 
 // cloud163 返回网易云音乐卡片
@@ -151,7 +177,7 @@ func cloud163(keyword string) (msg message.MessageSegment) {
 // qqmusic 返回QQ音乐卡片
 func qqmusic(keyword string) (msg message.MessageSegment) {
 	requestURL := "https://c.y.qq.com/splcloud/fcgi-bin/smartbox_new.fcg?platform=yqq.json&key=" + url.QueryEscape(keyword)
-	data, err := web.RequestDataWith(web.NewDefaultClient(), requestURL, "GET", "", web.RandUA())
+	data, err := web.RequestDataWith(web.NewDefaultClient(), requestURL, "GET", "", web.RandUA(), nil)
 	if err != nil {
 		msg = message.Text("ERROR: ", err)
 		return

plugin/nativesetu/data.go

@@ -33,10 +33,8 @@ type nsetu struct {
 
 func (n *nsetu) List() (l []string) {
 	if file.IsExist(n.db.DBPath) {
-		err := n.db.Open(time.Hour * 24)
-		if err == nil {
-			l, err = n.db.ListTables()
-		}
+		var err error
+		l, err = n.db.ListTables()
 		if err != nil {
 			logrus.Errorln("[nsetu]", err)
 		}
@@ -49,6 +47,10 @@ func (n *nsetu) scanall(path string) error {
 	root := os.DirFS(path)
 	_ = n.db.Close()
 	_ = os.Remove(n.db.DBPath)
+	err := n.db.Open(time.Hour)
+	if err != nil {
+		return err
+	}
 	return fs.WalkDir(root, ".", func(path string, d fs.DirEntry, err error) error {
 		if err != nil {
 			return err

plugin/nativesetu/main.go

@@ -4,6 +4,7 @@ package nativesetu
 import (
 	"fmt"
 	"os"
+	"time"
 
 	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
@@ -42,6 +43,10 @@ func init() {
 			logrus.Infoln("[nsetu] set setu dir to", setupath)
 		}
 	}
+	err := ns.db.Open(time.Hour)
+	if err != nil {
+		panic(err)
+	}
 
 	engine.OnRegex(`^本地(.*)$`, fcext.ValueInList(func(ctx *zero.Ctx) string { return ctx.State["regex_matched"].([]string)[1] }, ns)).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {

plugin/nativewife/main.go

@@ -17,6 +17,7 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
 	"github.com/FloatTech/floatbox/file"
+	"github.com/FloatTech/floatbox/process"
 	ctrl "github.com/FloatTech/zbpctrl"
 	"github.com/FloatTech/zbputils/control"
 )
@@ -78,8 +79,9 @@ func init() {
 						return
 					}
 				}
-				err := file.DownloadTo(url, grpfolder+"/"+name, true)
+				err := file.DownloadTo(url, grpfolder+"/"+name)
 				if err == nil {
+					process.SleepAbout1sTo2s()
 					ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("成功！"))
 				} else {
 					ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("错误：", err.Error()))

plugin/nihongo/nihongo.go

@@ -30,7 +30,7 @@ func init() {
 			ctx.SendChain(message.Text("ERROR: ", err))
 			return false
 		}
-		err = db.Open(time.Hour * 24)
+		err = db.Open(time.Hour)
 		if err != nil {
 			ctx.SendChain(message.Text("ERROR: ", err))
 			return false

plugin/novel/qianbi.go

@@ -3,19 +3,22 @@ package novel
 
 import (
 	"fmt"
-	"io"
 	"net/http"
-	"net/http/cookiejar"
 	"net/url"
+	"os"
+	"path/filepath"
 	"regexp"
 	"strings"
+	"sync"
 
 	"github.com/antchfx/htmlquery"
+	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
 	ub "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"
@@ -32,26 +35,49 @@ const (
 	ua           = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.110 Safari/537.36"
 	loginURL     = websiteURL + "/login.php?do=submit&jumpurl=https%3A%2F%2Fwww.23qb.com%2F"
 	searchURL    = websiteURL + "/saerch.php"
+	downloadURL  = websiteURL + "/modules/article/txtarticle.php?id=%v"
+	detailURL    = websiteURL + "/book/%v/"
 	idReg        = `/(\d+)/`
 )
 
-var gCurCookieJar *cookiejar.Jar
+var (
+	cachePath string
+	// apikey 由账号和密码拼接而成, 例: zerobot,123456
+	apikey   string
+	apikeymu sync.Mutex
+)
 
 func init() {
-	control.Register("novel", &ctrl.Options[*zero.Ctx]{
+	engine := control.Register("novel", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
+		Extra:            control.ExtraFromString("novel"),
 		Brief:            "铅笔小说网搜索",
-		Help:             "- 小说[xxx]",
-	}).OnRegex("^小说([\u4E00-\u9FA5A-Za-z0-9]{1,25})$").SetBlock(true).Limit(ctxext.LimitByUser).
+		Help: "- 小说[xxx]\n" +
+			"- 设置小说配置 zerobot 123456\n" +
+			"- 下载小说30298\n" +
+			"建议去https://www.23qb.com/ 注册一个账号, 小说下载有积分限制",
+		PrivateDataFolder: "novel",
+	})
+	cachePath = engine.DataFolder() + "cache/"
+	_ = os.MkdirAll(cachePath, 0755)
+	engine.OnRegex("^小说([\u4E00-\u9FA5A-Za-z0-9]{1,25})$").SetBlock(true).Limit(ctxext.LimitByUser).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SendChain(message.Text("少女祈祷中......"))
-			err := login(username, password)
+			key := getAPIKey(ctx)
+			u, p, _ := strings.Cut(key, ",")
+			if u == "" {
+				u = username
+			}
+			if p == "" {
+				p = password
+			}
+			cookie, err := login(u, p)
 			if err != nil {
 				ctx.SendChain(message.Text("ERROR: ", err))
 				return
 			}
 			searchKey := ctx.State["regex_matched"].([]string)[1]
-			searchHTML, err := search(searchKey)
+			searchHTML, err := search(searchKey, cookie)
 			if err != nil {
 				ctx.SendChain(message.Text("ERROR: ", err))
 				return
@@ -93,7 +119,7 @@ func init() {
 						ctx.SendChain(message.Text("ERROR: ", err))
 						return
 					}
-					if id := ctx.SendChain(message.Image("base64://" + helper.BytesToString(data))); id.ID() == 0 {
+					if id := ctx.SendChain(message.Image("base64://" + ub.BytesToString(data))); id.ID() == 0 {
 						ctx.SendChain(message.Text("ERROR: 可能被风控了"))
 					}
 				} else {
@@ -124,23 +150,76 @@ func init() {
 				ctx.SendChain(message.Text(text))
 			}
 		})
+	engine.OnRegex(`^设置小说配置\s(.*[^\s$])\s(.+)$`, zero.SuperUserPermission).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			regexMatched := ctx.State["regex_matched"].([]string)
+			err := setAPIKey(ctx.State["manager"].(*ctrl.Control[*zero.Ctx]), regexMatched[1]+","+regexMatched[2])
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+			ctx.SendChain(message.Text("成功设置小说配置\nusername: ", regexMatched[1], "\npassword: ", regexMatched[2]))
+		})
+	engine.OnRegex("^下载小说([0-9]{1,25})$").SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			regexMatched := ctx.State["regex_matched"].([]string)
+			id := regexMatched[1]
+			ctx.SendChain(message.Text("少女祈祷中......"))
+			key := getAPIKey(ctx)
+			u, p, _ := strings.Cut(key, ",")
+			if u == "" {
+				u = username
+			}
+			if p == "" {
+				p = password
+			}
+			cookie, err := login(u, p)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+			detailHTML, err := detail(id, cookie)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+			doc, err := htmlquery.Parse(strings.NewReader(detailHTML))
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+			title := htmlquery.InnerText(htmlquery.FindOne(doc, "//*[@id='bookinfo']/div[@class='bookright']/div[@class='d_title']/h1"))
+			fileName := filepath.Join(cachePath, title+".txt")
+			if file.IsExist(fileName) {
+				ctx.UploadThisGroupFile(filepath.Join(file.BOTPATH, fileName), filepath.Base(fileName), "")
+				return
+			}
+			data, err := download(id, cookie)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+			err = os.WriteFile(fileName, ub.StringToBytes(data), 0666)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+			ctx.UploadThisGroupFile(filepath.Join(file.BOTPATH, fileName), filepath.Base(fileName), "")
+		})
 }
 
-func login(username, password string) (err error) {
-	gCurCookieJar, _ = cookiejar.New(nil)
-	client := &http.Client{
-		Jar: gCurCookieJar,
-	}
-	usernameData, err := ub.UTF82GBK(helper.StringToBytes(username))
+func login(username, password string) (cookie string, err error) {
+	client := &http.Client{}
+	usernameData, err := ub.UTF82GBK(ub.StringToBytes(username))
 	if err != nil {
 		return
 	}
-	usernameGbk := helper.BytesToString(usernameData)
-	passwordData, err := ub.UTF82GBK(helper.StringToBytes(password))
+	usernameGbk := ub.BytesToString(usernameData)
+	passwordData, err := ub.UTF82GBK(ub.StringToBytes(password))
 	if err != nil {
 		return
 	}
-	passwordGbk := helper.BytesToString(passwordData)
+	passwordGbk := ub.BytesToString(passwordData)
 	loginReq, err := http.NewRequest("POST", loginURL, strings.NewReader(fmt.Sprintf("username=%s&password=%s&usecookie=315360000&action=login&submit=%s", url.QueryEscape(usernameGbk), url.QueryEscape(passwordGbk), submit)))
 	if err != nil {
 		return
@@ -151,38 +230,82 @@ func login(username, password string) (err error) {
 	if err != nil {
 		return
 	}
-	_ = loginResp.Body.Close()
+	defer loginResp.Body.Close()
+	for _, v := range loginResp.Cookies() {
+		cookie += v.Name + "=" + v.Value + ";"
+	}
 	return
 }
 
-func search(searchKey string) (searchHTML string, err error) {
-	searchKeyData, err := ub.UTF82GBK(helper.StringToBytes(searchKey))
+func search(searchKey string, cookie string) (searchHTML string, err error) {
+	searchKeyData, err := ub.UTF82GBK(ub.StringToBytes(searchKey))
 	if err != nil {
 		return
 	}
-	searchKeyGbk := helper.BytesToString(searchKeyData)
-	client := &http.Client{
-		Jar: gCurCookieJar,
-	}
-	searchReq, err := http.NewRequest("POST", searchURL, strings.NewReader(fmt.Sprintf("searchkey=%s&searchtype=all", url.QueryEscape(searchKeyGbk))))
+	searchKeyGbk := ub.BytesToString(searchKeyData)
+	data, err := web.RequestDataWithHeaders(web.NewDefaultClient(), searchURL, "POST", func(r *http.Request) error {
+		r.Header.Set("Cookie", cookie)
+		r.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+		r.Header.Set("User-Agent", ua)
+		return nil
+	}, strings.NewReader(fmt.Sprintf("searchkey=%s&searchtype=all", url.QueryEscape(searchKeyGbk))))
 	if err != nil {
 		return
 	}
-	searchReq.Header.Set("Content-Type", "application/x-www-form-urlencoded")
-	searchReq.Header.Set("User-Agent", ua)
-	searchResp, err := client.Do(searchReq)
+	searchData, err := ub.GBK2UTF8(data)
 	if err != nil {
 		return
 	}
-	searchData, err := io.ReadAll(searchResp.Body)
-	_ = searchResp.Body.Close()
-	if err != nil {
-		return
-	}
-	searchData, err = ub.GBK2UTF8(searchData)
-	if err != nil {
-		return
-	}
-	searchHTML = helper.BytesToString(searchData)
-	return searchHTML, nil
+	searchHTML = ub.BytesToString(searchData)
+	return
+}
+
+func detail(id string, cookie string) (detailHTML string, err error) {
+	data, err := web.RequestDataWithHeaders(web.NewDefaultClient(), fmt.Sprintf(detailURL, id), "GET", func(r *http.Request) error {
+		r.Header.Set("Cookie", cookie)
+		r.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+		r.Header.Set("User-Agent", ua)
+		return nil
+	}, nil)
+	if err != nil {
+		return
+	}
+	detailData, err := ub.GBK2UTF8(data)
+	if err != nil {
+		return
+	}
+	detailHTML = ub.BytesToString(detailData)
+	return
+}
+
+func download(id string, cookie string) (downloadHTML string, err error) {
+	data, err := web.RequestDataWithHeaders(web.NewDefaultClient(), fmt.Sprintf(downloadURL, id), "GET", func(r *http.Request) error {
+		r.Header.Set("Cookie", cookie)
+		r.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+		r.Header.Set("User-Agent", ua)
+		return nil
+	}, nil)
+	if err != nil {
+		return
+	}
+	downloadHTML = ub.BytesToString(data)
+	return
+}
+
+func getAPIKey(ctx *zero.Ctx) string {
+	apikeymu.Lock()
+	defer apikeymu.Unlock()
+	if apikey == "" {
+		m := ctx.State["manager"].(*ctrl.Control[*zero.Ctx])
+		_ = m.GetExtra(&apikey)
+		logrus.Debugln("[novel] get api key:", apikey)
+	}
+	return apikey
+}
+
+func setAPIKey(m *ctrl.Control[*zero.Ctx], key string) error {
+	apikeymu.Lock()
+	defer apikeymu.Unlock()
+	apikey = key
+	return m.SetExtra(apikey)
 }

plugin/omikuji/sensou.go

@@ -54,7 +54,7 @@ func init() { // 插件主体
 				ctx.SendChain(message.Text("ERROR: ", err))
 				return false
 			}
-			err = db.Open(time.Hour * 24)
+			err = db.Open(time.Hour)
 			if err != nil {
 				ctx.SendChain(message.Text("ERROR: ", err))
 				return false

plugin/qqwife/command.go

@@ -5,9 +5,12 @@ import (
 	"math/rand"
 	"sort"
 	"strconv"
+	"strings"
+	"sync"
 	"time"
 
 	"github.com/FloatTech/floatbox/math"
+	"github.com/FloatTech/imgfactory"
 	ctrl "github.com/FloatTech/zbpctrl"
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
@@ -19,51 +22,44 @@ import (
 	// 数据库
 	sql "github.com/FloatTech/sqlite"
 	// 画图
-	"github.com/Coloured-glaze/gg"
 	fcext "github.com/FloatTech/floatbox/ctxext"
 	"github.com/FloatTech/floatbox/file"
-	"github.com/FloatTech/floatbox/img/writer"
+	"github.com/FloatTech/gg"
 	"github.com/FloatTech/zbputils/img/text"
-
-	// 货币系统
-	"github.com/FloatTech/AnimeAPI/wallet"
 )
 
-// nolint: asciicheck
-// nolint: asciicheck
+type 婚姻登记 struct {
+	db *sql.Sqlite
+	sync.RWMutex
+}
+
+// 群设置
+type updateinfo struct {
+	GID        int64
+	Updatetime string  // 登记时间
+	CanMatch   int     // 嫁婚开关
+	CanNtr     int     // Ntr开关
+	CDtime     float64 // CD时间
+}
+
+// 结婚证信息
+type userinfo struct {
+	User       int64  // 用户身份证
+	Target     int64  // 对象身份证号
+	Username   string // 户主名称
+	Targetname string // 对象名称
+	Updatetime string // 登记时间
+
+}
+
 var (
 	民政局 = &婚姻登记{
 		db: &sql.Sqlite{},
 	}
-	sendtext = [...][]string{
-		{ // 表白成功
-			"是个勇敢的孩子(*/ω＼*) 今天的运气都降临在你的身边~\n\n",
-			"(´･ω･`)对方答应了你 并表示愿意当今天的CP\n\n",
-		},
-		{ // 表白失败
-			"今天的运气有一点背哦~明天再试试叭",
-			"_(:з」∠)_下次还有机会 咱抱抱你w",
-			"今天失败了惹. 摸摸头~咱明天还有机会",
-		},
-		{ // ntr成功
-			"因为你的个人魅力~~今天他就是你的了w\n\n",
-		},
-		{ // 离婚失败
-			"打是情,骂是爱,不打不亲不相爱。答应我不要分手。",
-			"床头打架床尾和，夫妻没有隔夜仇。安啦安啦，不要闹变扭。",
-		},
-		{ // 离婚成功
-			"离婚成功力\n话说你不考虑当个1？",
-			"离婚成功力\n天涯何处无芳草，何必单恋一枝花？不如再摘一支（bushi",
-		},
-	}
-)
-
-func init() {
-	engine := control.Register("qqwife", &ctrl.Options[*zero.Ctx]{
+	engine = control.Register("qqwife", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
 		Brief:            "一群一天一夫一妻制群老婆",
-		Help: "- 娶群友\n- 群老婆列表\n- [允许|禁止]自由恋爱\n- [允许|禁止]牛头人\n- 设置CD为xx小时    →(默认12小时)\n- 重置花名册\n- 重置所有花名册(用于清除所有群数据及其设置)\n" +
+		Help: "- 娶群友\n- 群老婆列表\n- [允许|禁止]自由恋爱\n- [允许|禁止]牛头人\n- 设置CD为xx小时    →(默认12小时)\n- 重置花名册\n- 重置所有花名册(用于清除所有群数据及其设置)\n- 查好感度[对方Q号|@对方QQ]\n- 好感度列表\n- 好感度数据整理 (当好感度列表出现重复名字时使用)\n" +
 			"--------------------------------\n以下指令存在CD,不跨天刷新,前两个受指令开关\n--------------------------------\n" +
 			"- (娶|嫁)@对方QQ\n自由选择对象, 自由恋爱(好感度越高成功率越高,保底30%概率)\n" +
 			"- 当[对方Q号|@对方QQ]的小三\n我和你才是真爱, 为了你我愿意付出一切(好感度越高成功率越高,保底10%概率)\n" +
@@ -72,7 +68,7 @@ func init() {
 			"- 做媒 @攻方QQ @受方QQ\n身为管理, 群友的xing福是要搭把手的(攻受双方好感度越高成功率越高,保底30%概率)\n" +
 			"--------------------------------\n好感度规则\n--------------------------------\n" +
 			"\"娶群友\"指令好感度随机增加1~5。\n\"A牛B的C\"会导致C恨A, 好感度-5;\nB为了报复A, 好感度+5(什么柜子play)\nA为BC做媒,成功B、C对A好感度+1反之-1\n做媒成功BC好感度+1" +
-			"Tips: 群老婆列表过0点刷新",
+			"\nTips: 群老婆列表过0点刷新",
 		PrivateDataFolder: "qqwife",
 	}).ApplySingle(single.New(
 		single.WithKeyFn(func(ctx *zero.Ctx) int64 { return ctx.Event.GroupID }),
@@ -84,106 +80,71 @@ func init() {
 			)
 		}),
 	))
-	getdb := fcext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool {
+	getdb = fcext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool {
 		民政局.db.DBPath = engine.DataFolder() + "结婚登记表.db"
-		err := 民政局.db.Open(time.Hour * 24)
-		if err != nil {
-			ctx.SendChain(message.Text("[qqwife]数据库发生问题力\n", err))
-			return false
+		err := 民政局.db.Open(time.Hour)
+		if err == nil {
+			// 创建群配置表
+			err = 民政局.db.Create("updateinfo", &updateinfo{})
+			if err != nil {
+				ctx.SendChain(message.Text("[ERROR]:", err))
+				return false
+			}
+			// 创建CD表
+			err = 民政局.db.Create("cdsheet", &cdsheet{})
+			if err != nil {
+				ctx.SendChain(message.Text("[ERROR]:", err))
+				return false
+			}
+			// 创建好感度表
+			err = 民政局.db.Create("favorability", &favorability{})
+			if err != nil {
+				ctx.SendChain(message.Text("[ERROR]:", err))
+				return false
+			}
+			return true
 		}
-		return true
+		ctx.SendChain(message.Text("[ERROR]:", err))
+		return false
 	})
-	// 技能CD设置
-	engine.OnRegex(`^设置CD为(\d+)小时`, zero.OnlyGroup, zero.AdminPermission, getdb).SetBlock(true).Limit(ctxext.LimitByUser).
-		Handle(func(ctx *zero.Ctx) {
-			cdTime, err := strconv.ParseFloat(ctx.State["regex_matched"].([]string)[1], 64)
-			if err != nil {
-				ctx.SendChain(message.Text("[qqwife]请设置纯数字\n", err))
-				return
-			}
-			gid := ctx.Event.GroupID
-			err = 民政局.setCDtime(gid, cdTime)
-			if err != nil {
-				ctx.SendChain(message.Text("[qqwife]设置CD时长失败\n", err))
-				return
-			}
-			ctx.SendChain(message.Text("设置成功"))
-		})
-	engine.OnRegex(`^(允许|禁止)(自由恋爱|牛头人)$`, zero.OnlyGroup, zero.AdminPermission, getdb).SetBlock(true).
-		Handle(func(ctx *zero.Ctx) {
-			status := ctx.State["regex_matched"].([]string)[1]
-			mode := ctx.State["regex_matched"].([]string)[2]
-			gid := ctx.Event.GroupID
-			statusBool := 1
-			if status == "禁止" {
-				statusBool = 0
-			}
-			err := 民政局.修改模式(gid, mode, statusBool)
-			if err != nil {
-				ctx.SendChain(message.Text("[qqwife]群状态查询失败\n", err))
-				return
-			}
-			ctx.SendChain(message.Text("设置成功"))
-		})
-	// 好感度系统
-	engine.OnRegex(`^查好感度\s?\[CQ:at,qq=(\d+)\]`, zero.OnlyGroup, getdb).SetBlock(true).Limit(ctxext.LimitByUser).
-		Handle(func(ctx *zero.Ctx) {
-			fiancee, err := strconv.ParseInt(ctx.State["regex_matched"].([]string)[1], 10, 64)
-			if err != nil {
-				ctx.SendChain(message.Text("[qqwife]你对象好像不存在？\n", err))
-				return
-			}
-			uid := ctx.Event.UserID
-			favor, err := 民政局.getFavorability(uid, fiancee)
-			if err != nil {
-				ctx.SendChain(message.Text("[qqwife]好感度库发生问题力\n", err))
-				return
-			}
-			// 输出结果
-			ctx.SendChain(
-				message.At(uid),
-				message.Text("\n当前你们好感度为", favor),
-			)
-		})
+)
+
+func init() {
 	engine.OnFullMatch("娶群友", zero.OnlyGroup, getdb).SetBlock(true).Limit(ctxext.LimitByUser).
 		Handle(func(ctx *zero.Ctx) {
 			gid := ctx.Event.GroupID
-			_, err := 民政局.开门时间(gid)
+			err := 民政局.开门时间(gid)
 			if err != nil {
-				ctx.SendChain(message.Text("[qqwife]数据库发生问题力\n", err))
+				ctx.SendChain(message.Text("[ERROR]:", err))
 				return
 			}
 			uid := ctx.Event.UserID
-			targetinfo, status, err := 民政局.查户口(gid, uid)
+			userInfo, _ := 民政局.查户口(gid, uid)
 			switch {
-			case status == "错":
-				ctx.SendChain(message.Text("[qqwife]数据库发生问题力\n", err))
-				return
-			case (status == "攻" && targetinfo.Target == 0) ||
-				(status == "受" && targetinfo.User == 0): // 如果是单身贵族
+			case userInfo != (userinfo{}) && (userInfo.Target == 0 || userInfo.User == 0): // 如果是单身贵族
 				ctx.SendChain(message.Text("今天你是单身贵族噢"))
 				return
-			case status == "攻": // 娶过别人
+			case userInfo.User == uid: // 娶过别人
 				ctx.SendChain(
 					message.At(uid),
-					message.Text("\n今天你在", targetinfo.Updatetime, "娶了群友"),
-					message.Image("http://q4.qlogo.cn/g?b=qq&nk="+strconv.FormatInt(targetinfo.Target, 10)+"&s=640").Add("cache", 0),
+					message.Text("\n今天你在", userInfo.Updatetime, "娶了群友"),
+					message.Image("http://q4.qlogo.cn/g?b=qq&nk="+strconv.FormatInt(userInfo.Target, 10)+"&s=640").Add("cache", 0),
 					message.Text(
 						"\n",
-						"[", targetinfo.Targetname, "]",
-						"(", targetinfo.Target, ")哒",
+						"[", userInfo.Targetname, "]",
+						"(", userInfo.Target, ")哒",
 					),
 				)
 				return
-			case status == "受": // 嫁给别人
+			case userInfo.Target == uid: // 嫁给别人
 				ctx.SendChain(
 					message.At(uid),
-					message.Text("\n今天你在", targetinfo.Updatetime, "被群友"),
-					message.Image("http://q4.qlogo.cn/g?b=qq&nk="+strconv.FormatInt(targetinfo.User, 10)+"&s=640").Add("cache", 0),
+					message.Text("\n今天你在", userInfo.Updatetime, "被群友"),
+					message.Image("http://q4.qlogo.cn/g?b=qq&nk="+strconv.FormatInt(userInfo.User, 10)+"&s=640").Add("cache", 0),
 					message.Text(
 						"\n",
-						"[", targetinfo.Username, "]",
-						"(", targetinfo.User, ")娶了",
+						"[", userInfo.Username, "]",
+						"(", userInfo.User, ")娶了",
 					),
 				)
 				return
@@ -198,12 +159,8 @@ func init() {
 			qqgrouplist := make([]int64, 0, len(temp))
 			for k := 0; k < len(temp); k++ {
 				usr := temp[k].Get("user_id").Int()
-				_, status, err := 民政局.查户口(gid, usr)
-				if status == "错" {
-					ctx.SendChain(message.Text("[qqwife]花名册数据读取有误，请重试\n", err))
-					return
-				}
-				if status != "单" {
+				usrInfo, _ := 民政局.查户口(gid, usr)
+				if usrInfo != (userinfo{}) {
 					continue
 				}
 				qqgrouplist = append(qqgrouplist, usr)
@@ -216,181 +173,33 @@ func init() {
 			// 随机抽娶
 			fiancee := qqgrouplist[rand.Intn(len(qqgrouplist))]
 			if fiancee == uid { // 如果是自己
-				ctx.SendChain(message.Text("呜...没娶到，你可以再尝试一次"))
-				return
-			}
-			// 去民政局办证
-			err = 民政局.登记(gid, uid, fiancee, ctx.CardOrNickName(uid), ctx.CardOrNickName(fiancee))
-			if err != nil {
-				ctx.SendChain(message.Text("[qqwife]数据库发生问题力\n", err))
-				return
-			}
-			favor, err := 民政局.setFavorability(uid, fiancee, 1+rand.Intn(5))
-			if err != nil {
-				ctx.SendChain(message.Text("[qqwife]好感度库发生问题力\n", err))
-			}
-			// 请大家吃席
-			ctx.SendChain(
-				message.At(uid),
-				message.Text("今天你的群老婆是"),
-				message.Image("http://q4.qlogo.cn/g?b=qq&nk="+strconv.FormatInt(fiancee, 10)+"&s=640").Add("cache", 0),
-				message.Text(
-					"\n",
-					"[", ctx.CardOrNickName(fiancee), "]",
-					"(", fiancee, ")哒\n当前你们好感度为", favor,
-				),
-			)
-		})
-	// 单身技能
-	engine.OnRegex(`^(娶|嫁)\[CQ:at,qq=(\d+)\]`, zero.OnlyGroup, getdb, checkdog).SetBlock(true).Limit(ctxext.LimitByUser).
-		Handle(func(ctx *zero.Ctx) {
-			gid := ctx.Event.GroupID
-			uid := ctx.Event.UserID
-			choice := ctx.State["regex_matched"].([]string)[1]
-			fiancee, _ := strconv.ParseInt(ctx.State["regex_matched"].([]string)[2], 10, 64)
-			// 写入CD
-			err := 民政局.writeCDtime(gid, uid, 1)
-			if err != nil {
-				ctx.SendChain(message.At(uid), message.Text("[qqwife]你的技能CD记录失败\n", err))
-			}
-			if uid == fiancee { // 如果是自己
-				switch rand.Intn(3) {
+				switch rand.Intn(10) {
 				case 1:
 					err := 民政局.登记(gid, uid, 0, "", "")
 					if err != nil {
-						ctx.SendChain(message.Text("[qqwife]数据库发生问题力\n", err))
+						ctx.SendChain(message.Text("[ERROR]:", err))
 						return
 					}
 					ctx.SendChain(message.Text("今日获得成就：单身贵族"))
 				default:
-					ctx.SendChain(message.Text("今日获得成就：自恋狂"))
+					ctx.SendChain(message.Text("呜...没娶到，你可以再尝试一次"))
+					return
 				}
-				return
 			}
-			favor, err := 民政局.getFavorability(uid, fiancee)
+			// 去民政局办证
+			err = 民政局.登记(gid, uid, fiancee, ctx.CardOrNickName(uid), ctx.CardOrNickName(fiancee))
 			if err != nil {
-				ctx.SendChain(message.Text("[qqwife]好感度库发生问题力\n", err))
+				ctx.SendChain(message.Text("[ERROR]:", err))
 				return
 			}
-			if favor < 30 {
-				favor = 30 // 保底30%概率
-			}
-			if rand.Intn(101) >= favor {
-				ctx.SendChain(message.Text(sendtext[1][rand.Intn(len(sendtext[1]))]))
-				return
-			}
-			// 去民政局登记
-			var choicetext string
-			switch choice {
-			case "娶":
-				err := 民政局.登记(gid, uid, fiancee, ctx.CardOrNickName(uid), ctx.CardOrNickName(fiancee))
-				if err != nil {
-					ctx.SendChain(message.Text("[qqwife]结婚登记失败力\n", err))
-					return
-				}
-				choicetext = "\n今天你的群老婆是"
-			default:
-				err := 民政局.登记(gid, fiancee, uid, ctx.CardOrNickName(fiancee), ctx.CardOrNickName(uid))
-				if err != nil {
-					ctx.SendChain(message.Text("[qqwife]结婚登记失败力\n", err))
-					return
-				}
-				choicetext = "\n今天你的群老公是"
+			favor, err := 民政局.更新好感度(uid, fiancee, 1+rand.Intn(5))
+			if err != nil {
+				ctx.SendChain(message.Text("[ERROR]:", err))
 			}
 			// 请大家吃席
 			ctx.SendChain(
-				message.Text(sendtext[0][rand.Intn(len(sendtext[0]))]),
 				message.At(uid),
-				message.Text(choicetext),
-				message.Image("http://q4.qlogo.cn/g?b=qq&nk="+strconv.FormatInt(fiancee, 10)+"&s=640").Add("cache", 0),
-				message.Text(
-					"\n",
-					"[", ctx.CardOrNickName(fiancee), "]",
-					"(", fiancee, ")哒",
-				),
-			)
-		})
-	// NTR技能
-	engine.OnRegex(`^当(\[CQ:at,qq=(\d+)\]\s?|(\d+))的小三`, zero.OnlyGroup, getdb, checkcp).SetBlock(true).Limit(ctxext.LimitByUser).
-		Handle(func(ctx *zero.Ctx) {
-			gid := ctx.Event.GroupID
-			uid := ctx.Event.UserID
-			fid := ctx.State["regex_matched"].([]string)
-			fiancee, _ := strconv.ParseInt(fid[2]+fid[3], 10, 64)
-			// 写入CD
-			err := 民政局.writeCDtime(gid, uid, 2)
-			if err != nil {
-				ctx.SendChain(message.At(uid), message.Text("[qqwife]你的技能CD记录失败\n", err))
-			}
-			if fiancee == uid {
-				ctx.SendChain(message.Text("今日获得成就：自我攻略"))
-				return
-			}
-			favor, err := 民政局.getFavorability(uid, fiancee)
-			if err != nil {
-				ctx.SendChain(message.Text("[qqwife]好感度库发生问题力\n", err))
-				return
-			}
-			if favor < 30 {
-				favor = 30 // 保底10%概率
-			}
-			if rand.Intn(101) >= favor/3 {
-				ctx.SendChain(message.Text("失败了！可惜"))
-				return
-			}
-			// 判断target是老公还是老婆
-			var choicetext string
-			userAID := uid     //攻的
-			var userBID int64  //被牛的
-			userCID := fiancee //受的
-			fianceeinfo, gender, err := 民政局.查户口(gid, userCID)
-			switch gender {
-			case "单":
-				ctx.SendChain(message.Text("ta现在还是单身哦，快向ta表白吧！"))
-				return
-			case "错":
-				ctx.SendChain(message.Text("[qqwife]对象状态查询失败\n", err))
-				return
-			case "攻":
-				err = 民政局.离婚休妻(gid, fianceeinfo.Target)
-				if err != nil {
-					ctx.SendChain(message.Text("ta不想和原来的对象分手...\n[error]", err))
-					return
-				}
-				userAID = fiancee
-				userCID = uid
-				userBID = fianceeinfo.Target
-				choicetext = "老公"
-			case "受":
-				err = 民政局.离婚休夫(gid, fianceeinfo.User)
-				if err != nil {
-					ctx.SendChain(message.Text("ta不想和原来的对象分手...\n[error]", err))
-					return
-				}
-				userBID = fianceeinfo.User
-				choicetext = "老婆"
-			default:
-				ctx.SendChain(message.Text("数据库发生问题力"))
-				return
-			}
-			err = 民政局.登记(gid, userAID, userCID, ctx.CardOrNickName(userAID), ctx.CardOrNickName(userCID))
-			if err != nil {
-				ctx.SendChain(message.Text("[qqwife]复婚登记失败力\n", err))
-				return
-			}
-			favor, err = 民政局.setFavorability(userAID, userCID, -5)
-			if err != nil {
-				ctx.SendChain(message.Text("[qqwife]好感度库发生问题力\n", err))
-			}
-			_, err = 民政局.setFavorability(userAID, userBID, 5)
-			if err != nil {
-				ctx.SendChain(message.Text("[qqwife]好感度库发生问题力\n", err))
-			}
-			// 输出结果
-			ctx.SendChain(
-				message.Text(sendtext[2][rand.Intn(len(sendtext[2]))]),
-				message.At(uid),
-				message.Text("今天你的群"+choicetext+"是"),
+				message.Text("今天你的群老婆是"),
 				message.Image("http://q4.qlogo.cn/g?b=qq&nk="+strconv.FormatInt(fiancee, 10)+"&s=640").Add("cache", 0),
 				message.Text(
 					"\n",
@@ -399,210 +208,20 @@ func init() {
 				),
 			)
 		})
-	// 做媒技能
-	engine.OnRegex(`^做媒\s?\[CQ:at,qq=(\d+)\]\s?\[CQ:at,qq=(\d+)\]`, zero.OnlyGroup, zero.AdminPermission, getdb, checkCondition).SetBlock(true).Limit(ctxext.LimitByUser).
-		Handle(func(ctx *zero.Ctx) {
-			gid := ctx.Event.GroupID
-			uid := ctx.Event.UserID
-			gayOne, _ := strconv.ParseInt(ctx.State["regex_matched"].([]string)[1], 10, 64)
-			gayZero, _ := strconv.ParseInt(ctx.State["regex_matched"].([]string)[2], 10, 64)
-			// 写入CD
-			err := 民政局.writeCDtime(gid, uid, 3)
-			if err != nil {
-				ctx.SendChain(message.At(uid), message.Text("[qqwife]你的技能CD记录失败\n", err))
-			}
-			favor, err := 民政局.getFavorability(gayOne, gayZero)
-			if err != nil {
-				ctx.SendChain(message.Text("[qqwife]好感度库发生问题力\n", err))
-				return
-			}
-			if favor < 30 {
-				favor = 30 // 保底30%概率
-			}
-			if rand.Intn(101) >= favor {
-				_, err = 民政局.setFavorability(uid, gayOne, -1)
-				if err != nil {
-					ctx.SendChain(message.Text("[qqwife]好感度库发生问题力\n", err))
-				}
-				_, err = 民政局.setFavorability(uid, gayZero, -1)
-				if err != nil {
-					ctx.SendChain(message.Text("[qqwife]好感度库发生问题力\n", err))
-				}
-				ctx.SendChain(message.Text(sendtext[1][rand.Intn(len(sendtext[1]))]))
-				return
-			}
-			// 去民政局登记
-			err = 民政局.登记(gid, gayOne, gayZero, ctx.CardOrNickName(gayOne), ctx.CardOrNickName(gayZero))
-			if err != nil {
-				ctx.SendChain(message.Text("[qqwife]结婚登记失败力\n", err))
-				return
-			}
-			_, err = 民政局.setFavorability(uid, gayOne, 1)
-			if err != nil {
-				ctx.SendChain(message.Text("[qqwife]好感度库发生问题力\n", err))
-			}
-			_, err = 民政局.setFavorability(uid, gayZero, 1)
-			if err != nil {
-				ctx.SendChain(message.Text("[qqwife]好感度库发生问题力\n", err))
-			}
-			_, err = 民政局.setFavorability(gayOne, gayZero, 1)
-			if err != nil {
-				ctx.SendChain(message.Text("[qqwife]好感度库发生问题力\n", err))
-			}
-			// 请大家吃席
-			ctx.SendChain(
-				message.At(uid),
-				message.Text("恭喜你成功撮合了一对CP\n\n"),
-				message.At(gayOne),
-				message.Text("今天你的群老婆是"),
-				message.Image("http://q4.qlogo.cn/g?b=qq&nk="+strconv.FormatInt(gayZero, 10)+"&s=640").Add("cache", 0),
-				message.Text(
-					"\n",
-					"[", ctx.CardOrNickName(gayZero), "]",
-					"(", gayZero, ")哒",
-				),
-			)
-		})
-	// 礼物系统
-	engine.OnRegex(`^买礼物给\s?(\[CQ:at,qq=(\d+)\]|(\d+))`, getdb).SetBlock(true).Limit(ctxext.LimitByUser).
-		Handle(func(ctx *zero.Ctx) {
-			gid := ctx.Event.GroupID
-			uid := ctx.Event.UserID
-			fiancee := ctx.State["regex_matched"].([]string)
-			gay, _ := strconv.ParseInt(fiancee[2]+fiancee[3], 10, 64)
-			if gay == uid {
-				ctx.Send(message.ReplyWithMessage(message.At(uid), message.Text("[qqwife]你想给自己买什么礼物呢?")))
-				return
-			}
-			// 获取CD
-			cdTime, err := 民政局.getCDtime(gid)
-			if err != nil {
-				ctx.SendChain(message.Text("[qqwife]获取该群技能CD错误(将以CD12H计算)\n", err))
-			}
-			ok, err := 民政局.compareCDtime(gid, uid, 5, cdTime)
-			if err != nil {
-				ctx.SendChain(message.Text("[qqwife]查询用户CD状态失败,请重试\n", err))
-				return
-			}
-			if !ok {
-				ctx.SendChain(message.Text("舔狗，今天你已经送过礼物了。"))
-				return
-			}
-			// 获取好感度
-			favor, err := 民政局.getFavorability(uid, gay)
-			if err != nil {
-				ctx.SendChain(message.Text("[qqwife]好感度库发生问题力\n", err))
-				return
-			}
-			// 对接小熊饼干
-			walletinfo := wallet.GetWalletOf(uid)
-			if walletinfo < 1 {
-				ctx.SendChain(message.Text("你钱包没钱啦！"))
-				return
-			}
-			moneyToFavor := rand.Intn(math.Min(walletinfo, 100)) + 1
-			// 计算钱对应的好感值
-			newFavor := 1
-			if favor > 50 {
-				newFavor += moneyToFavor % 10 // 礼物厌倦
-			} else {
-				newFavor += rand.Intn(moneyToFavor)
-			}
-			// 随机对方心情
-			mood := rand.Intn(5)
-			if mood == 0 {
-				newFavor = -newFavor
-			}
-			// 记录结果
-			err = wallet.InsertWalletOf(uid, -moneyToFavor)
-			if err != nil {
-				ctx.SendChain(message.Text("[qqwife]钱包坏掉力:\n", err))
-				return
-			}
-			lastfavor, err := 民政局.setFavorability(uid, gay, newFavor)
-			if err != nil {
-				ctx.SendChain(message.Text("[qqwife]好感度数据库发生问题力\n", err))
-				return
-			}
-			// 写入CD
-			err = 民政局.writeCDtime(gid, uid, 5)
-			if err != nil {
-				ctx.SendChain(message.At(uid), message.Text("[qqwife]你的技能CD记录失败\n", err))
-			}
-			// 输出结果
-			if mood == 0 {
-				ctx.SendChain(message.Text("你花了", moneyToFavor, "ATRI币买了一件女装送给了ta,ta很不喜欢,你们的好感度降低至", lastfavor))
-			} else {
-				ctx.SendChain(message.Text("你花了", moneyToFavor, "ATRI币买了一件女装送给了ta,ta很喜欢,你们的好感度升至", lastfavor))
-			}
-		})
-	engine.OnFullMatchGroup([]string{"闹离婚", "办离婚"}, zero.OnlyGroup, getdb, checkdivorce).Limit(ctxext.LimitByUser).SetBlock(true).
-		Handle(func(ctx *zero.Ctx) {
-			gid := ctx.Event.GroupID
-			uid := ctx.Event.UserID
-			// 写入CD
-			err := 民政局.writeCDtime(gid, uid, 4)
-			if err != nil {
-				ctx.SendChain(message.At(uid), message.Text("[qqwife]你的技能CD记录失败\n", err))
-			}
-			info, uidstatus, err := 民政局.查户口(gid, uid)
-			mun := 2
-			var fiancee int64
-			switch uidstatus {
-			case "错":
-				ctx.SendChain(message.Text("[qqwife]用户状态查询失败\n", err))
-				return
-			case "攻":
-				mun = 1
-				fiancee = info.Target
-			case "受":
-				mun = 0
-				fiancee = info.User
-			}
-			favor, err := 民政局.getFavorability(uid, fiancee)
-			if err != nil {
-				ctx.SendChain(message.Text("[qqwife]好感度库发生问题力\n", err))
-				return
-			}
-			if favor < 20 {
-				favor = 10
-			}
-			if rand.Intn(101) > 100-favor {
-				ctx.SendChain(message.Text(sendtext[3][rand.Intn(len(sendtext[3]))]))
-				return
-			}
-			switch mun {
-			case 1:
-				err = 民政局.离婚休妻(gid, fiancee)
-			case 0:
-				err = 民政局.离婚休夫(gid, fiancee)
-			default:
-				ctx.SendChain(message.Text("[qqwife]数据库发生问题力\n", err))
-				return
-			}
-			if err != nil {
-				ctx.SendChain(message.Text("[qqwife]数据库发生问题力\n", err))
-				return
-			}
-			ctx.SendChain(message.Text(sendtext[4][mun]))
-		})
 	engine.OnFullMatch("群老婆列表", zero.OnlyGroup, getdb).SetBlock(true).Limit(ctxext.LimitByUser).
 		Handle(func(ctx *zero.Ctx) {
 			gid := ctx.Event.GroupID
-			ok, err := 民政局.开门时间(gid)
+			err := 民政局.开门时间(gid)
 			if err != nil {
-				ctx.SendChain(message.Text("[qqwife]数据库发生问题力\n", err))
+				ctx.SendChain(message.Text("[ERROR]:", err))
 				return
 			}
-			if ok {
-				ctx.SendChain(message.Text("今天还没有人结婚哦"))
-				return
-			}
-			list, number, err := 民政局.花名册(gid)
+			list, err := 民政局.花名册(gid)
 			if err != nil {
-				ctx.SendChain(message.Text("[qqwife]数据库发生问题力\n", err))
+				ctx.SendChain(message.Text("[ERROR]:", err))
 				return
 			}
+			number := len(list)
 			if number <= 0 {
 				ctx.SendChain(message.Text("今天还没有人结婚哦"))
 				return
@@ -616,14 +235,14 @@ func init() {
 			canvas.SetRGB(1, 1, 1) // 白色
 			canvas.Clear()
 			/***********下载字体，可以注销掉***********/
-			_, err = file.GetLazyData(text.BoldFontFile, true)
+			data, err := file.GetLazyData(text.BoldFontFile, control.Md5File, true)
 			if err != nil {
 				ctx.SendChain(message.Text("[qqwife]ERROR: ", err))
 			}
 			/***********设置字体颜色为黑色***********/
 			canvas.SetRGB(0, 0, 0)
 			/***********设置字体大小,并获取字体高度用来定位***********/
-			if err = canvas.LoadFontFace(text.BoldFontFile, fontSize*2); err != nil {
+			if err = canvas.ParseFontFace(data, fontSize*2); err != nil {
 				ctx.SendChain(message.Text("[qqwife]ERROR: ", err))
 				return
 			}
@@ -632,7 +251,7 @@ func init() {
 			canvas.DrawString("群老婆列表", (1500-sl)/2, 160-h) // 放置在中间位置
 			canvas.DrawString("————————————————————", 0, 250-h)
 			/***********设置字体大小,并获取字体高度用来定位***********/
-			if err = canvas.LoadFontFace(text.BoldFontFile, fontSize); err != nil {
+			if err = canvas.ParseFontFace(data, fontSize); err != nil {
 				ctx.SendChain(message.Text("[qqwife]ERROR: ", err))
 				return
 			}
@@ -644,36 +263,186 @@ func init() {
 				canvas.DrawString(slicename(info[2], canvas), 800, float64(260+50*i)-h)
 				canvas.DrawString("("+info[3]+")", 1150, float64(260+50*i)-h)
 			}
-			data, cl := writer.ToBytes(canvas.Image())
+			data, err = imgfactory.ToBytes(canvas.Image())
+			if err != nil {
+				ctx.SendChain(message.Text("[qqwife]ERROR: ", err))
+				return
+			}
 			ctx.SendChain(message.ImageBytes(data))
-			cl()
 		})
 	engine.OnRegex(`^重置(所有|本群|/d+)?花名册$`, zero.SuperUserPermission, getdb).SetBlock(true).Limit(ctxext.LimitByUser).
 		Handle(func(ctx *zero.Ctx) {
-			cmd := "0"
+			var err error
 			switch ctx.State["regex_matched"].([]string)[1] {
-			case "":
-				if ctx.Event.GroupID == 0 {
-					ctx.SendChain(message.Text("该功能只能在群组使用或者指定群组"))
-					return
-				}
-				cmd = strconv.FormatInt(ctx.Event.GroupID, 10)
 			case "所有":
-				break
-			case "本群":
+				err = 民政局.清理花名册()
+			case "本群", "":
 				if ctx.Event.GroupID == 0 {
 					ctx.SendChain(message.Text("该功能只能在群组使用或者指定群组"))
 					return
 				}
-				cmd = strconv.FormatInt(ctx.Event.GroupID, 10)
+				err = 民政局.清理花名册("group" + strconv.FormatInt(ctx.Event.GroupID, 10))
 			default:
-				cmd = ctx.State["regex_matched"].([]string)[1]
+				cmd := ctx.State["regex_matched"].([]string)[1]
+				gid, _ := strconv.ParseInt(cmd, 10, 64) // 判断是否为群号
+				if gid == 0 {
+					ctx.SendChain(message.Text("请输入正确的群号"))
+					return
+				}
+				err = 民政局.清理花名册("group" + cmd)
 			}
-			err := 民政局.清理花名册(cmd)
 			if err != nil {
-				ctx.SendChain(message.Text("[qqwife]数据库发生问题力\n", err))
+				ctx.SendChain(message.Text("[ERROR]:", err))
 				return
 			}
 			ctx.SendChain(message.Text("重置成功"))
 		})
 }
+
+func (sql *婚姻登记) 查看设置(gid int64) (dbinfo updateinfo, err error) {
+	sql.Lock()
+	defer sql.Unlock()
+	// 创建群表格
+	err = sql.db.Create("updateinfo", &updateinfo{})
+	if err != nil {
+		return
+	}
+	if !sql.db.CanFind("updateinfo", "where gid is "+strconv.FormatInt(gid, 10)) {
+		// 没有记录
+		return updateinfo{
+			GID:      gid,
+			CanMatch: 1,
+			CanNtr:   1,
+			CDtime:   12,
+		}, nil
+	}
+	_ = sql.db.Find("updateinfo", &dbinfo, "where gid is "+strconv.FormatInt(gid, 10))
+	return
+}
+
+func (sql *婚姻登记) 更新设置(dbinfo updateinfo) error {
+	sql.Lock()
+	defer sql.Unlock()
+	return sql.db.Insert("updateinfo", &dbinfo)
+}
+
+func (sql *婚姻登记) 开门时间(gid int64) error {
+	grouInfo, err := sql.查看设置(gid)
+	if err != nil {
+		return err
+	}
+	sql.Lock()
+	defer sql.Unlock()
+	dbinfo := updateinfo{}
+	_ = sql.db.Find("updateinfo", &dbinfo, "where gid is "+strconv.FormatInt(gid, 10))
+	if time.Now().Format("2006/01/02") != dbinfo.Updatetime {
+		// 如果跨天了就删除
+		_ = sql.db.Drop("group" + strconv.FormatInt(gid, 10))
+		// 更新数据时间
+		grouInfo.GID = gid
+		grouInfo.Updatetime = time.Now().Format("2006/01/02")
+		return sql.db.Insert("updateinfo", &grouInfo)
+	}
+	return nil
+}
+
+func (sql *婚姻登记) 查户口(gid, uid int64) (info userinfo, err error) {
+	sql.Lock()
+	defer sql.Unlock()
+	gidstr := "group" + strconv.FormatInt(gid, 10)
+	// 创建群表格
+	err = sql.db.Create(gidstr, &userinfo{})
+	if err != nil {
+		return
+	}
+	uidstr := strconv.FormatInt(uid, 10)
+	err = sql.db.Find(gidstr, &info, "where user = "+uidstr)
+	if err != nil {
+		err = sql.db.Find(gidstr, &info, "where target = "+uidstr)
+	}
+	return
+}
+
+// 民政局登记数据
+func (sql *婚姻登记) 登记(gid, uid, target int64, username, targetname string) error {
+	sql.Lock()
+	defer sql.Unlock()
+	gidstr := "group" + strconv.FormatInt(gid, 10)
+	uidinfo := userinfo{
+		User:       uid,
+		Username:   username,
+		Target:     target,
+		Targetname: targetname,
+		Updatetime: time.Now().Format("15:04:05"),
+	}
+	return sql.db.Insert(gidstr, &uidinfo)
+}
+
+func (sql *婚姻登记) 花名册(gid int64) (list [][4]string, err error) {
+	sql.Lock()
+	defer sql.Unlock()
+	gidstr := "group" + strconv.FormatInt(gid, 10)
+	number, _ := sql.db.Count(gidstr)
+	if number <= 0 {
+		return
+	}
+	var info userinfo
+	err = sql.db.FindFor(gidstr, &info, "GROUP BY user", func() error {
+		if info.Target == 0 {
+			return nil
+		}
+		dbinfo := [4]string{
+			info.Username,
+			strconv.FormatInt(info.User, 10),
+			info.Targetname,
+			strconv.FormatInt(info.Target, 10),
+		}
+		list = append(list, dbinfo)
+		return nil
+	})
+	return
+}
+
+func slicename(name string, canvas *gg.Context) (resultname string) {
+	usermane := []rune(name) // 将每个字符单独放置
+	widthlen := 0
+	numberlen := 0
+	for i, v := range usermane {
+		width, _ := canvas.MeasureString(string(v)) // 获取单个字符的宽度
+		widthlen += int(width)
+		if widthlen > 350 {
+			break // 总宽度不能超过350
+		}
+		numberlen = i
+	}
+	if widthlen > 350 {
+		resultname = string(usermane[:numberlen-1]) + "......" // 名字切片
+	} else {
+		resultname = name
+	}
+	return
+}
+
+func (sql *婚姻登记) 清理花名册(gid ...string) error {
+	sql.Lock()
+	defer sql.Unlock()
+	switch gid {
+	case nil:
+		grouplist, err := sql.db.ListTables()
+		if err == nil {
+			for _, listName := range grouplist {
+				if listName == "favorability" {
+					continue
+				}
+				err = sql.db.Drop(listName)
+			}
+		}
+		return err
+	default:
+		err := sql.db.Drop(gid[0])
+		if err == nil {
+			_ = sql.db.Del("cdsheet", "where GroupID is "+strings.ReplaceAll(gid[0], "group", ""))
+		}
+		return err
+	}
+}

plugin/qqwife/favorSystem.go

@@ -0,0 +1,360 @@
+package qqwife
+
+import (
+	"errors"
+	"math/rand"
+	"sort"
+	"strconv"
+	"strings"
+
+	"github.com/FloatTech/floatbox/math"
+	"github.com/FloatTech/imgfactory"
+	control "github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+
+	// 画图
+	"github.com/FloatTech/floatbox/file"
+	"github.com/FloatTech/gg"
+	"github.com/FloatTech/zbputils/img/text"
+
+	// 货币系统
+	"github.com/FloatTech/AnimeAPI/wallet"
+)
+
+// 好感度系统
+type favorability struct {
+	Userinfo string // 记录用户
+	Favor    int    // 好感度
+}
+
+func init() {
+	// 好感度系统
+	engine.OnRegex(`^查好感度\s*(\[CQ:at,qq=)?(\d+)`, zero.OnlyGroup, getdb).SetBlock(true).Limit(ctxext.LimitByUser).
+		Handle(func(ctx *zero.Ctx) {
+			fiancee, _ := strconv.ParseInt(ctx.State["regex_matched"].([]string)[2], 10, 64)
+			uid := ctx.Event.UserID
+			favor, err := 民政局.查好感度(uid, fiancee)
+			if err != nil {
+				ctx.SendChain(message.Text("[ERROR]:", err))
+				return
+			}
+			// 输出结果
+			ctx.SendChain(
+				message.At(uid),
+				message.Text("\n当前你们好感度为", favor),
+			)
+		})
+	// 礼物系统
+	engine.OnRegex(`^买礼物给\s?(\[CQ:at,qq=(\d+)\]|(\d+))`, getdb).SetBlock(true).Limit(ctxext.LimitByUser).
+		Handle(func(ctx *zero.Ctx) {
+			gid := ctx.Event.GroupID
+			uid := ctx.Event.UserID
+			fiancee := ctx.State["regex_matched"].([]string)
+			gay, _ := strconv.ParseInt(fiancee[2]+fiancee[3], 10, 64)
+			if gay == uid {
+				ctx.Send(message.ReplyWithMessage(ctx.Event.MessageID, message.At(uid), message.Text("你想给自己买什么礼物呢?")))
+				return
+			}
+			// 获取CD
+			groupInfo, err := 民政局.查看设置(gid)
+			if err != nil {
+				ctx.SendChain(message.Text("[ERROR]:", err))
+				return
+			}
+			ok, err := 民政局.判断CD(gid, uid, "买礼物", groupInfo.CDtime)
+			if err != nil {
+				ctx.SendChain(message.Text("[ERROR]:", err))
+				return
+			}
+			if !ok {
+				ctx.SendChain(message.Text("舔狗，今天你已经送过礼物了。"))
+				return
+			}
+			// 获取好感度
+			favor, err := 民政局.查好感度(uid, gay)
+			if err != nil {
+				ctx.SendChain(message.Text("[ERROR]:好感度库发生问题力\n", err))
+				return
+			}
+			// 对接小熊饼干
+			walletinfo := wallet.GetWalletOf(uid)
+			if walletinfo < 1 {
+				ctx.SendChain(message.Text("你钱包没钱啦！"))
+				return
+			}
+			moneyToFavor := rand.Intn(math.Min(walletinfo, 100)) + 1
+			// 计算钱对应的好感值
+			newFavor := 1
+			moodMax := 2
+			if favor > 50 {
+				newFavor = moneyToFavor % 10 // 礼物厌倦
+			} else {
+				moodMax = 5
+				newFavor += rand.Intn(moneyToFavor)
+			}
+			// 随机对方心情
+			mood := rand.Intn(moodMax)
+			if mood == 0 {
+				newFavor = -newFavor
+			}
+			// 记录结果
+			err = wallet.InsertWalletOf(uid, -moneyToFavor)
+			if err != nil {
+				ctx.SendChain(message.Text("[ERROR]:钱包坏掉力:\n", err))
+				return
+			}
+			lastfavor, err := 民政局.更新好感度(uid, gay, newFavor)
+			if err != nil {
+				ctx.SendChain(message.Text("[ERROR]:好感度数据库发生问题力\n", err))
+				return
+			}
+			// 写入CD
+			err = 民政局.记录CD(gid, uid, "买礼物")
+			if err != nil {
+				ctx.SendChain(message.At(uid), message.Text("[ERROR]:你的技能CD记录失败\n", err))
+			}
+			// 输出结果
+			if mood == 0 {
+				ctx.SendChain(message.Text("你花了", moneyToFavor, "ATRI币买了一件女装送给了ta,ta很不喜欢,你们的好感度降低至", lastfavor))
+			} else {
+				ctx.SendChain(message.Text("你花了", moneyToFavor, "ATRI币买了一件女装送给了ta,ta很喜欢,你们的好感度升至", lastfavor))
+			}
+		})
+	engine.OnFullMatch("好感度列表", zero.OnlyGroup, getdb).SetBlock(true).Limit(ctxext.LimitByUser).
+		Handle(func(ctx *zero.Ctx) {
+			uid := ctx.Event.UserID
+			fianceeInfo, err := 民政局.getGroupFavorability(uid)
+			if err != nil {
+				ctx.SendChain(message.Text("[ERROR]:ERROR: ", err))
+				return
+			}
+			/***********设置图片的大小和底色***********/
+			number := len(fianceeInfo)
+			if number > 10 {
+				number = 10
+			}
+			fontSize := 50.0
+			canvas := gg.NewContext(1150, int(170+(50+70)*float64(number)))
+			canvas.SetRGB(1, 1, 1) // 白色
+			canvas.Clear()
+			/***********下载字体***********/
+			data, err := file.GetLazyData(text.BoldFontFile, control.Md5File, true)
+			if err != nil {
+				ctx.SendChain(message.Text("[ERROR]:ERROR: ", err))
+			}
+			/***********设置字体颜色为黑色***********/
+			canvas.SetRGB(0, 0, 0)
+			/***********设置字体大小,并获取字体高度用来定位***********/
+			if err = canvas.ParseFontFace(data, fontSize*2); err != nil {
+				ctx.SendChain(message.Text("[ERROR]:ERROR: ", err))
+				return
+			}
+			sl, h := canvas.MeasureString("你的好感度排行列表")
+			/***********绘制标题***********/
+			canvas.DrawString("你的好感度排行列表", (1100-sl)/2, 100) // 放置在中间位置
+			canvas.DrawString("————————————————————", 0, 160)
+			/***********设置字体大小,并获取字体高度用来定位***********/
+			if err = canvas.ParseFontFace(data, fontSize); err != nil {
+				ctx.SendChain(message.Text("[ERROR]:ERROR: ", err))
+				return
+			}
+			i := 0
+			for _, info := range fianceeInfo {
+				if i > 9 {
+					break
+				}
+				if info.Userinfo == "" {
+					continue
+				}
+				fianceID, err := strconv.ParseInt(info.Userinfo, 10, 64)
+				if err != nil {
+					ctx.SendChain(message.Text("[ERROR]:ERROR: ", err))
+					return
+				}
+				if fianceID == 0 {
+					continue
+				}
+				userName := ctx.CardOrNickName(fianceID)
+				canvas.SetRGB255(0, 0, 0)
+				canvas.DrawString(userName+"("+info.Userinfo+")", 10, float64(180+(50+70)*i))
+				canvas.DrawString(strconv.Itoa(info.Favor), 1020, float64(180+60+(50+70)*i))
+				canvas.DrawRectangle(10, float64(180+60+(50+70)*i)-h/2, 1000, 50)
+				canvas.SetRGB255(150, 150, 150)
+				canvas.Fill()
+				canvas.SetRGB255(0, 0, 0)
+				canvas.DrawRectangle(10, float64(180+60+(50+70)*i)-h/2, float64(info.Favor)*10, 50)
+				canvas.SetRGB255(231, 27, 100)
+				canvas.Fill()
+				i++
+			}
+			data, err = imgfactory.ToBytes(canvas.Image())
+			if err != nil {
+				ctx.SendChain(message.Text("[qqwife]ERROR: ", err))
+				return
+			}
+			ctx.SendChain(message.ImageBytes(data))
+		})
+
+	engine.OnFullMatch("好感度数据整理", zero.SuperUserPermission, getdb).SetBlock(true).Limit(ctxext.LimitByUser).
+		Handle(func(ctx *zero.Ctx) {
+			ctx.SendChain(message.Text("开始整理力，请稍等"))
+			民政局.Lock()
+			defer 民政局.Unlock()
+			count, err := 民政局.db.Count("favorability")
+			if err != nil {
+				ctx.SendChain(message.Text("[ERROR]: ", err))
+				return
+			}
+			if count == 0 {
+				ctx.SendChain(message.Text("[ERROR]: 不存在好感度数据."))
+				return
+			}
+			favor := favorability{}
+			delInfo := make([]string, 0, count*2)
+			favorInfo := make(map[string]int, count*2)
+			_ = 民政局.db.FindFor("favorability", &favor, "group by Userinfo", func() error {
+				delInfo = append(delInfo, favor.Userinfo)
+				// 解析旧数据
+				userList := strings.Split(favor.Userinfo, "+")
+				maxQQ, _ := strconv.ParseInt(userList[0], 10, 64)
+				minQQ, _ := strconv.ParseInt(userList[1], 10, 64)
+				if maxQQ > minQQ {
+					favor.Userinfo = userList[0] + "+" + userList[1]
+				} else {
+					favor.Userinfo = userList[1] + "+" + userList[0]
+				}
+				// 判断是否是重复的
+				score, ok := favorInfo[favor.Userinfo]
+				if ok {
+					if score < favor.Favor {
+						favorInfo[favor.Userinfo] = favor.Favor
+					}
+				} else {
+					favorInfo[favor.Userinfo] = favor.Favor
+				}
+				return nil
+			})
+			for _, updateinfo := range delInfo {
+				// 删除旧数据
+				err = 民政局.db.Del("favorability", "where Userinfo = '"+updateinfo+"'")
+				if err != nil {
+					userList := strings.Split(favor.Userinfo, "+")
+					uid1, _ := strconv.ParseInt(userList[0], 10, 64)
+					uid2, _ := strconv.ParseInt(userList[1], 10, 64)
+					ctx.SendChain(message.Text("[ERROR]: 删除", ctx.CardOrNickName(uid1), "和", ctx.CardOrNickName(uid2), "的好感度时发生了错误。\n错误信息:", err))
+				}
+			}
+			for userInfo, favor := range favorInfo {
+				favorInfo := favorability{
+					Userinfo: userInfo,
+					Favor:    favor,
+				}
+				err = 民政局.db.Insert("favorability", &favorInfo)
+				if err != nil {
+					userList := strings.Split(userInfo, "+")
+					uid1, _ := strconv.ParseInt(userList[0], 10, 64)
+					uid2, _ := strconv.ParseInt(userList[1], 10, 64)
+					ctx.SendChain(message.Text("[ERROR]: 更新", ctx.CardOrNickName(uid1), "和", ctx.CardOrNickName(uid2), "的好感度时发生了错误。\n错误信息:", err))
+				}
+			}
+			ctx.SendChain(message.Text("清理好了哦"))
+		})
+}
+
+func (sql *婚姻登记) 查好感度(uid, target int64) (int, error) {
+	sql.Lock()
+	defer sql.Unlock()
+	err := sql.db.Create("favorability", &favorability{})
+	if err != nil {
+		return 0, err
+	}
+	info := favorability{}
+	if uid > target {
+		userinfo := strconv.FormatInt(uid, 10) + "+" + strconv.FormatInt(target, 10)
+		err = sql.db.Find("favorability", &info, "where Userinfo is '"+userinfo+"'")
+		if err != nil {
+			_ = sql.db.Find("favorability", &info, "where Userinfo glob '*"+userinfo+"*'")
+		}
+	} else {
+		userinfo := strconv.FormatInt(target, 10) + "+" + strconv.FormatInt(uid, 10)
+		err = sql.db.Find("favorability", &info, "where Userinfo is '"+userinfo+"'")
+		if err != nil {
+			_ = sql.db.Find("favorability", &info, "where Userinfo glob '*"+userinfo+"*'")
+		}
+	}
+	return info.Favor, nil
+}
+
+// 获取好感度数据组
+type favorList []favorability
+
+func (s favorList) Len() int {
+	return len(s)
+}
+func (s favorList) Swap(i, j int) {
+	s[i], s[j] = s[j], s[i]
+}
+func (s favorList) Less(i, j int) bool {
+	return s[i].Favor > s[j].Favor
+}
+func (sql *婚姻登记) getGroupFavorability(uid int64) (list favorList, err error) {
+	uidStr := strconv.FormatInt(uid, 10)
+	sql.RLock()
+	defer sql.RUnlock()
+	info := favorability{}
+	err = sql.db.FindFor("favorability", &info, "where Userinfo glob '*"+uidStr+"*'", func() error {
+		var target string
+		userList := strings.Split(info.Userinfo, "+")
+		switch {
+		case len(userList) == 0:
+			return errors.New("好感度系统数据存在错误")
+		case userList[0] == uidStr:
+			target = userList[1]
+		default:
+			target = userList[0]
+		}
+		list = append(list, favorability{
+			Userinfo: target,
+			Favor:    info.Favor,
+		})
+		return nil
+	})
+	sort.Sort(list)
+	return
+}
+
+// 设置好感度 正增负减
+func (sql *婚姻登记) 更新好感度(uid, target int64, score int) (favor int, err error) {
+	sql.Lock()
+	defer sql.Unlock()
+	err = sql.db.Create("favorability", &favorability{})
+	if err != nil {
+		return
+	}
+	info := favorability{}
+	uidstr := strconv.FormatInt(uid, 10)
+	targstr := strconv.FormatInt(target, 10)
+	if uid > target {
+		info.Userinfo = uidstr + "+" + targstr
+		err = sql.db.Find("favorability", &info, "where Userinfo is '"+info.Userinfo+"'")
+	} else {
+		info.Userinfo = targstr + "+" + uidstr
+		err = sql.db.Find("favorability", &info, "where Userinfo is '"+info.Userinfo+"'")
+	}
+	if err != nil {
+		err = sql.db.Find("favorability", &info, "where Userinfo glob '*"+targstr+"+"+uidstr+"*'")
+		if err == nil { // 如果旧数据存在就删除旧数据
+			err = 民政局.db.Del("favorability", "where Userinfo = '"+info.Userinfo+"'")
+		}
+	}
+	info.Favor += score
+	if info.Favor > 100 {
+		info.Favor = 100
+	} else if info.Favor < 0 {
+		info.Favor = 0
+	}
+	err = sql.db.Insert("favorability", &info)
+	return info.Favor, err
+}

plugin/quan/quan.go

@@ -0,0 +1,60 @@
+// Package quan  qq权重查询
+package quan
+
+import (
+	"encoding/json"
+	"strconv"
+	"strings"
+
+	"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 (
+	quan = "http://tfapi.top/API/qqqz.php?type=json&qq=" // api
+)
+
+type result struct {
+	Code int    `json:"code"`
+	Msg  string `json:"msg"`
+	Qz   string `json:"qz"`
+}
+
+func init() { // 主函数
+	en := control.Register("quan", &ctrl.Options[*zero.Ctx]{
+		DisableOnDefault: false,
+		Brief:            "QQ权重查询",
+		Help: "权重查询方式\n" +
+			"- 权重查询+@xxx" +
+			"- 权重查询+QQ号(可以不写，默认本人)",
+	})
+	en.OnRegex(`^权重查询\s*(\[CQ:at,qq=)?(\d+)?`).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+		str := ctx.State["regex_matched"].([]string)[2] // 获取uid
+		if str == "" {                                  // user
+			str = strconv.FormatInt(ctx.Event.UserID, 10)
+		}
+		es, err := web.GetData(quan + str) // 将网站返回结果赋值
+		if err != nil {
+			ctx.SendChain(message.Text("出现错误捏: ", err))
+			return
+		}
+		var data result
+		err = json.Unmarshal(es, &data)
+		if err != nil {
+			ctx.SendChain(message.Text("解析json错误: ", err))
+			return
+		}
+		var msg strings.Builder
+		msg.WriteString("查询账号: ")
+		msg.WriteString(str)
+		msg.WriteString("\n")
+		msg.WriteString("查询状态: ")
+		msg.WriteString(data.Msg)
+		msg.WriteString("\n您的权重为: ")
+		msg.WriteString(data.Qz)
+		ctx.SendChain(message.Text(msg.String())) // 输出结果
+	})
+}

plugin/qzone/model.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"os"
 
-	_ "github.com/fumiama/sqlite3" // use sql
 	"github.com/jinzhu/gorm"
 )
 

plugin/qzone/qzone.go

@@ -12,15 +12,14 @@ import (
 	"strings"
 	"time"
 
-	"github.com/Coloured-glaze/gg"
 	"github.com/FloatTech/AnimeAPI/qzone"
 	"github.com/FloatTech/floatbox/binary"
-	"github.com/FloatTech/floatbox/img/writer"
 	"github.com/FloatTech/floatbox/web"
+	"github.com/FloatTech/gg"
+	"github.com/FloatTech/imgfactory"
 	ctrl "github.com/FloatTech/zbpctrl"
 	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
-	"github.com/FloatTech/zbputils/img"
 	"github.com/FloatTech/zbputils/img/text"
 	"github.com/jinzhu/gorm"
 	zero "github.com/wdvxdr1123/ZeroBot"
@@ -311,12 +310,11 @@ func renderForwardMsg(qq int64, raw string) (base64Bytes []byte, err error) {
 		imgdata   []byte
 		msgImg    image.Image
 		faceImg   image.Image
-		t         text.Text
 	)
 	if qq != 0 {
 		face, err = web.GetData(fmt.Sprintf(faceURL, qq))
 	} else {
-		face, err = web.RequestDataWith(web.NewTLS12Client(), fmt.Sprintf(anonymousURL, rand.Intn(4)+1), "GET", "gitcode.net", web.RandUA())
+		face, err = web.RequestDataWith(web.NewTLS12Client(), fmt.Sprintf(anonymousURL, rand.Intn(4)+1), "GET", "gitcode.net", web.RandUA(), nil)
 	}
 	if err != nil {
 		return
@@ -325,18 +323,17 @@ func renderForwardMsg(qq int64, raw string) (base64Bytes []byte, err error) {
 	if err != nil {
 		return
 	}
-	back := img.Size(faceImg, backX, backY).Circle(0).Im
+	back := imgfactory.Size(faceImg, backX, backY).Circle(0).Image()
 	m := message.ParseMessageFromString(raw)
 	maxHeight += margin
 
 	for _, v := range m {
 		switch {
 		case v.Type == "text" && strings.TrimSpace(v.Data["text"]) != "":
-			t, err = text.Render(strings.TrimSuffix(v.Data["text"], "\r\n"), text.FontFile, 400, 40)
+			msgImg, err = text.Render(strings.TrimSuffix(v.Data["text"], "\r\n"), text.FontFile, 400, 40)
 			if err != nil {
 				return
 			}
-			msgImg = t.Image()
 		case v.Type == "image" && v.Data["url"] != "":
 			imgdata, err = web.GetData(v.Data["url"])
 			if err != nil {
@@ -351,7 +348,7 @@ func renderForwardMsg(qq int64, raw string) (base64Bytes []byte, err error) {
 		}
 		canvas.DrawImage(back, margin, maxHeight)
 		if msgImg.Bounds().Dx() > 500 {
-			msgImg = img.Size(msgImg, 500, msgImg.Bounds().Dy()*500/msgImg.Bounds().Dx()).Im
+			msgImg = imgfactory.Size(msgImg, 500, msgImg.Bounds().Dy()*500/msgImg.Bounds().Dx()).Image()
 		}
 		canvas.DrawImage(msgImg, 2*margin+backX, maxHeight)
 		if 3*margin+backX+msgImg.Bounds().Dx() > maxWidth {
@@ -365,5 +362,5 @@ func renderForwardMsg(qq int64, raw string) (base64Bytes []byte, err error) {
 	}
 	im := canvas.Image().(*image.RGBA)
 	nim := im.SubImage(image.Rect(0, 0, maxWidth, maxHeight))
-	return writer.ToBase64(nim)
+	return imgfactory.ToBase64(nim)
 }

plugin/reborn/load.go

@@ -4,11 +4,12 @@ import (
 	"encoding/json"
 
 	"github.com/FloatTech/floatbox/file"
+	"github.com/FloatTech/zbputils/control"
 )
 
 // load 加载rate数据
 func load(area *rate, jsonfile string) error {
-	data, err := file.GetLazyData(jsonfile, true)
+	data, err := file.GetLazyData(jsonfile, control.Md5File, true)
 	if err != nil {
 		return err
 	}