Merge pull request #15 from AynaLivePlayer/dev

1.0.8prelease2

assets/translation.json

@@ -384,6 +384,10 @@
       "en": "User",
       "zh-CN": "普通用户"
     },
+    "plugin.diange.user_max": {
+      "en": "User Maximum queue",
+      "zh-CN": "单个用户最大点歌数"
+    },
     "plugin.maxduration.description": {
       "en": "Set the maximum duration of a song",
       "zh-CN": "设置歌曲最长能播多久"

go.mod

@@ -62,6 +62,7 @@ require (
 	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/sahilm/fuzzy v0.1.0 // indirect
+	github.com/saintfish/chardet v0.0.0-20230101081208-5e3ef4b5456d // indirect
 	github.com/spf13/cast v1.5.1 // indirect
 	github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c // indirect
 	github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef // indirect

plugin/diange/diange.go

@@ -18,6 +18,7 @@ import (
 	"golang.org/x/exp/slices"
 	"sort"
 	"strings"
+	"sync"
 	"time"
 )
 
@@ -35,6 +36,7 @@ type Diange struct {
 	MedalName           string
 	MedalPermission     int
 	QueueMax            int
+	UserMax             int
 	UserCoolDown        int
 	CustomCMD           string
 	SourceConfigPath    string
@@ -46,6 +48,7 @@ type Diange struct {
 	sourceConfigs      map[string]*sourceConfig
 	blacklist          []blacklistItem
 	cooldowns          map[string]int
+	userCount          sync.Map
 	panel              fyne.CanvasObject
 	log                logger.ILogger
 }
@@ -59,6 +62,7 @@ func NewDiange() *Diange {
 		AdminPermission:     true,
 		QueueMax:            128,
 		UserCoolDown:        -1,
+		UserMax:             128,
 		CustomCMD:           "点歌",
 		SourceConfigPath:    "./config/diange.json",
 		BlackListItemPath:   "./config/diange_blacklist.json",
@@ -85,8 +89,14 @@ func NewDiange() *Diange {
 				Command:  "点l歌",
 				Priority: 4,
 			},
+			"kugou": {
+				Enable:   true,
+				Command:  "点kg歌",
+				Priority: 5,
+			},
 		},
 		cooldowns: make(map[string]int),
+		userCount: sync.Map{},
 		log:       global.Logger.WithPrefix("Plugin.Diange"),
 	}
 	return diange
@@ -119,6 +129,18 @@ func (d *Diange) Enable() error {
 		"plugin.diange.queue.update",
 		func(event *event.Event) {
 			d.currentQueueLength = len(event.Data.(events.PlaylistDetailUpdateEvent).Medias)
+			medias := event.Data.(events.PlaylistDetailUpdateEvent).Medias
+			tmpUserCount := make(map[string]int)
+			for _, media := range medias {
+				_, ok := tmpUserCount[media.ToUser().Name]
+				if !ok {
+					tmpUserCount[media.ToUser().Name] = 0
+				}
+				tmpUserCount[media.ToUser().Name]++
+			}
+			for user, count := range tmpUserCount {
+				d.userCount.Store(user, count)
+			}
 		})
 	global.EventManager.RegisterA(
 		events.PlayerPlayingUpdate,
@@ -181,6 +203,18 @@ func (d *Diange) handleMessage(event *event.Event) {
 		return
 	}
 
+	//check user max
+	if d.UserMax > 0 {
+		userCount, ok := d.userCount.Load(message.User.Username)
+		if !ok {
+			userCount = 0
+		}
+		if userCount.(int) >= d.UserMax {
+			d.log.Infof("User %s(%s) exceed max diange count, ignore", message.User.Username, message.User.Uid)
+			return
+		}
+	}
+
 	// if in user cool down, return
 	ct := int(time.Now().Unix())
 	if (ct - d.cooldowns[message.User.Uid]) <= d.UserCoolDown {
@@ -321,6 +355,10 @@ func (d *Diange) CreatePanel() fyne.CanvasObject {
 		widget.NewLabel(i18n.T("plugin.diange.queue_max")), nil,
 		widget.NewEntryWithData(binding.IntToString(binding.BindInt(&d.QueueMax))),
 	)
+	dgUserMax := container.NewBorder(nil, nil,
+		widget.NewLabel(i18n.T("plugin.diange.user_max")), nil,
+		widget.NewEntryWithData(binding.IntToString(binding.BindInt(&d.UserMax))),
+	)
 	dgCoolDown := container.NewBorder(nil, nil,
 		widget.NewLabel(i18n.T("plugin.diange.cooldown")), nil,
 		widget.NewEntryWithData(binding.IntToString(binding.BindInt(&d.UserCoolDown))),
@@ -350,6 +388,6 @@ func (d *Diange) CreatePanel() fyne.CanvasObject {
 	dgSourceCMD := container.NewBorder(
 		nil, nil, widget.NewLabel(i18n.T("plugin.diange.source_cmd")), nil,
 		container.NewVBox(sourceCfgs...))
-	d.panel = container.NewVBox(dgPerm, dgMdPerm, dgQueue, dgCoolDown, dgShortCut, skipPlaylist, dgSourceCMD)
+	d.panel = container.NewVBox(dgPerm, dgMdPerm, dgQueue, dgUserMax, dgCoolDown, dgShortCut, skipPlaylist, dgSourceCMD)
 	return d.panel
 }

todo.txt

@@ -15,6 +15,7 @@
 ----
 
 Finished
+- 2024.06.23       : 歌词字符集自动检测解码，单个点歌数上线
 - 2024.06.22       : 支持多个点歌命令, kugou源
 - 2024.06.21       : bilibili歌单，包括收藏夹和视频合集
 - 2024.06.08       : kuwo源，修复本地lrc文件不被读取的问题