refactor: 移除option对ctx泛型处理

yqchilde · Feb 12, 2023 · bcf3e53 · bcf3e53
1 parent 05f77ef
commit bcf3e53
Show file tree

Hide file tree

Showing 23 changed files with 65 additions and 64 deletions.
diff --git a/engine/control/ban.go b/engine/control/ban.go
@@ -9,7 +9,7 @@ import (
 var banCache = make(map[string]struct{})
 
 // Ban 禁止某人在某群使用本插件
-func (m *Control[CTX]) Ban(uid, gid string) {
+func (m *Control) Ban(uid, gid string) {
 	var err error
 	if gid != "" {
 		label := fmt.Sprintf("%s_%s_%s", m.Service, uid, gid)
@@ -34,7 +34,7 @@ func (m *Control[CTX]) Ban(uid, gid string) {
 }
 
 // Permit 允许某人在某群使用本插件
-func (m *Control[CTX]) Permit(uid, gid string) {
+func (m *Control) Permit(uid, gid string) {
 	if gid != "" {
 		label := fmt.Sprintf("%s_%s_%s", m.Service, uid, gid)
 		m.Manager.Lock()
@@ -54,7 +54,7 @@ func (m *Control[CTX]) Permit(uid, gid string) {
 }
 
 // IsBannedIn 某人是否在某群被ban
-func (m *Control[CTX]) IsBannedIn(uid, gid string) bool {
+func (m *Control) IsBannedIn(uid, gid string) bool {
 	var b PluginBanConfig
 	var err error
 	if len(gid) != 0 {

diff --git a/engine/control/block.go b/engine/control/block.go
@@ -2,25 +2,25 @@ package control
 
 var blockCache = make(map[string]bool)
 
-func (manager *Manager[CTX]) initBlock() error {
+func (manager *Manager) initBlock() error {
 	return manager.D.Table("__block").AutoMigrate(&BotBlockConfig{})
 }
 
-func (manager *Manager[CTX]) DoBlock(uid string) error {
+func (manager *Manager) DoBlock(uid string) error {
 	manager.Lock()
 	defer manager.Unlock()
 	blockCache[uid] = true
 	return manager.D.Table("__block").Create(&BotBlockConfig{UserID: uid}).Error
 }
 
-func (manager *Manager[CTX]) DoUnblock(uid string) error {
+func (manager *Manager) DoUnblock(uid string) error {
 	manager.Lock()
 	defer manager.Unlock()
 	blockCache[uid] = false
 	return manager.D.Table("__block").Where("uid = ?", uid).Delete(&BotBlockConfig{}).Error
 }
 
-func (manager *Manager[CTX]) IsBlocked(uid string) bool {
+func (manager *Manager) IsBlocked(uid string) bool {
 	manager.RLock()
 	isBlock, ok := blockCache[uid]
 	manager.RUnlock()

diff --git a/engine/control/config.go b/engine/control/config.go
@@ -1,16 +1,18 @@
 package control
 
-type Options[CTX any] struct {
-	Alias            string    // 插件别名
-	Help             string    // 插件帮助信息
-	Priority         uint64    // 优先级,只读
-	DisableOnDefault bool      // 默认禁用状态
-	HideMenu         bool      // 是否隐藏在菜单中，默认显示，可用于隐藏一些不希望展示的插件
-	CacheFolder      string    // 缓存文件夹
-	DataFolder       string    // 数据文件夹
-	OnEnable         func(CTX) // 自定义启用插件后执行的操作
-	OnDisable        func(CTX) // 自定义禁用插件后执行的操作
-	OnCronjob        func(CTX) // 自定义定时任务，用于被定时调用
+import "github.com/yqchilde/wxbot/engine/robot"
+
+type Options struct {
+	Alias            string               // 插件别名
+	Help             string               // 插件帮助信息
+	Priority         uint64               // 优先级,只读
+	DisableOnDefault bool                 // 默认禁用状态
+	HideMenu         bool                 // 是否隐藏在菜单中，默认显示，可用于隐藏一些不希望展示的插件
+	CacheFolder      string               // 缓存文件夹
+	DataFolder       string               // 数据文件夹
+	OnEnable         func(ctx *robot.Ctx) // 自定义启用插件后执行的操作
+	OnDisable        func(ctx *robot.Ctx) // 自定义禁用插件后执行的操作
+	OnCronjob        func(ctx *robot.Ctx) // 自定义定时任务，用于被定时调用
 }
 
 // PluginConfig 插件配置表

diff --git a/engine/control/control.go b/engine/control/control.go
@@ -7,20 +7,20 @@ import (
 )
 
 // Control 插件控制器
-type Control[CTX any] struct {
+type Control struct {
 	Service string          // Service 插件服务名
 	Cache   map[string]bool // Cache 缓存
-	Options Options[CTX]    // Options 插件配置
-	Manager *Manager[CTX]   // Manager 插件管理器
+	Options Options         // Options 插件配置
+	Manager *Manager        // Manager 插件管理器
 }
 
-func (manager *Manager[CTX]) NewControl(service string, o *Options[CTX]) *Control[CTX] {
-	m := &Control[CTX]{
+func (manager *Manager) NewControl(service string, o *Options) *Control {
+	m := &Control{
 		Service: service,
 		Cache:   make(map[string]bool),
-		Options: func() Options[CTX] {
+		Options: func() Options {
 			if o == nil {
-				return Options[CTX]{}
+				return Options{}
 			}
 			return *o
 		}(),
@@ -43,7 +43,7 @@ func (manager *Manager[CTX]) NewControl(service string, o *Options[CTX]) *Contro
 }
 
 // Handler 返回预处理器
-func (m *Control[CTX]) Handler(gid, uid string) bool {
+func (m *Control) Handler(gid, uid string) bool {
 	if m.Manager.IsBlocked(uid) {
 		return false
 	}
@@ -57,7 +57,7 @@ func (m *Control[CTX]) Handler(gid, uid string) bool {
 }
 
 // Enable 使插件在某个群中启用
-func (m *Control[CTX]) Enable(groupID string) error {
+func (m *Control) Enable(groupID string) error {
 	if groupID != "all" {
 		if isEnable, ok := m.IsEnabledAll(true); ok {
 			if isEnable {
@@ -87,7 +87,7 @@ func (m *Control[CTX]) Enable(groupID string) error {
 }
 
 // Disable 使插件在某个群中禁用
-func (m *Control[CTX]) Disable(groupID string) error {
+func (m *Control) Disable(groupID string) error {
 	if groupID != "all" {
 		if isEnable, ok := m.IsEnabledAll(false); ok {
 			if isEnable {
@@ -117,7 +117,7 @@ func (m *Control[CTX]) Disable(groupID string) error {
 }
 
 // CloseGlobalMode 关闭全局模式
-func (m *Control[CTX]) CloseGlobalMode() error {
+func (m *Control) CloseGlobalMode() error {
 	if err := m.Manager.D.Table(m.Service).Delete(&PluginConfig{}, "gid = ?", "all").Error; err != nil {
 		log.Errorf("(plugin) %s close global failed: %v", m.Service, err)
 		return errors.New("关闭失败")
@@ -129,7 +129,7 @@ func (m *Control[CTX]) CloseGlobalMode() error {
 }
 
 // IsEnabledIn 查询开启群组
-func (m *Control[CTX]) IsEnabledIn(gid string) bool {
+func (m *Control) IsEnabledIn(gid string) bool {
 	m.Manager.RLock()
 	isEnable, ok := m.Cache["all"]
 	m.Manager.RUnlock()
@@ -157,7 +157,7 @@ func (m *Control[CTX]) IsEnabledIn(gid string) bool {
 }
 
 // IsEnabledAll 查询是否全局开启
-func (m *Control[CTX]) IsEnabledAll(enable bool) (isEnable bool, ok bool) {
+func (m *Control) IsEnabledAll(enable bool) (isEnable bool, ok bool) {
 	m.Manager.RLock()
 	isEnable, ok = m.Cache["all"]
 	m.Manager.RUnlock()

diff --git a/engine/control/engine.go b/engine/control/engine.go
@@ -18,7 +18,7 @@ type Engine struct {
 var dataFolderFilter = make(map[string]string)
 var cacheFolderFilter = make(map[string]string)
 
-func newEngine(service string, o *Options[*robot.Ctx]) (e *Engine) {
+func newEngine(service string, o *Options) (e *Engine) {
 	e = &Engine{
 		en:       robot.New(),
 		priority: priority,

diff --git a/engine/control/manager.go b/engine/control/manager.go
@@ -12,13 +12,13 @@ import (
 	"github.com/yqchilde/wxbot/engine/pkg/sqlite"
 )
 
-type Manager[CTX any] struct {
+type Manager struct {
 	sync.RWMutex
-	M map[string]*Control[CTX]
+	M map[string]*Control
 	D *gorm.DB
 }
 
-func NewManager[CTX any](dbpath string) (m Manager[CTX]) {
+func NewManager(dbpath string) (m Manager) {
 	i := strings.LastIndex(dbpath, "/")
 	if i > 0 {
 		if err := os.MkdirAll(dbpath[:i], 0755); err != nil {
@@ -29,8 +29,8 @@ func NewManager[CTX any](dbpath string) (m Manager[CTX]) {
 	if err := sqlite.Open(dbpath, &db, &gorm.Config{Logger: logger.Default.LogMode(logger.Silent)}); err != nil {
 		log.Fatal("open plugins database failed: ", err)
 	}
-	m = Manager[CTX]{
-		M: map[string]*Control[CTX]{},
+	m = Manager{
+		M: map[string]*Control{},
 		D: db.Orm,
 	}
 	if err := m.initBlock(); err != nil {
@@ -43,14 +43,14 @@ func NewManager[CTX any](dbpath string) (m Manager[CTX]) {
 }
 
 // Lookup 查找插件管理器
-func (manager *Manager[CTX]) Lookup(service string) (*Control[CTX], bool) {
+func (manager *Manager) Lookup(service string) (*Control, bool) {
 	manager.RLock()
 	m, ok := manager.M[service]
 	manager.RUnlock()
 	return m, ok
 }
 
 // LookupAll 查找全部插件管理器
-func (manager *Manager[CTX]) LookupAll() map[string]*Control[CTX] {
+func (manager *Manager) LookupAll() map[string]*Control {
 	return manager.M
 }
diff --git a/engine/control/register.go b/engine/control/register.go
@@ -4,7 +4,6 @@ import (
 	"sync/atomic"
 
 	"github.com/yqchilde/wxbot/engine/pkg/log"
-	"github.com/yqchilde/wxbot/engine/robot"
 )
 
 var (
@@ -13,7 +12,7 @@ var (
 )
 
 // Register 注册插件控制器
-func Register(service string, o *Options[*robot.Ctx]) *Engine {
+func Register(service string, o *Options) *Engine {
 	atomic.AddUint64(&priority, 10)
 	s, ok := priorityMap[priority]
 	if ok {
@@ -25,10 +24,10 @@ func Register(service string, o *Options[*robot.Ctx]) *Engine {
 }
 
 // GetOptionsOnCronjob 获取定时任务插件控制器配置
-func GetOptionsOnCronjob() map[string]*Control[*robot.Ctx] {
+func GetOptionsOnCronjob() map[string]*Control {
 	var (
 		services      = managers.LookupAll()
-		servicesClone = make(map[string]*Control[*robot.Ctx])
+		servicesClone = make(map[string]*Control)
 	)
 
 	for i := range services {

diff --git a/engine/control/response.go b/engine/control/response.go
@@ -6,11 +6,11 @@ import (
 
 var respCache = make(map[string]bool)
 
-func (manager *Manager[CTX]) initResponse() error {
+func (manager *Manager) initResponse() error {
 	return manager.D.Table("__resp").AutoMigrate(&BotResponseConfig{})
 }
 
-func (manager *Manager[CTX]) Response(gid string) error {
+func (manager *Manager) Response(gid string) error {
 	if manager.CanResponse(gid) {
 		return fmt.Errorf("group-%s is already response", gid)
 	}
@@ -20,7 +20,7 @@ func (manager *Manager[CTX]) Response(gid string) error {
 	return manager.D.Table("__resp").Create(&BotResponseConfig{GroupID: gid}).Error
 }
 
-func (manager *Manager[CTX]) Silence(gid string) error {
+func (manager *Manager) Silence(gid string) error {
 	if !manager.CanResponse(gid) {
 		return fmt.Errorf("group-%s is already silence", gid)
 	}
@@ -30,7 +30,7 @@ func (manager *Manager[CTX]) Silence(gid string) error {
 	return manager.D.Table("__resp").Where("gid = ?", gid).Delete(&BotResponseConfig{}).Error
 }
 
-func (manager *Manager[CTX]) CanResponse(gid string) bool {
+func (manager *Manager) CanResponse(gid string) bool {
 	manager.RLock()
 	isResp, ok := respCache["all"]
 	manager.RUnlock()

diff --git a/engine/control/rule.go b/engine/control/rule.go
@@ -8,10 +8,10 @@ import (
 
 var (
 	once     = sync.Once{}
-	managers = NewManager[*robot.Ctx]("data/manager/plugins.db")
+	managers = NewManager("data/manager/plugins.db")
 )
 
-func newControl(service string, o *Options[*robot.Ctx]) robot.Rule {
+func newControl(service string, o *Options) robot.Rule {
 	c := managers.NewControl(service, o)
 	return func(ctx *robot.Ctx) bool {
 		ctx.State["manager"] = c

diff --git a/plugins/baidubaike/main.go b/plugins/baidubaike/main.go
@@ -10,7 +10,7 @@ import (
 )
 
 func init() {
-	engine := control.Register("baidubaike", &control.Options[*robot.Ctx]{
+	engine := control.Register("baidubaike", &control.Options{
 		Alias: "百度百科",
 		Help: "用法：百度百科 XX\n" +
 			"示例：百度百科 okr",

diff --git a/plugins/chatgpt/main.go b/plugins/chatgpt/main.go
@@ -30,7 +30,7 @@ type ApiKey struct {
 }
 
 func init() {
-	engine := control.Register("chatgpt", &control.Options[*robot.Ctx]{
+	engine := control.Register("chatgpt", &control.Options{
 		Alias:      "ChatGPT",
 		Help:       "输入 {开始会话} => 进行ChatGPT连续会话",
 		DataFolder: "chatgpt",

diff --git a/plugins/crazykfc/main.go b/plugins/crazykfc/main.go
@@ -16,7 +16,7 @@ var sentence []string
 func init() {
 	go getCrazyKFCSentence()
 	rand.Seed(time.Now().UnixNano())
-	engine := control.Register("kfccrazy", &control.Options[*robot.Ctx]{
+	engine := control.Register("kfccrazy", &control.Options{
 		Alias: "kfc骚话",
 		Help:  "输入 {kfc骚话} => 获取肯德基疯狂星期四骚话",
 	})

diff --git a/plugins/ghmonitor/main.go b/plugins/ghmonitor/main.go
@@ -23,7 +23,7 @@ type Monitor struct {
 }
 
 func init() {
-	engine := control.Register("ghmonitor", &control.Options[*robot.Ctx]{
+	engine := control.Register("ghmonitor", &control.Options{
 		Alias:      "公众号监控",
 		Help:       "监控公众号 (gh_.*) 转发到 (.*)\n监控公众号关键词 (.*) 转发到 (.*)",
 		DataFolder: "ghmonitor",

diff --git a/plugins/jingdong/main.go b/plugins/jingdong/main.go
@@ -6,7 +6,7 @@ import (
 )
 
 func init() {
-	engine := control.Register("jdbean", &control.Options[*robot.Ctx]{
+	engine := control.Register("jdbean", &control.Options{
 		Alias:            "京豆上车",
 		Help:             "输入 {京东上车} => 快上车和我一起挂京豆",
 		DisableOnDefault: true,

diff --git a/plugins/manager/command.go b/plugins/manager/command.go
@@ -17,7 +17,7 @@ type Command struct {
 }
 
 func registerCommand() {
-	engine := control.Register("command", &control.Options[*robot.Ctx]{
+	engine := control.Register("command", &control.Options{
 		HideMenu: true,
 	})
 
@@ -37,7 +37,7 @@ func registerCommand() {
 
 	// 菜单输出
 	engine.OnFullMatchGroup([]string{"menu", "菜单"}).SetBlock(true).Handle(func(ctx *robot.Ctx) {
-		c := ctx.State["manager"].(*control.Control[*robot.Ctx])
+		c := ctx.State["manager"].(*control.Control)
 		options := MenuOptions{WxId: ctx.Event.FromUniqueID}
 		for _, m := range c.Manager.M {
 			if m.Options.HideMenu {

diff --git a/plugins/manager/cronjob.go b/plugins/manager/cronjob.go
@@ -38,7 +38,7 @@ type CronJob struct {
 }
 
 func registerCronjob() {
-	engine := control.Register("cronjob", &control.Options[*robot.Ctx]{
+	engine := control.Register("cronjob", &control.Options{
 		Alias:      "定时任务",
 		Help:       "管理员设置定时任务",
 		DataFolder: "manager",

diff --git a/plugins/manager/event.go b/plugins/manager/event.go
@@ -2,7 +2,7 @@ package manager
 
 func registerEvent() {
 	// 该插件按需引入，自行修改
-	//engine := control.Register("event", &control.Options[*robot.Ctx]{
+	//engine := control.Register("event", &control.Options{
 	//	HideMenu: true,
 	//})
 

diff --git a/plugins/memepicture/main.go b/plugins/memepicture/main.go
@@ -11,7 +11,7 @@ import (
 )
 
 func init() {
-	engine := control.Register("memepicture", &control.Options[*robot.Ctx]{
+	engine := control.Register("memepicture", &control.Options{
 		Alias: "表情原图",
 		Help:  "输入 {表情原图} => 30s内发送表情获取表情原图",
 	})

diff --git a/plugins/moyuban/main.go b/plugins/moyuban/main.go
@@ -10,7 +10,7 @@ import (
 )
 
 func init() {
-	engine := control.Register("moyu", &control.Options[*robot.Ctx]{
+	engine := control.Register("moyu", &control.Options{
 		Alias: "摸鱼日历",
 		Help:  "输入 {摸鱼日历|摸鱼} => 获取摸鱼办日历",
 	})