Merge pull request #70 from Yiwen-Chan/master

⬆️ 更新依赖

.github/workflows/prerelease.yml

@@ -1,55 +0,0 @@
-name: 测试版
-on:
-  push:
-    tags:
-      - p*
-
-env:
-  GITHUB_TOKEN: ${{ github.token }}
-
-jobs:
-  my-job:
-    name: Build ZeroBot-Plugin on Push Tag 🚀
-    runs-on: ubuntu-latest
-    steps:
-
-      - name: Set up Go
-        uses: actions/setup-go@v2
-        with:
-          go-version: 1.17
-
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
-
-      - name: Cache Go
-        id: cache
-        uses: actions/cache@v2
-        with:
-          # A list of files, directories, and wildcard patterns to cache and restore
-          path: ~/go/pkg/mod
-          key: ${{ runner.os }}-build-${{ hashFiles('**/go.sum') }}
-
-      - name: Tidy Go modules
-        run: go mod tidy
-
-      - name: Build linux-x64
-        run: CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -o artifacts/zerobot-plugin-linux-x64
-      - name: Build linux-x86
-        run: CGO_ENABLED=0 GOOS=linux GOARCH=386 go build -ldflags="-s -w" -o artifacts/zerobot-plugin-linux-x86
-      - name: Build windows-x64
-        run: CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -ldflags="-s -w" -o artifacts/zerobot-plugin-windows-x64.exe
-      - name: Build windows-x86
-        run: CGO_ENABLED=0 GOOS=windows GOARCH=386 go build -ldflags="-s -w" -o artifacts/zerobot-plugin-windows-x86.exe
-      - name: Build arm64
-        run: CGO_ENABLED=0 GOOS=linux GOARCH=arm64 GOARM=7 go build -ldflags="-s -w" -o artifacts/zerobot-plugin-linux-arm64
-      - name: Build armv6
-        run: CGO_ENABLED=0 GOOS=linux GOARCH=arm GOARM=6 go build -ldflags="-s -w" -o artifacts/zerobot-plugin-linux-armv6
-
-      - name: Upload binaries to release
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: artifacts/zerobot-plugin-*
-          tag: ${{ github.ref }}
-          overwrite: true
-          file_glob: true

.github/workflows/release.yml

@@ -1,55 +1,27 @@
-name: 稳定版
+name: compile
 on:
   push:
     tags:
-      - v*
-
-env:
-  GITHUB_TOKEN: ${{ github.token }}
+      - 'v*'
 
 jobs:
-  my-job:
-    name: Build ZeroBot-Plugin on Push Tag 🚀
+  goreleaser:
     runs-on: ubuntu-latest
     steps:
+      - name: Checkout
+        uses: actions/checkout@v2.3.4
+        with:
+          fetch-depth: 0
 
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.17
+          go-version: '1.17'
 
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
-
-      - name: Cache Go
-        id: cache
-        uses: actions/cache@v2
+      - name: Run GoReleaser
+        uses: goreleaser/goreleaser-action@v2
         with:
-          # A list of files, directories, and wildcard patterns to cache and restore
-          path: ~/go/pkg/mod
-          key: ${{ runner.os }}-build-${{ hashFiles('**/go.sum') }}
-
-      - name: Tidy Go modules
-        run: go mod tidy
-
-      - name: Build linux-x64
-        run: CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -o artifacts/zerobot-plugin-linux-x64
-      - name: Build linux-x86
-        run: CGO_ENABLED=0 GOOS=linux GOARCH=386 go build -ldflags="-s -w" -o artifacts/zerobot-plugin-linux-x86
-      - name: Build windows-x64
-        run: CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -ldflags="-s -w" -o artifacts/zerobot-plugin-windows-x64.exe
-      - name: Build windows-x86
-        run: CGO_ENABLED=0 GOOS=windows GOARCH=386 go build -ldflags="-s -w" -o artifacts/zerobot-plugin-windows-x86.exe
-      - name: Build arm64
-        run: CGO_ENABLED=0 GOOS=linux GOARCH=arm64 GOARM=7 go build -ldflags="-s -w" -o artifacts/zerobot-plugin-linux-arm64
-      - name: Build armv6
-        run: CGO_ENABLED=0 GOOS=linux GOARCH=arm GOARM=6 go build -ldflags="-s -w" -o artifacts/zerobot-plugin-linux-armv6
-
-      - name: Upload binaries to release
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: artifacts/zerobot-plugin-*
-          tag: ${{ github.ref }}
-          overwrite: true
-          file_glob: true
+          version: latest
+          args: release --rm-dist
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -5,8 +5,11 @@ data/manager
 data/acgimage
 data/fortune
 data/hs
+plugins/*.so
+plugins/*.dll
 .idea/
 .DS_Store
 .vscode
 go-zero*
 nohup.out
+zerobot

.goreleaser.yml

@@ -0,0 +1,85 @@
+env:
+  - GO111MODULE=on
+before:
+  hooks:
+    - go mod tidy
+builds:
+  - id: nowin
+    env:
+      - CGO_ENABLED=0
+      - GO111MODULE=on
+    goos:
+      - linux
+      - darwin
+    goarch:
+      - 386
+      - amd64
+      - arm
+      - arm64
+    goarm:
+      - 6
+      - 7
+    ignore:
+      - goos: darwin
+        goarch: arm
+      - goos: darwin
+        goarch: 386
+    mod_timestamp: "{{ .CommitTimestamp }}"
+    flags:
+      - -trimpath
+    ldflags:
+      - -s -w
+  - id: win
+    env:
+      - CGO_ENABLED=0
+      - GO111MODULE=on
+    goos:
+      - windows
+    goarch:
+      - 386
+      - amd64
+    mod_timestamp: "{{ .CommitTimestamp }}"
+    flags:
+      - -trimpath
+    ldflags:
+      - -s -w
+
+checksum:
+  name_template: "zbp_checksums.txt"
+changelog:
+  sort: asc
+  filters:
+    exclude:
+      - "^docs:"
+      - "^test:"
+      - fix typo
+      - Merge pull request
+      - Merge branch
+      - Merge remote-tracking
+      - go mod tidy
+
+archives:
+  - id: binary
+    builds:
+      - win
+    name_template: "zbp_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}"
+    format_overrides:
+      - goos: windows
+        format: binary
+  - id: nowin
+    builds:
+      - nowin
+      - win
+    name_template: "zbp_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}"
+    format_overrides:
+      - goos: windows
+        format: zip
+
+nfpms:
+  - license: GPL 3.0
+    homepage: https://go-cqhttp.org
+    file_name_template: "zbp_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}"
+    formats:
+      - deb
+      - rpm
+    maintainer: Kanri, DawnNights, Fumiama, Suika

README.md

@@ -10,9 +10,9 @@
 [![OICQ](https://img.shields.io/badge/OneBot-OICQ-green.svg?style=social&logo=appveyor)](https://github.com/takayama-lily/node-onebot)
 [![MIRAI](https://img.shields.io/badge/OneBot-Mirai-green.svg?style=social&logo=appveyor)](https://github.com/yyuueexxiinngg/onebot-kotlin)
 
-[![Go Report Card](https://goreportcard.com/badge/github.com/Yiwen-Chan/ZeroBot-Plugin?style=flat-square&logo=go)](https://goreportcard.com/report/github.com/github.com/Yiwen-Chan/ZeroBot-Plugin)
+[![Go Report Card](https://goreportcard.com/badge/github.com/FloatTech/ZeroBot-Plugin?style=flat-square&logo=go)](https://goreportcard.com/report/github.com/github.com/FloatTech/ZeroBot-Plugin)
 [![Badge](https://img.shields.io/badge/onebot-v11-black?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://github.com/howmanybots/onebot)
-[![Badge](https://img.shields.io/badge/zerobot-v1.2.3-black?style=flat-square&logo=go)](https://github.com/wdvxdr1123/ZeroBot)
+[![Badge](https://img.shields.io/badge/zerobot-v1.3.0-black?style=flat-square&logo=go)](https://github.com/wdvxdr1123/ZeroBot)
 [![License](https://img.shields.io/github/license/Yiwen-Chan/OneBot-YaYa.svg?style=flat-square&logo=gnu)](https://raw.githubusercontent.com/FloatTech/ZeroBot-Plugin/master/LICENSE)
 [![qq group](https://img.shields.io/badge/group-1048452984-red?style=flat-square&logo=tencent-qq)](https://jq.qq.com/?_wv=1027&k=QMb7x1mM)
 
@@ -20,13 +20,23 @@
 
 ## 命令行参数
 ```bash
-zerobot [-d] [-g] qq1 qq2 qq3 ...
+zerobot -h -t token -u url [-d|w] [-g] qq1 qq2 qq3 ...
 ```
-- **-d**: 开启 debug 级别日志输出
+- **-h**: 显示帮助
+- **-t token**: 设置`AccessToken`，默认为空
+- **-u url**: 设置`Url`，默认为`ws://127.0.0.1:6700`
+- **-d|w**: 开启 debug | warning 级别及以上日志输出
 - **-g**: 开启 [webgui](https://github.com/FloatTech/bot-manager)
 - **qqs**: superusers 的 qq 号
 
 ## 功能
+> 在编译时，以下功能除插件控制外，均可通过注释`main.go`中的相应`import`而物理禁用，减小插件体积。
+> 通过插件控制，还可动态管理某个功能在某个群的打开/关闭。
+- **web管理** `import _ "github.com/FloatTech/ZeroBot-Plugin/control/web"`
+    - 开启后可执行文件大约增加 5M ，默认注释不开启。如需开启请自行编辑`main.go`取消注释
+    - 需要配合 [webgui](https://github.com/FloatTech/bot-manager) 使用
+- **动态加载插件** `import _ github.com/FloatTech/ZeroBot-Plugin-Dynamic/dyloader`
+    - 本功能需要`cgo`，故已分离出主线。详见[ZeroBot-Plugin-Dynamic](https://github.com/FloatTech/ZeroBot-Plugin-Dynamic)
 - **插件控制**
     - [x] /启用 xxx
     - [x] /禁用 xxx
@@ -109,10 +119,10 @@ zerobot [-d] [-g] qq1 qq2 qq3 ...
     - [x] 设置随机图片网址[url]
     - [x] 太涩了(撤回最近发的图)
     - [x] 评价图片(发送一张图片让bot评分)
-- **每日运势** `github.com/FloatTech/ZeroBot-Plugin/plugin_fortune`
+- **每日运势** `import _ github.com/FloatTech/ZeroBot-Plugin/plugin_fortune`
     - [x] 运势|抽签
     - [x] 设置底图[车万 DC4 爱因斯坦 星空列车 樱云之恋 富婆妹 李清歌 公主连结 原神 明日方舟 碧蓝航线 碧蓝幻想 战双 阴阳师]
-- **浅草寺求签** `github.com/FloatTech/ZeroBot-Plugin/plugin_omikuji`
+- **浅草寺求签** `import _ github.com/FloatTech/ZeroBot-Plugin/plugin_omikuji`
     - [x] 求签|占卜
 - **bilibili** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_bilibili"`
     - [x] >vup info [名字|uid]
@@ -167,7 +177,7 @@ zerobot [-d] [-g] qq1 qq2 qq3 ...
 ### 本地运行
 
 1. 下载安装 [Go](https://studygolang.com/dl) 环境
-2. 下载本项目[压缩包](https://github.com/Yiwen-Chan/ZeroBot-Plugin/archive/master.zip)，本地解压
+2. 下载本项目[压缩包](https://github.com/FloatTech/ZeroBot-Plugin/archive/master.zip)，本地解压
 3. 编辑 main.go 文件，内容按需修改
 4. 双击 build.bat 文件 或 直接双击 run.bat 文件
 5. 运行 OneBot 框架，并同时运行本插件
@@ -179,7 +189,7 @@ zerobot [-d] [-g] qq1 qq2 qq3 ...
 1. 点击右上角 Fork 本项目，并转跳到自己 Fork 的仓库
 2. 点击仓库上方的 Actions 按钮，确认使用 Actions
 3. 编辑 main.go 文件，内容按需修改
-4. 前往 Release 页面发布一个 Release，`tag`形如`vx.y.z`，以触发稳定版编译流程
+4. 前往 Release 页面发布一个 Release，`tag`形如`v1.2.3`，以触发稳定版编译流程
 5. 点击 Actions 按钮，等待编译完成，回到 Release 页面下载编译好的文件
 6. 运行 OneBot 框架，并同时运行本插件
 7. 啾咪~
@@ -219,4 +229,4 @@ GOOS=linux GOARCH=mips GOMIPS=softfloat CGO_ENABLED=0 go build -ldflags "-s -w"
 
 ## License
 
-[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2FYiwen-Chan%2FZeroBot-Plugin.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2FYiwen-Chan%2FZeroBot-Plugin?ref=badge_large)
+[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2FFloatTech%2FZeroBot-Plugin.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2FFloatTech%2FZeroBot-Plugin?ref=badge_large)

control/register.go

@@ -4,9 +4,28 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 )
 
+var enmap = make(map[string]*zero.Engine)
+
 // Register 注册插件控制器
 func Register(service string, o *Options) *zero.Engine {
 	engine := zero.New()
 	engine.UsePreHandler(newctrl(service, o).Handler())
+	enmap[service] = engine
 	return engine
 }
+
+// Delete 删除插件控制器，不会删除数据
+func Delete(service string) {
+	engine, ok := enmap[service]
+	if ok {
+		engine.Delete()
+		mu.RLock()
+		_, ok = managers[service]
+		mu.RUnlock()
+		if ok {
+			mu.Lock()
+			delete(managers, service)
+			mu.Unlock()
+		}
+	}
+}

control/rule.go

@@ -11,11 +11,11 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/extension"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
-	"github.com/FloatTech/ZeroBot-Plugin/data"
+	"github.com/FloatTech/ZeroBot-Plugin/utils/sql"
 )
 
 var (
-	db = &data.Sqlite{DBPath: "data/control/plugins.db"}
+	db = &sql.Sqlite{DBPath: "data/control/plugins.db"}
 	// managers 每个插件对应的管理
 	managers = map[string]*Control{}
 	mu       = sync.RWMutex{}
@@ -49,8 +49,8 @@ func newctrl(service string, o *Options) *Control {
 	return m
 }
 
-// enable enables a group to pass the Manager.
-func (m *Control) enable(groupID int64) {
+// Enable enables a group to pass the Manager.
+func (m *Control) Enable(groupID int64) {
 	m.Lock()
 	err := db.Insert(m.service, &grpcfg{groupID, 0})
 	if err != nil {
@@ -59,8 +59,8 @@ func (m *Control) enable(groupID int64) {
 	m.Unlock()
 }
 
-// disable disables a group to pass the Manager.
-func (m *Control) disable(groupID int64) {
+// Disable disables a group to pass the Manager.
+func (m *Control) Disable(groupID int64) {
 	m.Lock()
 	err := db.Insert(m.service, &grpcfg{groupID, 1})
 	if err != nil {
@@ -69,7 +69,8 @@ func (m *Control) disable(groupID int64) {
 	m.Unlock()
 }
 
-func (m *Control) isEnabledIn(gid int64) bool {
+// IsEnabledIn 开启群
+func (m *Control) IsEnabledIn(gid int64) bool {
 	m.RLock()
 	var c grpcfg
 	err := db.Find(m.service, &c, "WHERE gid = "+strconv.FormatInt(gid, 10))
@@ -81,9 +82,9 @@ func (m *Control) isEnabledIn(gid int64) bool {
 	logrus.Errorf("[control] %v", err)
 	m.RUnlock()
 	if m.options.DisableOnDefault {
-		m.disable(gid)
+		m.Disable(gid)
 	} else {
-		m.enable(gid)
+		m.Enable(gid)
 	}
 	return !m.options.DisableOnDefault
 }
@@ -92,21 +93,21 @@ func (m *Control) isEnabledIn(gid int64) bool {
 func (m *Control) Handler() zero.Rule {
 	return func(ctx *zero.Ctx) bool {
 		ctx.State["manager"] = m
-		return m.isEnabledIn(ctx.Event.GroupID)
+		return m.IsEnabledIn(ctx.Event.GroupID)
 	}
 }
 
-// lookup returns a Manager by the service name, if
+// Lookup returns a Manager by the service name, if
 // not exist, it will returns nil.
-func lookup(service string) (*Control, bool) {
+func Lookup(service string) (*Control, bool) {
 	mu.RLock()
 	defer mu.RUnlock()
 	m, ok := managers[service]
 	return m, ok
 }
 
-// forEach iterates through managers.
-func forEach(iterator func(key string, manager *Control) bool) {
+// ForEach iterates through managers.
+func ForEach(iterator func(key string, manager *Control) bool) {
 	mu.RLock()
 	m := copyMap(managers)
 	mu.RUnlock()
@@ -138,38 +139,38 @@ func init() {
 					Handle(func(ctx *zero.Ctx) {
 						model := extension.CommandModel{}
 						_ = ctx.Parse(&model)
-						service, ok := lookup(model.Args)
+						service, ok := Lookup(model.Args)
 						if !ok {
-							ctx.Send("没有找到指定服务!")
+							ctx.SendChain(message.Text("没有找到指定服务!"))
 						}
-						service.enable(ctx.Event.GroupID)
-						ctx.Send(message.Text("已启用服务: " + model.Args))
+						service.Enable(ctx.Event.GroupID)
+						ctx.SendChain(message.Text("已启用服务: " + model.Args))
 					})
 
 				zero.OnCommandGroup([]string{"禁用", "disable"}, zero.AdminPermission, zero.OnlyGroup).
 					Handle(func(ctx *zero.Ctx) {
 						model := extension.CommandModel{}
 						_ = ctx.Parse(&model)
-						service, ok := lookup(model.Args)
+						service, ok := Lookup(model.Args)
 						if !ok {
-							ctx.Send("没有找到指定服务!")
+							ctx.SendChain(message.Text("没有找到指定服务!"))
 						}
-						service.disable(ctx.Event.GroupID)
-						ctx.Send(message.Text("已关闭服务: " + model.Args))
+						service.Disable(ctx.Event.GroupID)
+						ctx.SendChain(message.Text("已关闭服务: " + model.Args))
 					})
 
 				zero.OnCommandGroup([]string{"用法", "usage"}, zero.AdminPermission, zero.OnlyGroup).
 					Handle(func(ctx *zero.Ctx) {
 						model := extension.CommandModel{}
 						_ = ctx.Parse(&model)
-						service, ok := lookup(model.Args)
+						service, ok := Lookup(model.Args)
 						if !ok {
-							ctx.Send("没有找到指定服务!")
+							ctx.SendChain(message.Text("没有找到指定服务!"))
 						}
 						if service.options.Help != "" {
-							ctx.Send(service.options.Help)
+							ctx.SendChain(message.Text(service.options.Help))
 						} else {
-							ctx.Send("该服务无帮助!")
+							ctx.SendChain(message.Text("该服务无帮助!"))
 						}
 					})
 
@@ -177,17 +178,17 @@ func init() {
 					Handle(func(ctx *zero.Ctx) {
 						msg := `---服务列表---`
 						i := 0
-						forEach(func(key string, manager *Control) bool {
+						ForEach(func(key string, manager *Control) bool {
 							i++
 							msg += "\n" + strconv.Itoa(i) + `: `
-							if manager.isEnabledIn(ctx.Event.GroupID) {
+							if manager.IsEnabledIn(ctx.Event.GroupID) {
 								msg += "●" + key
 							} else {
 								msg += "○" + key
 							}
 							return true
 						})
-						ctx.Send(message.Text(msg))
+						ctx.SendChain(message.Text(msg))
 					})
 			}
 		}

control/web/gui.go

@@ -1,4 +1,4 @@
-package control
+package web
 
 import (
 	"encoding/json"
@@ -17,6 +17,8 @@ import (
 	log "github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
+
+	ctrl "github.com/FloatTech/ZeroBot-Plugin/control"
 )
 
 var (
@@ -34,8 +36,8 @@ var (
 type logWriter struct {
 }
 
-// InitGui 初始化gui
-func InitGui() {
+// initGui 初始化gui
+func initGui() {
 	// 将日志重定向到前端hook
 	writer := io.MultiWriter(l, os.Stderr)
 	log.SetOutput(writer)
@@ -86,8 +88,8 @@ func controller() {
 	// 获取插件列表
 	engine.POST("/get_plugins", func(context *gin.Context) {
 		var datas []map[string]interface{}
-		forEach(func(key string, manager *Control) bool {
-			datas = append(datas, map[string]interface{}{"id": 1, "handle_type": "", "name": key, "enable": manager.isEnabledIn(0)})
+		ctrl.ForEach(func(key string, manager *ctrl.Control) bool {
+			datas = append(datas, map[string]interface{}{"id": 1, "handle_type": "", "name": key, "enable": manager.IsEnabledIn(0)})
 			return true
 		})
 		context.JSON(200, datas)
@@ -134,14 +136,14 @@ func updateAllPluginStatus(context *gin.Context) {
 		return true
 	})
 
-	forEach(func(key string, manager *Control) bool {
+	ctrl.ForEach(func(key string, manager *ctrl.Control) bool {
 		if enable {
 			for _, group := range groups {
-				manager.enable(group)
+				manager.Enable(group)
 			}
 		} else {
 			for _, group := range groups {
-				manager.disable(group)
+				manager.Disable(group)
 			}
 		}
 		return true
@@ -168,7 +170,7 @@ func updatePluginAllGroupStatus(context *gin.Context) {
 		name = parse["name"].(string)
 		enable = parse["enable"].(bool)
 	}
-	control, b := lookup(name)
+	control, b := ctrl.Lookup(name)
 	if !b {
 		context.JSON(404, nil)
 		return
@@ -176,9 +178,9 @@ func updatePluginAllGroupStatus(context *gin.Context) {
 	zero.RangeBot(func(id int64, ctx *zero.Ctx) bool {
 		for _, group := range ctx.GetGroupList().Array() {
 			if enable {
-				control.enable(group.Get("group_id").Int())
+				control.Enable(group.Get("group_id").Int())
 			} else {
-				control.disable(group.Get("group_id").Int())
+				control.Disable(group.Get("group_id").Int())
 			}
 		}
 
@@ -205,15 +207,15 @@ func updatePluginStatus(context *gin.Context) {
 	name := parse["name"].(string)
 	enable := parse["enable"].(bool)
 	fmt.Println(name)
-	control, b := lookup(name)
+	control, b := ctrl.Lookup(name)
 	if !b {
 		context.JSON(404, "服务不存在")
 		return
 	}
 	if enable {
-		control.enable(groupID)
+		control.Enable(groupID)
 	} else {
-		control.disable(groupID)
+		control.Disable(groupID)
 	}
 	context.JSON(200, nil)
 }
@@ -237,12 +239,12 @@ func getPluginStatus(context *gin.Context) {
 		groupID = int64(parse["group_id"].(float64))
 		name = parse["name"].(string)
 	}
-	control, b := lookup(name)
+	control, b := ctrl.Lookup(name)
 	if !b {
 		context.JSON(404, "服务不存在")
 		return
 	}
-	context.JSON(200, gin.H{"enable": control.isEnabledIn(groupID)})
+	context.JSON(200, gin.H{"enable": control.IsEnabledIn(groupID)})
 }
 
 // getPluginsStatus
@@ -263,8 +265,8 @@ func getPluginsStatus(context *gin.Context) {
 		groupID = int64(parse["group_id"].(float64))
 	}
 	var datas []map[string]interface{}
-	forEach(func(key string, manager *Control) bool {
-		enable := manager.isEnabledIn(groupID)
+	ctrl.ForEach(func(key string, manager *ctrl.Control) bool {
+		enable := manager.IsEnabledIn(groupID)
 		datas = append(datas, map[string]interface{}{"name": key, "enable": enable})
 		return true
 	})

control/web/init.go

@@ -0,0 +1,11 @@
+// Package web 网页管理后端
+package web
+
+import "flag"
+
+func init() {
+	// 解析命令行参数，输入 `-g` 即可启用 gui
+	if *flag.Bool("g", false, "Enable web gui.") {
+		initGui()
+	}
+}

data/mem.go

@@ -1,15 +0,0 @@
-package data
-
-import "unsafe"
-
-// Str2bytes Fast convert
-func Str2bytes(s string) []byte {
-	x := (*[2]uintptr)(unsafe.Pointer(&s))
-	h := [3]uintptr{x[0], x[1], x[1]}
-	return *(*[]byte)(unsafe.Pointer(&h))
-}
-
-// Bytes2str Fast convert
-func Bytes2str(b []byte) string {
-	return *(*string)(unsafe.Pointer(&b))
-}

go.mod

@@ -16,7 +16,7 @@ require (
 	github.com/robfig/cron v1.2.0
 	github.com/shirou/gopsutil v3.21.9+incompatible
 	github.com/sirupsen/logrus v1.8.1
-	github.com/tidwall/gjson v1.9.3
-	github.com/wdvxdr1123/ZeroBot v1.2.4
+	github.com/tidwall/gjson v1.9.4
+	github.com/wdvxdr1123/ZeroBot v1.3.1
 	modernc.org/sqlite v1.13.1
 )

go.sum

@@ -88,7 +88,6 @@ github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6O
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/robfig/cron v1.2.0 h1:ZjScXvvxeQ63Dbyxy76Fj3AT3Ut0aKsyd2/tl3DTMuQ=
 github.com/robfig/cron v1.2.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k=
-github.com/shirou/gopsutil v3.21.8+incompatible h1:sh0foI8tMRlCidUJR+KzqWYWxrkuuPIGiO6Vp+KXdCU=
 github.com/shirou/gopsutil v3.21.8+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 github.com/shirou/gopsutil v3.21.9+incompatible h1:LTLpUnfX81MkHeCtSrwNKZwuW5Id6kCa7/P43NdcNn4=
 github.com/shirou/gopsutil v3.21.9+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
@@ -107,15 +106,12 @@ github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816/go
 github.com/tdf1939/ZeroBot-Plugin-Gif v0.0.0-20210828060956-389b1dc33652/go.mod h1:bkxKi7un9gCDvUUZAiIJF6k90pyj8rmxiXLJkiHcsMY=
 github.com/tdf1939/img v0.0.0-20210827153520-90cb4e9580a3/go.mod h1:FgTEOcosTWrkOr7++gbtPSj1rX5loRWrf/AL+hm3Cnw=
 github.com/tidwall/gjson v1.8.0/go.mod h1:5/xDoumyyDNerp2U36lyolv46b3uF/9Bu6OfyQ9GImk=
-github.com/tidwall/gjson v1.9.0 h1:+Od7AE26jAaMgVC31cQV/Ope5iKXulNMflrlB7k+F9E=
 github.com/tidwall/gjson v1.9.0/go.mod h1:5/xDoumyyDNerp2U36lyolv46b3uF/9Bu6OfyQ9GImk=
-github.com/tidwall/gjson v1.9.3 h1:hqzS9wAHMO+KVBBkLxYdkEeeFHuqr95GfClRLKlgK0E=
-github.com/tidwall/gjson v1.9.3/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
-github.com/tidwall/match v1.0.3 h1:FQUVvBImDutD8wJLN6c5eMzWtjgONK9MwIBCOrUJKeE=
+github.com/tidwall/gjson v1.9.4 h1:oNis7dk9Rs3dKJNNigXZT1MTOiJeBtpurn+IpCB75MY=
+github.com/tidwall/gjson v1.9.4/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
 github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
 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.1.0 h1:K3hMW5epkdAVwibsQEfR/7Zj0Qgt4DxtNumTq/VloO8=
 github.com/tidwall/pretty v1.1.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
 github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
@@ -129,8 +125,9 @@ github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
 github.com/wdvxdr1123/ZeroBot v1.2.2/go.mod h1:83nHtG8V5TAxPwH/LCDxLpZk4khIgs29dkr5TBWf7fc=
 github.com/wdvxdr1123/ZeroBot v1.2.3/go.mod h1:83nHtG8V5TAxPwH/LCDxLpZk4khIgs29dkr5TBWf7fc=
-github.com/wdvxdr1123/ZeroBot v1.2.4 h1:eC/41Tlkj1jxXW91x4K+qjUlaQXKGgUeLhxw7C6+qkM=
 github.com/wdvxdr1123/ZeroBot v1.2.4/go.mod h1:83nHtG8V5TAxPwH/LCDxLpZk4khIgs29dkr5TBWf7fc=
+github.com/wdvxdr1123/ZeroBot v1.3.1 h1:umzXG0Uc8CCxPgFM+BH4o8cPNKoXxF723EnEoNCi9RE=
+github.com/wdvxdr1123/ZeroBot v1.3.1/go.mod h1:83nHtG8V5TAxPwH/LCDxLpZk4khIgs29dkr5TBWf7fc=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -221,7 +218,6 @@ modernc.org/memory v1.0.5 h1:XRch8trV7GgvTec2i7jc33YlUI0RKVDBvZ5eZ5m8y14=
 modernc.org/memory v1.0.5/go.mod h1:B7OYswTRnfGg+4tDH1t1OeUNnsy2viGTdME4tzd+IjM=
 modernc.org/opt v0.1.1 h1:/0RX92k9vwVeDXj+Xn23DKp2VJubL7k8qNffND6qn3A=
 modernc.org/opt v0.1.1/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
-modernc.org/sqlite v1.13.0 h1:cwhUj0jTBgPjk/demWheV+T6xi6ifTfsGIFKFq0g3Ck=
 modernc.org/sqlite v1.13.0/go.mod h1:2qO/6jZJrcQaxFUHxOwa6Q6WfiGSsiVj6GXX0Ker+Jg=
 modernc.org/sqlite v1.13.1 h1:s/qk6VTTVyQIyhVNWa50whBBcI3+2oREbx85t227iOo=
 modernc.org/sqlite v1.13.1/go.mod h1:2qO/6jZJrcQaxFUHxOwa6Q6WfiGSsiVj6GXX0Ker+Jg=

main.go

@@ -3,13 +3,16 @@ package main
 import (
 	"flag"
 	"fmt"
+	"os"
 	"strings"
 
 	// 注：以下插件均可通过前面加 // 注释，注释后停用并不加载插件
 	// 下列插件可与 wdvxdr1123/ZeroBot v1.1.2 以上配合单独使用
-	// 词库类
-	"github.com/sirupsen/logrus"
 
+	// 插件控制
+	// _ "github.com/FloatTech/ZeroBot-Plugin/control/web" // web 后端控制
+
+	// 词库类
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_atri"      // ATRI词库
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_chat"      // 基础词库
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_qingyunke" // 青云客
@@ -45,45 +48,59 @@ import (
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_setutime"     // 来份涩图
 
 	// 以下为内置依赖，勿动
-
+	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/driver"
-
-	"github.com/FloatTech/ZeroBot-Plugin/control"
+	"github.com/wdvxdr1123/ZeroBot/message"
 )
 
 var (
 	contents = []string{
 		"* OneBot + ZeroBot + Golang",
-		"* Version 1.1.6 - 2021-10-09 12:50:23 +0800 CST",
+		"* Version 1.1.7 - 2021-10-09 12:50:23 +0800 CST",
 		"* Copyright © 2020 - 2021 Kanri, DawnNights, Fumiama, Suika",
 		"* Project: https://github.com/FloatTech/ZeroBot-Plugin",
 	}
 	banner = strings.Join(contents, "\n")
+	token  *string
+	url    *string
 )
 
 func init() {
-	var en bool
-	var debg bool
-	// 解析命令行参数，输入 `-g` 即可启用 gui
-	flag.BoolVar(&en, "g", false, "Enable web gui.")
-	// 解析命令行参数，输入 `-d` 即可开启 debug log
-	flag.BoolVar(&debg, "d", false, "Enable debug log.")
+	// 解析命令行参数
+	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.")
+	// 直接写死 AccessToken 时，请更改下面第二个参数
+	token = flag.String("t", "", "Set AccessToken of WSClient.")
+	// 直接写死 URL 时，请更改下面第二个参数
+	url = flag.String("u", "ws://127.0.0.1:6700", "Set Url of WSClient.")
 	flag.Parse()
-	if en {
-		control.InitGui()
-	}
-	if debg {
-		logrus.SetLevel(logrus.DebugLevel)
+	if *h {
+		printBanner()
+		fmt.Println("Usage:")
+		flag.PrintDefaults()
+		os.Exit(0)
+	} else {
+		if *d && !*w {
+			logrus.SetLevel(logrus.DebugLevel)
+		}
+		if *w {
+			logrus.SetLevel(logrus.WarnLevel)
+		}
 	}
 }
 
-func main() {
+func printBanner() {
 	fmt.Print(
 		"\n======================[ZeroBot-Plugin]======================",
 		"\n", banner, "\n",
 		"============================================================\n",
-	) // 启动打印
+	)
+}
+
+func main() {
+	printBanner()
 	zero.Run(zero.Config{
 		NickName:      []string{"椛椛", "ATRI", "atri", "亚托莉", "アトリ"},
 		CommandPrefix: "/",
@@ -96,8 +113,8 @@ func main() {
 		Driver: []zero.Driver{
 			&driver.WSClient{
 				// OneBot 正向WS 默认使用 6700 端口
-				Url:         "ws://127.0.0.1:6700",
-				AccessToken: "",
+				Url:         *url,
+				AccessToken: *token,
 			},
 		},
 	})
@@ -105,7 +122,7 @@ func main() {
 	// 帮助
 	zero.OnFullMatchGroup([]string{"/help", ".help", "菜单"}, zero.OnlyToMe).SetBlock(true).FirstPriority().
 		Handle(func(ctx *zero.Ctx) {
-			ctx.Send(banner)
+			ctx.SendChain(message.Text(banner))
 		})
 	select {}
 }

plugin_acgimage/classify.go

@@ -46,10 +46,10 @@ func init() { // 插件主体
 		Handle(func(ctx *zero.Ctx) {
 			url := ctx.State["regex_matched"].([]string)[1]
 			if !strings.HasPrefix(url, "http") {
-				ctx.Send("URL非法!")
+				ctx.SendChain(message.Text("URL非法!"))
 			} else {
 				randapi = url
-				ctx.Send("设置好啦")
+				ctx.SendChain(message.Text("设置好啦"))
 			}
 		})
 	// 有保护的随机图片
@@ -61,14 +61,14 @@ func init() { // 插件主体
 					replyClass(ctx, dhash, class, false, lastvisit, comment)
 				}()
 			} else {
-				ctx.Send("你太快啦!")
+				ctx.SendChain(message.Text("你太快啦!"))
 			}
 		})
 	// 直接随机图片，无r18保护，后果自负。如果出r18图可尽快通过发送"太涩了"撤回
 	engine.OnFullMatch("直接随机", zero.OnlyGroup, zero.AdminPermission).SetBlock(true).SetPriority(24).
 		Handle(func(ctx *zero.Ctx) {
 			if block {
-				ctx.Send("请稍后再试哦")
+				ctx.SendChain(message.Text("请稍后再试哦"))
 			} else if randapi != "" {
 				block = true
 				var url string
@@ -77,7 +77,7 @@ func init() { // 插件主体
 				} else {
 					url = randapi
 				}
-				setLastMsg(ctx.Event.GroupID, ctx.Send(message.Image(url).Add("cache", "0")))
+				setLastMsg(ctx.Event.GroupID, ctx.SendChain(message.Image(url).Add("cache", "0")))
 				block = false
 			}
 		})
@@ -89,7 +89,7 @@ func init() { // 插件主体
 	// 上传一张图进行评价
 	engine.OnKeywordGroup([]string{"评价图片"}, zero.OnlyGroup, picture.CmdMatch, picture.MustGiven).SetBlock(true).SetPriority(24).
 		Handle(func(ctx *zero.Ctx) {
-			ctx.Send("少女祈祷中...")
+			ctx.SendChain(message.Text("少女祈祷中..."))
 			for _, url := range ctx.State["image_url"].([]string) {
 				go func(target string) {
 					class, lastvisit, dhash, comment := classify.Classify(target, true)
@@ -101,7 +101,7 @@ func init() { // 插件主体
 		Handle(func(ctx *zero.Ctx) {
 			dhash := ctx.State["regex_matched"].([]string)[1]
 			if len(dhash) == 5*3 {
-				ctx.Send(message.Image(apihead + dhash))
+				ctx.SendChain(message.Image(apihead + dhash))
 			}
 		})
 }
@@ -124,19 +124,18 @@ func replyClass(ctx *zero.Ctx, dhash string, class int, noimg bool, lv int64, co
 		if dhash != "" && !noimg {
 			b14, err3 := url.QueryUnescape(dhash)
 			if err3 == nil {
-				ctx.Send(comment + "\n给你点提示哦：" + b14)
+				ctx.SendChain(message.Text(comment + "\n给你点提示哦：" + b14))
 				ctx.Event.GroupID = 0
-				ctx.Send(img)
+				ctx.SendChain(message.Text(img))
 			}
 		} else {
-			ctx.Send(comment)
+			ctx.SendChain(message.Text(comment))
 		}
 	} else {
-		comment := message.Text(comment)
 		if !noimg {
-			ctx.SendChain(img, comment)
+			ctx.SendChain(img, message.Text(comment))
 		} else {
-			ctx.SendChain(message.Reply(ctx.Event.MessageID), comment)
+			ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(comment))
 		}
 	}
 }

plugin_ai_false/ai_false.go

@@ -35,9 +35,9 @@ func init() { // 插件主体
 		Handle(func(ctx *zero.Ctx) {
 			err := os.RemoveAll("data/cache/*")
 			if err != nil {
-				ctx.Send("错误: " + err.Error())
+				ctx.SendChain(message.Text("错误: ", err.Error()))
 			} else {
-				ctx.Send("成功!")
+				ctx.SendChain(message.Text("成功!"))
 			}
 		})
 }

plugin_bilibili/info.go

@@ -12,17 +12,16 @@ import (
 	"github.com/FloatTech/ZeroBot-Plugin/control"
 )
 
-var engine *zero.Engine
+var engine = control.Register("bilibili", &control.Options{
+	DisableOnDefault: false,
+	Help: "bilibili\n" +
+		"- >vup info [名字|uid]\n" +
+		"- >user info [名字|uid]\n" +
+		"- /开启粉丝日报",
+})
 
 // 查成分的
 func init() {
-	engine = control.Register("bilibili", &control.Options{
-		DisableOnDefault: false,
-		Help: "bilibili\n" +
-			"- >vup info [名字|uid]\n" +
-			"- >user info [名字|uid]\n" +
-			"- /开启粉丝日报",
-	})
 	engine.OnRegex(`^>user info\s(.{1,25})$`).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			keyword := ctx.State["regex_matched"].([]string)[1]

plugin_diana/bing.go

@@ -2,11 +2,11 @@
 package diana
 
 import (
-	fmt "fmt"
 	"math/rand"
 	"time"
 
 	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
 
 	"github.com/FloatTech/ZeroBot-Plugin/control"
 	"github.com/FloatTech/ZeroBot-Plugin/plugin_diana/data"
@@ -28,22 +28,22 @@ func init() {
 		Handle(func(ctx *zero.Ctx) {
 			rand.Seed(time.Now().UnixNano())
 			// 绕过第一行发病
-			ctx.Send((*data.Array)[rand.Intn(len(*data.Array)-1)+1])
+			ctx.SendChain(message.Text((*data.Array)[rand.Intn(len(*data.Array)-1)+1]))
 		})
 	// 逆天
 	engine.OnFullMatch("发大病").SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			// 第一行是发病
-			ctx.Send((*data.Array)[0])
+			ctx.SendChain(message.Text((*data.Array)[0]))
 		})
 	// 增加小作文
 	engine.OnRegex(`^教你一篇小作文(.*)$`, zero.AdminPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			err := data.AddText(ctx.State["regex_matched"].([]string)[1])
 			if err != nil {
-				ctx.Send(fmt.Sprintf("ERROR: %v", err))
+				ctx.SendChain(message.Text("ERROR: ", err))
 			} else {
-				ctx.Send("记住啦!")
+				ctx.SendChain(message.Text("记住啦!"))
 			}
 		})
 }

plugin_diana/data/text.go

@@ -10,8 +10,7 @@ import (
 	"time"
 
 	log "github.com/sirupsen/logrus"
-
-	"github.com/FloatTech/ZeroBot-Plugin/data"
+	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 )
 
 const (
@@ -43,7 +42,7 @@ func init() {
 			log.Printf("[Diana]读取%d条小作文", arrl)
 			md5s = make([]*[16]byte, arrl)
 			for i, t := range *Array {
-				m := md5.Sum(data.Str2bytes(t))
+				m := md5.Sum(helper.StringToBytes(t))
 				md5s[i] = &m
 			}
 		} else {
@@ -93,7 +92,7 @@ func LoadText() error {
 
 // AddText 添加小作文
 func AddText(txt string) error {
-	sum := md5.Sum(data.Str2bytes(txt))
+	sum := md5.Sum(helper.StringToBytes(txt))
 	if txt != "" && !isin(&sum) {
 		m.Lock()
 		defer m.Unlock()

plugin_diana/zhiwang.go

@@ -1,3 +1,4 @@
+// Package diana 嘉然相关
 package diana
 
 import (
@@ -37,12 +38,12 @@ func init() {
 				zhiwangjson := zhiwangapi(msg)
 
 				if zhiwangjson == nil || zhiwangjson.Code != 0 {
-					ctx.Send("api返回错误")
+					ctx.SendChain(message.Text("api返回错误"))
 					return
 				}
 
 				if len(zhiwangjson.Data.Related) == 0 {
-					ctx.Send("枝网没搜到，查重率为0%，我的评价是：一眼真")
+					ctx.SendChain(message.Text("枝网没搜到，查重率为0%，我的评价是：一眼真"))
 					return
 				}
 

plugin_fortune/fortune.go

@@ -15,11 +15,14 @@ import (
 	"time"
 
 	"github.com/fogleman/gg"
+	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
+	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
 	"github.com/FloatTech/ZeroBot-Plugin/control"
-	"github.com/FloatTech/ZeroBot-Plugin/data"
+	"github.com/FloatTech/ZeroBot-Plugin/utils/dl"
+	"github.com/FloatTech/ZeroBot-Plugin/utils/math"
 )
 
 var (
@@ -53,14 +56,20 @@ func init() {
 			"- 运势|抽签\n" +
 			"- 设置底图[车万 DC4 爱因斯坦 星空列车 樱云之恋 富婆妹 李清歌 公主连结 原神 明日方舟 碧蓝航线 碧蓝幻想 战双 阴阳师]",
 	})
-	en.OnRegex(`^设置底图(.*)`, zero.OnlyGroup).SetBlock(true).SecondPriority().
+	en.OnRegex(`^设置底图(.*)`).SetBlock(true).SecondPriority().
 		Handle(func(ctx *zero.Ctx) {
+			gid := ctx.Event.GroupID
+			if gid <= 0 {
+				// 个人用户设为负数
+				gid = -ctx.Event.UserID
+			}
 			i, ok := index[ctx.State["regex_matched"].([]string)[1]]
 			if ok {
-				conf.Kind[ctx.Event.GroupID] = i
+				conf.Kind[gid] = i
 				savecfg("cfg.pb")
+				ctx.SendChain(message.Text("设置成功~"))
 			} else {
-				ctx.Send("没有这个底图哦～")
+				ctx.SendChain(message.Text("没有这个底图哦～"))
 			}
 		})
 	en.OnFullMatchGroup([]string{"运势", "抽签"}).SetBlock(true).SecondPriority().
@@ -69,7 +78,7 @@ func init() {
 			mikuji := base + "运势签文.json"
 			if _, err := os.Stat(mikuji); err != nil && !os.IsExist(err) {
 				ctx.SendChain(message.Text("正在下载签文文件，请稍后..."))
-				err := data.DownloadTo(site+"运势签文.json", mikuji)
+				err := dl.DownloadTo(site+"运势签文.json", mikuji)
 				if err != nil {
 					ctx.SendChain(message.Text("ERROR: ", err))
 					return
@@ -80,7 +89,7 @@ func init() {
 			ttf := base + "sakura.ttf"
 			if _, err := os.Stat(ttf); err != nil && !os.IsExist(err) {
 				ctx.SendChain(message.Text("正在下载字体文件，请稍后..."))
-				err := data.DownloadTo(site+"sakura.ttf", ttf)
+				err := dl.DownloadTo(site+"sakura.ttf", ttf)
 				if err != nil {
 					ctx.SendChain(message.Text("ERROR: ", err))
 					return
@@ -89,7 +98,13 @@ func init() {
 			}
 			// 获取该群背景类型，默认车万
 			kind := "车万"
-			if v, ok := conf.Kind[ctx.Event.GroupID]; ok {
+			gid := ctx.Event.GroupID
+			if gid <= 0 {
+				// 个人用户设为负数
+				gid = -ctx.Event.UserID
+			}
+			logrus.Debugln("[fortune]gid:", ctx.Event.GroupID, "uid:", ctx.Event.UserID)
+			if v, ok := conf.Kind[gid]; ok {
 				kind = table[v]
 			}
 			// 检查背景图片是否存在
@@ -97,32 +112,33 @@ func init() {
 			if _, err := os.Stat(folder); err != nil && !os.IsExist(err) {
 				ctx.SendChain(message.Text("正在下载背景图片，请稍后..."))
 				zipfile := kind + ".zip"
-				err := data.DownloadTo(site+zipfile, zipfile)
+				zipcache := base + zipfile
+				err := dl.DownloadTo(site+zipfile, zipcache)
 				if err != nil {
 					ctx.SendChain(message.Text("ERROR: ", err))
 					return
 				}
 				ctx.SendChain(message.Text("下载背景图片完毕"))
-				err = unpack(zipfile, folder+"/")
+				err = unpack(zipcache, folder+"/")
 				if err != nil {
 					ctx.SendChain(message.Text("ERROR: ", err))
 					return
 				}
 				ctx.SendChain(message.Text("解压背景图片完毕"))
 				// 释放空间
-				os.Remove(zipfile)
+				os.Remove(zipcache)
 			}
 			// 生成种子
 			t, _ := strconv.ParseInt(time.Now().Format("20060102"), 10, 64)
 			seed := ctx.Event.UserID + t
 			// 随机获取背景
-			background, err := randimage(base+kind+"/", seed)
+			background, err := randimage(folder+"/", seed)
 			if err != nil {
 				ctx.SendChain(message.Text("ERROR: ", err))
 				return
 			}
 			// 随机获取签文
-			title, text, err := randtext(base+"运势签文.json", seed)
+			title, text, err := randtext(mikuji, seed)
 			if err != nil {
 				ctx.SendChain(message.Text("ERROR: ", err))
 				return
@@ -134,7 +150,7 @@ func init() {
 				return
 			}
 			// 发送图片
-			ctx.SendChain(message.Image("base64://" + data.Bytes2str(d)))
+			ctx.SendChain(message.Image("base64://" + helper.BytesToString(d)))
 		})
 }
 
@@ -235,25 +251,6 @@ func draw(background, title, text string) ([]byte, error) {
 	if err := canvas.LoadFontFace(base+"sakura.ttf", 23); err != nil {
 		return nil, err
 	}
-	offest := func(total, now int, distance float64) float64 {
-		if total%2 == 0 {
-			return (float64(now-total/2) - 1) * distance
-		}
-		return (float64(now-total/2) - 1.5) * distance
-	}
-	rowsnum := func(total, div int) int {
-		temp := total / div
-		if total%div != 0 {
-			temp++
-		}
-		return temp
-	}
-	min := func(a, b int) int {
-		if a < b {
-			return a
-		}
-		return b
-	}
 	tw, th := canvas.MeasureString("测")
 	tw, th = tw+10, th+10
 	r := []rune(text)
@@ -262,7 +259,7 @@ func draw(background, title, text string) ([]byte, error) {
 	default:
 		for i, o := range r {
 			xnow := rowsnum(i+1, 9)
-			ysum := min(len(r)-(xnow-1)*9, 9)
+			ysum := math.Min(len(r)-(xnow-1)*9, 9)
 			ynow := i%9 + 1
 			canvas.DrawString(string(o), -offest(xsum, xnow, tw)+115, offest(ysum, ynow, th)+320.0)
 		}
@@ -270,7 +267,7 @@ func draw(background, title, text string) ([]byte, error) {
 		div := rowsnum(len(r), 2)
 		for i, o := range r {
 			xnow := rowsnum(i+1, div)
-			ysum := min(len(r)-(xnow-1)*div, div)
+			ysum := math.Min(len(r)-(xnow-1)*div, div)
 			ynow := i%div + 1
 			switch xnow {
 			case 1:
@@ -292,3 +289,18 @@ func draw(background, title, text string) ([]byte, error) {
 	encoder.Close()
 	return buffer.Bytes(), nil
 }
+
+func offest(total, now int, distance float64) float64 {
+	if total%2 == 0 {
+		return (float64(now-total/2) - 1) * distance
+	}
+	return (float64(now-total/2) - 1.5) * distance
+}
+
+func rowsnum(total, div int) int {
+	temp := total / div
+	if total%div != 0 {
+		temp++
+	}
+	return temp
+}

plugin_lolicon/lolicon.go

@@ -11,6 +11,7 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"
 
 	"github.com/FloatTech/ZeroBot-Plugin/control"
+	"github.com/FloatTech/ZeroBot-Plugin/utils/math"
 )
 
 const (
@@ -30,7 +31,7 @@ func init() {
 	}).OnFullMatch("来份萝莉").SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			go func() {
-				for i := 0; i < min(cap(queue)-len(queue), 2); i++ {
+				for i := 0; i < math.Min(cap(queue)-len(queue), 2); i++ {
 					resp, err := http.Get(api)
 					if err != nil {
 						ctx.SendChain(message.Text("ERROR: ", err))
@@ -60,10 +61,3 @@ func init() {
 			}
 		})
 }
-
-func min(a, b int) int {
-	if a < b {
-		return a
-	}
-	return b
-}

plugin_manager/manager.go

@@ -16,6 +16,8 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"
 
 	timer "github.com/FloatTech/ZeroBot-Plugin-Timer"
+
+	"github.com/FloatTech/ZeroBot-Plugin/utils/math"
 )
 
 const (
@@ -56,7 +58,7 @@ func init() { // 插件主体
 	// 菜单
 	zero.OnFullMatch("群管系统", zero.AdminPermission).SetBlock(true).FirstPriority().
 		Handle(func(ctx *zero.Ctx) {
-			ctx.Send(hint)
+			ctx.SendChain(message.Text(hint))
 		})
 	// 升为管理
 	zero.OnRegex(`^升为管理.*?(\d+)`, zero.OnlyGroup, zero.SuperUserPermission).SetBlock(true).SetPriority(40).
@@ -252,9 +254,9 @@ func init() { // 插件主体
 				ts.Grpid = uint64(ctx.Event.GroupID)
 				if ts.Enable {
 					go timer.RegisterTimer(ts, true)
-					ctx.Send("记住了~")
+					ctx.SendChain(message.Text("记住了~"))
 				} else {
-					ctx.Send("参数非法!")
+					ctx.SendChain(message.Text("参数非法!"))
 				}
 			}
 		})
@@ -271,9 +273,9 @@ func init() { // 插件主体
 					t.Enable = false
 					delete(*timer.Timers, ti) // 避免重复取消
 					_ = timer.SaveTimers()
-					ctx.Send("取消成功~")
+					ctx.SendChain(message.Text("取消成功~"))
 				} else {
-					ctx.Send("没有这个定时器哦~")
+					ctx.SendChain(message.Text("没有这个定时器哦~"))
 				}
 			}
 		})
@@ -281,7 +283,7 @@ func init() { // 插件主体
 	zero.OnFullMatch("列出所有提醒", zero.AdminPermission).SetBlock(true).SetPriority(40).
 		Handle(func(ctx *zero.Ctx) {
 			if ctx.Event.GroupID > 0 {
-				ctx.Send(fmt.Sprint(timer.ListTimers(uint64(ctx.Event.GroupID))))
+				ctx.SendChain(message.Text(timer.ListTimers(uint64(ctx.Event.GroupID))))
 			}
 		})
 	// 随机点名
@@ -300,13 +302,7 @@ func init() { // 插件主体
 			sort.SliceStable(temp, func(i, j int) bool {
 				return temp[i].Get("last_sent_time").Int() < temp[j].Get("last_sent_time").Int()
 			})
-			max := func(a, b int) int {
-				if a > b {
-					return a
-				}
-				return b
-			}
-			temp = temp[max(0, len(temp)-10):]
+			temp = temp[math.Max(0, len(temp)-10):]
 			rand.Seed(time.Now().UnixNano())
 			who := temp[rand.Intn(len(temp))]
 			if who.Get("user_id").Int() == ctx.Event.SelfID {
@@ -334,9 +330,9 @@ func init() { // 插件主体
 			if ctx.Event.NoticeType == "group_increase" {
 				word, ok := config.Welcome[uint64(ctx.Event.GroupID)]
 				if ok {
-					ctx.Send(word)
+					ctx.SendChain(message.Text(word))
 				} else {
-					ctx.Send("欢迎~")
+					ctx.SendChain(message.Text("欢迎~"))
 				}
 				enable, ok1 := config.Checkin[uint64(ctx.Event.GroupID)]
 				if ok1 && enable {
@@ -353,7 +349,7 @@ func init() { // 插件主体
 								ans, err := strconv.Atoi(text)
 								if err == nil {
 									if ans != r {
-										ctx.Send("答案不对哦，再想想吧~")
+										ctx.SendChain(message.Text("答案不对哦，再想想吧~"))
 										return false
 									}
 									return true
@@ -366,12 +362,12 @@ func init() { // 插件主体
 					recv, cancel := next.Repeat()
 					select {
 					case <-time.After(time.Minute):
-						ctx.Send("拜拜啦~")
+						ctx.SendChain(message.Text("拜拜啦~"))
 						ctx.SetGroupKick(ctx.Event.GroupID, uid, false)
 						cancel()
 					case <-recv:
 						cancel()
-						ctx.Send("答对啦~")
+						ctx.SendChain(message.Text("答对啦~"))
 					}
 				}
 			}
@@ -388,9 +384,9 @@ func init() { // 插件主体
 		Handle(func(ctx *zero.Ctx) {
 			config.Welcome[uint64(ctx.Event.GroupID)] = ctx.State["regex_matched"].([]string)[1]
 			if saveConfig() == nil {
-				ctx.Send("记住啦!")
+				ctx.SendChain(message.Text("记住啦!"))
 			} else {
-				ctx.Send("出错啦!")
+				ctx.SendChain(message.Text("出错啦!"))
 			}
 		})
 	// 入群验证开关
@@ -406,9 +402,9 @@ func init() { // 插件主体
 				return
 			}
 			if saveConfig() == nil {
-				ctx.Send("已" + option)
+				ctx.SendChain(message.Text("已", option))
 			} else {
-				ctx.Send("出错啦!")
+				ctx.SendChain(message.Text("出错啦!"))
 			}
 		})
 	// 运行 CQ 码
@@ -417,6 +413,7 @@ func init() { // 插件主体
 			var cmd = ctx.State["regex_matched"].([]string)[1]
 			cmd = strings.ReplaceAll(cmd, "&#91;", "[")
 			cmd = strings.ReplaceAll(cmd, "&#93;", "]")
+			// 可注入，权限为主人
 			ctx.Send(cmd)
 		})
 }

plugin_minecraft/manager.go

@@ -19,24 +19,23 @@ import (
 
 const api = "http://your.addr:23333/api/start_server/%s/?apikey=apikey"
 
-var engine *zero.Engine
+var engine = control.Register("minecraft", &control.Options{
+	DisableOnDefault: false,
+	Help: "minecraft\n" +
+		"- /mcstart xxx\n" +
+		"- /mcstop xxx\n" +
+		"- /mclist servername\n" +
+		"- https://github.com/Suwings/MCSManager",
+})
 
 func init() {
-	engine = control.Register("minecraft", &control.Options{
-		DisableOnDefault: false,
-		Help: "minecraft\n" +
-			"- /mcstart xxx\n" +
-			"- /mcstop xxx\n" +
-			"- /mclist servername\n" +
-			"- https://github.com/Suwings/MCSManager",
-	})
 	engine.OnCommand("mcstart").SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			model := extension.CommandModel{}
 			_ = ctx.Parse(&model)
 			ctx.SendChain(message.Text("开启服务器: ", model.Args, "....."))
 			result := start(model.Args)
-			ctx.Send(result)
+			ctx.SendChain(message.Text(result))
 		})
 	engine.OnCommand("mcstop").SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
@@ -44,7 +43,7 @@ func init() {
 			_ = ctx.Parse(&model)
 			ctx.SendChain(message.Text("开启服务器: ", model.Args, "....."))
 			result := stop(model.Args)
-			ctx.Send(result)
+			ctx.SendChain(message.Text(result))
 		})
 }
 

plugin_music/selecter.go

@@ -32,7 +32,7 @@ func init() {
 	}).OnRegex("^(.{0,2})点歌(.{1,25})$").SetBlock(true).FirstPriority().
 		Handle(func(ctx *zero.Ctx) {
 			if !limit.Load(ctx.Event.UserID).Acquire() {
-				ctx.Send("请稍后重试0x0...")
+				ctx.SendChain(message.Text("请稍后重试0x0..."))
 				return
 			}
 			// switch 平台

plugin_runcode/code_runner.go

@@ -107,7 +107,7 @@ func init() {
 	}).OnRegex(`^>runcode\s(.+?)\s([\s\S]+)$`).SetBlock(true).SecondPriority().
 		Handle(func(ctx *zero.Ctx) {
 			if !limit.Load(ctx.Event.UserID).Acquire() {
-				ctx.Send("请稍后重试0x0...")
+				ctx.SendChain(message.Text("请稍后重试0x0..."))
 			} else {
 				language := ctx.State["regex_matched"].([]string)[1]
 				language = strings.ToLower(language)

plugin_saucenao/searcher.go

@@ -27,7 +27,7 @@ func init() { // 插件主体
 	engine.OnRegex(`^搜图(\d+)$`).SetBlock(true).FirstPriority().
 		Handle(func(ctx *zero.Ctx) {
 			id, _ := strconv.ParseInt(ctx.State["regex_matched"].([]string)[1], 10, 64)
-			ctx.Send("少女祈祷中......")
+			ctx.SendChain(message.Text("少女祈祷中......"))
 			// 获取P站插图信息
 			illust, err := pixiv.Works(id)
 			if err != nil {
@@ -51,14 +51,14 @@ func init() { // 插件主体
 					),
 				)
 			} else {
-				ctx.Send("图片不存在!")
+				ctx.SendChain(message.Text("图片不存在!"))
 			}
 		})
 	// 以图搜图
 	engine.OnKeywordGroup([]string{"以图搜图", "搜索图片", "以图识图"}, picture.CmdMatch, picture.MustGiven).SetBlock(true).FirstPriority().
 		Handle(func(ctx *zero.Ctx) {
 			// 开始搜索图片
-			ctx.Send("少女祈祷中......")
+			ctx.SendChain(message.Text("少女祈祷中......"))
 			for _, pic := range ctx.State["image_url"].([]string) {
 				fmt.Println(pic)
 				if result, err := saucenao.SauceNAO(pic); err != nil {

plugin_setutime/setu_geter.go

@@ -18,13 +18,14 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"
 
 	"github.com/FloatTech/ZeroBot-Plugin/control"
-	"github.com/FloatTech/ZeroBot-Plugin/data"
+	"github.com/FloatTech/ZeroBot-Plugin/utils/math"
+	"github.com/FloatTech/ZeroBot-Plugin/utils/sql"
 )
 
 // Pools 图片缓冲池
 type imgpool struct {
 	Lock  sync.Mutex
-	DB    *data.Sqlite
+	DB    *sql.Sqlite
 	Path  string
 	Group int64
 	List  []string
@@ -40,7 +41,7 @@ const (
 // NewPoolsCache 返回一个缓冲池对象
 func newPools() *imgpool {
 	cache := &imgpool{
-		DB:    &data.Sqlite{DBPath: "data/SetuTime/SetuTime.db"},
+		DB:    &sql.Sqlite{DBPath: "data/SetuTime/SetuTime.db"},
 		Path:  "data/SetuTime/cache/",
 		Group: 0,
 		List:  []string{"涩图", "二次元", "风景", "车万"}, // 可以自己加类别，得自己加图片进数据库
@@ -106,7 +107,7 @@ func init() { // 插件主体
 			var imgtype = ctx.State["regex_matched"].([]string)[1]
 			// 补充池子
 			go func() {
-				times := min(pool.Max-pool.size(imgtype), 2)
+				times := math.Min(pool.Max-pool.size(imgtype), 2)
 				for i := 0; i < times; i++ {
 					illust := &pixiv.Illust{}
 					// 查询出一张图片
@@ -122,7 +123,6 @@ func init() { // 插件主体
 					ctx.SendGroupMessage(pool.Group, []message.MessageSegment{message.Image(file(illust))})
 					// 向缓冲池添加一张图片
 					pool.push(imgtype, illust)
-
 					time.Sleep(time.Second * 1)
 				}
 			}()
@@ -169,7 +169,7 @@ func init() { // 插件主体
 				ctx.SendChain(message.Text("ERROR: ", err))
 				return
 			}
-			ctx.Send("添加成功")
+			ctx.SendChain(message.Text("添加成功"))
 		})
 
 	engine.OnRegex(`^删除(.*?)(\d+)$`, firstValueInList(pool.List), zero.SuperUserPermission).SetBlock(true).SetPriority(22).
@@ -180,10 +180,10 @@ func init() { // 插件主体
 			)
 			// 查询数据库
 			if err := pool.DB.Del(imgtype, fmt.Sprintf("WHERE pid=%d", id)); err != nil {
-				ctx.Send(fmt.Sprintf("ERROR: %v", err))
+				ctx.SendChain(message.Text("ERROR: ", err))
 				return
 			}
-			ctx.Send("删除成功")
+			ctx.SendChain(message.Text("删除成功"))
 		})
 
 	// 查询数据库涩图数量
@@ -200,7 +200,7 @@ func init() { // 插件主体
 				state = append(state, ": ")
 				state = append(state, fmt.Sprintf("%d", num))
 			}
-			ctx.Send(strings.Join(state, ""))
+			ctx.SendChain(message.Text(state))
 		})
 }
 
@@ -217,18 +217,6 @@ func firstValueInList(list []string) zero.Rule {
 	}
 }
 
-// min 返回两数最小值
-func min(a, b int) int {
-	switch {
-	default:
-		return a
-	case a > b:
-		return b
-	case a < b:
-		return a
-	}
-}
-
 // size 返回缓冲池指定类型的现有大小
 func (p *imgpool) size(imgtype string) int {
 	return len(p.Pool[imgtype])

plugin_shindan/shindan.go

@@ -1,3 +1,10 @@
+/*
+ * @Author: Kanri
+ * @Date: 2021-10-15 21:23:14
+ * @LastEditors: Kanri
+ * @LastEditTime: 2021-10-15 21:42:51
+ * @Description:
+ */
 // Package shindan 基于 https://shindanmaker.com 的测定小功能
 package shindan
 
@@ -52,6 +59,7 @@ func handle(ctx *zero.Ctx) {
 	if err != nil {
 		ctx.SendChain(message.Text("ERROR: ", err))
 	}
+	// TODO: 可注入
 	ctx.Send(text)
 }
 

utils/dl/dl.go

@@ -1,4 +1,5 @@
-package data
+// Package dl 下载实用工具
+package dl
 
 import (
 	"io"
@@ -6,6 +7,7 @@ import (
 	"os"
 )
 
+// DownloadTo 下载到路径
 func DownloadTo(url, file string) error {
 	resp, err := http.Get(url)
 	if err == nil {

utils/math/math.go

@@ -0,0 +1,18 @@
+// Package math 计算实用工具
+package math
+
+// Max 返回两数最大值，该函数将被内联
+func Max(a, b int) int {
+	if a > b {
+		return a
+	}
+	return b
+}
+
+// Min 返回两数最小值，该函数将被内联
+func Min(a, b int) int {
+	if a > b {
+		return b
+	}
+	return a
+}

utils/sql/sqlite.go

@@ -1,5 +1,5 @@
-// Package data 数据库/数据处理相关工具
-package data
+// Package sql 数据库/数据处理相关工具
+package sql
 
 import (
 	"database/sql"