From 92de963c0cd0ee537f99017c0ecfc8cdb8cd0d5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8E=AB=E6=80=9D=E6=BD=8B?=
 <55676105+shudorcl@users.noreply.github.com>
Date: Thu, 3 Feb 2022 13:41:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E6=9B=B4=E5=A4=9A?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6=E4=B8=AD=E4=BD=BF=E7=94=A8=E7=A9=BA=E6=A0=BC?=
 =?UTF-8?q?=E7=9A=84=E4=BD=93=E9=AA=8C=20=20(#114)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 优化在两个命令中使用空格分隔的体验
- fortune的设置底图功能
- b14的加密功能

* 优化四个插件中使用空格分隔的体验
- 加密
- 哔哩哔哩推送
- 藏头诗
- 运势

* 优化并修正了上一个commit
- 加上了因为复制粘贴疏忽又没有注意测试遗漏的`?`
- 调整藏头诗和加密的正则触发，使其不必多此一举
- 删去了未被发现的测试代码

* - 删去了遗漏的Trim

* 优化了更多插件中使用空格的体验
- 优化了music bilibili image_finder 中使用空格的体验
- 补上了plugin_bilibili中未实现的vup开头触发
- 为plugin_bilibili_parse输出的消息加上一个换行符，优化排版
---
 plugin_bilibili/info.go                 | 2 +-
 plugin_bilibili_parse/bilibili_parse.go | 2 +-
 plugin_image_finder/keyword.go          | 2 +-
 plugin_music/selecter.go                | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugin_bilibili/info.go b/plugin_bilibili/info.go
index 02c416cc..a8254077 100644
--- a/plugin_bilibili/info.go
+++ b/plugin_bilibili/info.go
@@ -22,7 +22,7 @@ var engine = control.Register("bilibili", order.PrioBilibili, &control.Options{
 
 // 查成分的
 func init() {
-	engine.OnRegex(`^>user info\s(.{1,25})$`).SetBlock(true).
+	engine.OnRegex(`^>(?:user|vup)\s?info\s?(.{1,25})$`).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			keyword := ctx.State["regex_matched"].([]string)[1]
 			rest, err := uid(keyword)
diff --git a/plugin_bilibili_parse/bilibili_parse.go b/plugin_bilibili_parse/bilibili_parse.go
index 8f86f233..761a2a9f 100644
--- a/plugin_bilibili_parse/bilibili_parse.go
+++ b/plugin_bilibili_parse/bilibili_parse.go
@@ -57,7 +57,7 @@ func parseURL(bilibiliURL string) (m message.Message) {
 	m = append(m, message.Image(image))
 	like := htmlquery.FindOne(doc, "//*[@id='arc_toolbar_report']/div[1]/span[@class='like']/text()").Data
 	coin := htmlquery.FindOne(doc, "//*[@id='arc_toolbar_report']/div[1]/span[@class='coin']/text()").Data
-	m = append(m, message.Text("点赞：", strings.TrimSpace(like)+"投币：", strings.TrimSpace(coin)+"\n"))
+	m = append(m, message.Text("\n点赞：", strings.TrimSpace(like)+"投币：", strings.TrimSpace(coin)+"\n"))
 	collect := htmlquery.FindOne(doc, "//*[@id='arc_toolbar_report']/div[1]/span[@class='collect']/text()").Data
 	share := htmlquery.FindOne(doc, "//*[@id='arc_toolbar_report']/div[1]/span[@class='share']/text()").Data
 	m = append(m, message.Text("收藏：", strings.TrimSpace(collect)+"分享：", strings.TrimSpace(share)+"\n"))
diff --git a/plugin_image_finder/keyword.go b/plugin_image_finder/keyword.go
index 5f9afb15..89a698f5 100644
--- a/plugin_image_finder/keyword.go
+++ b/plugin_image_finder/keyword.go
@@ -69,7 +69,7 @@ func init() {
 		DisableOnDefault: false,
 		Help: "关键字搜图\n" +
 			"- 来张 [xxx]",
-	}).OnRegex(`^来张 (.*)$`, zero.AdminPermission).SetBlock(true).
+	}).OnRegex(`^来张\s?(.*)$`, zero.AdminPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			keyword := ctx.State["regex_matched"].([]string)[1]
 			soutujson := soutuapi(keyword)
diff --git a/plugin_music/selecter.go b/plugin_music/selecter.go
index ab0c3c29..723bd788 100644
--- a/plugin_music/selecter.go
+++ b/plugin_music/selecter.go
@@ -30,7 +30,7 @@ func init() {
 			"- 网易点歌[xxx]\n" +
 			"- 酷我点歌[xxx]\n" +
 			"- 酷狗点歌[xxx]",
-	}).OnRegex("^(.{0,2})点歌(.{1,25})$").SetBlock(true).
+	}).OnRegex(`^(.{0,2})点歌\s?(.{1,25})$`).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			if !limit.Load(ctx.Event.UserID).Acquire() {
 				ctx.SendChain(message.Text("请稍后重试0x0..."))