fix(gif, qqwife): at 解析问题 (#960)

Co-authored-by: hutiance <hutiance@newings.net.cn> Co-authored-by: 源文雨 <41315874+fumiama@users.noreply.github.com>
FloatTech · Aug 21, 2024 · 89a5b68 · 89a5b68
1 parent adbcb39
commit 89a5b68
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/plugin/gif/run.go b/plugin/gif/run.go
@@ -150,7 +150,7 @@ func init() { // 插件主体
 		PrivateDataFolder: "gif",
 	}).ApplySingle(ctxext.DefaultSingle)
 	datapath = file.BOTPATH + "/" + en.DataFolder()
-	en.OnRegex(`^(` + strings.Join(cmd, "|") + `)[\s\S]*?(\[CQ:(image\,file=([0-9a-zA-Z]{32}).*|at.+?(\d{5,11}))\].*|(\d+))$`).
+	en.OnRegex(`^(` + strings.Join(cmd, "|") + `)[\s\S]*?(\[CQ:(image\,file=([0-9a-zA-Z]{32}).*|at.+?qq=(\d{5,11})).*\].*|(\d+))$`).
 		SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		list := ctx.State["regex_matched"].([]string)
 		atUserID, _ := strconv.ParseInt(list[4]+list[5]+list[6], 10, 64)

diff --git a/plugin/qqwife/function.go b/plugin/qqwife/function.go
@@ -93,7 +93,7 @@ func init() {
 			ctx.SendChain(message.Text("设置成功"))
 		})
 	// 单身技能
-	engine.OnRegex(`^(娶|嫁)\[CQ:at,qq=(\d+)\]`, zero.OnlyGroup, getdb, checkSingleDog).SetBlock(true).Limit(ctxext.LimitByUser).
+	engine.OnRegex(`^(娶|嫁)\[CQ:at,(?:\S*,)?qq=(\d+)(?:,\S*)?\]`, zero.OnlyGroup, getdb, checkSingleDog).SetBlock(true).Limit(ctxext.LimitByUser).
 		Handle(func(ctx *zero.Ctx) {
 			gid := ctx.Event.GroupID
 			uid := ctx.Event.UserID