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

…into FloatTech-master

# Conflicts:
#	README.md
#	data
#	go.mod
#	go.sum
#	main.go
#	plugin/mcfish/fish.go
#	plugin/mcfish/main.go
#	plugin/mcfish/pack.go
#	plugin/mcfish/pole.go
#	plugin/mcfish/store.go

.github/workflows/pull.yml

@@ -1,6 +1,24 @@
 name: PullLint
-on: [ pull_request ]
+on:
+  pull_request_target:
+    types: [assigned, opened, synchronize, reopened]
 jobs:
+  # This workflow closes invalid PR
+  close-pr:
+    name: closepr
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+    permissions: write-all
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      - name: Close PR if commit message is "Update main.go"
+        if: github.event.pull_request.title == 'Update main.go'
+        uses: superbrothers/close-pull-request@v3
+        with:
+          # Optional. Post a issue comment just before closing a pull request.
+          comment: "Invalid PR."
+
   golangci:
     name: lint
     runs-on: ubuntu-latest

go.mod

@@ -31,16 +31,15 @@ require (
 	github.com/fumiama/unibase2n v0.0.0-20221020155353-02876e777430
 	github.com/glebarez/sqlite v1.9.0
 	github.com/go-echarts/go-echarts/v2 v2.2.7
-	github.com/go-resty/resty/v2 v2.7.0
-	github.com/gogo/protobuf v1.3.2
-	github.com/golang-module/carbon/v2 v2.2.3
+	github.com/go-resty/resty/v2 v2.8.0
+	github.com/golang-module/carbon/v2 v2.2.8
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0
 	github.com/google/uuid v1.3.0
 	github.com/jinzhu/gorm v1.9.16
 	github.com/jozsefsallai/gophersauce v1.0.1
 	github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible
 	github.com/lithammer/fuzzysearch v1.1.5
-	github.com/mileusna/useragent v1.3.3
+	github.com/mileusna/useragent v1.3.4
 	github.com/mroth/weightedrand v1.0.0
 	github.com/notnil/chess v1.9.0
 	github.com/orcaman/concurrent-map/v2 v2.0.1
@@ -51,19 +50,18 @@ require (
 	github.com/samber/lo v1.38.1
 	github.com/shirou/gopsutil/v3 v3.23.1
 	github.com/sirupsen/logrus v1.9.0
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.710
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/nlp v1.0.710
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tmt v1.0.710
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.754
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tmt v1.0.754
 	github.com/tidwall/gjson v1.14.4
 	github.com/tidwall/sjson v1.2.5
 	github.com/wcharczuk/go-chart/v2 v2.1.0
 	github.com/wdvxdr1123/ZeroBot v1.7.4
 	gitlab.com/gomidi/midi/v2 v2.0.25
 	golang.org/x/image v0.3.0
-	golang.org/x/sys v0.8.0
-	golang.org/x/text v0.9.0
+	golang.org/x/sys v0.12.0
+	golang.org/x/text v0.13.0
 	gopkg.in/yaml.v3 v3.0.1
-	gorm.io/gorm v1.25.2
+	gorm.io/gorm v1.25.4
 )
 
 require (
@@ -117,12 +115,12 @@ require (
 	github.com/tklauser/numcpus v0.6.0 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/crypto v0.4.0 // indirect
+	golang.org/x/crypto v0.13.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.10.0 // indirect
-	golang.org/x/net v0.10.0 // indirect
+	golang.org/x/net v0.15.0 // indirect
 	golang.org/x/tools v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.66.2 // indirect
 	modernc.org/libc v1.22.5 // indirect

main.go

@@ -64,22 +64,22 @@ import (
 	//                               vvvv                               //
 
 	// _ "github.com/FloatTech/ZeroBot-Plugin/plugin/ahsai"        // ahsai tts
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/aifalse"      // 服务器监控
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/aifalse"          // 服务器监控
 	_ "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/baidu"        // 百度一下
 
 	// _ "github.com/FloatTech/ZeroBot-Plugin/plugin/baiduaudit"   // 百度内容审核
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/base16384"   // base16384加解密
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/base16384"        // base16384加解密
 	_ "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/chess"        // 国际象棋
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/chess"            // 国际象棋
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/choose"       // 选择困难症帮手
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/chouxianghua" // 说抽象话
 
@@ -93,7 +93,7 @@ import (
 	_ "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/driftbottle" // 漂流瓶
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/driftbottle"      // 漂流瓶
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/emojimix"    // 合成emoji
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/event"       // 好友申请群聊邀请事件处理
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/font"        // 渲染任意文字到图片
@@ -107,7 +107,7 @@ import (
 	_ "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/imgfinder" // 关键字搜图
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/imgfinder"        // 关键字搜图
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/inject"    // 注入指令
 
 	// _ "github.com/FloatTech/ZeroBot-Plugin/plugin/jandan"       // 煎蛋网无聊图
@@ -118,19 +118,19 @@ import (
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/lolicon" // lolicon 随机图片
 
 	// _ "github.com/FloatTech/ZeroBot-Plugin/plugin/magicprompt"  // magicprompt吟唱提示
-
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/mcfish"           // 钓鱼模拟器
 	//	_ "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/moyucalendar" // 摸鱼人日历
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/moyucalendar"     // 摸鱼人日历
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/music"        // 点歌
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/nativesetu"   // 本地涩图
 	_ "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/nwife"   // 本地老婆
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/nwife"            // 本地老婆
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/omikuji" // 浅草寺求签
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/qqwife"  // 一群一天一夫一妻制群老婆
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/quan"    // QQ权重查询
@@ -151,17 +151,16 @@ import (
 	_ "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/vtbmusic"     // vtb点歌
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/vtbquotation" // vtb语录
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/vtbquotation"     // 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/wenxinvilg" // 百度文心AI画图
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/wenxinvilg"       // 百度文心AI画图
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/wife"       // 抽老婆
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/wordcount"  // 聊天热词
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/wordcount"        // 聊天热词
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/wordle"     // 猜单词
 
 	// _ "github.com/FloatTech/ZeroBot-Plugin/plugin/ygo"           // 游戏王相关插件

plugin/active/main.go

@@ -14,7 +14,6 @@ import (
 	"github.com/samber/lo"
 
 	"github.com/FloatTech/ZeroBot-Plugin/config"
-	"github.com/FloatTech/ZeroBot-Plugin/nlp"
 	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
 	zero "github.com/wdvxdr1123/ZeroBot"
@@ -67,7 +66,7 @@ func init() {
 			//	ctx.SendChain(message.Image(b.URL))
 			//} else {
 			msg := ctx.ExtractPlainText()
-			r := lo.Sample([]aireply.AIReply{aireply.NewXiaoAi(aireply.XiaoAiURL, aireply.XiaoAiBotName), nlp.NewTencent(nlp.BotName)})
+			r := lo.Sample([]aireply.AIReply{aireply.NewXiaoAi(aireply.XiaoAiURL, aireply.XiaoAiBotName)})
 			ctx.SendChain(message.Text(r.TalkPlain(ctx.Event.UserID, msg, zero.BotConfig.NickName[0])))
 			//}
 		})

plugin/mcfish/fish.go

@@ -17,6 +17,15 @@ import (
 func init() {
 	engine.OnRegex(`^进行(([1-5]\d|[1-9])次)?钓鱼$`, getdb).SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
 		uid := ctx.Event.UserID
+		numberOfPole, err := dbdata.getNumberFor(uid, "竿")
+		if err != nil {
+			ctx.SendChain(message.Text("[ERROR at store.go.9.3]:", err))
+			return
+		}
+		if numberOfPole > 30 {
+			ctx.SendChain(message.Text("你有", numberOfPole, "支鱼竿,大于30支的玩家不允许钓鱼"))
+			return
+		}
 		fishNumber := 1
 		info := ctx.State["regex_matched"].([]string)[2]
 		if info != "" {
@@ -114,7 +123,10 @@ func init() {
 			if equipInfo.Durable < 10 && equipInfo.Durable > 0 {
 				msg = "(你的鱼竿耐久仅剩" + strconv.Itoa(equipInfo.Durable) + ")"
 			} else if equipInfo.Durable <= 0 {
-				msg = "(你的鱼竿耐已销毁)"
+				msg = "(你的鱼竿已销毁)"
+			}
+			if equipInfo.Equip == "三叉戟" {
+				fishNumber *= 3
 			}
 		} else {
 			fishNmaes, err := dbdata.pickFishFor(uid, fishNumber)
@@ -138,6 +150,7 @@ func init() {
 				msg += strconv.Itoa(number) + name + "、"
 			}
 			msg += ")"
+			fishNumber /= 2
 		}
 		waitTime := 120 / (equipInfo.Induce + 1)
 		ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("你开始去钓鱼了,请耐心等待鱼上钩(预计要", time.Second*time.Duration(waitTime), ")"))
@@ -153,6 +166,11 @@ func init() {
 			ctx.SendChain(message.Text("[ERROR at fish.go.5.1]:", err))
 			return
 		}
+		number2, err := dbdata.getNumberFor(uid, "海豚")
+		if err != nil {
+			ctx.SendChain(message.Text("[ERROR at fish.go.5.1]:", err))
+			return
+		}
 		if number > 100 || equipInfo.Equip == "美西螈" { // 放大概率
 			probabilities["treasure"] = probabilityLimit{
 				Min: 0,
@@ -171,6 +189,11 @@ func init() {
 				Max: 90,
 			}
 		}
+		if number2 != 0 {
+			info := probabilities["waste"]
+			info.Max = 100
+			probabilities["waste"] = info
+		}
 		for name, info := range probabilities {
 			switch name {
 			case "treasure":
@@ -217,6 +240,18 @@ func init() {
 					typeOfThing = "article"
 					picName = "book"
 					thingName = "海之眷顾"
+				case dice >= probabilities["净化书"].Min && dice < probabilities["净化书"].Max:
+					typeOfThing = "article"
+					picName = "book"
+					thingName = "净化书"
+				case dice >= probabilities["宝藏诅咒"].Min && dice < probabilities["宝藏诅咒"].Max:
+					typeOfThing = "article"
+					picName = "book"
+					thingName = "宝藏诅咒"
+				case dice >= probabilities["海豚"].Min && dice < probabilities["海豚"].Max:
+					typeOfThing = "fish"
+					picName = "海豚"
+					thingName = "海豚"
 				default:
 					typeOfThing = "article"
 					picName = "book"
@@ -300,6 +335,10 @@ func init() {
 				thingNameList[thingName] += number
 			}
 		}
+		err = dbdata.updateCurseFor(uid, "fish", fishNumber)
+		if err != nil {
+			logrus.Warnln(err)
+		}
 		if len(thingNameList) == 1 {
 			thingName := ""
 			numberOfFish := 0