Merge branch 'FloatTech:master' into master

Author: Patti-sfdn

README.md

@@ -1026,6 +1026,10 @@ print("run[CQ:image,file="+j["img"]+"]")
   - [x] 酷我点歌[xxx]
 
   - [x] 酷狗点歌[xxx]
+  
+  - [x] qq点歌[xxx]
+  
+  - [x] 咪咕点歌[xxx]
 
 </details>
 <details>

console/console_windows.go

@@ -38,12 +38,18 @@ func setConsoleTitle(title string) (err error) {
 }
 
 func init() {
+	debugMode := os.Getenv("DEBUG_MODE") == "1"
 	stdin := windows.Handle(os.Stdin.Fd())
 
 	var mode uint32
 	err := windows.GetConsoleMode(stdin, &mode)
 	if err != nil {
-		panic(err)
+		if debugMode {
+			logrus.Warnf("调试模式下忽略控制台模式获取失败: %v", err)
+			return // 调试模式下直接返回，跳过后续配置
+		} else {
+			panic(err) // 非调试模式下 panic
+		}
 	}
 
 	mode &^= windows.ENABLE_QUICK_EDIT_MODE // 禁用快速编辑模式

go.mod

@@ -12,7 +12,7 @@ require (
 	github.com/FloatTech/sqlite v1.7.1
 	github.com/FloatTech/ttl v0.0.0-20240716161252-965925764562
 	github.com/FloatTech/zbpctrl v1.7.0
-	github.com/FloatTech/zbputils v1.7.2-0.20250601113004-1bee2a7cd4b6
+	github.com/FloatTech/zbputils v1.7.2-0.20250614165821-95cf57cf2434
 	github.com/RomiChan/syncx v0.0.0-20240418144900-b7402ffdebc7
 	github.com/RomiChan/websocket v1.4.3-0.20220227141055-9b2c6168c9c5
 	github.com/Tnze/go-mc v1.20.2

go.sum

@@ -17,8 +17,8 @@ github.com/FloatTech/ttl v0.0.0-20240716161252-965925764562 h1:snfw7FNFym1eNnLrQ
 github.com/FloatTech/ttl v0.0.0-20240716161252-965925764562/go.mod h1:fHZFWGquNXuHttu9dUYoKuNbm3dzLETnIOnm1muSfDs=
 github.com/FloatTech/zbpctrl v1.7.0 h1:Hxo6EIhJo+pHjcQP9QgIJgluaT1pHH99zkk3njqTNMo=
 github.com/FloatTech/zbpctrl v1.7.0/go.mod h1:xmM4dSwHA02Gei3ogCRiG+RTrw/7Z69PfrN5NYf8BPE=
-github.com/FloatTech/zbputils v1.7.2-0.20250601113004-1bee2a7cd4b6 h1:85LGKvgkWMZU065WOIEVaaeHDNYK01CwdNr/m+jzTKw=
-github.com/FloatTech/zbputils v1.7.2-0.20250601113004-1bee2a7cd4b6/go.mod h1:ArZ0fMAcmPEIXOqDmfzbSx+oYH8sssApQnbCu694iS8=
+github.com/FloatTech/zbputils v1.7.2-0.20250614165821-95cf57cf2434 h1:oEYQFQ2/qx10FtZKCNbW3Ohj/Iw71aM4RWpIu+LMmf8=
+github.com/FloatTech/zbputils v1.7.2-0.20250614165821-95cf57cf2434/go.mod h1:ArZ0fMAcmPEIXOqDmfzbSx+oYH8sssApQnbCu694iS8=
 github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
 github.com/RomiChan/syncx v0.0.0-20240418144900-b7402ffdebc7 h1:S/ferNiehVjNaBMNNBxUjLtVmP/YWD6Yh79RfPv4ehU=
 github.com/RomiChan/syncx v0.0.0-20240418144900-b7402ffdebc7/go.mod h1:vD7Ra3Q9onRtojoY5sMCLQ7JBgjUsrXDnDKyFxqpf9w=

gomod2nix.toml

@@ -29,8 +29,8 @@ schema = 3
     version = "v1.7.0"
     hash = "sha256-HDDnE0oktWJH1tkxuQwUUbeJhmVwY5fyc/vR72D2mkU="
   [mod."github.com/FloatTech/zbputils"]
-    version = "v1.7.2-0.20250601113004-1bee2a7cd4b6"
-    hash = "sha256-pNL591h1gGP60wKEuvvF3DoshbaphoLze7Pa7gDA9bQ="
+    version = "v1.7.2-0.20250614165821-95cf57cf2434"
+    hash = "sha256-9r2nbDAo/ZCDSAXuOHUKaQM5bEoSOAFb0FJTDxne/gQ="
   [mod."github.com/RomiChan/syncx"]
     version = "v0.0.0-20240418144900-b7402ffdebc7"
     hash = "sha256-L1j1vgiwqXpF9pjMoRRlrQUHzoULisw/01plaEAwxs4="

plugin/music/selecter.go

@@ -21,6 +21,10 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"
 )
 
+var (
+	longZhuURL = "https://www.hhlqilongzhu.cn/api/joox/juhe_music.php?msg=%v"
+)
+
 func init() {
 	control.AutoRegister(&ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
@@ -29,7 +33,8 @@ func init() {
 			"- 网易点歌[xxx]\n" +
 			"- 酷我点歌[xxx]\n" +
 			"- 酷狗点歌[xxx]\n" +
-			"- 咪咕点歌[xxx]",
+			"- 咪咕点歌[xxx]\n" +
+			"- qq点歌[xxx]\n",
 	}).OnRegex(`^(.{0,2})点歌\s?(.{1,25})$`).SetBlock(true).Limit(ctxext.LimitByUser).
 		Handle(func(ctx *zero.Ctx) {
 			// switch 平台
@@ -42,12 +47,37 @@ func init() {
 				ctx.SendChain(kugou(ctx.State["regex_matched"].([]string)[2]))
 			case "网易":
 				ctx.SendChain(cloud163(ctx.State["regex_matched"].([]string)[2]))
-			default: // 默认 QQ音乐
+			case "qq":
 				ctx.SendChain(qqmusic(ctx.State["regex_matched"].([]string)[2]))
+			default: // 默认聚合点歌
+				ctx.SendChain(longzhu(ctx.State["regex_matched"].([]string)[2]))
 			}
 		})
 }
 
+// longzhu 聚合平台
+func longzhu(keyword string) message.Segment {
+	data, _ := web.GetData(fmt.Sprintf(longZhuURL, url.QueryEscape(keyword)))
+	// 假设 data 是包含整个 JSON 数组的字节切片
+	results := gjson.ParseBytes(data).Array()
+	for _, result := range results {
+		if strings.Contains(strings.ToLower(result.Get("title").String()), strings.ToLower(keyword)) {
+			if musicURL := result.Get("full_track").String(); musicURL != "" {
+				return message.Record(musicURL)
+			}
+		}
+	}
+
+	results = gjson.GetBytes(data, "#.full_track").Array()
+	if len(results) > 0 {
+		if musicURL := results[0].String(); musicURL != "" {
+			return message.Record(musicURL)
+		}
+	}
+
+	return message.Text("点歌失败, 找不到 ", keyword, " 的相关结果")
+}
+
 // migu 返回咪咕音乐卡片
 func migu(keyword string) message.Segment {
 	headers := http.Header{

plugin/niuniu/main.go

@@ -65,7 +65,7 @@ func init() {
 		messages = append(messages, ctxext.FakeSenderForwardNode(ctx, message.Text("牛牛拍卖行有以下牛牛")))
 		for _, info := range auction {
 			msg := fmt.Sprintf("商品序号: %d\n牛牛原所属: %d\n牛牛价格: %d%s\n牛牛大小: %.2fcm",
-				info.ID+1, info.UserID, info.Money, wallet.GetWalletName(), info.Length)
+				info.ID, info.UserID, info.Money, wallet.GetWalletName(), info.Length)
 			messages = append(messages, ctxext.FakeSenderForwardNode(ctx, message.Text(msg)))
 		}
 		if id := ctx.Send(messages).ID(); id == 0 {
@@ -81,7 +81,7 @@ func init() {
 		for {
 			select {
 			case <-timer.C:
-				ctx.SendChain(message.At(uid), message.Text(" 超时,已自动取消"))
+				ctx.SendChain(message.At(uid), message.Text(" 超时，已自动取消"))
 				return
 			case r := <-recv:
 				answer = r.Event.Message.String()
@@ -90,7 +90,6 @@ func init() {
 					ctx.SendChain(message.Text("ERROR: ", err))
 					return
 				}
-				n--
 				msg, err := niu.Auction(gid, uid, n)
 				if err != nil {
 					ctx.SendChain(message.Text("ERROR:", err))
@@ -109,6 +108,12 @@ func init() {
 			ctx.SendChain(message.Text("ERROR:", err))
 			return
 		}
+		// 数据库操作成功之后，及时删除残留的缓存
+		key := fmt.Sprintf("%d_%d", gid, uid)
+		_, ok := jjCount.Load(key)
+		if ok {
+			jjCount.Delete(key)
+		}
 		ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(sell))
 	})
 	en.OnFullMatch("牛牛背包", zero.OnlyGroup).SetBlock(true).Handle(func(ctx *zero.Ctx) {
@@ -145,7 +150,7 @@ func init() {
 
 		var messages message.Message
 		messages = append(messages, ctxext.FakeSenderForwardNode(ctx, message.Text("牛牛商店当前售卖的物品如下")))
-		for id := range propMap {
+		for id := 1; id <= len(propMap); id++ {
 			product := propMap[id]
 			productInfo := fmt.Sprintf("商品%d\n商品名: %s\n商品价格: %dATRI币\n商品作用域: %s\n商品描述: %s\n使用次数:%d",
 				id, product.name, product.cost, product.scope, product.description, product.count)
@@ -165,7 +170,7 @@ func init() {
 		for {
 			select {
 			case <-timer.C:
-				ctx.SendChain(message.At(uid), message.Text(" 超时,已自动取消"))
+				ctx.SendChain(message.At(uid), message.Text(" 超时，已自动取消"))
 				return
 			case r := <-recv:
 				answer = r.Event.Message.String()
@@ -196,16 +201,16 @@ func init() {
 		}
 
 		if time.Since(last.TimeLimit) > time.Hour {
-			ctx.SendChain(message.Text("时间已经过期了,牛牛已被收回!"))
+			ctx.SendChain(message.Text("时间已经过期了，牛牛已被收回!"))
 			jjCount.Delete(fmt.Sprintf("%d_%d", gid, uid))
 			return
 		}
 
 		if last.Count < 4 {
-			ctx.SendChain(message.Text("你还没有被厥够4次呢,不能赎牛牛"))
+			ctx.SendChain(message.Text("你还没有被厥够4次呢，不能赎牛牛"))
 			return
 		}
-		ctx.SendChain(message.Text("再次确认一下哦,这次赎牛牛，牛牛长度将会变成", last.Length, "cm\n还需要嘛【是|否】"))
+		ctx.SendChain(message.Text("再次确认一下哦，这次赎牛牛，牛牛长度将会变成", last.Length, "cm\n还需要嘛【是|否】"))
 		recv, cancel := zero.NewFutureEvent("message", 999, false, zero.CheckUser(uid), zero.CheckGroup(gid), zero.RegexRule(`^(是|否)$`)).Repeat()
 		defer cancel()
 		timer := time.NewTimer(2 * time.Minute)
@@ -222,11 +227,11 @@ func init() {
 					return
 				}
 
-				if err := niu.Redeem(gid, uid, last.Length); err == nil {
+				if err := niu.Redeem(gid, uid, last.Length); err != nil {
 					ctx.SendChain(message.Text("ERROR:", err))
 					return
 				}
-
+				// 成功赎回，删除残留的缓存。
 				jjCount.Delete(fmt.Sprintf("%d_%d", gid, uid))
 
 				ctx.SendChain(message.At(uid), message.Text(fmt.Sprintf("恭喜你!成功赎回牛牛,当前长度为:%.2fcm", last.Length)))
@@ -342,8 +347,9 @@ func init() {
 		j := fmt.Sprintf("%d_%d", gid, adduser)
 		count, ok := jjCount.Load(j)
 		var c lastLength
-		// 按照最后一次被jj时的时间计算，超过60分钟则重置
+		// 按照最后一次被 jj 时的时间计算，超过60分钟则重置
 		if !ok {
+			// 第一次被 jj
 			c = lastLength{
 				TimeLimit: time.Now(),
 				Count:     1,
@@ -355,6 +361,7 @@ func init() {
 				Count:     count.Count + 1,
 				Length:    count.Length,
 			}
+			// 超时了，重置
 			if time.Since(c.TimeLimit) > time.Hour {
 				c = lastLength{
 					TimeLimit: time.Now(),
@@ -372,6 +379,9 @@ func init() {
 			)))
 
 			if c.Count >= 4 {
+				if c.Count == 6 {
+					return
+				}
 				id := ctx.SendPrivateMessage(adduser,
 					message.Text(fmt.Sprintf("你在%d群里已经被厥冒烟了，快去群里赎回你原本的牛牛!\n发送:`赎牛牛`即可！", gid)))
 				if id == 0 {
@@ -386,7 +396,7 @@ func init() {
 		key := fmt.Sprintf("%d_%d", gid, uid)
 		data, ok := register.Load(key)
 		switch {
-		case !ok || time.Since(data.TimeLimit) > time.Hour*12:
+		case !ok || time.Since(data.TimeLimit) > time.Hour*24:
 			data = &lastLength{
 				TimeLimit: time.Now(),
 				Count:     1,
@@ -396,6 +406,7 @@ func init() {
 				ctx.SendChain(message.Text("你的钱不够你注销牛牛了，这次注销需要", data.Count*50, wallet.GetWalletName()))
 				return
 			}
+			data.Count++
 		}
 		register.Store(key, data)
 		msg, err := niu.Cancel(gid, uid)

plugin/score/model.go

@@ -2,6 +2,7 @@ package score
 
 import (
 	"os"
+	"sync"
 	"time"
 
 	"github.com/jinzhu/gorm"
@@ -11,7 +12,10 @@ import (
 var sdb *scoredb
 
 // scoredb 分数数据库
-type scoredb gorm.DB
+type scoredb struct {
+	db      *gorm.DB
+	scoremu sync.Mutex
+}
 
 // scoretable 分数结构体
 type scoretable struct {
@@ -52,25 +56,31 @@ func initialize(dbpath string) *scoredb {
 		panic(err)
 	}
 	gdb.AutoMigrate(&scoretable{}).AutoMigrate(&signintable{})
-	return (*scoredb)(gdb)
+	return &scoredb{
+		db: gdb,
+	}
 }
 
 // Close ...
 func (sdb *scoredb) Close() error {
-	db := (*gorm.DB)(sdb)
+	db := sdb.db
 	return db.Close()
 }
 
 // GetScoreByUID 取得分数
 func (sdb *scoredb) GetScoreByUID(uid int64) (s scoretable) {
-	db := (*gorm.DB)(sdb)
+	sdb.scoremu.Lock()
+	defer sdb.scoremu.Unlock()
+	db := sdb.db
 	db.Model(&scoretable{}).FirstOrCreate(&s, "uid = ? ", uid)
 	return s
 }
 
 // InsertOrUpdateScoreByUID 插入或更新分数
 func (sdb *scoredb) InsertOrUpdateScoreByUID(uid int64, score int) (err error) {
-	db := (*gorm.DB)(sdb)
+	sdb.scoremu.Lock()
+	defer sdb.scoremu.Unlock()
+	db := sdb.db
 	s := scoretable{
 		UID:   uid,
 		Score: score,
@@ -91,14 +101,18 @@ func (sdb *scoredb) InsertOrUpdateScoreByUID(uid int64, score int) (err error) {
 
 // GetSignInByUID 取得签到次数
 func (sdb *scoredb) GetSignInByUID(uid int64) (si signintable) {
-	db := (*gorm.DB)(sdb)
+	sdb.scoremu.Lock()
+	defer sdb.scoremu.Unlock()
+	db := sdb.db
 	db.Model(&signintable{}).FirstOrCreate(&si, "uid = ? ", uid)
 	return si
 }
 
 // InsertOrUpdateSignInCountByUID 插入或更新签到次数
 func (sdb *scoredb) InsertOrUpdateSignInCountByUID(uid int64, count int) (err error) {
-	db := (*gorm.DB)(sdb)
+	sdb.scoremu.Lock()
+	defer sdb.scoremu.Unlock()
+	db := sdb.db
 	si := signintable{
 		UID:   uid,
 		Count: count,
@@ -118,7 +132,9 @@ func (sdb *scoredb) InsertOrUpdateSignInCountByUID(uid int64, count int) (err er
 }
 
 func (sdb *scoredb) GetScoreRankByTopN(n int) (st []scoretable, err error) {
-	db := (*gorm.DB)(sdb)
+	sdb.scoremu.Lock()
+	defer sdb.scoremu.Unlock()
+	db := sdb.db
 	err = db.Model(&scoretable{}).Order("score desc").Limit(n).Find(&st).Error
 	return
 }