Merge branch 'master' of https://github.com/FloatTech/ZeroBot-Plugin

go.mod

@@ -3,7 +3,7 @@ module github.com/FloatTech/ZeroBot-Plugin
 go 1.16
 
 require (
-	github.com/FloatTech/AnimeAPI v1.1.6
+	github.com/FloatTech/AnimeAPI v1.1.8
 	github.com/FloatTech/ZeroBot-Plugin-Timer v1.4.3
 	github.com/StackExchange/wmi v1.2.1 // indirect
 	github.com/golang/protobuf v1.5.2
@@ -12,6 +12,7 @@ require (
 	github.com/sirupsen/logrus v1.8.1
 	github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816
 	github.com/tidwall/gjson v1.8.1
+	github.com/tidwall/pretty v1.2.0 // indirect
 	github.com/tklauser/go-sysconf v0.3.7 // indirect
 	github.com/wdvxdr1123/ZeroBot v1.2.2
 	modernc.org/sqlite v1.12.0

go.sum

@@ -1,5 +1,5 @@
-github.com/FloatTech/AnimeAPI v1.1.6 h1:M+970Vfi0ax0ElcS3fQXNKKlB+TiKWnL9gEePj/z0oo=
-github.com/FloatTech/AnimeAPI v1.1.6/go.mod h1:CC+vF30UGBlcIUxwFOcXIEHoJ4r7c5x2iLQsnUCVdDI=
+github.com/FloatTech/AnimeAPI v1.1.8 h1:v+VxMnYBCn5ANQBXcubzWOD2DZ0RxqwvI9zVBgwl4oE=
+github.com/FloatTech/AnimeAPI v1.1.8/go.mod h1:CC+vF30UGBlcIUxwFOcXIEHoJ4r7c5x2iLQsnUCVdDI=
 github.com/FloatTech/ZeroBot-Plugin-Timer v1.4.3 h1:jn/dH+OwPSRozkmeCeQQPrAGJRBudcm3OK5tXhGItRk=
 github.com/FloatTech/ZeroBot-Plugin-Timer v1.4.3/go.mod h1:MVOQQ4e6AVGFm993blXXU4Sd6bAsLY2+Zb+/HMrEeEc=
 github.com/StackExchange/wmi v1.2.1 h1:VIkavFPXSjcnS+O8yTq7NI32k0R5Aj+v39y29VYDOSA=
@@ -72,8 +72,9 @@ github.com/tidwall/gjson v1.8.1 h1:8j5EE9Hrh3l9Od1OIEDAb7IpezNA20UdRngNAj5N0WU=
 github.com/tidwall/gjson v1.8.1/go.mod h1:5/xDoumyyDNerp2U36lyolv46b3uF/9Bu6OfyQ9GImk=
 github.com/tidwall/match v1.0.3 h1:FQUVvBImDutD8wJLN6c5eMzWtjgONK9MwIBCOrUJKeE=
 github.com/tidwall/match v1.0.3/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=
 github.com/tklauser/go-sysconf v0.3.7 h1:HT7h4+536gjqeq1ZIJPgOl1rg1XFatQGVZWp7Py53eg=
 github.com/tklauser/go-sysconf v0.3.7/go.mod h1:JZIdXh4RmBvZDBZ41ld2bGxRV3n4daiiqA3skYhAoQ4=
 github.com/tklauser/numcpus v0.2.3 h1:nQ0QYpiritP6ViFhrKYsiv6VVxOpum2Gks5GhnJbS/8=

plugin_atri/atri.go

@@ -16,8 +16,8 @@ import (
 var (
 	// ATRI 所有命令的优先级
 	prio = -1
-	// ATRI 表情的 GitHub 镜像位置
-	res = "https://raw.dihe.moe/Yiwen-Chan/ZeroBot-Plugin/master/plugin_atri/"
+	// ATRI 表情的 GitHub 位置，如果发现图片不能下载请使用镜像
+	res = "https://raw.githubusercontent.com/FloatTech/ZeroBot-Plugin/master/plugin_atri/"
 	// ATRI 的总开关
 	enable = true
 )

plugin_omikuji/sensou.go

@@ -13,7 +13,7 @@ const (
 )
 
 func init() { // 插件主体
-	zero.OnFullMatchGroup([]string{"求签", "运势", "占卜"}, zero.OnlyToMe).
+	zero.OnFullMatchGroup([]string{"求签", "运势", "占卜"}, zero.OnlyToMe).SetPriority(10).
 		Handle(func(ctx *zero.Ctx) {
 			miku := rand.Intn(100) + 1
 			ctx.SendChain(message.Image(fmt.Sprintf(bed, miku, 0)), message.Image(fmt.Sprintf(bed, miku, 1)))

plugin_shindan/shindan.go

@@ -21,6 +21,7 @@ func init() {
 	zero.OnPrefix("异世界转生", number(587874)).SetBlock(true).FirstPriority().Handle(handle)
 	zero.OnPrefix("今天是什么少女", number(162207)).SetBlock(true).FirstPriority().Handle(handle)
 	zero.OnPrefix("卖萌", number(360578)).SetBlock(true).FirstPriority().Handle(handle)
+	zero.OnPrefix("抽老婆", number(1075116)).SetBlock(true).FirstPriority().Handle(handle)
 }
 
 // shindanmaker 处理函数