fix extra

plugin/ai_reply/ai_tts.go

@@ -2,10 +2,8 @@ package aireply
 
 import (
 	"errors"
-	"net/url"
 
 	"github.com/RomiChan/syncx"
-	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 
 	"github.com/FloatTech/AnimeAPI/aireply"
@@ -54,25 +52,23 @@ var ttscnspeakers = [...]string{
 	"晓甄（女 - 年轻人）",
 }
 
-const (
-	defaultttsindexkey    = -2905
-	gsapikeyextragrp      = -1
-	chatgptapikeyextragrp = -2
+const defaultttsindexkey = -2905
+
+var (
+	原  = newapikeystore("./data/tts/o.txt")
+	ཆཏ = newapikeystore("./data/tts/c.txt")
 )
 
-type replymode struct {
-	APIKey     string   // APIKey is for chatgpt
-	replyModes []string `json:"-"`
-}
+type replymode []string
 
-func (r *replymode) setReplyMode(ctx *zero.Ctx, name string) error {
+func (r replymode) setReplyMode(ctx *zero.Ctx, name string) error {
 	gid := ctx.Event.GroupID
 	if gid == 0 {
 		gid = -ctx.Event.UserID
 	}
 	var ok bool
 	var index int64
-	for i, s := range r.replyModes {
+	for i, s := range r {
 		if s == name {
 			ok = true
 			index = int64(i)
@@ -89,7 +85,7 @@ func (r *replymode) setReplyMode(ctx *zero.Ctx, name string) error {
 	return m.SetData(gid, (m.GetData(index)&^0xff)|(index&0xff))
 }
 
-func (r *replymode) getReplyMode(ctx *zero.Ctx) aireply.AIReply {
+func (r replymode) getReplyMode(ctx *zero.Ctx) aireply.AIReply {
 	gid := ctx.Event.GroupID
 	if gid == 0 {
 		gid = -ctx.Event.UserID
@@ -102,7 +98,7 @@ func (r *replymode) getReplyMode(ctx *zero.Ctx) aireply.AIReply {
 		case 1:
 			return aireply.NewXiaoAi(aireply.XiaoAiURL, aireply.XiaoAiBotName)
 		case 2:
-			k := r.getAPIKey(ctx)
+			k := ཆཏ.k
 			if k != "" {
 				return aireply.NewChatGPT(aireply.ChatGPTURL, k)
 			}
@@ -112,21 +108,6 @@ func (r *replymode) getReplyMode(ctx *zero.Ctx) aireply.AIReply {
 	return aireply.NewQYK(aireply.QYKURL, aireply.QYKBotName)
 }
 
-func (r *replymode) getAPIKey(ctx *zero.Ctx) string {
-	if r.APIKey == "" {
-		m := ctx.State["manager"].(*ctrl.Control[*zero.Ctx])
-		_ = m.Manager.GetExtra(chatgptapikeyextragrp, &r)
-		logrus.Debugln("[tts] get api key:", r.APIKey)
-	}
-	return r.APIKey
-}
-
-func (r *replymode) setAPIKey(m *ctrl.Control[*zero.Ctx], key string) error {
-	r.APIKey = key
-	_ = m.Manager.Response(chatgptapikeyextragrp)
-	return m.Manager.SetExtra(chatgptapikeyextragrp, r)
-}
-
 var ttsins = func() map[string]tts.TTS {
 	m := make(map[string]tts.TTS, 128)
 	for _, mode := range append(genshin.SoundList[:], extrattsname...) {
@@ -141,10 +122,7 @@ var ttsModes = func() []string {
 	return s
 }()
 
-type ttsmode struct {
-	APIKey string                  // APIKey is for genshin vits
-	mode   syncx.Map[int64, int64] `json:"-"` // mode grp index
-}
+type ttsmode syncx.Map[int64, int64]
 
 func list(list []string, num int) string {
 	s := ""
@@ -162,33 +140,17 @@ func list(list []string, num int) string {
 func newttsmode() *ttsmode {
 	t := &ttsmode{}
 	m, ok := control.Lookup("tts")
-	t.mode = syncx.Map[int64, int64]{}
-	t.mode.Store(defaultttsindexkey, 0)
+	(*syncx.Map[int64, int64])(t).Store(defaultttsindexkey, 0)
 	if ok {
 		index := m.GetData(defaultttsindexkey)
 		msk := index & 0xff
 		if msk >= 0 && (msk < int64(len(genshin.SoundList)) || msk == baiduttsindex || msk == ttscnttsindex) {
-			t.mode.Store(defaultttsindexkey, index)
+			(*syncx.Map[int64, int64])(t).Store(defaultttsindexkey, index)
 		}
 	}
 	return t
 }
 
-func (t *ttsmode) getAPIKey(ctx *zero.Ctx) string {
-	if t.APIKey == "" {
-		m := ctx.State["manager"].(*ctrl.Control[*zero.Ctx])
-		_ = m.Manager.GetExtra(gsapikeyextragrp, &t)
-		logrus.Debugln("[tts] get api key:", t.APIKey)
-	}
-	return url.QueryEscape(t.APIKey)
-}
-
-func (t *ttsmode) setAPIKey(m *ctrl.Control[*zero.Ctx], key string) error {
-	t.APIKey = key
-	_ = m.Manager.Response(gsapikeyextragrp)
-	return m.Manager.SetExtra(gsapikeyextragrp, t)
-}
-
 func (t *ttsmode) setSoundMode(ctx *zero.Ctx, name string, baiduper, mockingsynt int) error {
 	gid := ctx.Event.GroupID
 	if gid == 0 {
@@ -216,7 +178,7 @@ func (t *ttsmode) setSoundMode(ctx *zero.Ctx, name string, baiduper, mockingsynt
 		}
 	}
 	m := ctx.State["manager"].(*ctrl.Control[*zero.Ctx])
-	t.mode.Store(gid, index)
+	(*syncx.Map[int64, int64])(t).Store(gid, index)
 	return m.SetData(gid, (m.GetData(gid)&^0xffff00)|((index<<8)&0xff00)|((int64(baiduper)<<16)&0x0f0000)|((int64(mockingsynt)<<20)&0xf00000))
 }
 
@@ -225,14 +187,14 @@ func (t *ttsmode) getSoundMode(ctx *zero.Ctx) (tts.TTS, error) {
 	if gid == 0 {
 		gid = -ctx.Event.UserID
 	}
-	i, ok := t.mode.Load(gid)
+	i, ok := (*syncx.Map[int64, int64])(t).Load(gid)
 	if !ok {
 		m := ctx.State["manager"].(*ctrl.Control[*zero.Ctx])
 		i = m.GetData(gid) >> 8
 	}
 	m := i & 0xff
 	if m < 0 || (m >= int64(len(genshin.SoundList)) && m != baiduttsindex && m != ttscnttsindex) {
-		i, _ = t.mode.Load(defaultttsindexkey)
+		i, _ = (*syncx.Map[int64, int64])(t).Load(defaultttsindexkey)
 		m = i & 0xff
 	}
 	mode := ttsModes[m]
@@ -248,9 +210,9 @@ func (t *ttsmode) getSoundMode(ctx *zero.Ctx) (tts.TTS, error) {
 				return nil, err
 			}
 		default: // 原神
-			k := t.getAPIKey(ctx)
+			k := 原.k
 			if k != "" {
-				ins = genshin.NewGenshin(int(m), t.getAPIKey(ctx))
+				ins = genshin.NewGenshin(int(m), 原.k)
 				ttsins[mode] = ins
 			} else {
 				return nil, errors.New("no valid speaker")
@@ -296,6 +258,6 @@ func (t *ttsmode) setDefaultSoundMode(name string, baiduper, mockingsynt int) er
 	if !ok {
 		return errors.New("[tts] service not found")
 	}
-	t.mode.Store(defaultttsindexkey, index)
+	(*syncx.Map[int64, int64])(t).Store(defaultttsindexkey, index)
 	return m.SetData(defaultttsindexkey, (index&0xff)|((int64(baiduper)<<8)&0x0f00)|((int64(mockingsynt)<<12)&0xf000))
 }

plugin/ai_reply/main.go

@@ -15,9 +15,7 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"
 )
 
-var replmd = replymode{
-	replyModes: []string{"青云客", "小爱", "ChatGPT"},
-}
+var replmd = replymode([]string{"青云客", "小爱", "ChatGPT"})
 
 var ttsmd = newttsmode()
 
@@ -32,6 +30,7 @@ func init() { // 插件主体
 			"- 设置原神语音 api key xxxxxx (key请加开发群获得)\n" +
 			"当前适用的原神人物含有以下: \n" + list(genshin.SoundList[:], 5) +
 			"\n当前适用的TTSCN人物含有以下(以数字顺序代表): \n" + list(ttscnspeakers[:], 5),
+		PrivateDataFolder: "tts",
 	})
 
 	enr := control.Register("aireply", &ctrl.Options[*zero.Ctx]{
@@ -66,7 +65,7 @@ func init() { // 插件主体
 	})
 
 	enr.OnRegex(`^设置\s*ChatGPT\s*api\s*key\s*(.*)$`, zero.OnlyPrivate, zero.SuperUserPermission).SetBlock(true).Handle(func(ctx *zero.Ctx) {
-		err := replmd.setAPIKey(ctx.State["manager"].(*ctrl.Control[*zero.Ctx]), ctx.State["regex_matched"].([]string)[1])
+		err := ཆཏ.set(ctx.State["regex_matched"].([]string)[1])
 		if err != nil {
 			ctx.SendChain(message.Text("ERROR: ", err))
 			return
@@ -184,7 +183,7 @@ func init() { // 插件主体
 	})
 
 	ent.OnRegex(`^设置原神语音\s*api\s*key\s*([0-9a-zA-Z-_]{54}==)$`, zero.OnlyPrivate, zero.SuperUserPermission).SetBlock(true).Handle(func(ctx *zero.Ctx) {
-		err := ttsmd.setAPIKey(ctx.State["manager"].(*ctrl.Control[*zero.Ctx]), ctx.State["regex_matched"].([]string)[1])
+		err := 原.set(ctx.State["regex_matched"].([]string)[1])
 		if err != nil {
 			ctx.SendChain(message.Text("ERROR: ", err))
 			return

plugin/ai_reply/model.go

@@ -0,0 +1,29 @@
+package aireply
+
+import (
+	"os"
+
+	"github.com/FloatTech/floatbox/binary"
+	"github.com/FloatTech/floatbox/file"
+)
+
+type apikeystore struct {
+	k string
+	p string
+}
+
+func newapikeystore(p string) (s apikeystore) {
+	s.p = p
+	if file.IsExist(p) {
+		data, err := os.ReadFile(p)
+		if err == nil {
+			s.k = binary.BytesToString(data)
+		}
+	}
+	return
+}
+
+func (s *apikeystore) set(k string) error {
+	s.k = k
+	return os.WriteFile(s.p, binary.StringToBytes(k), 0644)
+}