✏️ 优化戳一戳命令牌为群号

* fix:捕获协程异常

* feat:添加睡眠时间

* feat:添加睡眠管理功能

* fix:修改对标时间

* fix:修改注释函数名，使用一个时间

* feat:让大家能够更加清楚的看到每一个功能

* feat:把群管放在control,增加退群信息

* fix:不会recover

* fix:原本的正则限制机器人回复回复的消息，故去掉正则

* fix:添加服务详情,整理manager

* feat:chat进control

Co-authored-by: Guohuiyuan <haibaraguo@yeahka.com>

README.md

@@ -45,6 +45,7 @@ zerobot -h -t token -u url [-d|w] [-g 监听地址:端口] qq1 qq2 qq3 ...
     - [x] /还原 xxx (在发送的群/用户还原xxx的开启状态到初始状态)
     - [x] /用法 xxx
     - [x] /服务列表
+    - [x] /服务详情
     - [x] @Bot 插件冲突检测 (会在本群发送一条消息并在约 1s 后撤回以检测其它同类 bot 中已启用的插件并禁用)
 - **聊天** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_chat"`
     - [x] [BOT名字]
@@ -54,7 +55,7 @@ zerobot -h -t token -u url [-d|w] [-g 监听地址:端口] qq1 qq2 qq3 ...
     - [x] 群温度
     - [x] 设置温度[正整数]
 - **ATRI** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_atri"`
-    - [x] 具体指令看代码
+    - [x] 具体指令看 /用法 atri
     - 注：本插件基于 [ATRI](https://github.com/Kyomotoi/ATRI) ，为 Golang 移植版
 - **群管** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_manager"`
     - [x] 禁言[@xxx][分钟]
@@ -68,7 +69,7 @@ zerobot -h -t token -u url [-d|w] [-g 监听地址:端口] qq1 qq2 qq3 ...
     - [x] 修改头衔[@xxx][xxx]
     - [x] 申请头衔[xxx]
     - [x] 踢出群聊[@xxx]
-    - [x] 退出群聊[群号]
+    - [x] 退出群聊[群号]@Bot
     - [x] *入群欢迎
     - [x] *退群通知
     - [x] 设置欢迎语[欢迎~]
@@ -108,7 +109,7 @@ zerobot -h -t token -u url [-d|w] [-g 监听地址:端口] qq1 qq2 qq3 ...
     - [x] 爬[@xxx]
     - [x] 摸[@xxx]
     - [x] 搓[@xxx]
-    - 注：更多指令见项目 --> https://github.com/tdf1939/ZeroBot-Plugin-Gif
+    - 注：更多指令见项目 --> https://github.com/FloatTech/ZeroBot-Plugin-Gif
 - **base16384加解密** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_b14"`
     - [x] 加密xxx
     - [x] 解密xxx
@@ -128,6 +129,7 @@ zerobot -h -t token -u url [-d|w] [-g 监听地址:端口] qq1 qq2 qq3 ...
     - [x] 设置本地setu绝对路径[xxx]
     - [x] 刷新所有本地setu
     - [x] 所有本地setu分类
+    - 注：刷新文件夹较慢，请耐心等待刷新完成，会提示“成功”。
 - **lolicon** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_lolicon"`
     - [x] 来份萝莉
 - **搜图** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_saucenao"`
@@ -144,6 +146,8 @@ zerobot -h -t token -u url [-d|w] [-g 监听地址:端口] qq1 qq2 qq3 ...
 - **每日运势** `import _ github.com/FloatTech/ZeroBot-Plugin/plugin_fortune`
     - [x] 运势|抽签
     - [x] 设置底图[车万 DC4 爱因斯坦 星空列车 樱云之恋 富婆妹 李清歌 公主连结 原神 明日方舟 碧蓝航线 碧蓝幻想 战双 阴阳师]
+- **睡眠管理** `import _ github.com/FloatTech/ZeroBot-Plugin/plugin_sleep_manage`
+    - [x] 早安|晚安
 - **浅草寺求签** `import _ github.com/FloatTech/ZeroBot-Plugin/plugin_omikuji`
     - [x] 求签|占卜
 - **bilibili** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_bilibili"`
@@ -160,10 +164,16 @@ zerobot -h -t token -u url [-d|w] [-g 监听地址:端口] qq1 qq2 qq3 ...
     - [x] 查询鬼东西[序号][@xxx]
     - 注：由于需要科学，默认注释。
 - **AIfalse** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_ai_false"`
-    - [x] 查询计算机当前活跃度 [身体检查]
+    - [x] 查询计算机当前活跃度: [检查身体|自检|启动自检|系统状态]
     - [x] 清理缓存
     - [ ] 简易语音
     - [ ] 爬图合成 [@xxx]
+- **抽wife** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_nativewife"`
+    - [x] 抽wife[@xxx]
+    - [x] 添加wife[名字][图片]
+    - [x] 删除wife[名字]
+    - [x] [让|不让]所有人均可添加wife
+    - 注：不同群添加后不会重叠
 - **minecraft** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_minecraft"`
     - [x] /mcstart xxx
 	- [x] /mcstop xxx

control/rule.go

@@ -53,8 +53,16 @@ func newctrl(service string, o *Options) *Control {
 // Enable enables a group to pass the Manager.
 // groupID == 0 (ALL) will operate on all grps.
 func (m *Control) Enable(groupID int64) {
+	var c grpcfg
+	m.RLock()
+	err := db.Find(m.service, &c, "WHERE gid = "+strconv.FormatInt(groupID, 10))
+	m.RUnlock()
+	if err != nil {
+		c.GroupID = groupID
+	}
+	c.Disable = int64(uint64(c.Disable) & 0xffffffff_fffffffe)
 	m.Lock()
-	err := db.Insert(m.service, &grpcfg{groupID, 0})
+	err = db.Insert(m.service, &c)
 	m.Unlock()
 	if err != nil {
 		logrus.Errorf("[control] %v", err)
@@ -64,8 +72,16 @@ func (m *Control) Enable(groupID int64) {
 // Disable disables a group to pass the Manager.
 // groupID == 0 (ALL) will operate on all grps.
 func (m *Control) Disable(groupID int64) {
+	var c grpcfg
+	m.RLock()
+	err := db.Find(m.service, &c, "WHERE gid = "+strconv.FormatInt(groupID, 10))
+	m.RUnlock()
+	if err != nil {
+		c.GroupID = groupID
+	}
+	c.Disable |= 1
 	m.Lock()
-	err := db.Insert(m.service, &grpcfg{groupID, 1})
+	err = db.Insert(m.service, &c)
 	m.Unlock()
 	if err != nil {
 		logrus.Errorf("[control] %v", err)
@@ -95,20 +111,67 @@ func (m *Control) IsEnabledIn(gid int64) bool {
 		err = db.Find(m.service, &c, "WHERE gid = "+strconv.FormatInt(gid, 10))
 		m.RUnlock()
 		if err == nil && gid == c.GroupID {
-			logrus.Debugf("[control] plugin %s of grp %d : %d", m.service, c.GroupID, c.Disable)
-			return c.Disable == 0
+			logrus.Debugf("[control] plugin %s of grp %d : %d", m.service, c.GroupID, c.Disable&1)
+			return c.Disable&1 == 0
 		}
 	}
 	m.RLock()
 	err = db.Find(m.service, &c, "WHERE gid = 0")
 	m.RUnlock()
 	if err == nil && c.GroupID == 0 {
-		logrus.Debugf("[control] plugin %s of all : %d", m.service, c.Disable)
-		return c.Disable == 0
+		logrus.Debugf("[control] plugin %s of all : %d", m.service, c.Disable&1)
+		return c.Disable&1 == 0
 	}
 	return !m.options.DisableOnDefault
 }
 
+// GetData 获取某个群的 63 字节配置信息
+func (m *Control) GetData(gid int64) int64 {
+	var c grpcfg
+	var err error
+	logrus.Debugln("[control] IsEnabledIn recv gid =", gid)
+	if gid != 0 {
+		m.RLock()
+		err = db.Find(m.service, &c, "WHERE gid = "+strconv.FormatInt(gid, 10))
+		m.RUnlock()
+		if err == nil && gid == c.GroupID {
+			logrus.Debugf("[control] plugin %s of grp %d : %x", m.service, c.GroupID, c.Disable>>1)
+			return c.Disable >> 1
+		}
+	}
+	m.RLock()
+	err = db.Find(m.service, &c, "WHERE gid = 0")
+	m.RUnlock()
+	if err == nil && c.GroupID == 0 {
+		logrus.Debugf("[control] plugin %s of all : %x", m.service, c.Disable>>1)
+		return c.Disable >> 1
+	}
+	return 0
+}
+
+// SetData 为某个群设置低 63 位配置数据
+func (m *Control) SetData(groupID int64, data int64) error {
+	var c grpcfg
+	m.RLock()
+	err := db.Find(m.service, &c, "WHERE gid = "+strconv.FormatInt(groupID, 10))
+	m.RUnlock()
+	if err != nil {
+		c.GroupID = groupID
+		if m.options.DisableOnDefault {
+			c.Disable = 1
+		}
+	}
+	c.Disable |= data << 1
+	logrus.Debugf("[control] set plugin %s of all : %x", m.service, data)
+	m.Lock()
+	err = db.Insert(m.service, &c)
+	m.Unlock()
+	if err != nil {
+		logrus.Errorf("[control] %v", err)
+	}
+	return err
+}
+
 // Handler 返回 预处理器
 func (m *Control) Handler() zero.Rule {
 	return func(ctx *zero.Ctx) bool {
@@ -246,6 +309,42 @@ func init() {
 						})
 						ctx.SendChain(message.Text(msg))
 					})
+
+				zero.OnCommandGroup([]string{"服务详情", "service_detail"}, userOrGrpAdmin).
+					Handle(func(ctx *zero.Ctx) {
+						var m message.Message
+						m = append(m,
+							message.CustomNode(
+								ctx.Event.Sender.NickName,
+								ctx.Event.UserID,
+								"---服务详情---",
+							))
+						i := 0
+						ForEach(func(key string, manager *Control) bool {
+							service, _ := Lookup(key)
+							help := service.options.Help
+							i++
+							msg := strconv.Itoa(i) + `: `
+							if manager.IsEnabledIn(ctx.Event.GroupID) {
+								msg += "●" + key
+							} else {
+								msg += "○" + key
+							}
+							msg += "\n" + help
+							m = append(m,
+								message.CustomNode(
+									ctx.Event.Sender.NickName,
+									ctx.Event.UserID,
+									msg,
+								))
+							return true
+						})
+
+						ctx.SendGroupForwardMessage(
+							ctx.Event.GroupID,
+							m,
+						)
+					})
 			}
 		}
 		mu.Unlock()

control/web/gui.go

@@ -60,7 +60,7 @@ type request struct {
 // InitGui 初始化gui
 func InitGui(addr string) {
 	// 将日志重定向到前端hook
-	writer := io.MultiWriter(l, os.Stderr)
+	writer := io.MultiWriter(l, os.Stdout)
 	log.SetOutput(writer)
 	// 监听后端
 	go controller(addr)

go.mod

@@ -6,6 +6,7 @@ require (
 	github.com/FloatTech/AnimeAPI v1.1.10
 	github.com/FloatTech/ZeroBot-Plugin-Gif v0.2.4
 	github.com/FloatTech/bot-manager v1.0.1-0.20211112011524-85b9895271ed
+	github.com/RomiChan/protobuf v0.0.0-20211202142450-893e94b43c21
 	github.com/corona10/goimagehash v1.0.3
 	github.com/fogleman/gg v1.3.0
 	github.com/fumiama/cron v1.3.0
@@ -13,7 +14,6 @@ require (
 	github.com/fumiama/gofastTEA v0.0.5
 	github.com/fumiama/gotracemoe v0.0.3
 	github.com/gin-gonic/gin v1.7.5
-	github.com/golang/protobuf v1.5.2
 	github.com/gorilla/websocket v1.4.2
 	github.com/jinzhu/gorm v1.9.16
 	github.com/logoove/sqlite v1.13.0

go.sum

@@ -12,6 +12,8 @@ github.com/FloatTech/imgfactory v0.1.1/go.mod h1:ThDALab8aOuU6KVYESVWFqmjcqtm03e
 github.com/Mrs4s/MiraiGo v0.0.0-20211120033824-43b23f4e6fcb h1:Rkj28fqIwGx/EgBzRYtpmJRfH6wqVn7cNdc7aJ0QE4M=
 github.com/Mrs4s/MiraiGo v0.0.0-20211120033824-43b23f4e6fcb/go.mod h1:imVKbfKqqeit+C/eaWGb4MKQ3z3gN6pRpBU5RMtp5so=
 github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
+github.com/RomiChan/protobuf v0.0.0-20211202142450-893e94b43c21 h1:3i3D7gO1qPeUGY0Bl7rQIoeeNE10kgQFyPqLV1ks9ew=
+github.com/RomiChan/protobuf v0.0.0-20211202142450-893e94b43c21/go.mod h1:CKKOWC7mBxd36zxsCB1V8DTrwlTNRQvkSVbYqyUiGEE=
 github.com/StackExchange/wmi v1.2.1 h1:VIkavFPXSjcnS+O8yTq7NI32k0R5Aj+v39y29VYDOSA=
 github.com/StackExchange/wmi v1.2.1/go.mod h1:rcmrprowKIVzvc+NUiLncP2uuArMWLCbu9SBzvHz7e8=
 github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=

main.go

@@ -18,12 +18,13 @@ import (
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_qingyunke" // 青云客
 
 	// 实用类
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_b14"         // base16384加解密
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_github"      // 搜索GitHub仓库
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_manager"     // 群管
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_nbnhhsh"     // 拼音首字母缩写释义工具
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_runcode"     // 在线运行代码
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_translation" // 翻译
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_b14"          // base16384加解密
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_github"       // 搜索GitHub仓库
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_manager"      // 群管
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_nbnhhsh"      // 拼音首字母缩写释义工具
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_runcode"      // 在线运行代码
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_sleep_manage" // 统计睡眠时间
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_translation"  // 翻译
 
 	// 娱乐类
 	// _ "github.com/FloatTech/ZeroBot-Plugin/plugin_wtf"    // 鬼东西
@@ -49,6 +50,7 @@ import (
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_image_finder"  // 关键字搜图
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_lolicon"       // lolicon 随机图片
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_nativesetu"    // 本地涩图
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_nativewife"    // 本地老婆
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_saucenao"      // 以图搜图
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_setutime"      // 来份涩图
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_tracemoe"      // 搜番
@@ -78,8 +80,8 @@ func init() {
 	d := flag.Bool("d", false, "Enable debug level log and higher.")
 	w := flag.Bool("w", false, "Enable warning level log and higher.")
 	h := flag.Bool("h", false, "Display this help.")
-	// 解析命令行参数，输入 `-g 监听地址:端口` 即可启用 gui
-	// g := flag.String("g", "127.0.0.1:3000", "Enable web gui.")
+	// 解析命令行参数，输入 `-g 监听地址:端口` 指定 gui 访问地址，默认 127.0.0.1:3000
+	// g := flag.String("g", "127.0.0.1:3000", "Set web gui listening address.")
 
 	// 直接写死 AccessToken 时，请更改下面第二个参数
 	token = flag.String("t", "", "Set AccessToken of WSClient.")
@@ -100,10 +102,8 @@ func init() {
 			logrus.SetLevel(logrus.WarnLevel)
 		}
 	}
-	// 解析命令行参数，输入 `-g` 即可启用 gui
-	// if *g {
-	// 	webctrl.InitGui(*g)
-	// }
+	// 启用 gui
+	// webctrl.InitGui(*g)
 }
 
 func printBanner() {
@@ -119,7 +119,7 @@ func main() {
 	// 帮助
 	zero.OnFullMatchGroup([]string{"/help", ".help", "菜单"}, zero.OnlyToMe).SetBlock(true).FirstPriority().
 		Handle(func(ctx *zero.Ctx) {
-			ctx.SendChain(message.Text(banner))
+			ctx.SendChain(message.Text(banner, "\n可发送\"/服务详情\"查看 bot 功能"))
 		})
 	zero.RunAndBlock(
 		zero.Config{

main_win.go

@@ -9,6 +9,7 @@ import (
 )
 
 func init() {
+	// windows 不支持带颜色的 log，故自定义格式
 	logrus.SetFormatter(&easy.Formatter{
 		LogFormat: "[%lvl%] %msg%\n",
 	})

plugin_ai_false/ai_false.go

@@ -20,7 +20,7 @@ func init() { // 插件主体
 	engine := control.Register("aifalse", &control.Options{
 		DisableOnDefault: false,
 		Help: "AIfalse\n" +
-			"- 查询计算机当前活跃度[检查身体|自检|启动自检|系统状态",
+			"- 查询计算机当前活跃度: [检查身体|自检|启动自检|系统状态]",
 	})
 	engine.OnFullMatchGroup([]string{"检查身体", "自检", "启动自检", "系统状态"}, zero.AdminPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {

plugin_atri/atri.go

@@ -20,13 +20,21 @@ const (
 	// 服务名
 	servicename = "atri"
 	// ATRI 所有命令的优先级
-	prio = 2
+	prio = 5
 	// ATRI 表情的 codechina 镜像
 	res = "https://codechina.csdn.net/u011570312/ZeroBot-Plugin/-/raw/master/plugin_atri/"
 )
 
 func init() { // 插件主体
-	engine := control.Register(servicename, &control.Options{})
+	engine := control.Register(servicename, &control.Options{
+		DisableOnDefault: false,
+		Help: "本插件基于 ATRI ，为 Golang 移植版\n" +
+			"- ATRI醒醒\n- ATRI睡吧\n- 萝卜子\n- 喜欢|爱你|爱|suki|daisuki|すき|好き|贴贴|老婆|亲一个|mua\n" +
+			"- 草你妈|操你妈|脑瘫|废柴|fw|废物|战斗|爬|爪巴|sb|SB|傻B\n- 早安|早哇|早上好|ohayo|哦哈哟|お早う|早好|早|早早早\n" +
+			"- 中午好|午安|午好\n- 晚安|oyasuminasai|おやすみなさい|晚好|晚上好\n- 高性能|太棒了|すごい|sugoi|斯国一|よかった\n" +
+			"- 没事|没关系|大丈夫|还好|不要紧|没出大问题|没伤到哪\n- 好吗|是吗|行不行|能不能|可不可以\n- 啊这\n- 我好了\n- ？|?|¿\n" +
+			"- 离谱\n- 答应我",
+	})
 	zero.OnFullMatch("ATRI醒醒", zero.AdminPermission).SetBlock(true).SetPriority(prio).
 		Handle(func(ctx *zero.Ctx) {
 			c, ok := control.Lookup(servicename)
@@ -65,7 +73,7 @@ func init() { // 插件主体
 			process.SleepAbout1sTo2s()
 			ctx.SendChain(randImage("FN.jpg", "WQ.jpg", "WQ1.jpg"))
 		})
-	engine.OnFullMatchGroup([]string{"早安", "早哇", "早上好", "ohayo", "哦哈哟", "お早う", "早好", "早"}).SetBlock(true).SetPriority(prio).
+	engine.OnFullMatchGroup([]string{"早安", "早哇", "早上好", "ohayo", "哦哈哟", "お早う", "早好", "早", "早早早"}).SetBlock(true).SetPriority(prio).
 		Handle(func(ctx *zero.Ctx) {
 			now := time.Now().Hour()
 			process.SleepAbout1sTo2s()

plugin_chat/chat.go

@@ -9,13 +9,20 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/extension/rate"
 	"github.com/wdvxdr1123/ZeroBot/message"
+
+	"github.com/FloatTech/ZeroBot-Plugin/control"
 )
 
 var poke = rate.NewManager(time.Minute*5, 8) // 戳一戳
 
+var engine = control.Register("chat", &control.Options{
+	DisableOnDefault: false,
+	Help:             "chat\n- [BOT名字]\n- [戳一戳BOT]\n- 空调开\n- 空调关\n- 群温度\n- 设置温度[正整数]",
+})
+
 func init() { // 插件主体
 	// 被喊名字
-	zero.OnFullMatch("", zero.OnlyToMe).SetBlock(false).FirstPriority().
+	engine.OnFullMatch("", zero.OnlyToMe).SetBlock(true).FirstPriority().
 		Handle(func(ctx *zero.Ctx) {
 			var nickname = zero.BotConfig.NickName[0]
 			time.Sleep(time.Second * 1)
@@ -29,15 +36,15 @@ func init() { // 插件主体
 			))
 		})
 	// 戳一戳
-	zero.On("notice/notify/poke", zero.OnlyToMe).SetBlock(false).FirstPriority().
+	engine.On("notice/notify/poke", zero.OnlyToMe).SetBlock(false).FirstPriority().
 		Handle(func(ctx *zero.Ctx) {
 			var nickname = zero.BotConfig.NickName[0]
 			switch {
-			case poke.Load(ctx.Event.UserID).AcquireN(3):
+			case poke.Load(ctx.Event.GroupID).AcquireN(3):
 				// 5分钟共8块命令牌 一次消耗3块命令牌
 				time.Sleep(time.Second * 1)
 				ctx.SendChain(message.Text("请不要戳", nickname, " >_<"))
-			case poke.Load(ctx.Event.UserID).Acquire():
+			case poke.Load(ctx.Event.GroupID).Acquire():
 				// 5分钟共8块命令牌 一次消耗1块命令牌
 				time.Sleep(time.Second * 1)
 				ctx.SendChain(message.Text("喂(#`O′) 戳", nickname, "干嘛！"))
@@ -48,18 +55,18 @@ func init() { // 插件主体
 	// 群空调
 	var AirConditTemp = map[int64]int{}
 	var AirConditSwitch = map[int64]bool{}
-	zero.OnFullMatch("空调开").SetBlock(true).FirstPriority().
+	engine.OnFullMatch("空调开").SetBlock(true).FirstPriority().
 		Handle(func(ctx *zero.Ctx) {
 			AirConditSwitch[ctx.Event.GroupID] = true
 			ctx.SendChain(message.Text("❄️哔~"))
 		})
-	zero.OnFullMatch("空调关").SetBlock(true).FirstPriority().
+	engine.OnFullMatch("空调关").SetBlock(true).FirstPriority().
 		Handle(func(ctx *zero.Ctx) {
 			AirConditSwitch[ctx.Event.GroupID] = false
 			delete(AirConditTemp, ctx.Event.GroupID)
 			ctx.SendChain(message.Text("💤哔~"))
 		})
-	zero.OnRegex(`设置温度(\d+)`).SetBlock(true).FirstPriority().
+	engine.OnRegex(`设置温度(\d+)`).SetBlock(true).FirstPriority().
 		Handle(func(ctx *zero.Ctx) {
 			if _, exist := AirConditTemp[ctx.Event.GroupID]; !exist {
 				AirConditTemp[ctx.Event.GroupID] = 26
@@ -78,7 +85,7 @@ func init() { // 插件主体
 				))
 			}
 		})
-	zero.OnFullMatch(`群温度`).SetBlock(true).FirstPriority().
+	engine.OnFullMatch(`群温度`).SetBlock(true).FirstPriority().
 		Handle(func(ctx *zero.Ctx) {
 			if _, exist := AirConditTemp[ctx.Event.GroupID]; !exist {
 				AirConditTemp[ctx.Event.GroupID] = 26

plugin_choose/choose.go

@@ -17,7 +17,7 @@ func init() {
 		DisableOnDefault: false,
 		Help: "choose\n" +
 			"- 选择可口可乐还是百事可乐\n" +
-			"- 选择肯德基还是麦当劳还是必胜客\n",
+			"- 选择肯德基还是麦当劳还是必胜客",
 	})
 	engine.OnPrefix("选择").SetBlock(true).FirstPriority().Handle(handle)
 }

plugin_diana/bing.go

@@ -28,13 +28,13 @@ func init() {
 		Handle(func(ctx *zero.Ctx) {
 			rand.Seed(time.Now().UnixNano())
 			// 绕过第一行发病
-			ctx.SendChain(message.Text((*data.Array)[rand.Intn(len(*data.Array)-1)+1]))
+			ctx.SendChain(message.Text(data.RandText()))
 		})
 	// 逆天
 	engine.OnFullMatch("发大病").SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			// 第一行是发病
-			ctx.SendChain(message.Text((*data.Array)[0]))
+			ctx.SendChain(message.Text(data.HentaiText()))
 		})
 	// 增加小作文
 	engine.OnRegex(`^教你一篇小作文(.*)$`, zero.AdminPermission).SetBlock(true).

plugin_diana/data/text.go

@@ -5,10 +5,12 @@ import (
 	"crypto/md5"
 	"errors"
 	"io"
+	"math/rand"
 	"net/http"
 	"os"
 	"sync"
 
+	"github.com/RomiChan/protobuf/proto"
 	log "github.com/sirupsen/logrus"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
@@ -24,8 +26,6 @@ const (
 
 var (
 	compo Composition
-	// Array 小作文数组指针
-	Array = &compo.Array
 	// m 小作文保存锁
 	m sync.Mutex
 	// md5s 验证重复
@@ -41,10 +41,10 @@ func init() {
 		}
 		err1 := LoadText()
 		if err1 == nil {
-			arrl := len(*Array)
+			arrl := len(compo.Array)
 			log.Printf("[Diana]读取%d条小作文", arrl)
 			md5s = make([]*[16]byte, arrl)
-			for i, t := range *Array {
+			for i, t := range compo.Array {
 				m := md5.Sum(helper.StringToBytes(t))
 				md5s[i] = &m
 			}
@@ -63,7 +63,7 @@ func LoadText() error {
 			data, err1 := io.ReadAll(f)
 			if err1 == nil {
 				if len(data) > 0 {
-					return compo.Unmarshal(data)
+					return proto.Unmarshal(data, &compo)
 				}
 			}
 			return err1
@@ -82,7 +82,7 @@ func LoadText() error {
 				data, err := io.ReadAll(resp.Body)
 				if err == nil && len(data) > 0 {
 					_, _ = f.Write(data)
-					return compo.Unmarshal(data)
+					return proto.Unmarshal(data, &compo)
 				}
 				return err
 			}
@@ -106,6 +106,16 @@ func AddText(txt string) error {
 	return nil
 }
 
+// RandText 随机小作文
+func RandText() string {
+	return (compo.Array)[rand.Intn(len(compo.Array)-1)+1]
+}
+
+// HentaiText 发大病
+func HentaiText() string {
+	return (compo.Array)[0]
+}
+
 func isin(sum *[16]byte) bool {
 	for _, t := range md5s {
 		if *t == *sum {
@@ -117,7 +127,7 @@ func isin(sum *[16]byte) bool {
 
 // savecompo 同步保存作文
 func savecompo() error {
-	data, err := compo.Marshal()
+	data, err := proto.Marshal(&compo)
 	if err == nil {
 		if file.IsExist(datapath) {
 			f, err1 := os.OpenFile(pbfile, os.O_WRONLY|os.O_TRUNC|os.O_CREATE, 0644)

plugin_diana/data/text.pb.go

@@ -1,326 +1,5 @@
-// Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: text.proto
-
 package data
 
-import (
-	fmt "fmt"
-	proto "github.com/golang/protobuf/proto"
-	io "io"
-	math "math"
-	math_bits "math/bits"
-)
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
-
 type Composition struct {
-	Array                []string `protobuf:"bytes,1,rep,name=array,proto3" json:"array,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	Array []string `protobuf:"bytes,1,rep"`
 }
-
-func (m *Composition) Reset()         { *m = Composition{} }
-func (m *Composition) String() string { return proto.CompactTextString(m) }
-func (*Composition) ProtoMessage()    {}
-func (*Composition) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a8e73d1ce47f9297, []int{0}
-}
-func (m *Composition) XXX_Unmarshal(b []byte) error {
-	return m.Unmarshal(b)
-}
-func (m *Composition) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	if deterministic {
-		return xxx_messageInfo_Composition.Marshal(b, m, deterministic)
-	} else {
-		b = b[:cap(b)]
-		n, err := m.MarshalToSizedBuffer(b)
-		if err != nil {
-			return nil, err
-		}
-		return b[:n], nil
-	}
-}
-func (m *Composition) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Composition.Merge(m, src)
-}
-func (m *Composition) XXX_Size() int {
-	return m.Size()
-}
-func (m *Composition) XXX_DiscardUnknown() {
-	xxx_messageInfo_Composition.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Composition proto.InternalMessageInfo
-
-func (m *Composition) GetArray() []string {
-	if m != nil {
-		return m.Array
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterType((*Composition)(nil), "diana.composition")
-}
-
-func init() { proto.RegisterFile("text.proto", fileDescriptor_a8e73d1ce47f9297) }
-
-var fileDescriptor_a8e73d1ce47f9297 = []byte{
-	// 100 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x2a, 0x49, 0xad, 0x28,
-	0xd1, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x4d, 0xc9, 0x4c, 0xcc, 0x4b, 0x54, 0x52, 0xe6,
-	0xe2, 0x4e, 0xce, 0xcf, 0x2d, 0xc8, 0x2f, 0xce, 0x2c, 0xc9, 0xcc, 0xcf, 0x13, 0x12, 0xe1, 0x62,
-	0x4d, 0x2c, 0x2a, 0x4a, 0xac, 0x94, 0x60, 0x54, 0x60, 0xd6, 0xe0, 0x0c, 0x82, 0x70, 0x9c, 0x04,
-	0x4e, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x19, 0x8f, 0xe5,
-	0x18, 0x92, 0xd8, 0xc0, 0x86, 0x18, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x22, 0x35, 0x44, 0xcb,
-	0x52, 0x00, 0x00, 0x00,
-}
-
-func (m *Composition) Marshal() (dAtA []byte, err error) {
-	size := m.Size()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBuffer(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *Composition) MarshalTo(dAtA []byte) (int, error) {
-	size := m.Size()
-	return m.MarshalToSizedBuffer(dAtA[:size])
-}
-
-func (m *Composition) MarshalToSizedBuffer(dAtA []byte) (int, error) {
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	if m.XXX_unrecognized != nil {
-		i -= len(m.XXX_unrecognized)
-		copy(dAtA[i:], m.XXX_unrecognized)
-	}
-	if len(m.Array) > 0 {
-		for iNdEx := len(m.Array) - 1; iNdEx >= 0; iNdEx-- {
-			i -= len(m.Array[iNdEx])
-			copy(dAtA[i:], m.Array[iNdEx])
-			i = encodeVarintText(dAtA, i, uint64(len(m.Array[iNdEx])))
-			i--
-			dAtA[i] = 0xa
-		}
-	}
-	return len(dAtA) - i, nil
-}
-
-func encodeVarintText(dAtA []byte, offset int, v uint64) int {
-	offset -= sovText(v)
-	base := offset
-	for v >= 1<<7 {
-		dAtA[offset] = uint8(v&0x7f | 0x80)
-		v >>= 7
-		offset++
-	}
-	dAtA[offset] = uint8(v)
-	return base
-}
-func (m *Composition) Size() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	if len(m.Array) > 0 {
-		for _, s := range m.Array {
-			l = len(s)
-			n += 1 + l + sovText(uint64(l))
-		}
-	}
-	if m.XXX_unrecognized != nil {
-		n += len(m.XXX_unrecognized)
-	}
-	return n
-}
-
-func sovText(x uint64) (n int) {
-	return (math_bits.Len64(x|1) + 6) / 7
-}
-func sozText(x uint64) (n int) {
-	return sovText(uint64((x << 1) ^ uint64((int64(x) >> 63))))
-}
-func (m *Composition) Unmarshal(dAtA []byte) error {
-	l := len(dAtA)
-	iNdEx := 0
-	for iNdEx < l {
-		preIndex := iNdEx
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return ErrIntOverflowText
-			}
-			if iNdEx >= l {
-				return io.ErrUnexpectedEOF
-			}
-			b := dAtA[iNdEx]
-			iNdEx++
-			wire |= uint64(b&0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		fieldNum := int32(wire >> 3)
-		wireType := int(wire & 0x7)
-		if wireType == 4 {
-			return fmt.Errorf("proto: composition: wiretype end group for non-group")
-		}
-		if fieldNum <= 0 {
-			return fmt.Errorf("proto: composition: illegal tag %d (wire type %d)", fieldNum, wire)
-		}
-		switch fieldNum {
-		case 1:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Array", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowText
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				stringLen |= uint64(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			intStringLen := int(stringLen)
-			if intStringLen < 0 {
-				return ErrInvalidLengthText
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex < 0 {
-				return ErrInvalidLengthText
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.Array = append(m.Array, string(dAtA[iNdEx:postIndex]))
-			iNdEx = postIndex
-		default:
-			iNdEx = preIndex
-			skippy, err := skipText(dAtA[iNdEx:])
-			if err != nil {
-				return err
-			}
-			if (skippy < 0) || (iNdEx+skippy) < 0 {
-				return ErrInvalidLengthText
-			}
-			if (iNdEx + skippy) > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...)
-			iNdEx += skippy
-		}
-	}
-
-	if iNdEx > l {
-		return io.ErrUnexpectedEOF
-	}
-	return nil
-}
-func skipText(dAtA []byte) (n int, err error) {
-	l := len(dAtA)
-	iNdEx := 0
-	depth := 0
-	for iNdEx < l {
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return 0, ErrIntOverflowText
-			}
-			if iNdEx >= l {
-				return 0, io.ErrUnexpectedEOF
-			}
-			b := dAtA[iNdEx]
-			iNdEx++
-			wire |= (uint64(b) & 0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		wireType := int(wire & 0x7)
-		switch wireType {
-		case 0:
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return 0, ErrIntOverflowText
-				}
-				if iNdEx >= l {
-					return 0, io.ErrUnexpectedEOF
-				}
-				iNdEx++
-				if dAtA[iNdEx-1] < 0x80 {
-					break
-				}
-			}
-		case 1:
-			iNdEx += 8
-		case 2:
-			var length int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return 0, ErrIntOverflowText
-				}
-				if iNdEx >= l {
-					return 0, io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				length |= (int(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if length < 0 {
-				return 0, ErrInvalidLengthText
-			}
-			iNdEx += length
-		case 3:
-			depth++
-		case 4:
-			if depth == 0 {
-				return 0, ErrUnexpectedEndOfGroupText
-			}
-			depth--
-		case 5:
-			iNdEx += 4
-		default:
-			return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
-		}
-		if iNdEx < 0 {
-			return 0, ErrInvalidLengthText
-		}
-		if depth == 0 {
-			return iNdEx, nil
-		}
-	}
-	return 0, io.ErrUnexpectedEOF
-}
-
-var (
-	ErrInvalidLengthText        = fmt.Errorf("proto: negative length found during unmarshaling")
-	ErrIntOverflowText          = fmt.Errorf("proto: integer overflow")
-	ErrUnexpectedEndOfGroupText = fmt.Errorf("proto: unexpected end of group")
-)

plugin_diana/data/text.proto

@@ -1,6 +0,0 @@
-syntax = "proto3";
-package data;
-
-message composition {
-  repeated string array = 1;
-}

plugin_diana/tools/convert.go

@@ -6,6 +6,8 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/RomiChan/protobuf/proto"
+
 	"github.com/FloatTech/ZeroBot-Plugin/plugin_diana/data"
 )
 
@@ -36,7 +38,7 @@ func main() {
 		panic(err)
 	}
 
-	data, _ := compo.Marshal()
+	data, _ := proto.Marshal(&compo)
 	f, err1 := os.OpenFile(os.Args[2], os.O_WRONLY|os.O_TRUNC|os.O_CREATE, 0644)
 	if err1 == nil {
 		defer f.Close()

plugin_fortune/cfg.pb.go

@@ -1,405 +1,5 @@
-// Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: cfg.proto
-
 package fortune
 
-import (
-	fmt "fmt"
-	proto "github.com/golang/protobuf/proto"
-	io "io"
-	math "math"
-	math_bits "math/bits"
-)
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
-
 type Conf struct {
-	Kind                 map[int64]uint32 `protobuf:"bytes,1,rep,name=kind,proto3" json:"kind,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
-	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
-	XXX_unrecognized     []byte           `json:"-"`
-	XXX_sizecache        int32            `json:"-"`
+	Kind map[int64]uint32 `protobuf:"bytes,1,rep" protobuf_key:"varint,1,opt" protobuf_val:"varint,2,opt"`
 }
-
-func (m *Conf) Reset()         { *m = Conf{} }
-func (m *Conf) String() string { return proto.CompactTextString(m) }
-func (*Conf) ProtoMessage()    {}
-func (*Conf) Descriptor() ([]byte, []int) {
-	return fileDescriptor_f81ba022997f8a9d, []int{0}
-}
-func (m *Conf) XXX_Unmarshal(b []byte) error {
-	return m.Unmarshal(b)
-}
-func (m *Conf) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	if deterministic {
-		return xxx_messageInfo_Conf.Marshal(b, m, deterministic)
-	} else {
-		b = b[:cap(b)]
-		n, err := m.MarshalToSizedBuffer(b)
-		if err != nil {
-			return nil, err
-		}
-		return b[:n], nil
-	}
-}
-func (m *Conf) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Conf.Merge(m, src)
-}
-func (m *Conf) XXX_Size() int {
-	return m.Size()
-}
-func (m *Conf) XXX_DiscardUnknown() {
-	xxx_messageInfo_Conf.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Conf proto.InternalMessageInfo
-
-func (m *Conf) GetKind() map[int64]uint32 {
-	if m != nil {
-		return m.Kind
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterType((*Conf)(nil), "fortune.conf")
-	proto.RegisterMapType((map[int64]uint32)(nil), "fortune.conf.KindEntry")
-}
-
-func init() { proto.RegisterFile("cfg.proto", fileDescriptor_f81ba022997f8a9d) }
-
-var fileDescriptor_f81ba022997f8a9d = []byte{
-	// 154 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x4c, 0x4e, 0x4b, 0xd7,
-	0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x4f, 0xcb, 0x2f, 0x2a, 0x29, 0xcd, 0x4b, 0x55, 0xca,
-	0xe1, 0x62, 0x49, 0xce, 0xcf, 0x4b, 0x13, 0xd2, 0xe6, 0x62, 0xc9, 0xce, 0xcc, 0x4b, 0x91, 0x60,
-	0x54, 0x60, 0xd6, 0xe0, 0x36, 0x12, 0xd7, 0x83, 0xca, 0xeb, 0x81, 0x24, 0xf5, 0xbc, 0x33, 0xf3,
-	0x52, 0x5c, 0xf3, 0x4a, 0x8a, 0x2a, 0x83, 0xc0, 0x8a, 0xa4, 0xcc, 0xb9, 0x38, 0xe1, 0x42, 0x42,
-	0x02, 0x5c, 0xcc, 0xd9, 0xa9, 0x95, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0xcc, 0x41, 0x20, 0xa6, 0x90,
-	0x08, 0x17, 0x6b, 0x59, 0x62, 0x4e, 0x69, 0xaa, 0x04, 0x93, 0x02, 0xa3, 0x06, 0x6f, 0x10, 0x84,
-	0x63, 0xc5, 0x64, 0xc1, 0xe8, 0x24, 0x70, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f,
-	0x1e, 0xc9, 0x31, 0xce, 0x78, 0x2c, 0xc7, 0x90, 0xc4, 0x06, 0x76, 0x8f, 0x31, 0x20, 0x00, 0x00,
-	0xff, 0xff, 0x8a, 0xa2, 0xbe, 0x9e, 0x9c, 0x00, 0x00, 0x00,
-}
-
-func (m *Conf) Marshal() (dAtA []byte, err error) {
-	size := m.Size()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBuffer(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *Conf) MarshalTo(dAtA []byte) (int, error) {
-	size := m.Size()
-	return m.MarshalToSizedBuffer(dAtA[:size])
-}
-
-func (m *Conf) MarshalToSizedBuffer(dAtA []byte) (int, error) {
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	if m.XXX_unrecognized != nil {
-		i -= len(m.XXX_unrecognized)
-		copy(dAtA[i:], m.XXX_unrecognized)
-	}
-	if len(m.Kind) > 0 {
-		for k := range m.Kind {
-			v := m.Kind[k]
-			baseI := i
-			i = encodeVarintCfg(dAtA, i, uint64(v))
-			i--
-			dAtA[i] = 0x10
-			i = encodeVarintCfg(dAtA, i, uint64(k))
-			i--
-			dAtA[i] = 0x8
-			i = encodeVarintCfg(dAtA, i, uint64(baseI-i))
-			i--
-			dAtA[i] = 0xa
-		}
-	}
-	return len(dAtA) - i, nil
-}
-
-func encodeVarintCfg(dAtA []byte, offset int, v uint64) int {
-	offset -= sovCfg(v)
-	base := offset
-	for v >= 1<<7 {
-		dAtA[offset] = uint8(v&0x7f | 0x80)
-		v >>= 7
-		offset++
-	}
-	dAtA[offset] = uint8(v)
-	return base
-}
-func (m *Conf) Size() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	if len(m.Kind) > 0 {
-		for k, v := range m.Kind {
-			_ = k
-			_ = v
-			mapEntrySize := 1 + sovCfg(uint64(k)) + 1 + sovCfg(uint64(v))
-			n += mapEntrySize + 1 + sovCfg(uint64(mapEntrySize))
-		}
-	}
-	if m.XXX_unrecognized != nil {
-		n += len(m.XXX_unrecognized)
-	}
-	return n
-}
-
-func sovCfg(x uint64) (n int) {
-	return (math_bits.Len64(x|1) + 6) / 7
-}
-func sozCfg(x uint64) (n int) {
-	return sovCfg(uint64((x << 1) ^ uint64((int64(x) >> 63))))
-}
-func (m *Conf) Unmarshal(dAtA []byte) error {
-	l := len(dAtA)
-	iNdEx := 0
-	for iNdEx < l {
-		preIndex := iNdEx
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return ErrIntOverflowCfg
-			}
-			if iNdEx >= l {
-				return io.ErrUnexpectedEOF
-			}
-			b := dAtA[iNdEx]
-			iNdEx++
-			wire |= uint64(b&0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		fieldNum := int32(wire >> 3)
-		wireType := int(wire & 0x7)
-		if wireType == 4 {
-			return fmt.Errorf("proto: conf: wiretype end group for non-group")
-		}
-		if fieldNum <= 0 {
-			return fmt.Errorf("proto: conf: illegal tag %d (wire type %d)", fieldNum, wire)
-		}
-		switch fieldNum {
-		case 1:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Kind", wireType)
-			}
-			var msglen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowCfg
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				msglen |= int(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if msglen < 0 {
-				return ErrInvalidLengthCfg
-			}
-			postIndex := iNdEx + msglen
-			if postIndex < 0 {
-				return ErrInvalidLengthCfg
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			if m.Kind == nil {
-				m.Kind = make(map[int64]uint32)
-			}
-			var mapkey int64
-			var mapvalue uint32
-			for iNdEx < postIndex {
-				entryPreIndex := iNdEx
-				var wire uint64
-				for shift := uint(0); ; shift += 7 {
-					if shift >= 64 {
-						return ErrIntOverflowCfg
-					}
-					if iNdEx >= l {
-						return io.ErrUnexpectedEOF
-					}
-					b := dAtA[iNdEx]
-					iNdEx++
-					wire |= uint64(b&0x7F) << shift
-					if b < 0x80 {
-						break
-					}
-				}
-				fieldNum := int32(wire >> 3)
-				if fieldNum == 1 {
-					for shift := uint(0); ; shift += 7 {
-						if shift >= 64 {
-							return ErrIntOverflowCfg
-						}
-						if iNdEx >= l {
-							return io.ErrUnexpectedEOF
-						}
-						b := dAtA[iNdEx]
-						iNdEx++
-						mapkey |= int64(b&0x7F) << shift
-						if b < 0x80 {
-							break
-						}
-					}
-				} else if fieldNum == 2 {
-					for shift := uint(0); ; shift += 7 {
-						if shift >= 64 {
-							return ErrIntOverflowCfg
-						}
-						if iNdEx >= l {
-							return io.ErrUnexpectedEOF
-						}
-						b := dAtA[iNdEx]
-						iNdEx++
-						mapvalue |= uint32(b&0x7F) << shift
-						if b < 0x80 {
-							break
-						}
-					}
-				} else {
-					iNdEx = entryPreIndex
-					skippy, err := skipCfg(dAtA[iNdEx:])
-					if err != nil {
-						return err
-					}
-					if (skippy < 0) || (iNdEx+skippy) < 0 {
-						return ErrInvalidLengthCfg
-					}
-					if (iNdEx + skippy) > postIndex {
-						return io.ErrUnexpectedEOF
-					}
-					iNdEx += skippy
-				}
-			}
-			m.Kind[mapkey] = mapvalue
-			iNdEx = postIndex
-		default:
-			iNdEx = preIndex
-			skippy, err := skipCfg(dAtA[iNdEx:])
-			if err != nil {
-				return err
-			}
-			if (skippy < 0) || (iNdEx+skippy) < 0 {
-				return ErrInvalidLengthCfg
-			}
-			if (iNdEx + skippy) > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...)
-			iNdEx += skippy
-		}
-	}
-
-	if iNdEx > l {
-		return io.ErrUnexpectedEOF
-	}
-	return nil
-}
-func skipCfg(dAtA []byte) (n int, err error) {
-	l := len(dAtA)
-	iNdEx := 0
-	depth := 0
-	for iNdEx < l {
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return 0, ErrIntOverflowCfg
-			}
-			if iNdEx >= l {
-				return 0, io.ErrUnexpectedEOF
-			}
-			b := dAtA[iNdEx]
-			iNdEx++
-			wire |= (uint64(b) & 0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		wireType := int(wire & 0x7)
-		switch wireType {
-		case 0:
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return 0, ErrIntOverflowCfg
-				}
-				if iNdEx >= l {
-					return 0, io.ErrUnexpectedEOF
-				}
-				iNdEx++
-				if dAtA[iNdEx-1] < 0x80 {
-					break
-				}
-			}
-		case 1:
-			iNdEx += 8
-		case 2:
-			var length int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return 0, ErrIntOverflowCfg
-				}
-				if iNdEx >= l {
-					return 0, io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				length |= (int(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if length < 0 {
-				return 0, ErrInvalidLengthCfg
-			}
-			iNdEx += length
-		case 3:
-			depth++
-		case 4:
-			if depth == 0 {
-				return 0, ErrUnexpectedEndOfGroupCfg
-			}
-			depth--
-		case 5:
-			iNdEx += 4
-		default:
-			return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
-		}
-		if iNdEx < 0 {
-			return 0, ErrInvalidLengthCfg
-		}
-		if depth == 0 {
-			return iNdEx, nil
-		}
-	}
-	return 0, io.ErrUnexpectedEOF
-}
-
-var (
-	ErrInvalidLengthCfg        = fmt.Errorf("proto: negative length found during unmarshaling")
-	ErrIntOverflowCfg          = fmt.Errorf("proto: integer overflow")
-	ErrUnexpectedEndOfGroupCfg = fmt.Errorf("proto: unexpected end of group")
-)

plugin_fortune/cfg.proto

@@ -1,6 +0,0 @@
-syntax = "proto3";
-package fortune;
-
-message conf {
-  map<int64, uint32> kind = 1;
-}

plugin_fortune/data.go

@@ -6,6 +6,8 @@ import (
 	"os"
 	"sync"
 
+	"github.com/RomiChan/protobuf/proto"
+
 	"github.com/FloatTech/ZeroBot-Plugin/utils/file"
 )
 
@@ -23,7 +25,7 @@ func loadcfg(name string) error {
 			data, err1 := io.ReadAll(f)
 			if err1 == nil {
 				if len(data) > 0 {
-					return conf.Unmarshal(data)
+					return proto.Unmarshal(data, &conf)
 				}
 			}
 			return err1
@@ -36,7 +38,7 @@ func loadcfg(name string) error {
 
 func savecfg(name string) error {
 	name = base + name
-	data, err := conf.Marshal()
+	data, err := proto.Marshal(&conf)
 	if err == nil {
 		if file.IsExist(base) {
 			f, err1 := os.OpenFile(name, os.O_WRONLY|os.O_TRUNC|os.O_CREATE, 0644)

plugin_github/repo_searcher.go

@@ -47,25 +47,50 @@ func init() { // 插件主体
 			// 发送结果
 			switch ctx.State["regex_matched"].([]string)[1] {
 			case "-p ": // 图片模式
-				ctx.SendChain(message.Image(
-					"https://opengraph.githubassets.com/0/"+repo.Get("full_name").Str,
-				).Add("cache", 0))
-			default:
-				ctx.SendChain(message.Text(
-					repo.Get("full_name").Str, "\n",
-					"Description: ",
-					repo.Get("description").Str, "\n",
-					"Star/Fork/Issue: ",
-					repo.Get("watchers").Int(), "/", repo.Get("forks").Int(), "/", repo.Get("open_issues").Int(), "\n",
-					"Language: ",
-					notnull(repo.Get("language").Str, "None"), "\n",
-					"License: ",
-					notnull(strings.ToUpper(repo.Get("license.key").Str), "None"), "\n",
-					"Last pushed: ",
-					repo.Get("pushed_at").Str, "\n",
-					"Jump: ",
-					repo.Get("html_url").Str, "\n",
-				))
+				ctx.SendChain(
+					message.Image(
+						"https://opengraph.githubassets.com/0/"+repo.Get("full_name").Str,
+					).Add("cache", 0),
+				)
+			case "-t ": // 文字模式
+				ctx.SendChain(
+					message.Text(
+						repo.Get("full_name").Str, "\n",
+						"Description: ",
+						repo.Get("description").Str, "\n",
+						"Star/Fork/Issue: ",
+						repo.Get("watchers").Int(), "/", repo.Get("forks").Int(), "/", repo.Get("open_issues").Int(), "\n",
+						"Language: ",
+						notnull(repo.Get("language").Str, "None"), "\n",
+						"License: ",
+						notnull(strings.ToUpper(repo.Get("license.key").Str), "None"), "\n",
+						"Last pushed: ",
+						repo.Get("pushed_at").Str, "\n",
+						"Jump: ",
+						repo.Get("html_url").Str, "\n",
+					),
+				)
+			default: // 文字模式
+				ctx.SendChain(
+					message.Text(
+						repo.Get("full_name").Str, "\n",
+						"Description: ",
+						repo.Get("description").Str, "\n",
+						"Star/Fork/Issue: ",
+						repo.Get("watchers").Int(), "/", repo.Get("forks").Int(), "/", repo.Get("open_issues").Int(), "\n",
+						"Language: ",
+						notnull(repo.Get("language").Str, "None"), "\n",
+						"License: ",
+						notnull(strings.ToUpper(repo.Get("license.key").Str), "None"), "\n",
+						"Last pushed: ",
+						repo.Get("pushed_at").Str, "\n",
+						"Jump: ",
+						repo.Get("html_url").Str, "\n",
+					),
+					message.Image(
+						"https://opengraph.githubassets.com/0/"+repo.Get("full_name").Str,
+					).Add("cache", 0),
+				)
 			}
 		})
 }

plugin_manager/manager.go

@@ -11,11 +11,13 @@ import (
 	"strings"
 	"time"
 
+	"github.com/RomiChan/protobuf/proto"
 	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/extension/rate"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
+	"github.com/FloatTech/ZeroBot-Plugin/control"
 	"github.com/FloatTech/ZeroBot-Plugin/plugin_manager/timer"
 	"github.com/FloatTech/ZeroBot-Plugin/utils/file"
 	"github.com/FloatTech/ZeroBot-Plugin/utils/math"
@@ -37,15 +39,15 @@ const (
 		"- 修改头衔@QQ XXX\n" +
 		"- 申请头衔 XXX\n" +
 		"- 踢出群聊@QQ\n" +
-		"- 退出群聊 1234\n" +
+		"- 退出群聊 1234@bot\n" +
 		"- 群聊转发 1234 XXX\n" +
 		"- 私聊转发 0000 XXX\n" +
 		"- 在MM月dd日的hh点mm分时(用http://url)提醒大家XXX\n" +
 		"- 在MM月[每周|周几]的hh点mm分时(用http://url)提醒大家XXX\n" +
 		"- 取消在MM月dd日的hh点mm分的提醒\n" +
 		"- 取消在MM月[每周|周几]的hh点mm分的提醒\n" +
-		"- [x] 在\"cron\"时(用[url])提醒大家[xxx]\n" +
-		"- [x] 取消在\"cron\"的提醒\n" +
+		"- 在\"cron\"时(用[url])提醒大家[xxx]\n" +
+		"- 取消在\"cron\"的提醒\n" +
 		"- 列出所有提醒\n" +
 		"- 翻牌\n" +
 		"- 设置欢迎语XXX\n" +
@@ -57,6 +59,10 @@ var (
 	limit  = rate.NewManager(time.Minute*5, 2)
 	clock  timer.Clock
 )
+var engine = control.Register("manager", &control.Options{
+	DisableOnDefault: false,
+	Help:             hint,
+})
 
 func init() { // 插件主体
 	loadConfig()
@@ -64,13 +70,8 @@ func init() { // 插件主体
 		time.Sleep(time.Second + time.Millisecond*time.Duration(rand.Intn(1000)))
 		clock = timer.NewClock(timerfile)
 	}()
-	// 菜单
-	zero.OnFullMatch("群管系统", zero.AdminPermission).SetBlock(true).FirstPriority().
-		Handle(func(ctx *zero.Ctx) {
-			ctx.SendChain(message.Text(hint))
-		})
 	// 升为管理
-	zero.OnRegex(`^升为管理.*?(\d+)`, zero.OnlyGroup, zero.SuperUserPermission).SetBlock(true).SetPriority(40).
+	engine.OnRegex(`^升为管理.*?(\d+)`, zero.OnlyGroup, zero.SuperUserPermission).SetBlock(true).SetPriority(40).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SetGroupAdmin(
 				ctx.Event.GroupID,
@@ -85,7 +86,7 @@ func init() { // 插件主体
 			ctx.SendChain(message.Text(nickname + " 升为了管理~"))
 		})
 	// 取消管理
-	zero.OnRegex(`^取消管理.*?(\d+)`, zero.OnlyGroup, zero.SuperUserPermission).SetBlock(true).SetPriority(40).
+	engine.OnRegex(`^取消管理.*?(\d+)`, zero.OnlyGroup, zero.SuperUserPermission).SetBlock(true).SetPriority(40).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SetGroupAdmin(
 				ctx.Event.GroupID,
@@ -100,7 +101,7 @@ func init() { // 插件主体
 			ctx.SendChain(message.Text("残念~ " + nickname + " 暂时失去了管理员的资格"))
 		})
 	// 踢出群聊
-	zero.OnRegex(`^踢出群聊.*?(\d+)`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).SetPriority(40).
+	engine.OnRegex(`^踢出群聊.*?(\d+)`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).SetPriority(40).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SetGroupKick(
 				ctx.Event.GroupID,
@@ -115,7 +116,7 @@ func init() { // 插件主体
 			ctx.SendChain(message.Text("残念~ " + nickname + " 被放逐"))
 		})
 	// 退出群聊
-	zero.OnRegex(`^退出群聊.*?(\d+)`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).SetPriority(40).
+	engine.OnRegex(`^退出群聊.*?(\d+)`, zero.OnlyToMe, zero.SuperUserPermission).SetBlock(true).SetPriority(40).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SetGroupLeave(
 				strToInt(ctx.State["regex_matched"].([]string)[1]), // 要退出的群的群号
@@ -123,7 +124,7 @@ func init() { // 插件主体
 			)
 		})
 	// 开启全体禁言
-	zero.OnRegex(`^开启全员禁言$`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).SetPriority(40).
+	engine.OnRegex(`^开启全员禁言$`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).SetPriority(40).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SetGroupWholeBan(
 				ctx.Event.GroupID,
@@ -132,7 +133,7 @@ func init() { // 插件主体
 			ctx.SendChain(message.Text("全员自闭开始~"))
 		})
 	// 解除全员禁言
-	zero.OnRegex(`^解除全员禁言$`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).SetPriority(40).
+	engine.OnRegex(`^解除全员禁言$`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).SetPriority(40).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SetGroupWholeBan(
 				ctx.Event.GroupID,
@@ -141,7 +142,7 @@ func init() { // 插件主体
 			ctx.SendChain(message.Text("全员自闭结束~"))
 		})
 	// 禁言
-	zero.OnRegex(`^禁言.*?(\d+).*?\s(\d+)(.*)`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).SetPriority(40).
+	engine.OnRegex(`^禁言.*?(\d+).*?\s(\d+)(.*)`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).SetPriority(40).
 		Handle(func(ctx *zero.Ctx) {
 			duration := strToInt(ctx.State["regex_matched"].([]string)[2])
 			switch ctx.State["regex_matched"].([]string)[3] {
@@ -165,7 +166,7 @@ func init() { // 插件主体
 			ctx.SendChain(message.Text("小黑屋收留成功~"))
 		})
 	// 解除禁言
-	zero.OnRegex(`^解除禁言.*?(\d+)`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).SetPriority(40).
+	engine.OnRegex(`^解除禁言.*?(\d+)`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).SetPriority(40).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SetGroupBan(
 				ctx.Event.GroupID,
@@ -175,7 +176,7 @@ func init() { // 插件主体
 			ctx.SendChain(message.Text("小黑屋释放成功~"))
 		})
 	// 自闭禁言
-	zero.OnRegex(`^(我要自闭|禅定).*?(\d+)(.*)`, zero.OnlyGroup).SetBlock(true).SetPriority(40).
+	engine.OnRegex(`^(我要自闭|禅定).*?(\d+)(.*)`, zero.OnlyGroup).SetBlock(true).SetPriority(40).
 		Handle(func(ctx *zero.Ctx) {
 			duration := strToInt(ctx.State["regex_matched"].([]string)[2])
 			switch ctx.State["regex_matched"].([]string)[3] {
@@ -199,7 +200,7 @@ func init() { // 插件主体
 			ctx.SendChain(message.Text("那我就不手下留情了~"))
 		})
 	// 修改名片
-	zero.OnRegex(`^修改名片.*?(\d+).*?\s(.*)`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).SetPriority(40).
+	engine.OnRegex(`^修改名片.*?(\d+).*?\s(.*)`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).SetPriority(40).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SetGroupCard(
 				ctx.Event.GroupID,
@@ -209,7 +210,7 @@ func init() { // 插件主体
 			ctx.SendChain(message.Text("嗯！已经修改了"))
 		})
 	// 修改头衔
-	zero.OnRegex(`^修改头衔.*?(\d+).*?\s(.*)`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).SetPriority(40).
+	engine.OnRegex(`^修改头衔.*?(\d+).*?\s(.*)`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).SetPriority(40).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SetGroupSpecialTitle(
 				ctx.Event.GroupID,
@@ -219,7 +220,7 @@ func init() { // 插件主体
 			ctx.SendChain(message.Text("嗯！已经修改了"))
 		})
 	// 申请头衔
-	zero.OnRegex(`^申请头衔(.*)`, zero.OnlyGroup).SetBlock(true).SetPriority(40).
+	engine.OnRegex(`^申请头衔(.*)`, zero.OnlyGroup).SetBlock(true).SetPriority(40).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SetGroupSpecialTitle(
 				ctx.Event.GroupID,
@@ -229,7 +230,7 @@ func init() { // 插件主体
 			ctx.SendChain(message.Text("嗯！不错的头衔呢~"))
 		})
 	// 群聊转发
-	zero.OnRegex(`^群聊转发.*?(\d+)\s(.*)`, zero.SuperUserPermission).SetBlock(true).SetPriority(40).
+	engine.OnRegex(`^群聊转发.*?(\d+)\s(.*)`, zero.SuperUserPermission).SetBlock(true).SetPriority(40).
 		Handle(func(ctx *zero.Ctx) {
 			// 对CQ码进行反转义
 			content := ctx.State["regex_matched"].([]string)[2]
@@ -242,7 +243,7 @@ func init() { // 插件主体
 			ctx.SendChain(message.Text("📧 --> " + ctx.State["regex_matched"].([]string)[1]))
 		})
 	// 私聊转发
-	zero.OnRegex(`^私聊转发.*?(\d+)\s(.*)`, zero.SuperUserPermission).SetBlock(true).SetPriority(40).
+	engine.OnRegex(`^私聊转发.*?(\d+)\s(.*)`, zero.SuperUserPermission).SetBlock(true).SetPriority(40).
 		Handle(func(ctx *zero.Ctx) {
 			// 对CQ码进行反转义
 			content := ctx.State["regex_matched"].([]string)[2]
@@ -255,7 +256,7 @@ func init() { // 插件主体
 			ctx.SendChain(message.Text("📧 --> " + ctx.State["regex_matched"].([]string)[1]))
 		})
 	// 定时提醒
-	zero.OnRegex(`^在(.{1,2})月(.{1,3}日|每?周.?)的(.{1,3})点(.{1,3})分时(用.+)?提醒大家(.*)`, zero.AdminPermission, zero.OnlyGroup).SetBlock(true).SetPriority(40).
+	engine.OnRegex(`^在(.{1,2})月(.{1,3}日|每?周.?)的(.{1,3})点(.{1,3})分时(用.+)?提醒大家(.*)`, zero.AdminPermission, zero.OnlyGroup).SetBlock(true).SetPriority(40).
 		Handle(func(ctx *zero.Ctx) {
 			dateStrs := ctx.State["regex_matched"].([]string)
 			ts := timer.GetFilledTimer(dateStrs, ctx.Event.SelfID, false)
@@ -267,7 +268,7 @@ func init() { // 插件主体
 			}
 		})
 	// 定时 cron 提醒
-	zero.OnRegex(`^在"(.*)"时(用.+)?提醒大家(.*)`, zero.AdminPermission, zero.OnlyGroup).SetBlock(true).SetPriority(40).
+	engine.OnRegex(`^在"(.*)"时(用.+)?提醒大家(.*)`, zero.AdminPermission, zero.OnlyGroup).SetBlock(true).SetPriority(40).
 		Handle(func(ctx *zero.Ctx) {
 			dateStrs := ctx.State["regex_matched"].([]string)
 			var url, alert string
@@ -290,7 +291,7 @@ func init() { // 插件主体
 			}
 		})
 	// 取消定时
-	zero.OnRegex(`^取消在(.{1,2})月(.{1,3}日|每?周.?)的(.{1,3})点(.{1,3})分的提醒`, zero.AdminPermission, zero.OnlyGroup).SetBlock(true).SetPriority(40).
+	engine.OnRegex(`^取消在(.{1,2})月(.{1,3}日|每?周.?)的(.{1,3})点(.{1,3})分的提醒`, zero.AdminPermission, zero.OnlyGroup).SetBlock(true).SetPriority(40).
 		Handle(func(ctx *zero.Ctx) {
 			dateStrs := ctx.State["regex_matched"].([]string)
 			ts := timer.GetFilledTimer(dateStrs, ctx.Event.SelfID, true)
@@ -303,7 +304,7 @@ func init() { // 插件主体
 			}
 		})
 	// 取消 cron 定时
-	zero.OnRegex(`^取消在"(.*)"的提醒`, zero.AdminPermission, zero.OnlyGroup).SetBlock(true).SetPriority(40).
+	engine.OnRegex(`^取消在"(.*)"的提醒`, zero.AdminPermission, zero.OnlyGroup).SetBlock(true).SetPriority(40).
 		Handle(func(ctx *zero.Ctx) {
 			dateStrs := ctx.State["regex_matched"].([]string)
 			ts := timer.Timer{Cron: dateStrs[1]}
@@ -316,12 +317,12 @@ func init() { // 插件主体
 			}
 		})
 	// 列出本群所有定时
-	zero.OnFullMatch("列出所有提醒", zero.AdminPermission, zero.OnlyGroup).SetBlock(true).SetPriority(40).
+	engine.OnFullMatch("列出所有提醒", zero.AdminPermission, zero.OnlyGroup).SetBlock(true).SetPriority(40).
 		Handle(func(ctx *zero.Ctx) {
-			ctx.SendChain(message.Text(clock.ListTimers(uint64(ctx.Event.GroupID))))
+			ctx.SendChain(message.Text(clock.ListTimers(ctx.Event.GroupID)))
 		})
 	// 随机点名
-	zero.OnFullMatchGroup([]string{"翻牌"}, zero.OnlyGroup).SetBlock(true).SetPriority(40).
+	engine.OnFullMatchGroup([]string{"翻牌"}, zero.OnlyGroup).SetBlock(true).SetPriority(40).
 		Handle(func(ctx *zero.Ctx) {
 			if !limit.Load(ctx.Event.UserID).Acquire() {
 				ctx.SendChain(message.Text("少女祈祷中......"))
@@ -359,16 +360,16 @@ func init() { // 插件主体
 			)
 		})
 	// 入群欢迎
-	zero.OnNotice().SetBlock(false).FirstPriority().
+	engine.OnNotice().SetBlock(false).FirstPriority().
 		Handle(func(ctx *zero.Ctx) {
-			if ctx.Event.NoticeType == "group_increase" {
-				word, ok := config.Welcome[uint64(ctx.Event.GroupID)]
+			if ctx.Event.NoticeType == "group_increase" && ctx.Event.SelfID != ctx.Event.UserID {
+				word, ok := config.Welcome[ctx.Event.GroupID]
 				if ok {
 					ctx.SendChain(message.Text(word))
 				} else {
 					ctx.SendChain(message.Text("欢迎~"))
 				}
-				enable, ok1 := config.Checkin[uint64(ctx.Event.GroupID)]
+				enable, ok1 := config.Checkin[ctx.Event.GroupID]
 				if ok1 && enable {
 					uid := ctx.Event.UserID
 					a := rand.Intn(100)
@@ -407,16 +408,18 @@ func init() { // 插件主体
 			}
 		})
 	// 退群提醒
-	zero.OnNotice().SetBlock(false).SetPriority(40).
+	engine.OnNotice().SetBlock(false).SetPriority(40).
 		Handle(func(ctx *zero.Ctx) {
 			if ctx.Event.NoticeType == "group_decrease" {
-				ctx.SendChain(message.Text("有人跑路了~"))
+				userid := ctx.Event.UserID
+				nickname := ctx.GetStrangerInfo(userid, false).Get("nickname").String()
+				ctx.SendChain(message.Text(nickname, "(", userid, ")", "离开了我们~"))
 			}
 		})
 	// 设置欢迎语
-	zero.OnRegex(`^设置欢迎语([\s\S]*)$`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).SetPriority(40).
+	engine.OnRegex(`^设置欢迎语([\s\S]*)$`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).SetPriority(40).
 		Handle(func(ctx *zero.Ctx) {
-			config.Welcome[uint64(ctx.Event.GroupID)] = ctx.State["regex_matched"].([]string)[1]
+			config.Welcome[ctx.Event.GroupID] = ctx.State["regex_matched"].([]string)[1]
 			if saveConfig() == nil {
 				ctx.SendChain(message.Text("记住啦!"))
 			} else {
@@ -424,14 +427,14 @@ func init() { // 插件主体
 			}
 		})
 	// 入群验证开关
-	zero.OnRegex(`^(.*)入群验证$`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).SetPriority(40).
+	engine.OnRegex(`^(.*)入群验证$`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).SetPriority(40).
 		Handle(func(ctx *zero.Ctx) {
 			option := ctx.State["regex_matched"].([]string)[1]
 			switch option {
 			case "开启":
-				config.Checkin[uint64(ctx.Event.GroupID)] = true
+				config.Checkin[ctx.Event.GroupID] = true
 			case "关闭":
-				config.Checkin[uint64(ctx.Event.GroupID)] = false
+				config.Checkin[ctx.Event.GroupID] = false
 			default:
 				return
 			}
@@ -442,7 +445,7 @@ func init() { // 插件主体
 			}
 		})
 	// 运行 CQ 码
-	zero.OnRegex(`^run(.*)$`, zero.SuperUserPermission).SetBlock(true).SetPriority(0).
+	engine.OnRegex(`^run(.*)$`, zero.SuperUserPermission).SetBlock(true).SetPriority(0).
 		Handle(func(ctx *zero.Ctx) {
 			var cmd = ctx.State["regex_matched"].([]string)[1]
 			cmd = strings.ReplaceAll(cmd, "[", "[")
@@ -450,6 +453,17 @@ func init() { // 插件主体
 			// 可注入，权限为主人
 			ctx.Send(cmd)
 		})
+	// 自动同意加好友，被邀请入群(从qingyunke移过来，先注释)
+	/*
+		engine.OnRequest().SetBlock(false).FirstPriority().Handle(func(ctx *zero.Ctx) {
+			if ctx.Event.RequestType == "friend" {
+				ctx.SetFriendAddRequest(ctx.Event.Flag, true, "")
+			}
+			if ctx.Event.RequestType == "group" && ctx.Event.SubType == "invite" {
+				ctx.SetGroupAddRequest(ctx.Event.Flag, "invite", true, "我爱你，mua~")
+			}
+		})
+	*/
 }
 
 func strToInt(str string) int64 {
@@ -467,15 +481,15 @@ func loadConfig() {
 				data, err1 := io.ReadAll(f)
 				if err1 == nil {
 					if len(data) > 0 {
-						if config.Unmarshal(data) == nil {
+						if proto.Unmarshal(data, &config) == nil {
 							return
 						}
 					}
 				}
 			}
 		}
-		config.Checkin = make(map[uint64]bool)
-		config.Welcome = make(map[uint64]string)
+		config.Checkin = make(map[int64]bool)
+		config.Welcome = make(map[int64]string)
 	} else {
 		panic(mkdirerr)
 	}
@@ -483,7 +497,7 @@ func loadConfig() {
 
 // saveConfig 保存设置，无此文件则新建
 func saveConfig() error {
-	data, err := config.Marshal()
+	data, err := proto.Marshal(&config)
 	if err != nil {
 		return err
 	} else if file.IsExist(datapath) {

plugin_manager/manager.pb.go

@@ -1,561 +1,6 @@
-// Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: manager.proto
-
 package manager
 
-import (
-	fmt "fmt"
-	proto "github.com/golang/protobuf/proto"
-	io "io"
-	math "math"
-	math_bits "math/bits"
-)
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
-
 type Config struct {
-	Checkin              map[uint64]bool   `protobuf:"bytes,1,rep,name=checkin,proto3" json:"checkin,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
-	Welcome              map[uint64]string `protobuf:"bytes,2,rep,name=welcome,proto3" json:"welcome,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
-	XXX_unrecognized     []byte            `json:"-"`
-	XXX_sizecache        int32             `json:"-"`
+	Checkin map[int64]bool   `protobuf:"bytes,1,rep" protobuf_key:"varint,1,opt" protobuf_val:"varint,2,opt"`
+	Welcome map[int64]string `protobuf:"bytes,2,rep" protobuf_key:"varint,1,opt" protobuf_val:"bytes,2,opt"`
 }
-
-func (m *Config) Reset()         { *m = Config{} }
-func (m *Config) String() string { return proto.CompactTextString(m) }
-func (*Config) ProtoMessage()    {}
-func (*Config) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cde9ec64f0d2c859, []int{0}
-}
-func (m *Config) XXX_Unmarshal(b []byte) error {
-	return m.Unmarshal(b)
-}
-func (m *Config) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	if deterministic {
-		return xxx_messageInfo_Config.Marshal(b, m, deterministic)
-	} else {
-		b = b[:cap(b)]
-		n, err := m.MarshalToSizedBuffer(b)
-		if err != nil {
-			return nil, err
-		}
-		return b[:n], nil
-	}
-}
-func (m *Config) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Config.Merge(m, src)
-}
-func (m *Config) XXX_Size() int {
-	return m.Size()
-}
-func (m *Config) XXX_DiscardUnknown() {
-	xxx_messageInfo_Config.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Config proto.InternalMessageInfo
-
-func (m *Config) GetCheckin() map[uint64]bool {
-	if m != nil {
-		return m.Checkin
-	}
-	return nil
-}
-
-func (m *Config) GetWelcome() map[uint64]string {
-	if m != nil {
-		return m.Welcome
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterType((*Config)(nil), "manager.config")
-	proto.RegisterMapType((map[uint64]bool)(nil), "manager.config.CheckinEntry")
-	proto.RegisterMapType((map[uint64]string)(nil), "manager.config.WelcomeEntry")
-}
-
-func init() { proto.RegisterFile("manager.proto", fileDescriptor_cde9ec64f0d2c859) }
-
-var fileDescriptor_cde9ec64f0d2c859 = []byte{
-	// 186 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0xcd, 0x4d, 0xcc, 0x4b,
-	0x4c, 0x4f, 0x2d, 0xd2, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x87, 0x72, 0x95, 0x3e, 0x30,
-	0x72, 0xb1, 0x25, 0xe7, 0xe7, 0xa5, 0x65, 0xa6, 0x0b, 0x99, 0x71, 0xb1, 0x27, 0x67, 0xa4, 0x26,
-	0x67, 0x67, 0xe6, 0x49, 0x30, 0x2a, 0x30, 0x6b, 0x70, 0x1b, 0xc9, 0xe8, 0xc1, 0x34, 0x41, 0x54,
-	0xe8, 0x39, 0x43, 0xa4, 0x5d, 0xf3, 0x4a, 0x8a, 0x2a, 0x83, 0x60, 0x8a, 0x41, 0xfa, 0xca, 0x53,
-	0x73, 0x92, 0xf3, 0x73, 0x53, 0x25, 0x98, 0xb0, 0xeb, 0x0b, 0x87, 0x48, 0x43, 0xf5, 0x41, 0x15,
-	0x4b, 0x59, 0x71, 0xf1, 0x20, 0x1b, 0x28, 0x24, 0xc0, 0xc5, 0x9c, 0x9d, 0x5a, 0x29, 0xc1, 0xa8,
-	0xc0, 0xa8, 0xc1, 0x12, 0x04, 0x62, 0x0a, 0x89, 0x70, 0xb1, 0x96, 0x25, 0xe6, 0x94, 0x82, 0xcc,
-	0x65, 0xd4, 0xe0, 0x08, 0x82, 0x70, 0xac, 0x98, 0x2c, 0x18, 0x41, 0x7a, 0x91, 0x0d, 0x25, 0xa4,
-	0x97, 0x13, 0x49, 0xaf, 0x93, 0xc0, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78,
-	0x24, 0xc7, 0x38, 0xe3, 0xb1, 0x1c, 0x43, 0x12, 0x1b, 0x38, 0x50, 0x8c, 0x01, 0x01, 0x00, 0x00,
-	0xff, 0xff, 0x2a, 0xe6, 0x90, 0x6e, 0x25, 0x01, 0x00, 0x00,
-}
-
-func (m *Config) Marshal() (dAtA []byte, err error) {
-	size := m.Size()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBuffer(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *Config) MarshalTo(dAtA []byte) (int, error) {
-	size := m.Size()
-	return m.MarshalToSizedBuffer(dAtA[:size])
-}
-
-func (m *Config) MarshalToSizedBuffer(dAtA []byte) (int, error) {
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	if m.XXX_unrecognized != nil {
-		i -= len(m.XXX_unrecognized)
-		copy(dAtA[i:], m.XXX_unrecognized)
-	}
-	if len(m.Welcome) > 0 {
-		for k := range m.Welcome {
-			v := m.Welcome[k]
-			baseI := i
-			i -= len(v)
-			copy(dAtA[i:], v)
-			i = encodeVarintManager(dAtA, i, uint64(len(v)))
-			i--
-			dAtA[i] = 0x12
-			i = encodeVarintManager(dAtA, i, uint64(k))
-			i--
-			dAtA[i] = 0x8
-			i = encodeVarintManager(dAtA, i, uint64(baseI-i))
-			i--
-			dAtA[i] = 0x12
-		}
-	}
-	if len(m.Checkin) > 0 {
-		for k := range m.Checkin {
-			v := m.Checkin[k]
-			baseI := i
-			i--
-			if v {
-				dAtA[i] = 1
-			} else {
-				dAtA[i] = 0
-			}
-			i--
-			dAtA[i] = 0x10
-			i = encodeVarintManager(dAtA, i, uint64(k))
-			i--
-			dAtA[i] = 0x8
-			i = encodeVarintManager(dAtA, i, uint64(baseI-i))
-			i--
-			dAtA[i] = 0xa
-		}
-	}
-	return len(dAtA) - i, nil
-}
-
-func encodeVarintManager(dAtA []byte, offset int, v uint64) int {
-	offset -= sovManager(v)
-	base := offset
-	for v >= 1<<7 {
-		dAtA[offset] = uint8(v&0x7f | 0x80)
-		v >>= 7
-		offset++
-	}
-	dAtA[offset] = uint8(v)
-	return base
-}
-func (m *Config) Size() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	if len(m.Checkin) > 0 {
-		for k, v := range m.Checkin {
-			_ = k
-			_ = v
-			mapEntrySize := 1 + sovManager(uint64(k)) + 1 + 1
-			n += mapEntrySize + 1 + sovManager(uint64(mapEntrySize))
-		}
-	}
-	if len(m.Welcome) > 0 {
-		for k, v := range m.Welcome {
-			_ = k
-			_ = v
-			mapEntrySize := 1 + sovManager(uint64(k)) + 1 + len(v) + sovManager(uint64(len(v)))
-			n += mapEntrySize + 1 + sovManager(uint64(mapEntrySize))
-		}
-	}
-	if m.XXX_unrecognized != nil {
-		n += len(m.XXX_unrecognized)
-	}
-	return n
-}
-
-func sovManager(x uint64) (n int) {
-	return (math_bits.Len64(x|1) + 6) / 7
-}
-func sozManager(x uint64) (n int) {
-	return sovManager(uint64((x << 1) ^ uint64((int64(x) >> 63))))
-}
-func (m *Config) Unmarshal(dAtA []byte) error {
-	l := len(dAtA)
-	iNdEx := 0
-	for iNdEx < l {
-		preIndex := iNdEx
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return ErrIntOverflowManager
-			}
-			if iNdEx >= l {
-				return io.ErrUnexpectedEOF
-			}
-			b := dAtA[iNdEx]
-			iNdEx++
-			wire |= uint64(b&0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		fieldNum := int32(wire >> 3)
-		wireType := int(wire & 0x7)
-		if wireType == 4 {
-			return fmt.Errorf("proto: config: wiretype end group for non-group")
-		}
-		if fieldNum <= 0 {
-			return fmt.Errorf("proto: config: illegal tag %d (wire type %d)", fieldNum, wire)
-		}
-		switch fieldNum {
-		case 1:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Checkin", wireType)
-			}
-			var msglen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowManager
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				msglen |= int(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if msglen < 0 {
-				return ErrInvalidLengthManager
-			}
-			postIndex := iNdEx + msglen
-			if postIndex < 0 {
-				return ErrInvalidLengthManager
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			if m.Checkin == nil {
-				m.Checkin = make(map[uint64]bool)
-			}
-			var mapkey uint64
-			var mapvalue bool
-			for iNdEx < postIndex {
-				entryPreIndex := iNdEx
-				var wire uint64
-				for shift := uint(0); ; shift += 7 {
-					if shift >= 64 {
-						return ErrIntOverflowManager
-					}
-					if iNdEx >= l {
-						return io.ErrUnexpectedEOF
-					}
-					b := dAtA[iNdEx]
-					iNdEx++
-					wire |= uint64(b&0x7F) << shift
-					if b < 0x80 {
-						break
-					}
-				}
-				fieldNum := int32(wire >> 3)
-				if fieldNum == 1 {
-					for shift := uint(0); ; shift += 7 {
-						if shift >= 64 {
-							return ErrIntOverflowManager
-						}
-						if iNdEx >= l {
-							return io.ErrUnexpectedEOF
-						}
-						b := dAtA[iNdEx]
-						iNdEx++
-						mapkey |= uint64(b&0x7F) << shift
-						if b < 0x80 {
-							break
-						}
-					}
-				} else if fieldNum == 2 {
-					var mapvaluetemp int
-					for shift := uint(0); ; shift += 7 {
-						if shift >= 64 {
-							return ErrIntOverflowManager
-						}
-						if iNdEx >= l {
-							return io.ErrUnexpectedEOF
-						}
-						b := dAtA[iNdEx]
-						iNdEx++
-						mapvaluetemp |= int(b&0x7F) << shift
-						if b < 0x80 {
-							break
-						}
-					}
-					mapvalue = bool(mapvaluetemp != 0)
-				} else {
-					iNdEx = entryPreIndex
-					skippy, err := skipManager(dAtA[iNdEx:])
-					if err != nil {
-						return err
-					}
-					if (skippy < 0) || (iNdEx+skippy) < 0 {
-						return ErrInvalidLengthManager
-					}
-					if (iNdEx + skippy) > postIndex {
-						return io.ErrUnexpectedEOF
-					}
-					iNdEx += skippy
-				}
-			}
-			m.Checkin[mapkey] = mapvalue
-			iNdEx = postIndex
-		case 2:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Welcome", wireType)
-			}
-			var msglen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowManager
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				msglen |= int(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if msglen < 0 {
-				return ErrInvalidLengthManager
-			}
-			postIndex := iNdEx + msglen
-			if postIndex < 0 {
-				return ErrInvalidLengthManager
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			if m.Welcome == nil {
-				m.Welcome = make(map[uint64]string)
-			}
-			var mapkey uint64
-			var mapvalue string
-			for iNdEx < postIndex {
-				entryPreIndex := iNdEx
-				var wire uint64
-				for shift := uint(0); ; shift += 7 {
-					if shift >= 64 {
-						return ErrIntOverflowManager
-					}
-					if iNdEx >= l {
-						return io.ErrUnexpectedEOF
-					}
-					b := dAtA[iNdEx]
-					iNdEx++
-					wire |= uint64(b&0x7F) << shift
-					if b < 0x80 {
-						break
-					}
-				}
-				fieldNum := int32(wire >> 3)
-				if fieldNum == 1 {
-					for shift := uint(0); ; shift += 7 {
-						if shift >= 64 {
-							return ErrIntOverflowManager
-						}
-						if iNdEx >= l {
-							return io.ErrUnexpectedEOF
-						}
-						b := dAtA[iNdEx]
-						iNdEx++
-						mapkey |= uint64(b&0x7F) << shift
-						if b < 0x80 {
-							break
-						}
-					}
-				} else if fieldNum == 2 {
-					var stringLenmapvalue uint64
-					for shift := uint(0); ; shift += 7 {
-						if shift >= 64 {
-							return ErrIntOverflowManager
-						}
-						if iNdEx >= l {
-							return io.ErrUnexpectedEOF
-						}
-						b := dAtA[iNdEx]
-						iNdEx++
-						stringLenmapvalue |= uint64(b&0x7F) << shift
-						if b < 0x80 {
-							break
-						}
-					}
-					intStringLenmapvalue := int(stringLenmapvalue)
-					if intStringLenmapvalue < 0 {
-						return ErrInvalidLengthManager
-					}
-					postStringIndexmapvalue := iNdEx + intStringLenmapvalue
-					if postStringIndexmapvalue < 0 {
-						return ErrInvalidLengthManager
-					}
-					if postStringIndexmapvalue > l {
-						return io.ErrUnexpectedEOF
-					}
-					mapvalue = string(dAtA[iNdEx:postStringIndexmapvalue])
-					iNdEx = postStringIndexmapvalue
-				} else {
-					iNdEx = entryPreIndex
-					skippy, err := skipManager(dAtA[iNdEx:])
-					if err != nil {
-						return err
-					}
-					if (skippy < 0) || (iNdEx+skippy) < 0 {
-						return ErrInvalidLengthManager
-					}
-					if (iNdEx + skippy) > postIndex {
-						return io.ErrUnexpectedEOF
-					}
-					iNdEx += skippy
-				}
-			}
-			m.Welcome[mapkey] = mapvalue
-			iNdEx = postIndex
-		default:
-			iNdEx = preIndex
-			skippy, err := skipManager(dAtA[iNdEx:])
-			if err != nil {
-				return err
-			}
-			if (skippy < 0) || (iNdEx+skippy) < 0 {
-				return ErrInvalidLengthManager
-			}
-			if (iNdEx + skippy) > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...)
-			iNdEx += skippy
-		}
-	}
-
-	if iNdEx > l {
-		return io.ErrUnexpectedEOF
-	}
-	return nil
-}
-func skipManager(dAtA []byte) (n int, err error) {
-	l := len(dAtA)
-	iNdEx := 0
-	depth := 0
-	for iNdEx < l {
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return 0, ErrIntOverflowManager
-			}
-			if iNdEx >= l {
-				return 0, io.ErrUnexpectedEOF
-			}
-			b := dAtA[iNdEx]
-			iNdEx++
-			wire |= (uint64(b) & 0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		wireType := int(wire & 0x7)
-		switch wireType {
-		case 0:
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return 0, ErrIntOverflowManager
-				}
-				if iNdEx >= l {
-					return 0, io.ErrUnexpectedEOF
-				}
-				iNdEx++
-				if dAtA[iNdEx-1] < 0x80 {
-					break
-				}
-			}
-		case 1:
-			iNdEx += 8
-		case 2:
-			var length int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return 0, ErrIntOverflowManager
-				}
-				if iNdEx >= l {
-					return 0, io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				length |= (int(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if length < 0 {
-				return 0, ErrInvalidLengthManager
-			}
-			iNdEx += length
-		case 3:
-			depth++
-		case 4:
-			if depth == 0 {
-				return 0, ErrUnexpectedEndOfGroupManager
-			}
-			depth--
-		case 5:
-			iNdEx += 4
-		default:
-			return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
-		}
-		if iNdEx < 0 {
-			return 0, ErrInvalidLengthManager
-		}
-		if depth == 0 {
-			return iNdEx, nil
-		}
-	}
-	return 0, io.ErrUnexpectedEOF
-}
-
-var (
-	ErrInvalidLengthManager        = fmt.Errorf("proto: negative length found during unmarshaling")
-	ErrIntOverflowManager          = fmt.Errorf("proto: integer overflow")
-	ErrUnexpectedEndOfGroupManager = fmt.Errorf("proto: unexpected end of group")
-)

plugin_manager/manager.proto

@@ -1,7 +0,0 @@
-syntax = "proto3";
-package manager;
-
-message config {
-  map<uint64, bool> checkin = 1;
-  map<uint64, string> welcome = 2;
-}

plugin_manager/timer/migrate/main.go

@@ -1,71 +0,0 @@
-package main
-
-import (
-	"fmt"
-	io "io"
-	"os"
-	"time"
-
-	"github.com/FloatTech/ZeroBot-Plugin/utils/file"
-)
-
-var timersmap TimersMapOld
-var timersmapnew TimersMap
-
-func loadTimers(pbfile string) bool {
-	if file.IsExist(pbfile) {
-		f, err := os.Open(pbfile)
-		if err == nil {
-			data, err1 := io.ReadAll(f)
-			if err1 == nil {
-				if len(data) > 0 {
-					err1 = timersmap.Unmarshal(data)
-					if err1 == nil {
-						return true
-					}
-				}
-			}
-		}
-	}
-	return false
-}
-
-// saveTimers 保存当前计时器
-func saveTimers(pbfile string) error {
-	data, err := timersmapnew.Marshal()
-	if err == nil {
-		f, err1 := os.OpenFile(pbfile, os.O_WRONLY|os.O_TRUNC|os.O_CREATE, 0644)
-		if err1 != nil {
-			return err1
-		} else {
-			_, err2 := f.Write(data)
-			f.Close()
-			return err2
-		}
-	}
-	return err
-}
-
-func main() {
-	if len(os.Args) == 3 {
-		if loadTimers(os.Args[1]) {
-			timersmapnew.Timers = make(map[string]*Timer)
-			for s, t := range timersmap.Timers {
-				tm := &Timer{
-					Alert: t.Alert,
-					Url:   t.Url,
-				}
-				tm.SetMonth(time.Month(t.Month))
-				tm.SetDay(int(t.Day))
-				tm.SetHour(int(t.Hour))
-				tm.SetMinute(int(t.Minute))
-				tm.SetWeek(time.Weekday(t.Week))
-				tm.SetEn(t.Enable)
-				timersmapnew.Timers[s] = tm
-			}
-			saveTimers(os.Args[2])
-		}
-	} else {
-		fmt.Println("用法：旧文件路径 新文件路径")
-	}
-}

plugin_manager/timer/migrate/old.go

@@ -1,946 +0,0 @@
-package main
-
-import (
-	fmt "fmt"
-	io "io"
-	math "math"
-	math_bits "math/bits"
-
-	proto "github.com/golang/protobuf/proto"
-)
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
-
-type TimerOld struct {
-	Enable               bool     `protobuf:"varint,1,opt,name=enable,proto3" json:"enable,omitempty"`
-	Alert                string   `protobuf:"bytes,2,opt,name=alert,proto3" json:"alert,omitempty"`
-	Url                  string   `protobuf:"bytes,3,opt,name=url,proto3" json:"url,omitempty"`
-	Month                int32    `protobuf:"zigzag32,4,opt,name=month,proto3" json:"month,omitempty"`
-	Day                  int32    `protobuf:"zigzag32,5,opt,name=day,proto3" json:"day,omitempty"`
-	Week                 int32    `protobuf:"zigzag32,6,opt,name=week,proto3" json:"week,omitempty"`
-	Hour                 int32    `protobuf:"zigzag32,7,opt,name=hour,proto3" json:"hour,omitempty"`
-	Minute               int32    `protobuf:"zigzag32,8,opt,name=minute,proto3" json:"minute,omitempty"`
-	Grpid                uint64   `protobuf:"varint,9,opt,name=grpid,proto3" json:"grpid,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *TimerOld) Reset()         { *m = TimerOld{} }
-func (m *TimerOld) String() string { return proto.CompactTextString(m) }
-func (*TimerOld) ProtoMessage()    {}
-func (*TimerOld) Descriptor() ([]byte, []int) {
-	return fileDescriptor_old, []int{0}
-}
-func (m *TimerOld) XXX_Unmarshal(b []byte) error {
-	return m.Unmarshal(b)
-}
-func (m *TimerOld) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	if deterministic {
-		return xxx_messageInfo_Timer.Marshal(b, m, deterministic)
-	} else {
-		b = b[:cap(b)]
-		n, err := m.MarshalToSizedBuffer(b)
-		if err != nil {
-			return nil, err
-		}
-		return b[:n], nil
-	}
-}
-func (m *TimerOld) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Timer.Merge(m, src)
-}
-func (m *TimerOld) XXX_Size() int {
-	return m.Size()
-}
-func (m *TimerOld) XXX_DiscardUnknown() {
-	xxx_messageInfo_Timer.DiscardUnknown(m)
-}
-
-func (m *TimerOld) GetEnable() bool {
-	if m != nil {
-		return m.Enable
-	}
-	return false
-}
-
-func (m *TimerOld) GetAlert() string {
-	if m != nil {
-		return m.Alert
-	}
-	return ""
-}
-
-func (m *TimerOld) GetUrl() string {
-	if m != nil {
-		return m.Url
-	}
-	return ""
-}
-
-func (m *TimerOld) GetMonth() int32 {
-	if m != nil {
-		return m.Month
-	}
-	return 0
-}
-
-func (m *TimerOld) GetDay() int32 {
-	if m != nil {
-		return m.Day
-	}
-	return 0
-}
-
-func (m *TimerOld) GetWeek() int32 {
-	if m != nil {
-		return m.Week
-	}
-	return 0
-}
-
-func (m *TimerOld) GetHour() int32 {
-	if m != nil {
-		return m.Hour
-	}
-	return 0
-}
-
-func (m *TimerOld) GetMinute() int32 {
-	if m != nil {
-		return m.Minute
-	}
-	return 0
-}
-
-func (m *TimerOld) GetGrpid() uint64 {
-	if m != nil {
-		return m.Grpid
-	}
-	return 0
-}
-
-type TimersMapOld struct {
-	Timers               map[string]*TimerOld `protobuf:"bytes,1,rep,name=timers,proto3" json:"timers,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
-	XXX_unrecognized     []byte               `json:"-"`
-	XXX_sizecache        int32                `json:"-"`
-}
-
-func (m *TimersMapOld) Reset()         { *m = TimersMapOld{} }
-func (m *TimersMapOld) String() string { return proto.CompactTextString(m) }
-func (*TimersMapOld) ProtoMessage()    {}
-func (*TimersMapOld) Descriptor() ([]byte, []int) {
-	return fileDescriptor_old, []int{1}
-}
-func (m *TimersMapOld) XXX_Unmarshal(b []byte) error {
-	return m.Unmarshal(b)
-}
-func (m *TimersMapOld) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	if deterministic {
-		return xxx_messageInfo_TimersMap.Marshal(b, m, deterministic)
-	} else {
-		b = b[:cap(b)]
-		n, err := m.MarshalToSizedBuffer(b)
-		if err != nil {
-			return nil, err
-		}
-		return b[:n], nil
-	}
-}
-func (m *TimersMapOld) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TimersMap.Merge(m, src)
-}
-func (m *TimersMapOld) XXX_Size() int {
-	return m.Size()
-}
-func (m *TimersMapOld) XXX_DiscardUnknown() {
-	xxx_messageInfo_TimersMap.DiscardUnknown(m)
-}
-
-func (m *TimersMapOld) GetTimers() map[string]*TimerOld {
-	if m != nil {
-		return m.Timers
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterType((*TimerOld)(nil), "timer.Timer")
-	proto.RegisterType((*TimersMapOld)(nil), "timer.TimersMap")
-	proto.RegisterMapType((map[string]*TimerOld)(nil), "timer.TimersMap.TimersEntry")
-}
-
-func init() { proto.RegisterFile("timer.proto", fileDescriptor_old) }
-
-var fileDescriptor_old = []byte{
-	// 278 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x90, 0xcd, 0x4a, 0xc3, 0x40,
-	0x10, 0xc7, 0x9d, 0xe6, 0xc3, 0x66, 0xe3, 0xa1, 0x2e, 0x22, 0x83, 0x48, 0x08, 0x39, 0xe5, 0xd4,
-	0x43, 0xf5, 0x20, 0x1e, 0x05, 0xf1, 0xe4, 0x65, 0xf1, 0x05, 0x52, 0xba, 0xd8, 0xd0, 0x7c, 0xb1,
-	0xdd, 0x28, 0x79, 0x05, 0x9f, 0xc0, 0x17, 0x12, 0x3c, 0xfa, 0x08, 0x12, 0x5f, 0x44, 0x66, 0x36,
-	0x94, 0xde, 0x7e, 0xff, 0x5f, 0xfe, 0x64, 0x67, 0x46, 0xc4, 0xb6, 0xac, 0xb5, 0x59, 0x76, 0xa6,
-	0xb5, 0xad, 0x0c, 0x38, 0x64, 0x5f, 0x20, 0x82, 0x17, 0x22, 0x79, 0x29, 0x42, 0xdd, 0x14, 0xeb,
-	0x4a, 0x23, 0xa4, 0x90, 0xcf, 0xd5, 0x94, 0xe4, 0x85, 0x08, 0x8a, 0x4a, 0x1b, 0x8b, 0xb3, 0x14,
-	0xf2, 0x48, 0xb9, 0x20, 0x17, 0xc2, 0xeb, 0x4d, 0x85, 0x1e, 0x3b, 0x42, 0xea, 0xd5, 0x6d, 0x63,
-	0xb7, 0xe8, 0xa7, 0x90, 0x9f, 0x2b, 0x17, 0xa8, 0xb7, 0x29, 0x06, 0x0c, 0xd8, 0x11, 0x4a, 0x29,
-	0xfc, 0x77, 0xad, 0x77, 0x18, 0xb2, 0x62, 0x26, 0xb7, 0x6d, 0x7b, 0x83, 0xa7, 0xce, 0x11, 0xd3,
-	0x3c, 0x75, 0xd9, 0xf4, 0x56, 0xe3, 0x9c, 0xed, 0x94, 0xe8, 0x9d, 0x57, 0xd3, 0x95, 0x1b, 0x8c,
-	0x52, 0xc8, 0x7d, 0xe5, 0x42, 0xf6, 0x01, 0x22, 0xe2, 0x3d, 0xf6, 0xcf, 0x45, 0x27, 0x6f, 0x45,
-	0xc8, 0xeb, 0xed, 0x11, 0x52, 0x2f, 0x8f, 0x57, 0xd7, 0x4b, 0xb7, 0xfa, 0xa1, 0x31, 0xd1, 0x63,
-	0x63, 0xcd, 0xa0, 0xa6, 0xee, 0xd5, 0x93, 0x88, 0x8f, 0x34, 0x8d, 0xbe, 0xd3, 0x03, 0x5f, 0x23,
-	0x52, 0x84, 0x32, 0x13, 0xc1, 0x5b, 0x51, 0xf5, 0x9a, 0x4f, 0x11, 0xaf, 0xce, 0x8e, 0xff, 0xaa,
-	0xdc, 0xa7, 0xfb, 0xd9, 0x1d, 0x3c, 0x2c, 0xbe, 0xc7, 0x04, 0x7e, 0xc6, 0x04, 0x7e, 0xc7, 0x04,
-	0x3e, 0xff, 0x92, 0x93, 0x75, 0xc8, 0x47, 0xbf, 0xf9, 0x0f, 0x00, 0x00, 0xff, 0xff, 0xe0, 0xc7,
-	0xad, 0xf8, 0x83, 0x01, 0x00, 0x00,
-}
-
-func (m *TimerOld) Marshal() (dAtA []byte, err error) {
-	size := m.Size()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBuffer(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *TimerOld) MarshalTo(dAtA []byte) (int, error) {
-	size := m.Size()
-	return m.MarshalToSizedBuffer(dAtA[:size])
-}
-
-func (m *TimerOld) MarshalToSizedBuffer(dAtA []byte) (int, error) {
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	if m.XXX_unrecognized != nil {
-		i -= len(m.XXX_unrecognized)
-		copy(dAtA[i:], m.XXX_unrecognized)
-	}
-	if m.Grpid != 0 {
-		i = encodeVarintTimerOld(dAtA, i, uint64(m.Grpid))
-		i--
-		dAtA[i] = 0x48
-	}
-	if m.Minute != 0 {
-		i = encodeVarintTimerOld(dAtA, i, uint64((uint32(m.Minute)<<1)^uint32((m.Minute>>31))))
-		i--
-		dAtA[i] = 0x40
-	}
-	if m.Hour != 0 {
-		i = encodeVarintTimerOld(dAtA, i, uint64((uint32(m.Hour)<<1)^uint32((m.Hour>>31))))
-		i--
-		dAtA[i] = 0x38
-	}
-	if m.Week != 0 {
-		i = encodeVarintTimerOld(dAtA, i, uint64((uint32(m.Week)<<1)^uint32((m.Week>>31))))
-		i--
-		dAtA[i] = 0x30
-	}
-	if m.Day != 0 {
-		i = encodeVarintTimerOld(dAtA, i, uint64((uint32(m.Day)<<1)^uint32((m.Day>>31))))
-		i--
-		dAtA[i] = 0x28
-	}
-	if m.Month != 0 {
-		i = encodeVarintTimerOld(dAtA, i, uint64((uint32(m.Month)<<1)^uint32((m.Month>>31))))
-		i--
-		dAtA[i] = 0x20
-	}
-	if len(m.Url) > 0 {
-		i -= len(m.Url)
-		copy(dAtA[i:], m.Url)
-		i = encodeVarintTimerOld(dAtA, i, uint64(len(m.Url)))
-		i--
-		dAtA[i] = 0x1a
-	}
-	if len(m.Alert) > 0 {
-		i -= len(m.Alert)
-		copy(dAtA[i:], m.Alert)
-		i = encodeVarintTimerOld(dAtA, i, uint64(len(m.Alert)))
-		i--
-		dAtA[i] = 0x12
-	}
-	if m.Enable {
-		i--
-		if m.Enable {
-			dAtA[i] = 1
-		} else {
-			dAtA[i] = 0
-		}
-		i--
-		dAtA[i] = 0x8
-	}
-	return len(dAtA) - i, nil
-}
-
-func (m *TimersMapOld) Marshal() (dAtA []byte, err error) {
-	size := m.Size()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBuffer(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *TimersMapOld) MarshalTo(dAtA []byte) (int, error) {
-	size := m.Size()
-	return m.MarshalToSizedBuffer(dAtA[:size])
-}
-
-func (m *TimersMapOld) MarshalToSizedBuffer(dAtA []byte) (int, error) {
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	if m.XXX_unrecognized != nil {
-		i -= len(m.XXX_unrecognized)
-		copy(dAtA[i:], m.XXX_unrecognized)
-	}
-	if len(m.Timers) > 0 {
-		for k := range m.Timers {
-			v := m.Timers[k]
-			baseI := i
-			if v != nil {
-				{
-					size, err := v.MarshalToSizedBuffer(dAtA[:i])
-					if err != nil {
-						return 0, err
-					}
-					i -= size
-					i = encodeVarintTimerOld(dAtA, i, uint64(size))
-				}
-				i--
-				dAtA[i] = 0x12
-			}
-			i -= len(k)
-			copy(dAtA[i:], k)
-			i = encodeVarintTimerOld(dAtA, i, uint64(len(k)))
-			i--
-			dAtA[i] = 0xa
-			i = encodeVarintTimerOld(dAtA, i, uint64(baseI-i))
-			i--
-			dAtA[i] = 0xa
-		}
-	}
-	return len(dAtA) - i, nil
-}
-
-func encodeVarintTimerOld(dAtA []byte, offset int, v uint64) int {
-	offset -= sovTimerOld(v)
-	base := offset
-	for v >= 1<<7 {
-		dAtA[offset] = uint8(v&0x7f | 0x80)
-		v >>= 7
-		offset++
-	}
-	dAtA[offset] = uint8(v)
-	return base
-}
-func (m *TimerOld) Size() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	if m.Enable {
-		n += 2
-	}
-	l = len(m.Alert)
-	if l > 0 {
-		n += 1 + l + sovTimerOld(uint64(l))
-	}
-	l = len(m.Url)
-	if l > 0 {
-		n += 1 + l + sovTimerOld(uint64(l))
-	}
-	if m.Month != 0 {
-		n += 1 + sozTimerOld(uint64(m.Month))
-	}
-	if m.Day != 0 {
-		n += 1 + sozTimerOld(uint64(m.Day))
-	}
-	if m.Week != 0 {
-		n += 1 + sozTimerOld(uint64(m.Week))
-	}
-	if m.Hour != 0 {
-		n += 1 + sozTimerOld(uint64(m.Hour))
-	}
-	if m.Minute != 0 {
-		n += 1 + sozTimerOld(uint64(m.Minute))
-	}
-	if m.Grpid != 0 {
-		n += 1 + sovTimerOld(uint64(m.Grpid))
-	}
-	if m.XXX_unrecognized != nil {
-		n += len(m.XXX_unrecognized)
-	}
-	return n
-}
-
-func (m *TimersMapOld) Size() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	if len(m.Timers) > 0 {
-		for k, v := range m.Timers {
-			_ = k
-			_ = v
-			l = 0
-			if v != nil {
-				l = v.Size()
-				l += 1 + sovTimerOld(uint64(l))
-			}
-			mapEntrySize := 1 + len(k) + sovTimerOld(uint64(len(k))) + l
-			n += mapEntrySize + 1 + sovTimerOld(uint64(mapEntrySize))
-		}
-	}
-	if m.XXX_unrecognized != nil {
-		n += len(m.XXX_unrecognized)
-	}
-	return n
-}
-
-func sovTimerOld(x uint64) (n int) {
-	return (math_bits.Len64(x|1) + 6) / 7
-}
-func sozTimerOld(x uint64) (n int) {
-	return sovTimerOld(uint64((x << 1) ^ uint64((int64(x) >> 63))))
-}
-func (m *TimerOld) Unmarshal(dAtA []byte) error {
-	l := len(dAtA)
-	iNdEx := 0
-	for iNdEx < l {
-		preIndex := iNdEx
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return ErrIntOverflowTimerOld
-			}
-			if iNdEx >= l {
-				return io.ErrUnexpectedEOF
-			}
-			b := dAtA[iNdEx]
-			iNdEx++
-			wire |= uint64(b&0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		fieldNum := int32(wire >> 3)
-		wireType := int(wire & 0x7)
-		if wireType == 4 {
-			return fmt.Errorf("proto: Timer: wiretype end group for non-group")
-		}
-		if fieldNum <= 0 {
-			return fmt.Errorf("proto: Timer: illegal tag %d (wire type %d)", fieldNum, wire)
-		}
-		switch fieldNum {
-		case 1:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Enable", wireType)
-			}
-			var v int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTimerOld
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				v |= int(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			m.Enable = bool(v != 0)
-		case 2:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Alert", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTimerOld
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				stringLen |= uint64(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			intStringLen := int(stringLen)
-			if intStringLen < 0 {
-				return ErrInvalidLengthTimerOld
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex < 0 {
-				return ErrInvalidLengthTimerOld
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.Alert = string(dAtA[iNdEx:postIndex])
-			iNdEx = postIndex
-		case 3:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Url", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTimerOld
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				stringLen |= uint64(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			intStringLen := int(stringLen)
-			if intStringLen < 0 {
-				return ErrInvalidLengthTimerOld
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex < 0 {
-				return ErrInvalidLengthTimerOld
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.Url = string(dAtA[iNdEx:postIndex])
-			iNdEx = postIndex
-		case 4:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Month", wireType)
-			}
-			var v int32
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTimerOld
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				v |= int32(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			v = int32((uint32(v) >> 1) ^ uint32(((v&1)<<31)>>31))
-			m.Month = v
-		case 5:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Day", wireType)
-			}
-			var v int32
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTimerOld
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				v |= int32(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			v = int32((uint32(v) >> 1) ^ uint32(((v&1)<<31)>>31))
-			m.Day = v
-		case 6:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Week", wireType)
-			}
-			var v int32
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTimerOld
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				v |= int32(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			v = int32((uint32(v) >> 1) ^ uint32(((v&1)<<31)>>31))
-			m.Week = v
-		case 7:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Hour", wireType)
-			}
-			var v int32
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTimerOld
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				v |= int32(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			v = int32((uint32(v) >> 1) ^ uint32(((v&1)<<31)>>31))
-			m.Hour = v
-		case 8:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Minute", wireType)
-			}
-			var v int32
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTimerOld
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				v |= int32(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			v = int32((uint32(v) >> 1) ^ uint32(((v&1)<<31)>>31))
-			m.Minute = v
-		case 9:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Grpid", wireType)
-			}
-			m.Grpid = 0
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTimerOld
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				m.Grpid |= uint64(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-		default:
-			iNdEx = preIndex
-			skippy, err := skipTimerOld(dAtA[iNdEx:])
-			if err != nil {
-				return err
-			}
-			if (skippy < 0) || (iNdEx+skippy) < 0 {
-				return ErrInvalidLengthTimerOld
-			}
-			if (iNdEx + skippy) > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...)
-			iNdEx += skippy
-		}
-	}
-
-	if iNdEx > l {
-		return io.ErrUnexpectedEOF
-	}
-	return nil
-}
-func (m *TimersMapOld) Unmarshal(dAtA []byte) error {
-	l := len(dAtA)
-	iNdEx := 0
-	for iNdEx < l {
-		preIndex := iNdEx
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return ErrIntOverflowTimerOld
-			}
-			if iNdEx >= l {
-				return io.ErrUnexpectedEOF
-			}
-			b := dAtA[iNdEx]
-			iNdEx++
-			wire |= uint64(b&0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		fieldNum := int32(wire >> 3)
-		wireType := int(wire & 0x7)
-		if wireType == 4 {
-			return fmt.Errorf("proto: TimersMap: wiretype end group for non-group")
-		}
-		if fieldNum <= 0 {
-			return fmt.Errorf("proto: TimersMap: illegal tag %d (wire type %d)", fieldNum, wire)
-		}
-		switch fieldNum {
-		case 1:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Timers", wireType)
-			}
-			var msglen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTimerOld
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				msglen |= int(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if msglen < 0 {
-				return ErrInvalidLengthTimerOld
-			}
-			postIndex := iNdEx + msglen
-			if postIndex < 0 {
-				return ErrInvalidLengthTimerOld
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			if m.Timers == nil {
-				m.Timers = make(map[string]*TimerOld)
-			}
-			var mapkey string
-			var mapvalue *TimerOld
-			for iNdEx < postIndex {
-				entryPreIndex := iNdEx
-				var wire uint64
-				for shift := uint(0); ; shift += 7 {
-					if shift >= 64 {
-						return ErrIntOverflowTimerOld
-					}
-					if iNdEx >= l {
-						return io.ErrUnexpectedEOF
-					}
-					b := dAtA[iNdEx]
-					iNdEx++
-					wire |= uint64(b&0x7F) << shift
-					if b < 0x80 {
-						break
-					}
-				}
-				fieldNum := int32(wire >> 3)
-				if fieldNum == 1 {
-					var stringLenmapkey uint64
-					for shift := uint(0); ; shift += 7 {
-						if shift >= 64 {
-							return ErrIntOverflowTimerOld
-						}
-						if iNdEx >= l {
-							return io.ErrUnexpectedEOF
-						}
-						b := dAtA[iNdEx]
-						iNdEx++
-						stringLenmapkey |= uint64(b&0x7F) << shift
-						if b < 0x80 {
-							break
-						}
-					}
-					intStringLenmapkey := int(stringLenmapkey)
-					if intStringLenmapkey < 0 {
-						return ErrInvalidLengthTimerOld
-					}
-					postStringIndexmapkey := iNdEx + intStringLenmapkey
-					if postStringIndexmapkey < 0 {
-						return ErrInvalidLengthTimerOld
-					}
-					if postStringIndexmapkey > l {
-						return io.ErrUnexpectedEOF
-					}
-					mapkey = string(dAtA[iNdEx:postStringIndexmapkey])
-					iNdEx = postStringIndexmapkey
-				} else if fieldNum == 2 {
-					var mapmsglen int
-					for shift := uint(0); ; shift += 7 {
-						if shift >= 64 {
-							return ErrIntOverflowTimerOld
-						}
-						if iNdEx >= l {
-							return io.ErrUnexpectedEOF
-						}
-						b := dAtA[iNdEx]
-						iNdEx++
-						mapmsglen |= int(b&0x7F) << shift
-						if b < 0x80 {
-							break
-						}
-					}
-					if mapmsglen < 0 {
-						return ErrInvalidLengthTimerOld
-					}
-					postmsgIndex := iNdEx + mapmsglen
-					if postmsgIndex < 0 {
-						return ErrInvalidLengthTimerOld
-					}
-					if postmsgIndex > l {
-						return io.ErrUnexpectedEOF
-					}
-					mapvalue = &TimerOld{}
-					if err := mapvalue.Unmarshal(dAtA[iNdEx:postmsgIndex]); err != nil {
-						return err
-					}
-					iNdEx = postmsgIndex
-				} else {
-					iNdEx = entryPreIndex
-					skippy, err := skipTimerOld(dAtA[iNdEx:])
-					if err != nil {
-						return err
-					}
-					if (skippy < 0) || (iNdEx+skippy) < 0 {
-						return ErrInvalidLengthTimerOld
-					}
-					if (iNdEx + skippy) > postIndex {
-						return io.ErrUnexpectedEOF
-					}
-					iNdEx += skippy
-				}
-			}
-			m.Timers[mapkey] = mapvalue
-			iNdEx = postIndex
-		default:
-			iNdEx = preIndex
-			skippy, err := skipTimerOld(dAtA[iNdEx:])
-			if err != nil {
-				return err
-			}
-			if (skippy < 0) || (iNdEx+skippy) < 0 {
-				return ErrInvalidLengthTimerOld
-			}
-			if (iNdEx + skippy) > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...)
-			iNdEx += skippy
-		}
-	}
-
-	if iNdEx > l {
-		return io.ErrUnexpectedEOF
-	}
-	return nil
-}
-func skipTimerOld(dAtA []byte) (n int, err error) {
-	l := len(dAtA)
-	iNdEx := 0
-	depth := 0
-	for iNdEx < l {
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return 0, ErrIntOverflowTimerOld
-			}
-			if iNdEx >= l {
-				return 0, io.ErrUnexpectedEOF
-			}
-			b := dAtA[iNdEx]
-			iNdEx++
-			wire |= (uint64(b) & 0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		wireType := int(wire & 0x7)
-		switch wireType {
-		case 0:
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return 0, ErrIntOverflowTimerOld
-				}
-				if iNdEx >= l {
-					return 0, io.ErrUnexpectedEOF
-				}
-				iNdEx++
-				if dAtA[iNdEx-1] < 0x80 {
-					break
-				}
-			}
-		case 1:
-			iNdEx += 8
-		case 2:
-			var length int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return 0, ErrIntOverflowTimerOld
-				}
-				if iNdEx >= l {
-					return 0, io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				length |= (int(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if length < 0 {
-				return 0, ErrInvalidLengthTimerOld
-			}
-			iNdEx += length
-		case 3:
-			depth++
-		case 4:
-			if depth == 0 {
-				return 0, ErrUnexpectedEndOfGroupTimerOld
-			}
-			depth--
-		case 5:
-			iNdEx += 4
-		default:
-			return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
-		}
-		if iNdEx < 0 {
-			return 0, ErrInvalidLengthTimerOld
-		}
-		if depth == 0 {
-			return iNdEx, nil
-		}
-	}
-	return 0, io.ErrUnexpectedEOF
-}
-
-var (
-	ErrInvalidLengthTimerOld        = fmt.Errorf("proto: negative length found during unmarshaling")
-	ErrIntOverflowTimerOld          = fmt.Errorf("proto: integer overflow")
-	ErrUnexpectedEndOfGroupTimerOld = fmt.Errorf("proto: unexpected end of group")
-)

plugin_manager/timer/migrate/timer.pb.go

@@ -1,810 +0,0 @@
-package main
-
-import (
-	fmt "fmt"
-	io "io"
-	math "math"
-	math_bits "math/bits"
-
-	proto "github.com/golang/protobuf/proto"
-)
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
-
-type Timer struct {
-	Alert                       string   `protobuf:"bytes,1,opt,name=alert,proto3" json:"alert,omitempty"`
-	Cron                        string   `protobuf:"bytes,2,opt,name=cron,proto3" json:"cron,omitempty"`
-	En1Month4Day5Week3Hour5Min6 int32    `protobuf:"varint,4,opt,name=en1month4day5week3hour5min6,proto3" json:"en1month4day5week3hour5min6,omitempty"`
-	Selfid                      int64    `protobuf:"varint,8,opt,name=selfid,proto3" json:"selfid,omitempty"`
-	Url                         string   `protobuf:"bytes,16,opt,name=url,proto3" json:"url,omitempty"`
-	XXX_NoUnkeyedLiteral        struct{} `json:"-"`
-	XXX_unrecognized            []byte   `json:"-"`
-	XXX_sizecache               int32    `json:"-"`
-}
-
-func (m *Timer) Reset()         { *m = Timer{} }
-func (m *Timer) String() string { return proto.CompactTextString(m) }
-func (*Timer) ProtoMessage()    {}
-func (*Timer) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad0307ee16b652d2, []int{0}
-}
-func (m *Timer) XXX_Unmarshal(b []byte) error {
-	return m.Unmarshal(b)
-}
-func (m *Timer) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	if deterministic {
-		return xxx_messageInfo_Timer.Marshal(b, m, deterministic)
-	} else {
-		b = b[:cap(b)]
-		n, err := m.MarshalToSizedBuffer(b)
-		if err != nil {
-			return nil, err
-		}
-		return b[:n], nil
-	}
-}
-func (m *Timer) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Timer.Merge(m, src)
-}
-func (m *Timer) XXX_Size() int {
-	return m.Size()
-}
-func (m *Timer) XXX_DiscardUnknown() {
-	xxx_messageInfo_Timer.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Timer proto.InternalMessageInfo
-
-func (m *Timer) GetAlert() string {
-	if m != nil {
-		return m.Alert
-	}
-	return ""
-}
-
-func (m *Timer) GetCron() string {
-	if m != nil {
-		return m.Cron
-	}
-	return ""
-}
-
-func (m *Timer) GetEn1Month4Day5Week3Hour5Min6() int32 {
-	if m != nil {
-		return m.En1Month4Day5Week3Hour5Min6
-	}
-	return 0
-}
-
-func (m *Timer) GetSelfid() int64 {
-	if m != nil {
-		return m.Selfid
-	}
-	return 0
-}
-
-func (m *Timer) GetUrl() string {
-	if m != nil {
-		return m.Url
-	}
-	return ""
-}
-
-type TimersMap struct {
-	Timers               map[string]*Timer `protobuf:"bytes,1,rep,name=timers,proto3" json:"timers,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
-	XXX_unrecognized     []byte            `json:"-"`
-	XXX_sizecache        int32             `json:"-"`
-}
-
-func (m *TimersMap) Reset()         { *m = TimersMap{} }
-func (m *TimersMap) String() string { return proto.CompactTextString(m) }
-func (*TimersMap) ProtoMessage()    {}
-func (*TimersMap) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad0307ee16b652d2, []int{1}
-}
-func (m *TimersMap) XXX_Unmarshal(b []byte) error {
-	return m.Unmarshal(b)
-}
-func (m *TimersMap) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	if deterministic {
-		return xxx_messageInfo_TimersMap.Marshal(b, m, deterministic)
-	} else {
-		b = b[:cap(b)]
-		n, err := m.MarshalToSizedBuffer(b)
-		if err != nil {
-			return nil, err
-		}
-		return b[:n], nil
-	}
-}
-func (m *TimersMap) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TimersMap.Merge(m, src)
-}
-func (m *TimersMap) XXX_Size() int {
-	return m.Size()
-}
-func (m *TimersMap) XXX_DiscardUnknown() {
-	xxx_messageInfo_TimersMap.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_TimersMap proto.InternalMessageInfo
-
-func (m *TimersMap) GetTimers() map[string]*Timer {
-	if m != nil {
-		return m.Timers
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterType((*Timer)(nil), "timer.Timer")
-	proto.RegisterType((*TimersMap)(nil), "timer.TimersMap")
-	proto.RegisterMapType((map[string]*Timer)(nil), "timer.TimersMap.TimersEntry")
-}
-
-func init() { proto.RegisterFile("timer.proto", fileDescriptor_ad0307ee16b652d2) }
-
-var fileDescriptor_ad0307ee16b652d2 = []byte{
-	// 256 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x2e, 0xc9, 0xcc, 0x4d,
-	0x2d, 0xd2, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x05, 0x73, 0x94, 0xe6, 0x32, 0x72, 0xb1,
-	0x86, 0x80, 0x58, 0x42, 0x22, 0x5c, 0xac, 0x89, 0x39, 0xa9, 0x45, 0x25, 0x12, 0x8c, 0x0a, 0x8c,
-	0x1a, 0x9c, 0x41, 0x10, 0x8e, 0x90, 0x10, 0x17, 0x4b, 0x72, 0x51, 0x7e, 0x9e, 0x04, 0x13, 0x58,
-	0x10, 0xcc, 0x16, 0x72, 0xe0, 0x92, 0x4e, 0xcd, 0x33, 0xcc, 0xcd, 0xcf, 0x2b, 0xc9, 0x30, 0x49,
-	0x49, 0xac, 0x34, 0x2d, 0x4f, 0x4d, 0xcd, 0x36, 0xce, 0xc8, 0x2f, 0x2d, 0x32, 0xcd, 0xcd, 0xcc,
-	0x33, 0x93, 0x60, 0x51, 0x60, 0xd4, 0x60, 0x0d, 0xc2, 0xa7, 0x44, 0x48, 0x8c, 0x8b, 0xad, 0x38,
-	0x35, 0x27, 0x2d, 0x33, 0x45, 0x82, 0x43, 0x81, 0x51, 0x83, 0x39, 0x08, 0xca, 0x13, 0x12, 0xe0,
-	0x62, 0x2e, 0x2d, 0xca, 0x91, 0x10, 0x00, 0x5b, 0x06, 0x62, 0x2a, 0x75, 0x31, 0x72, 0x71, 0x82,
-	0xdd, 0x57, 0xec, 0x9b, 0x58, 0x20, 0x64, 0xc2, 0xc5, 0x06, 0x76, 0x76, 0xb1, 0x04, 0xa3, 0x02,
-	0xb3, 0x06, 0xb7, 0x91, 0x8c, 0x1e, 0xc4, 0x4b, 0x70, 0x15, 0x50, 0x96, 0x6b, 0x5e, 0x49, 0x51,
-	0x65, 0x10, 0x54, 0xad, 0x94, 0x3b, 0x17, 0x37, 0x92, 0x30, 0xc8, 0x92, 0xec, 0xd4, 0x4a, 0xa8,
-	0x37, 0x41, 0x4c, 0x21, 0x25, 0x2e, 0xd6, 0xb2, 0xc4, 0x9c, 0xd2, 0x54, 0xb0, 0x2f, 0xb9, 0x8d,
-	0x78, 0x90, 0x4d, 0x0d, 0x82, 0x48, 0x59, 0x31, 0x59, 0x30, 0x3a, 0x09, 0x9c, 0x78, 0x24, 0xc7,
-	0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x33, 0x1e, 0xcb, 0x31, 0x24, 0xb1, 0x81,
-	0x03, 0xd3, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0xf5, 0xc1, 0x9e, 0x44, 0x5b, 0x01, 0x00, 0x00,
-}
-
-func (m *Timer) Marshal() (dAtA []byte, err error) {
-	size := m.Size()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBuffer(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *Timer) MarshalTo(dAtA []byte) (int, error) {
-	size := m.Size()
-	return m.MarshalToSizedBuffer(dAtA[:size])
-}
-
-func (m *Timer) MarshalToSizedBuffer(dAtA []byte) (int, error) {
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	if m.XXX_unrecognized != nil {
-		i -= len(m.XXX_unrecognized)
-		copy(dAtA[i:], m.XXX_unrecognized)
-	}
-	if len(m.Url) > 0 {
-		i -= len(m.Url)
-		copy(dAtA[i:], m.Url)
-		i = encodeVarintTimer(dAtA, i, uint64(len(m.Url)))
-		i--
-		dAtA[i] = 0x1
-		i--
-		dAtA[i] = 0x82
-	}
-	if m.Selfid != 0 {
-		i = encodeVarintTimer(dAtA, i, uint64(m.Selfid))
-		i--
-		dAtA[i] = 0x40
-	}
-	if m.En1Month4Day5Week3Hour5Min6 != 0 {
-		i = encodeVarintTimer(dAtA, i, uint64(m.En1Month4Day5Week3Hour5Min6))
-		i--
-		dAtA[i] = 0x20
-	}
-	if len(m.Cron) > 0 {
-		i -= len(m.Cron)
-		copy(dAtA[i:], m.Cron)
-		i = encodeVarintTimer(dAtA, i, uint64(len(m.Cron)))
-		i--
-		dAtA[i] = 0x12
-	}
-	if len(m.Alert) > 0 {
-		i -= len(m.Alert)
-		copy(dAtA[i:], m.Alert)
-		i = encodeVarintTimer(dAtA, i, uint64(len(m.Alert)))
-		i--
-		dAtA[i] = 0xa
-	}
-	return len(dAtA) - i, nil
-}
-
-func (m *TimersMap) Marshal() (dAtA []byte, err error) {
-	size := m.Size()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBuffer(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *TimersMap) MarshalTo(dAtA []byte) (int, error) {
-	size := m.Size()
-	return m.MarshalToSizedBuffer(dAtA[:size])
-}
-
-func (m *TimersMap) MarshalToSizedBuffer(dAtA []byte) (int, error) {
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	if m.XXX_unrecognized != nil {
-		i -= len(m.XXX_unrecognized)
-		copy(dAtA[i:], m.XXX_unrecognized)
-	}
-	if len(m.Timers) > 0 {
-		for k := range m.Timers {
-			v := m.Timers[k]
-			baseI := i
-			if v != nil {
-				{
-					size, err := v.MarshalToSizedBuffer(dAtA[:i])
-					if err != nil {
-						return 0, err
-					}
-					i -= size
-					i = encodeVarintTimer(dAtA, i, uint64(size))
-				}
-				i--
-				dAtA[i] = 0x12
-			}
-			i -= len(k)
-			copy(dAtA[i:], k)
-			i = encodeVarintTimer(dAtA, i, uint64(len(k)))
-			i--
-			dAtA[i] = 0xa
-			i = encodeVarintTimer(dAtA, i, uint64(baseI-i))
-			i--
-			dAtA[i] = 0xa
-		}
-	}
-	return len(dAtA) - i, nil
-}
-
-func encodeVarintTimer(dAtA []byte, offset int, v uint64) int {
-	offset -= sovTimer(v)
-	base := offset
-	for v >= 1<<7 {
-		dAtA[offset] = uint8(v&0x7f | 0x80)
-		v >>= 7
-		offset++
-	}
-	dAtA[offset] = uint8(v)
-	return base
-}
-func (m *Timer) Size() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	l = len(m.Alert)
-	if l > 0 {
-		n += 1 + l + sovTimer(uint64(l))
-	}
-	l = len(m.Cron)
-	if l > 0 {
-		n += 1 + l + sovTimer(uint64(l))
-	}
-	if m.En1Month4Day5Week3Hour5Min6 != 0 {
-		n += 1 + sovTimer(uint64(m.En1Month4Day5Week3Hour5Min6))
-	}
-	if m.Selfid != 0 {
-		n += 1 + sovTimer(uint64(m.Selfid))
-	}
-	l = len(m.Url)
-	if l > 0 {
-		n += 2 + l + sovTimer(uint64(l))
-	}
-	if m.XXX_unrecognized != nil {
-		n += len(m.XXX_unrecognized)
-	}
-	return n
-}
-
-func (m *TimersMap) Size() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	if len(m.Timers) > 0 {
-		for k, v := range m.Timers {
-			_ = k
-			_ = v
-			l = 0
-			if v != nil {
-				l = v.Size()
-				l += 1 + sovTimer(uint64(l))
-			}
-			mapEntrySize := 1 + len(k) + sovTimer(uint64(len(k))) + l
-			n += mapEntrySize + 1 + sovTimer(uint64(mapEntrySize))
-		}
-	}
-	if m.XXX_unrecognized != nil {
-		n += len(m.XXX_unrecognized)
-	}
-	return n
-}
-
-func sovTimer(x uint64) (n int) {
-	return (math_bits.Len64(x|1) + 6) / 7
-}
-func sozTimer(x uint64) (n int) {
-	return sovTimer(uint64((x << 1) ^ uint64((int64(x) >> 63))))
-}
-func (m *Timer) Unmarshal(dAtA []byte) error {
-	l := len(dAtA)
-	iNdEx := 0
-	for iNdEx < l {
-		preIndex := iNdEx
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return ErrIntOverflowTimer
-			}
-			if iNdEx >= l {
-				return io.ErrUnexpectedEOF
-			}
-			b := dAtA[iNdEx]
-			iNdEx++
-			wire |= uint64(b&0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		fieldNum := int32(wire >> 3)
-		wireType := int(wire & 0x7)
-		if wireType == 4 {
-			return fmt.Errorf("proto: Timer: wiretype end group for non-group")
-		}
-		if fieldNum <= 0 {
-			return fmt.Errorf("proto: Timer: illegal tag %d (wire type %d)", fieldNum, wire)
-		}
-		switch fieldNum {
-		case 1:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Alert", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTimer
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				stringLen |= uint64(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			intStringLen := int(stringLen)
-			if intStringLen < 0 {
-				return ErrInvalidLengthTimer
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex < 0 {
-				return ErrInvalidLengthTimer
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.Alert = string(dAtA[iNdEx:postIndex])
-			iNdEx = postIndex
-		case 2:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Cron", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTimer
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				stringLen |= uint64(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			intStringLen := int(stringLen)
-			if intStringLen < 0 {
-				return ErrInvalidLengthTimer
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex < 0 {
-				return ErrInvalidLengthTimer
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.Cron = string(dAtA[iNdEx:postIndex])
-			iNdEx = postIndex
-		case 4:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field En1Month4Day5Week3Hour5Min6", wireType)
-			}
-			m.En1Month4Day5Week3Hour5Min6 = 0
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTimer
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				m.En1Month4Day5Week3Hour5Min6 |= int32(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-		case 8:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Selfid", wireType)
-			}
-			m.Selfid = 0
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTimer
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				m.Selfid |= int64(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-		case 16:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Url", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTimer
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				stringLen |= uint64(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			intStringLen := int(stringLen)
-			if intStringLen < 0 {
-				return ErrInvalidLengthTimer
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex < 0 {
-				return ErrInvalidLengthTimer
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.Url = string(dAtA[iNdEx:postIndex])
-			iNdEx = postIndex
-		default:
-			iNdEx = preIndex
-			skippy, err := skipTimer(dAtA[iNdEx:])
-			if err != nil {
-				return err
-			}
-			if (skippy < 0) || (iNdEx+skippy) < 0 {
-				return ErrInvalidLengthTimer
-			}
-			if (iNdEx + skippy) > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...)
-			iNdEx += skippy
-		}
-	}
-
-	if iNdEx > l {
-		return io.ErrUnexpectedEOF
-	}
-	return nil
-}
-func (m *TimersMap) Unmarshal(dAtA []byte) error {
-	l := len(dAtA)
-	iNdEx := 0
-	for iNdEx < l {
-		preIndex := iNdEx
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return ErrIntOverflowTimer
-			}
-			if iNdEx >= l {
-				return io.ErrUnexpectedEOF
-			}
-			b := dAtA[iNdEx]
-			iNdEx++
-			wire |= uint64(b&0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		fieldNum := int32(wire >> 3)
-		wireType := int(wire & 0x7)
-		if wireType == 4 {
-			return fmt.Errorf("proto: TimersMap: wiretype end group for non-group")
-		}
-		if fieldNum <= 0 {
-			return fmt.Errorf("proto: TimersMap: illegal tag %d (wire type %d)", fieldNum, wire)
-		}
-		switch fieldNum {
-		case 1:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Timers", wireType)
-			}
-			var msglen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTimer
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				msglen |= int(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if msglen < 0 {
-				return ErrInvalidLengthTimer
-			}
-			postIndex := iNdEx + msglen
-			if postIndex < 0 {
-				return ErrInvalidLengthTimer
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			if m.Timers == nil {
-				m.Timers = make(map[string]*Timer)
-			}
-			var mapkey string
-			var mapvalue *Timer
-			for iNdEx < postIndex {
-				entryPreIndex := iNdEx
-				var wire uint64
-				for shift := uint(0); ; shift += 7 {
-					if shift >= 64 {
-						return ErrIntOverflowTimer
-					}
-					if iNdEx >= l {
-						return io.ErrUnexpectedEOF
-					}
-					b := dAtA[iNdEx]
-					iNdEx++
-					wire |= uint64(b&0x7F) << shift
-					if b < 0x80 {
-						break
-					}
-				}
-				fieldNum := int32(wire >> 3)
-				if fieldNum == 1 {
-					var stringLenmapkey uint64
-					for shift := uint(0); ; shift += 7 {
-						if shift >= 64 {
-							return ErrIntOverflowTimer
-						}
-						if iNdEx >= l {
-							return io.ErrUnexpectedEOF
-						}
-						b := dAtA[iNdEx]
-						iNdEx++
-						stringLenmapkey |= uint64(b&0x7F) << shift
-						if b < 0x80 {
-							break
-						}
-					}
-					intStringLenmapkey := int(stringLenmapkey)
-					if intStringLenmapkey < 0 {
-						return ErrInvalidLengthTimer
-					}
-					postStringIndexmapkey := iNdEx + intStringLenmapkey
-					if postStringIndexmapkey < 0 {
-						return ErrInvalidLengthTimer
-					}
-					if postStringIndexmapkey > l {
-						return io.ErrUnexpectedEOF
-					}
-					mapkey = string(dAtA[iNdEx:postStringIndexmapkey])
-					iNdEx = postStringIndexmapkey
-				} else if fieldNum == 2 {
-					var mapmsglen int
-					for shift := uint(0); ; shift += 7 {
-						if shift >= 64 {
-							return ErrIntOverflowTimer
-						}
-						if iNdEx >= l {
-							return io.ErrUnexpectedEOF
-						}
-						b := dAtA[iNdEx]
-						iNdEx++
-						mapmsglen |= int(b&0x7F) << shift
-						if b < 0x80 {
-							break
-						}
-					}
-					if mapmsglen < 0 {
-						return ErrInvalidLengthTimer
-					}
-					postmsgIndex := iNdEx + mapmsglen
-					if postmsgIndex < 0 {
-						return ErrInvalidLengthTimer
-					}
-					if postmsgIndex > l {
-						return io.ErrUnexpectedEOF
-					}
-					mapvalue = &Timer{}
-					if err := mapvalue.Unmarshal(dAtA[iNdEx:postmsgIndex]); err != nil {
-						return err
-					}
-					iNdEx = postmsgIndex
-				} else {
-					iNdEx = entryPreIndex
-					skippy, err := skipTimer(dAtA[iNdEx:])
-					if err != nil {
-						return err
-					}
-					if (skippy < 0) || (iNdEx+skippy) < 0 {
-						return ErrInvalidLengthTimer
-					}
-					if (iNdEx + skippy) > postIndex {
-						return io.ErrUnexpectedEOF
-					}
-					iNdEx += skippy
-				}
-			}
-			m.Timers[mapkey] = mapvalue
-			iNdEx = postIndex
-		default:
-			iNdEx = preIndex
-			skippy, err := skipTimer(dAtA[iNdEx:])
-			if err != nil {
-				return err
-			}
-			if (skippy < 0) || (iNdEx+skippy) < 0 {
-				return ErrInvalidLengthTimer
-			}
-			if (iNdEx + skippy) > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...)
-			iNdEx += skippy
-		}
-	}
-
-	if iNdEx > l {
-		return io.ErrUnexpectedEOF
-	}
-	return nil
-}
-func skipTimer(dAtA []byte) (n int, err error) {
-	l := len(dAtA)
-	iNdEx := 0
-	depth := 0
-	for iNdEx < l {
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return 0, ErrIntOverflowTimer
-			}
-			if iNdEx >= l {
-				return 0, io.ErrUnexpectedEOF
-			}
-			b := dAtA[iNdEx]
-			iNdEx++
-			wire |= (uint64(b) & 0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		wireType := int(wire & 0x7)
-		switch wireType {
-		case 0:
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return 0, ErrIntOverflowTimer
-				}
-				if iNdEx >= l {
-					return 0, io.ErrUnexpectedEOF
-				}
-				iNdEx++
-				if dAtA[iNdEx-1] < 0x80 {
-					break
-				}
-			}
-		case 1:
-			iNdEx += 8
-		case 2:
-			var length int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return 0, ErrIntOverflowTimer
-				}
-				if iNdEx >= l {
-					return 0, io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				length |= (int(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if length < 0 {
-				return 0, ErrInvalidLengthTimer
-			}
-			iNdEx += length
-		case 3:
-			depth++
-		case 4:
-			if depth == 0 {
-				return 0, ErrUnexpectedEndOfGroupTimer
-			}
-			depth--
-		case 5:
-			iNdEx += 4
-		default:
-			return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
-		}
-		if iNdEx < 0 {
-			return 0, ErrInvalidLengthTimer
-		}
-		if depth == 0 {
-			return iNdEx, nil
-		}
-	}
-	return 0, io.ErrUnexpectedEOF
-}
-
-var (
-	ErrInvalidLengthTimer        = fmt.Errorf("proto: negative length found during unmarshaling")
-	ErrIntOverflowTimer          = fmt.Errorf("proto: integer overflow")
-	ErrUnexpectedEndOfGroupTimer = fmt.Errorf("proto: unexpected end of group")
-)

plugin_manager/timer/migrate/wrap.go

@@ -1,75 +0,0 @@
-package main
-
-import "time"
-
-func (m *Timer) En() (en bool) {
-	return m.En1Month4Day5Week3Hour5Min6&0x800000 != 0
-}
-
-func (m *Timer) Month() (mon time.Month) {
-	mon = time.Month((m.En1Month4Day5Week3Hour5Min6 & 0x780000) >> 19)
-	if mon == 0b1111 {
-		mon = -1
-	}
-	return
-}
-
-func (m *Timer) Day() (d int) {
-	d = int((m.En1Month4Day5Week3Hour5Min6 & 0x07c000) >> 14)
-	if d == 0b11111 {
-		d = -1
-	}
-	return
-}
-
-func (m *Timer) Week() (w time.Weekday) {
-	w = time.Weekday((m.En1Month4Day5Week3Hour5Min6 & 0x003800) >> 11)
-	if w == 0b111 {
-		w = -1
-	}
-	return
-}
-
-func (m *Timer) Hour() (h int) {
-	h = int((m.En1Month4Day5Week3Hour5Min6 & 0x0007c0) >> 6)
-	if h == 0b11111 {
-		h = -1
-	}
-	return
-}
-
-func (m *Timer) Minute() (min int) {
-	min = int(m.En1Month4Day5Week3Hour5Min6 & 0x00003f)
-	if min == 0b111111 {
-		min = -1
-	}
-	return
-}
-
-func (m *Timer) SetEn(en bool) {
-	if en {
-		m.En1Month4Day5Week3Hour5Min6 |= 0x800000
-	} else {
-		m.En1Month4Day5Week3Hour5Min6 &= 0x7fffff
-	}
-}
-
-func (m *Timer) SetMonth(mon time.Month) {
-	m.En1Month4Day5Week3Hour5Min6 = ((int32(mon) << 19) & 0x780000) | (m.En1Month4Day5Week3Hour5Min6 & 0x87ffff)
-}
-
-func (m *Timer) SetDay(d int) {
-	m.En1Month4Day5Week3Hour5Min6 = ((int32(d) << 14) & 0x07c000) | (m.En1Month4Day5Week3Hour5Min6 & 0xf83fff)
-}
-
-func (m *Timer) SetWeek(w time.Weekday) {
-	m.En1Month4Day5Week3Hour5Min6 = ((int32(w) << 11) & 0x003800) | (m.En1Month4Day5Week3Hour5Min6 & 0xffc7ff)
-}
-
-func (m *Timer) SetHour(h int) {
-	m.En1Month4Day5Week3Hour5Min6 = ((int32(h) << 6) & 0x0007c0) | (m.En1Month4Day5Week3Hour5Min6 & 0xfff83f)
-}
-
-func (m *Timer) SetMinute(min int) {
-	m.En1Month4Day5Week3Hour5Min6 = (int32(min) & 0x00003f) | (m.En1Month4Day5Week3Hour5Min6 & 0xffffc0)
-}

plugin_manager/timer/timer.go

@@ -9,6 +9,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/RomiChan/protobuf/proto"
 	"github.com/fumiama/cron"
 	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
@@ -134,7 +135,7 @@ func (c *Clock) CancelTimer(key string) bool {
 // SaveTimers 保存当前计时器
 func (c *Clock) SaveTimers() error {
 	c.timersmu.RLock()
-	data, err := c.timersmap.Marshal()
+	data, err := proto.Marshal(&c.timersmap)
 	c.timersmu.RUnlock()
 	if err == nil {
 		c.timersmu.Lock()
@@ -152,10 +153,10 @@ func (c *Clock) SaveTimers() error {
 }
 
 // ListTimers 列出本群所有计时器
-func (c *Clock) ListTimers(grpID uint64) []string {
+func (c *Clock) ListTimers(grpID int64) []string {
 	// 数组默认长度为map长度,后面append时,不需要重新申请内存和拷贝,效率很高
 	if c.timers != nil {
-		g := strconv.FormatUint(grpID, 10)
+		g := strconv.FormatInt(grpID, 10)
 		c.timersmu.RLock()
 		keys := make([]string, 0, len(*c.timers))
 		for k := range *c.timers {
@@ -189,7 +190,7 @@ func (c *Clock) loadTimers(pbfile string) {
 			data, err := io.ReadAll(f)
 			if err == nil {
 				if len(data) > 0 {
-					err = c.timersmap.Unmarshal(data)
+					err = proto.Unmarshal(data, &c.timersmap)
 					if err == nil {
 						for str, t := range c.timersmap.Timers {
 							grp, err := strconv.ParseInt(str[1:strings.Index(str, "]")], 10, 64)

plugin_manager/timer/timer.pb.go

@@ -1,812 +1,13 @@
-// Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: timer.proto
-
 package timer
 
-import (
-	fmt "fmt"
-	proto "github.com/golang/protobuf/proto"
-	io "io"
-	math "math"
-	math_bits "math/bits"
-)
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
-
 type Timer struct {
-	Alert                       string   `protobuf:"bytes,1,opt,name=alert,proto3" json:"alert,omitempty"`
-	Cron                        string   `protobuf:"bytes,2,opt,name=cron,proto3" json:"cron,omitempty"`
-	En1Month4Day5Week3Hour5Min6 int32    `protobuf:"varint,4,opt,name=en1month4day5week3hour5min6,proto3" json:"en1month4day5week3hour5min6,omitempty"`
-	Selfid                      int64    `protobuf:"varint,8,opt,name=selfid,proto3" json:"selfid,omitempty"`
-	Url                         string   `protobuf:"bytes,16,opt,name=url,proto3" json:"url,omitempty"`
-	XXX_NoUnkeyedLiteral        struct{} `json:"-"`
-	XXX_unrecognized            []byte   `json:"-"`
-	XXX_sizecache               int32    `json:"-"`
-}
-
-func (m *Timer) Reset()         { *m = Timer{} }
-func (m *Timer) String() string { return proto.CompactTextString(m) }
-func (*Timer) ProtoMessage()    {}
-func (*Timer) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad0307ee16b652d2, []int{0}
-}
-func (m *Timer) XXX_Unmarshal(b []byte) error {
-	return m.Unmarshal(b)
-}
-func (m *Timer) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	if deterministic {
-		return xxx_messageInfo_Timer.Marshal(b, m, deterministic)
-	} else {
-		b = b[:cap(b)]
-		n, err := m.MarshalToSizedBuffer(b)
-		if err != nil {
-			return nil, err
-		}
-		return b[:n], nil
-	}
-}
-func (m *Timer) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Timer.Merge(m, src)
-}
-func (m *Timer) XXX_Size() int {
-	return m.Size()
-}
-func (m *Timer) XXX_DiscardUnknown() {
-	xxx_messageInfo_Timer.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Timer proto.InternalMessageInfo
-
-func (m *Timer) GetAlert() string {
-	if m != nil {
-		return m.Alert
-	}
-	return ""
-}
-
-func (m *Timer) GetCron() string {
-	if m != nil {
-		return m.Cron
-	}
-	return ""
-}
-
-func (m *Timer) GetEn1Month4Day5Week3Hour5Min6() int32 {
-	if m != nil {
-		return m.En1Month4Day5Week3Hour5Min6
-	}
-	return 0
-}
-
-func (m *Timer) GetSelfid() int64 {
-	if m != nil {
-		return m.Selfid
-	}
-	return 0
-}
-
-func (m *Timer) GetUrl() string {
-	if m != nil {
-		return m.Url
-	}
-	return ""
+	Alert                       string `protobuf:"bytes,1,opt"`
+	Cron                        string `protobuf:"bytes,2,opt"`
+	En1Month4Day5Week3Hour5Min6 int32  `protobuf:"varint,4,opt"`
+	Selfid                      int64  `protobuf:"varint,8,opt"`
+	Url                         string `protobuf:"bytes,16,opt"`
 }
 
 type TimersMap struct {
-	Timers               map[string]*Timer `protobuf:"bytes,1,rep,name=timers,proto3" json:"timers,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
-	XXX_unrecognized     []byte            `json:"-"`
-	XXX_sizecache        int32             `json:"-"`
+	Timers map[string]*Timer `protobuf:"bytes,1,rep" protobuf_key:"bytes,1,opt" protobuf_val:"bytes,2,opt"`
 }
-
-func (m *TimersMap) Reset()         { *m = TimersMap{} }
-func (m *TimersMap) String() string { return proto.CompactTextString(m) }
-func (*TimersMap) ProtoMessage()    {}
-func (*TimersMap) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad0307ee16b652d2, []int{1}
-}
-func (m *TimersMap) XXX_Unmarshal(b []byte) error {
-	return m.Unmarshal(b)
-}
-func (m *TimersMap) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	if deterministic {
-		return xxx_messageInfo_TimersMap.Marshal(b, m, deterministic)
-	} else {
-		b = b[:cap(b)]
-		n, err := m.MarshalToSizedBuffer(b)
-		if err != nil {
-			return nil, err
-		}
-		return b[:n], nil
-	}
-}
-func (m *TimersMap) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TimersMap.Merge(m, src)
-}
-func (m *TimersMap) XXX_Size() int {
-	return m.Size()
-}
-func (m *TimersMap) XXX_DiscardUnknown() {
-	xxx_messageInfo_TimersMap.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_TimersMap proto.InternalMessageInfo
-
-func (m *TimersMap) GetTimers() map[string]*Timer {
-	if m != nil {
-		return m.Timers
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterType((*Timer)(nil), "timer.Timer")
-	proto.RegisterType((*TimersMap)(nil), "timer.TimersMap")
-	proto.RegisterMapType((map[string]*Timer)(nil), "timer.TimersMap.TimersEntry")
-}
-
-func init() { proto.RegisterFile("timer.proto", fileDescriptor_ad0307ee16b652d2) }
-
-var fileDescriptor_ad0307ee16b652d2 = []byte{
-	// 256 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x2e, 0xc9, 0xcc, 0x4d,
-	0x2d, 0xd2, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x05, 0x73, 0x94, 0xe6, 0x32, 0x72, 0xb1,
-	0x86, 0x80, 0x58, 0x42, 0x22, 0x5c, 0xac, 0x89, 0x39, 0xa9, 0x45, 0x25, 0x12, 0x8c, 0x0a, 0x8c,
-	0x1a, 0x9c, 0x41, 0x10, 0x8e, 0x90, 0x10, 0x17, 0x4b, 0x72, 0x51, 0x7e, 0x9e, 0x04, 0x13, 0x58,
-	0x10, 0xcc, 0x16, 0x72, 0xe0, 0x92, 0x4e, 0xcd, 0x33, 0xcc, 0xcd, 0xcf, 0x2b, 0xc9, 0x30, 0x49,
-	0x49, 0xac, 0x34, 0x2d, 0x4f, 0x4d, 0xcd, 0x36, 0xce, 0xc8, 0x2f, 0x2d, 0x32, 0xcd, 0xcd, 0xcc,
-	0x33, 0x93, 0x60, 0x51, 0x60, 0xd4, 0x60, 0x0d, 0xc2, 0xa7, 0x44, 0x48, 0x8c, 0x8b, 0xad, 0x38,
-	0x35, 0x27, 0x2d, 0x33, 0x45, 0x82, 0x43, 0x81, 0x51, 0x83, 0x39, 0x08, 0xca, 0x13, 0x12, 0xe0,
-	0x62, 0x2e, 0x2d, 0xca, 0x91, 0x10, 0x00, 0x5b, 0x06, 0x62, 0x2a, 0x75, 0x31, 0x72, 0x71, 0x82,
-	0xdd, 0x57, 0xec, 0x9b, 0x58, 0x20, 0x64, 0xc2, 0xc5, 0x06, 0x76, 0x76, 0xb1, 0x04, 0xa3, 0x02,
-	0xb3, 0x06, 0xb7, 0x91, 0x8c, 0x1e, 0xc4, 0x4b, 0x70, 0x15, 0x50, 0x96, 0x6b, 0x5e, 0x49, 0x51,
-	0x65, 0x10, 0x54, 0xad, 0x94, 0x3b, 0x17, 0x37, 0x92, 0x30, 0xc8, 0x92, 0xec, 0xd4, 0x4a, 0xa8,
-	0x37, 0x41, 0x4c, 0x21, 0x25, 0x2e, 0xd6, 0xb2, 0xc4, 0x9c, 0xd2, 0x54, 0xb0, 0x2f, 0xb9, 0x8d,
-	0x78, 0x90, 0x4d, 0x0d, 0x82, 0x48, 0x59, 0x31, 0x59, 0x30, 0x3a, 0x09, 0x9c, 0x78, 0x24, 0xc7,
-	0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x33, 0x1e, 0xcb, 0x31, 0x24, 0xb1, 0x81,
-	0x03, 0xd3, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0xf5, 0xc1, 0x9e, 0x44, 0x5b, 0x01, 0x00, 0x00,
-}
-
-func (m *Timer) Marshal() (dAtA []byte, err error) {
-	size := m.Size()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBuffer(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *Timer) MarshalTo(dAtA []byte) (int, error) {
-	size := m.Size()
-	return m.MarshalToSizedBuffer(dAtA[:size])
-}
-
-func (m *Timer) MarshalToSizedBuffer(dAtA []byte) (int, error) {
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	if m.XXX_unrecognized != nil {
-		i -= len(m.XXX_unrecognized)
-		copy(dAtA[i:], m.XXX_unrecognized)
-	}
-	if len(m.Url) > 0 {
-		i -= len(m.Url)
-		copy(dAtA[i:], m.Url)
-		i = encodeVarintTimer(dAtA, i, uint64(len(m.Url)))
-		i--
-		dAtA[i] = 0x1
-		i--
-		dAtA[i] = 0x82
-	}
-	if m.Selfid != 0 {
-		i = encodeVarintTimer(dAtA, i, uint64(m.Selfid))
-		i--
-		dAtA[i] = 0x40
-	}
-	if m.En1Month4Day5Week3Hour5Min6 != 0 {
-		i = encodeVarintTimer(dAtA, i, uint64(m.En1Month4Day5Week3Hour5Min6))
-		i--
-		dAtA[i] = 0x20
-	}
-	if len(m.Cron) > 0 {
-		i -= len(m.Cron)
-		copy(dAtA[i:], m.Cron)
-		i = encodeVarintTimer(dAtA, i, uint64(len(m.Cron)))
-		i--
-		dAtA[i] = 0x12
-	}
-	if len(m.Alert) > 0 {
-		i -= len(m.Alert)
-		copy(dAtA[i:], m.Alert)
-		i = encodeVarintTimer(dAtA, i, uint64(len(m.Alert)))
-		i--
-		dAtA[i] = 0xa
-	}
-	return len(dAtA) - i, nil
-}
-
-func (m *TimersMap) Marshal() (dAtA []byte, err error) {
-	size := m.Size()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBuffer(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *TimersMap) MarshalTo(dAtA []byte) (int, error) {
-	size := m.Size()
-	return m.MarshalToSizedBuffer(dAtA[:size])
-}
-
-func (m *TimersMap) MarshalToSizedBuffer(dAtA []byte) (int, error) {
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	if m.XXX_unrecognized != nil {
-		i -= len(m.XXX_unrecognized)
-		copy(dAtA[i:], m.XXX_unrecognized)
-	}
-	if len(m.Timers) > 0 {
-		for k := range m.Timers {
-			v := m.Timers[k]
-			baseI := i
-			if v != nil {
-				{
-					size, err := v.MarshalToSizedBuffer(dAtA[:i])
-					if err != nil {
-						return 0, err
-					}
-					i -= size
-					i = encodeVarintTimer(dAtA, i, uint64(size))
-				}
-				i--
-				dAtA[i] = 0x12
-			}
-			i -= len(k)
-			copy(dAtA[i:], k)
-			i = encodeVarintTimer(dAtA, i, uint64(len(k)))
-			i--
-			dAtA[i] = 0xa
-			i = encodeVarintTimer(dAtA, i, uint64(baseI-i))
-			i--
-			dAtA[i] = 0xa
-		}
-	}
-	return len(dAtA) - i, nil
-}
-
-func encodeVarintTimer(dAtA []byte, offset int, v uint64) int {
-	offset -= sovTimer(v)
-	base := offset
-	for v >= 1<<7 {
-		dAtA[offset] = uint8(v&0x7f | 0x80)
-		v >>= 7
-		offset++
-	}
-	dAtA[offset] = uint8(v)
-	return base
-}
-func (m *Timer) Size() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	l = len(m.Alert)
-	if l > 0 {
-		n += 1 + l + sovTimer(uint64(l))
-	}
-	l = len(m.Cron)
-	if l > 0 {
-		n += 1 + l + sovTimer(uint64(l))
-	}
-	if m.En1Month4Day5Week3Hour5Min6 != 0 {
-		n += 1 + sovTimer(uint64(m.En1Month4Day5Week3Hour5Min6))
-	}
-	if m.Selfid != 0 {
-		n += 1 + sovTimer(uint64(m.Selfid))
-	}
-	l = len(m.Url)
-	if l > 0 {
-		n += 2 + l + sovTimer(uint64(l))
-	}
-	if m.XXX_unrecognized != nil {
-		n += len(m.XXX_unrecognized)
-	}
-	return n
-}
-
-func (m *TimersMap) Size() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	if len(m.Timers) > 0 {
-		for k, v := range m.Timers {
-			_ = k
-			_ = v
-			l = 0
-			if v != nil {
-				l = v.Size()
-				l += 1 + sovTimer(uint64(l))
-			}
-			mapEntrySize := 1 + len(k) + sovTimer(uint64(len(k))) + l
-			n += mapEntrySize + 1 + sovTimer(uint64(mapEntrySize))
-		}
-	}
-	if m.XXX_unrecognized != nil {
-		n += len(m.XXX_unrecognized)
-	}
-	return n
-}
-
-func sovTimer(x uint64) (n int) {
-	return (math_bits.Len64(x|1) + 6) / 7
-}
-func sozTimer(x uint64) (n int) {
-	return sovTimer(uint64((x << 1) ^ uint64((int64(x) >> 63))))
-}
-func (m *Timer) Unmarshal(dAtA []byte) error {
-	l := len(dAtA)
-	iNdEx := 0
-	for iNdEx < l {
-		preIndex := iNdEx
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return ErrIntOverflowTimer
-			}
-			if iNdEx >= l {
-				return io.ErrUnexpectedEOF
-			}
-			b := dAtA[iNdEx]
-			iNdEx++
-			wire |= uint64(b&0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		fieldNum := int32(wire >> 3)
-		wireType := int(wire & 0x7)
-		if wireType == 4 {
-			return fmt.Errorf("proto: Timer: wiretype end group for non-group")
-		}
-		if fieldNum <= 0 {
-			return fmt.Errorf("proto: Timer: illegal tag %d (wire type %d)", fieldNum, wire)
-		}
-		switch fieldNum {
-		case 1:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Alert", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTimer
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				stringLen |= uint64(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			intStringLen := int(stringLen)
-			if intStringLen < 0 {
-				return ErrInvalidLengthTimer
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex < 0 {
-				return ErrInvalidLengthTimer
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.Alert = string(dAtA[iNdEx:postIndex])
-			iNdEx = postIndex
-		case 2:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Cron", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTimer
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				stringLen |= uint64(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			intStringLen := int(stringLen)
-			if intStringLen < 0 {
-				return ErrInvalidLengthTimer
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex < 0 {
-				return ErrInvalidLengthTimer
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.Cron = string(dAtA[iNdEx:postIndex])
-			iNdEx = postIndex
-		case 4:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field En1Month4Day5Week3Hour5Min6", wireType)
-			}
-			m.En1Month4Day5Week3Hour5Min6 = 0
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTimer
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				m.En1Month4Day5Week3Hour5Min6 |= int32(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-		case 8:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Selfid", wireType)
-			}
-			m.Selfid = 0
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTimer
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				m.Selfid |= int64(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-		case 16:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Url", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTimer
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				stringLen |= uint64(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			intStringLen := int(stringLen)
-			if intStringLen < 0 {
-				return ErrInvalidLengthTimer
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex < 0 {
-				return ErrInvalidLengthTimer
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.Url = string(dAtA[iNdEx:postIndex])
-			iNdEx = postIndex
-		default:
-			iNdEx = preIndex
-			skippy, err := skipTimer(dAtA[iNdEx:])
-			if err != nil {
-				return err
-			}
-			if (skippy < 0) || (iNdEx+skippy) < 0 {
-				return ErrInvalidLengthTimer
-			}
-			if (iNdEx + skippy) > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...)
-			iNdEx += skippy
-		}
-	}
-
-	if iNdEx > l {
-		return io.ErrUnexpectedEOF
-	}
-	return nil
-}
-func (m *TimersMap) Unmarshal(dAtA []byte) error {
-	l := len(dAtA)
-	iNdEx := 0
-	for iNdEx < l {
-		preIndex := iNdEx
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return ErrIntOverflowTimer
-			}
-			if iNdEx >= l {
-				return io.ErrUnexpectedEOF
-			}
-			b := dAtA[iNdEx]
-			iNdEx++
-			wire |= uint64(b&0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		fieldNum := int32(wire >> 3)
-		wireType := int(wire & 0x7)
-		if wireType == 4 {
-			return fmt.Errorf("proto: TimersMap: wiretype end group for non-group")
-		}
-		if fieldNum <= 0 {
-			return fmt.Errorf("proto: TimersMap: illegal tag %d (wire type %d)", fieldNum, wire)
-		}
-		switch fieldNum {
-		case 1:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Timers", wireType)
-			}
-			var msglen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTimer
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				msglen |= int(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if msglen < 0 {
-				return ErrInvalidLengthTimer
-			}
-			postIndex := iNdEx + msglen
-			if postIndex < 0 {
-				return ErrInvalidLengthTimer
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			if m.Timers == nil {
-				m.Timers = make(map[string]*Timer)
-			}
-			var mapkey string
-			var mapvalue *Timer
-			for iNdEx < postIndex {
-				entryPreIndex := iNdEx
-				var wire uint64
-				for shift := uint(0); ; shift += 7 {
-					if shift >= 64 {
-						return ErrIntOverflowTimer
-					}
-					if iNdEx >= l {
-						return io.ErrUnexpectedEOF
-					}
-					b := dAtA[iNdEx]
-					iNdEx++
-					wire |= uint64(b&0x7F) << shift
-					if b < 0x80 {
-						break
-					}
-				}
-				fieldNum := int32(wire >> 3)
-				if fieldNum == 1 {
-					var stringLenmapkey uint64
-					for shift := uint(0); ; shift += 7 {
-						if shift >= 64 {
-							return ErrIntOverflowTimer
-						}
-						if iNdEx >= l {
-							return io.ErrUnexpectedEOF
-						}
-						b := dAtA[iNdEx]
-						iNdEx++
-						stringLenmapkey |= uint64(b&0x7F) << shift
-						if b < 0x80 {
-							break
-						}
-					}
-					intStringLenmapkey := int(stringLenmapkey)
-					if intStringLenmapkey < 0 {
-						return ErrInvalidLengthTimer
-					}
-					postStringIndexmapkey := iNdEx + intStringLenmapkey
-					if postStringIndexmapkey < 0 {
-						return ErrInvalidLengthTimer
-					}
-					if postStringIndexmapkey > l {
-						return io.ErrUnexpectedEOF
-					}
-					mapkey = string(dAtA[iNdEx:postStringIndexmapkey])
-					iNdEx = postStringIndexmapkey
-				} else if fieldNum == 2 {
-					var mapmsglen int
-					for shift := uint(0); ; shift += 7 {
-						if shift >= 64 {
-							return ErrIntOverflowTimer
-						}
-						if iNdEx >= l {
-							return io.ErrUnexpectedEOF
-						}
-						b := dAtA[iNdEx]
-						iNdEx++
-						mapmsglen |= int(b&0x7F) << shift
-						if b < 0x80 {
-							break
-						}
-					}
-					if mapmsglen < 0 {
-						return ErrInvalidLengthTimer
-					}
-					postmsgIndex := iNdEx + mapmsglen
-					if postmsgIndex < 0 {
-						return ErrInvalidLengthTimer
-					}
-					if postmsgIndex > l {
-						return io.ErrUnexpectedEOF
-					}
-					mapvalue = &Timer{}
-					if err := mapvalue.Unmarshal(dAtA[iNdEx:postmsgIndex]); err != nil {
-						return err
-					}
-					iNdEx = postmsgIndex
-				} else {
-					iNdEx = entryPreIndex
-					skippy, err := skipTimer(dAtA[iNdEx:])
-					if err != nil {
-						return err
-					}
-					if (skippy < 0) || (iNdEx+skippy) < 0 {
-						return ErrInvalidLengthTimer
-					}
-					if (iNdEx + skippy) > postIndex {
-						return io.ErrUnexpectedEOF
-					}
-					iNdEx += skippy
-				}
-			}
-			m.Timers[mapkey] = mapvalue
-			iNdEx = postIndex
-		default:
-			iNdEx = preIndex
-			skippy, err := skipTimer(dAtA[iNdEx:])
-			if err != nil {
-				return err
-			}
-			if (skippy < 0) || (iNdEx+skippy) < 0 {
-				return ErrInvalidLengthTimer
-			}
-			if (iNdEx + skippy) > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...)
-			iNdEx += skippy
-		}
-	}
-
-	if iNdEx > l {
-		return io.ErrUnexpectedEOF
-	}
-	return nil
-}
-func skipTimer(dAtA []byte) (n int, err error) {
-	l := len(dAtA)
-	iNdEx := 0
-	depth := 0
-	for iNdEx < l {
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return 0, ErrIntOverflowTimer
-			}
-			if iNdEx >= l {
-				return 0, io.ErrUnexpectedEOF
-			}
-			b := dAtA[iNdEx]
-			iNdEx++
-			wire |= (uint64(b) & 0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		wireType := int(wire & 0x7)
-		switch wireType {
-		case 0:
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return 0, ErrIntOverflowTimer
-				}
-				if iNdEx >= l {
-					return 0, io.ErrUnexpectedEOF
-				}
-				iNdEx++
-				if dAtA[iNdEx-1] < 0x80 {
-					break
-				}
-			}
-		case 1:
-			iNdEx += 8
-		case 2:
-			var length int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return 0, ErrIntOverflowTimer
-				}
-				if iNdEx >= l {
-					return 0, io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				length |= (int(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if length < 0 {
-				return 0, ErrInvalidLengthTimer
-			}
-			iNdEx += length
-		case 3:
-			depth++
-		case 4:
-			if depth == 0 {
-				return 0, ErrUnexpectedEndOfGroupTimer
-			}
-			depth--
-		case 5:
-			iNdEx += 4
-		default:
-			return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
-		}
-		if iNdEx < 0 {
-			return 0, ErrInvalidLengthTimer
-		}
-		if depth == 0 {
-			return iNdEx, nil
-		}
-	}
-	return 0, io.ErrUnexpectedEOF
-}
-
-var (
-	ErrInvalidLengthTimer        = fmt.Errorf("proto: negative length found during unmarshaling")
-	ErrIntOverflowTimer          = fmt.Errorf("proto: integer overflow")
-	ErrUnexpectedEndOfGroupTimer = fmt.Errorf("proto: unexpected end of group")
-)

plugin_manager/timer/timer.proto

@@ -1,14 +0,0 @@
-syntax = "proto3";
-package timer;
-
-message Timer {
-    string alert = 1;
-    string cron = 2;
-    int32 en1month4day5week3hour5min6 = 4;
-    int64 selfid = 8;
-    string url = 16;
-}
-
-message TimersMap {
-    map<string, Timer> timers = 1;
-}

plugin_moyu/run.go

@@ -22,7 +22,7 @@ func init() { // 插件主体
 		DisableOnDefault: true,
 		Help: "moyu\n" +
 			"- 添加摸鱼提醒\n" +
-			"- 删除摸鱼提醒\n",
+			"- 删除摸鱼提醒",
 	}).OnFullMatch("删除摸鱼提醒", zero.OnlyGroup, zero.AdminPermission).SetBlock(true).SetPriority(20).
 		Handle(func(ctx *zero.Ctx) {
 			m, ok := control.Lookup("moyu")

plugin_nativesetu/data.go

@@ -98,9 +98,8 @@ func scanclass(root fs.FS, path, clsn string) error {
 	for _, d := range ds {
 		if !d.IsDir() {
 			relpath := path + "/" + d.Name()
-			fullpath := setupath + "/" + relpath
-			logrus.Debugln("[nsetu] read", fullpath)
-			f, e := os.ReadFile(fullpath)
+			logrus.Debugln("[nsetu] read", relpath)
+			f, e := fs.ReadFile(root, relpath)
 			if e != nil {
 				return e
 			}

plugin_nativewife/main.go

@@ -0,0 +1,169 @@
+package nativewife
+
+import (
+	"crypto/md5"
+	"encoding/binary"
+	"errors"
+	"fmt"
+	"math/rand"
+	"os"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/FloatTech/AnimeAPI/picture"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+	"github.com/wdvxdr1123/ZeroBot/utils/helper"
+
+	"github.com/FloatTech/ZeroBot-Plugin/control"
+	"github.com/FloatTech/ZeroBot-Plugin/utils/file"
+)
+
+const base = "data/nwife"
+
+var baseuri = "file:///" + file.BOT_PATH + "/" + base
+
+func init() {
+	err := os.MkdirAll(base, 0755)
+	if err != nil {
+		panic(err)
+	}
+	engine := control.Register("nwife", &control.Options{
+		DisableOnDefault: false,
+		Help:             "nativewife\n- 抽wife[@xxx]\n- 添加wife[名字][图片]\n- 删除wife[名字]\n- [让|不让]所有人均可添加wife",
+	})
+	engine.OnPrefix("抽wife", zero.OnlyGroup).SetBlock(true).SetPriority(20).
+		Handle(func(ctx *zero.Ctx) {
+			grpf := strconv.FormatInt(ctx.Event.GroupID, 36)
+			wifes, err := os.ReadDir(base + "/" + grpf)
+			if err != nil {
+				ctx.SendChain(message.Text("一个wife也没有哦~"))
+				return
+			}
+			switch len(wifes) {
+			case 0:
+				ctx.SendChain(message.Text("一个wife也没有哦~"))
+			case 1:
+				wn := wifes[0].Name()
+				ctx.SendChain(message.Text("大家的wife都是", wn, "\n"), message.Image(baseuri+"/"+grpf+"/"+wn), message.Text("\n哦~"))
+			default:
+				// 获取名字
+				name := ctx.State["args"].(string)
+				if len(ctx.Event.Message) > 1 && ctx.Event.Message[1].Type == "at" {
+					qq, _ := strconv.ParseInt(ctx.Event.Message[1].Data["qq"], 10, 64)
+					name = ctx.GetGroupMemberInfo(ctx.Event.GroupID, qq, false).Get("nickname").Str
+				} else if name == "" {
+					name = ctx.Event.Sender.NickName
+				}
+				now := time.Now()
+				s := md5.Sum(helper.StringToBytes(fmt.Sprintf("%s%d%d%d", name, now.Year(), now.Month(), now.Day())))
+				r := rand.New(rand.NewSource(int64(binary.LittleEndian.Uint64(s[:]))))
+				n := r.Intn(len(wifes))
+				wn := wifes[n].Name()
+				ctx.SendChain(message.Text(name, "的wife是", wn, "\n"), message.Image(baseuri+"/"+grpf+"/"+wn), message.Text("\n哦~"))
+			}
+		})
+	// 上传一张图
+	engine.OnPrefix("添加wife", zero.OnlyGroup, chkAddWifePermission, picture.MustGiven).SetBlock(true).SetPriority(20).
+		Handle(func(ctx *zero.Ctx) {
+			name := ""
+			for _, elem := range ctx.Event.Message {
+				if elem.Type == "text" {
+					name = strings.ReplaceAll(elem.Data["text"], " ", "")
+					name = name[strings.LastIndex(name, "添加wife")+10:]
+					name = strings.ReplaceAll(name, "/", "")
+					name = strings.ReplaceAll(name, "\\", "")
+					break
+				}
+			}
+			if name != "" {
+				url := ctx.State["image_url"].([]string)[0]
+				grpfolder := base + "/" + strconv.FormatInt(ctx.Event.GroupID, 36)
+				if file.IsNotExist(grpfolder) {
+					os.Mkdir(grpfolder, 0755)
+				}
+				err = file.DownloadTo(url, grpfolder+"/"+name, true)
+				if err == nil {
+					ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("成功！"))
+				} else {
+					ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("错误：", err.Error()))
+				}
+			} else {
+				ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("没有找到wife的名字！"))
+			}
+		})
+	engine.OnPrefix("删除wife", zero.OnlyGroup, zero.AdminPermission).SetBlock(true).SetPriority(20).
+		Handle(func(ctx *zero.Ctx) {
+			name := ""
+			for _, elem := range ctx.Event.Message {
+				if elem.Type == "text" {
+					name = strings.ReplaceAll(elem.Data["text"], " ", "")
+					name = name[strings.LastIndex(name, "删除wife")+10:]
+					name = strings.ReplaceAll(name, "/", "")
+					name = strings.ReplaceAll(name, "\\", "")
+					break
+				}
+			}
+			if name != "" {
+				grpfolder := base + "/" + strconv.FormatInt(ctx.Event.GroupID, 36)
+				err = os.Remove(grpfolder + "/" + name)
+				if err == nil {
+					ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("成功！"))
+				} else {
+					ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("错误：", err.Error()))
+				}
+			} else {
+				ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("没有找到wife的名字！"))
+			}
+		})
+	engine.OnSuffix("所有人均可添加wife", zero.SuperUserPermission, zero.OnlyGroup).SetBlock(true).SetPriority(20).
+		Handle(func(ctx *zero.Ctx) {
+			text := ""
+			for _, elem := range ctx.Event.Message {
+				if elem.Type == "text" {
+					text = strings.ReplaceAll(elem.Data["text"], " ", "")
+					text = text[:strings.LastIndex(text, "所有人均可添加wife")]
+					break
+				}
+			}
+			var err error
+			switch text {
+			case "设置", "授予", "让":
+				err = setEveryoneCanAddWife(ctx.Event.GroupID, true)
+			case "取消", "撤销", "不让":
+				err = setEveryoneCanAddWife(ctx.Event.GroupID, false)
+			}
+			if err == nil {
+				ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("成功！"))
+			} else {
+				ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("错误：", err.Error()))
+			}
+		})
+}
+
+func chkAddWifePermission(ctx *zero.Ctx) bool {
+	gid := ctx.Event.GroupID
+	if gid > 0 {
+		m, ok := control.Lookup("nwife")
+		if ok {
+			data := m.GetData(gid)
+			if data&1 == 1 {
+				return true
+			}
+			return zero.AdminPermission(ctx)
+		}
+	}
+	return false
+}
+
+func setEveryoneCanAddWife(gid int64, canadd bool) error {
+	m, ok := control.Lookup("nwife")
+	if ok {
+		if canadd {
+			return m.SetData(gid, 1)
+		}
+		return m.SetData(gid, 0)
+	}
+	return errors.New("no such plugin")
+}

plugin_qingyunke/qingyunke.go

@@ -32,14 +32,14 @@ func init() { // 插件主体
 		Help: "青云客\n" +
 			"- @Bot 任意文本(任意一句话回复)",
 	})
-	// 回复 匹配中文、英文、数字、空格但不包括下划线等符号
-	engine.OnRegex("^([\u4E00-\u9FA5A-Za-z0-9\\s]{1,30})", zero.OnlyToMe).SetBlock(true).SetPriority(prio).
+	// 回复 @和包括名字
+	engine.OnMessage(zero.OnlyToMe).SetBlock(true).SetPriority(prio).
 		Handle(func(ctx *zero.Ctx) {
 			if !bucket.Load(ctx.Event.UserID).Acquire() {
 				// 频繁触发，不回复
 				return
 			}
-			msg := ctx.State["regex_matched"].([]string)[1]
+			msg := ctx.ExtractPlainText()
 			// 调用青云客接口
 			reply, err := getMessage(msg)
 			if err != nil {

plugin_qingyunke/request.go

@@ -1,21 +0,0 @@
-package qingyunke
-
-// TODO: 移动到 manager 搭配自动验证使用
-
-/*
-import (
-	zero "github.com/wdvxdr1123/ZeroBot"
-)
-
-//自动同意加群，加好友
-func init() {
-	zero.OnRequest().SetBlock(false).FirstPriority().Handle(func(ctx *zero.Ctx) {
-		if ctx.Event.RequestType == "friend" {
-			ctx.SetFriendAddRequest(ctx.Event.Flag, true, "")
-		}
-		if ctx.Event.RequestType == "group" && ctx.Event.SubType == "invite" {
-			ctx.SetGroupAddRequest(ctx.Event.Flag, "invite", true, "我爱你，mua~")
-		}
-	})
-}
-*/

plugin_sleep_manage/data.go

@@ -0,0 +1,26 @@
+package plugin_sleep_manage
+
+import (
+	"os"
+
+	log "github.com/sirupsen/logrus"
+
+	"github.com/FloatTech/ZeroBot-Plugin/plugin_sleep_manage/model"
+	"github.com/FloatTech/ZeroBot-Plugin/utils/process"
+)
+
+func init() {
+	go func() {
+		defer func() {
+			//recover() //可以打印panic的错误信息
+			if err := recover(); err != nil { //产生了panic异常
+				log.Println(err)
+			}
+
+		}() //别忘了(), 调用此匿名函数
+		process.SleepAbout1sTo2s()
+		_ = os.MkdirAll(dbpath, 0755)
+		model.Initialize(dbfile)
+	}()
+
+}

plugin_sleep_manage/model/model.go

@@ -0,0 +1,110 @@
+package model
+
+import (
+	"os"
+	"time"
+
+	"github.com/jinzhu/gorm"
+	_ "github.com/logoove/sqlite"
+	log "github.com/sirupsen/logrus"
+)
+
+type SleepDB gorm.DB
+
+func Initialize(dbpath string) *SleepDB {
+	var err error
+	if _, err = os.Stat(dbpath); err != nil || os.IsNotExist(err) {
+		// 生成文件
+		f, err := os.Create(dbpath)
+		if err != nil {
+			return nil
+		}
+		defer f.Close()
+	}
+	gdb, err := gorm.Open("sqlite3", dbpath)
+	if err != nil {
+		panic(err)
+	}
+	gdb.AutoMigrate(&SleepManage{})
+	return (*SleepDB)(gdb)
+}
+
+func Open(dbpath string) (*SleepDB, error) {
+	db, err := gorm.Open("sqlite3", dbpath)
+	if err != nil {
+		return nil, err
+	} else {
+		return (*SleepDB)(db), nil
+	}
+}
+
+func (sdb *SleepDB) Close() error {
+	db := (*gorm.DB)(sdb)
+	return db.Close()
+}
+
+type SleepManage struct {
+	gorm.Model
+	GroupId   int64     `gorm:"column:group_id"`
+	UserId    int64     `gorm:"column:user_id"`
+	SleepTime time.Time `gorm:"column:sleep_time"`
+}
+
+func (SleepManage) TableName() string {
+	return "sleep_manage"
+}
+
+// 更新睡眠时间
+func (sdb *SleepDB) Sleep(groupId, userId int64) (position int, awakeTime time.Duration) {
+	db := (*gorm.DB)(sdb)
+	now := time.Now()
+
+	today := now.Add(-time.Hour*time.Duration(3+now.Hour()) - time.Minute*time.Duration(now.Minute()) - time.Second*time.Duration(now.Second()))
+	st := SleepManage{
+		GroupId:   groupId,
+		UserId:    userId,
+		SleepTime: now,
+	}
+	if err := db.Debug().Model(&SleepManage{}).Where("group_id = ? and user_id = ?", groupId, userId).First(&st).Error; err != nil {
+		// error handling...
+		if gorm.IsRecordNotFoundError(err) {
+			db.Debug().Model(&SleepManage{}).Create(&st) // newUser not user
+		}
+	} else {
+		log.Println("sleeptime为", st)
+		awakeTime = now.Sub(st.SleepTime)
+		db.Debug().Model(&SleepManage{}).Where("group_id = ? and user_id = ?", groupId, userId).Update(
+			map[string]interface{}{
+				"sleep_time": now,
+			})
+	}
+	db.Debug().Model(&SleepManage{}).Where("group_id = ? and sleep_time <= ? and sleep_time >= ?", groupId, now, today).Count(&position)
+	return position, awakeTime
+}
+
+// 更新起床时间
+func (sdb *SleepDB) GetUp(groupId, userId int64) (position int, sleepTime time.Duration) {
+	db := (*gorm.DB)(sdb)
+	now := time.Now()
+	today := now.Add(-time.Hour*time.Duration(-6+now.Hour()) - time.Minute*time.Duration(now.Minute()) - time.Second*time.Duration(now.Second()))
+	st := SleepManage{
+		GroupId:   groupId,
+		UserId:    userId,
+		SleepTime: now,
+	}
+	if err := db.Debug().Model(&SleepManage{}).Where("group_id = ? and user_id = ?", groupId, userId).First(&st).Error; err != nil {
+		// error handling...
+		if gorm.IsRecordNotFoundError(err) {
+			db.Debug().Model(&SleepManage{}).Create(&st) // newUser not user
+		}
+	} else {
+		log.Println("sleeptime为", st)
+		sleepTime = now.Sub(st.SleepTime)
+		db.Debug().Model(&SleepManage{}).Where("group_id = ? and user_id = ?", groupId, userId).Update(
+			map[string]interface{}{
+				"get_up_time": now,
+			})
+	}
+	db.Debug().Model(&SleepManage{}).Where("group_id = ? and sleep_time <= ? and sleep_time >= ?", groupId, now, today).Count(&position)
+	return position, sleepTime
+}

plugin_sleep_manage/sleep_manage.go

@@ -0,0 +1,80 @@
+package plugin_sleep_manage
+
+import (
+	"fmt"
+	"time"
+
+	log "github.com/sirupsen/logrus"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+
+	"github.com/FloatTech/ZeroBot-Plugin/control"
+	"github.com/FloatTech/ZeroBot-Plugin/plugin_sleep_manage/model"
+)
+
+const dbpath = "data/SleepManage/"
+const dbfile = dbpath + "sleepmanage.db"
+const prio = 4
+
+var engine = control.Register("sleepmanage", &control.Options{
+	DisableOnDefault: false,
+	Help:             "sleepmanage\n- 早安\n- 晚安",
+})
+
+func init() {
+	engine.OnFullMatch("早安", isMorning, zero.OnlyGroup).SetBlock(true).SetPriority(prio).
+		Handle(func(ctx *zero.Ctx) {
+			db, err := model.Open(dbfile)
+			if err != nil {
+				log.Errorln(err)
+				return
+			}
+			position, getUpTime := db.GetUp(ctx.Event.GroupID, ctx.Event.UserID)
+			log.Println(position, getUpTime)
+			hour, minute, second := timeDuration(getUpTime)
+			if (hour == 0 && minute == 0 && second == 0) || hour >= 24 {
+				ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(fmt.Sprintf("早安成功！你是今天第%d个起床的", position)))
+			} else {
+				ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(fmt.Sprintf("早安成功！你的睡眠时长为%d时%d分%d秒,你是今天第%d个起床的", hour, minute, second, position)))
+			}
+			db.Close()
+
+		})
+	engine.OnFullMatch("晚安", isEvening, zero.OnlyGroup).SetBlock(true).SetPriority(prio).
+		Handle(func(ctx *zero.Ctx) {
+			db, err := model.Open(dbfile)
+			if err != nil {
+				log.Errorln(err)
+				return
+			}
+			position, sleepTime := db.Sleep(ctx.Event.GroupID, ctx.Event.UserID)
+			log.Println(position, sleepTime)
+			hour, minute, second := timeDuration(sleepTime)
+			if (hour == 0 && minute == 0 && second == 0) || hour >= 24 {
+				ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(fmt.Sprintf("晚安成功！你是今天第%d个睡觉的", position)))
+			} else {
+				ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(fmt.Sprintf("晚安成功！你的清醒时长为%d时%d分%d秒,你是今天第%d个睡觉的", hour, minute, second, position)))
+			}
+			db.Close()
+
+		})
+}
+
+func timeDuration(time time.Duration) (hour, minute, second int64) {
+	hour = int64(time) / (1000 * 1000 * 1000 * 60 * 60)
+	minute = (int64(time) - hour*(1000*1000*1000*60*60)) / (1000 * 1000 * 1000 * 60)
+	second = (int64(time) - hour*(1000*1000*1000*60*60) - minute*(1000*1000*1000*60)) / (1000 * 1000 * 1000)
+	return hour, minute, second
+}
+
+// 只统计6点到12点的早安
+func isMorning(ctx *zero.Ctx) bool {
+	now := time.Now().Hour()
+	return now >= 6 && now <= 12
+}
+
+// 只统计21点到凌晨3点的晚安
+func isEvening(ctx *zero.Ctx) bool {
+	now := time.Now().Hour()
+	return now >= 21 || now <= 3
+}

plugin_vtb_quotation/model/model.go

@@ -194,32 +194,35 @@ func (vdb *VtbDB) Close() error {
 
 const vtbUrl = "https://vtbkeyboard.moe/api/get_vtb_list"
 
-func (vdb *VtbDB) GetVtbList() []string {
+func (vdb *VtbDB) GetVtbList() (uidList []string) {
 	db := (*gorm.DB)(vdb)
 	client := &http.Client{}
 	req, err := http.NewRequest("GET", vtbUrl, nil)
 	if err != nil {
 		logrus.Errorln(err)
+		return
 	}
 	// 自定义Header
 	req.Header.Set("User-Agent", randua())
 	resp, err := client.Do(req)
 	if err != nil {
 		logrus.Errorln(err)
+		return
 	}
 
 	defer resp.Body.Close()
 	bytes, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
 		logrus.Errorln(err)
+		return
 	}
 	// logrus.Println(string(bytes))
 	vtbListStr, err := strconv.Unquote(strings.Replace(strconv.Quote(string(bytes)), `\\u`, `\u`, -1))
 	if err != nil {
 		logrus.Errorln(err)
+		return
 	}
 	// logrus.Println(vtbListStr)
-	uidList := make([]string, 0)
 	count := gjson.Get(vtbListStr, "#").Int()
 	for i := int64(0); i < count; i++ {
 		item := gjson.Get(vtbListStr, strconv.FormatInt(i, 10))
@@ -261,23 +264,27 @@ func (vdb *VtbDB) StoreVtb(uid string) {
 	req, err := http.NewRequest("GET", vtbUrl, nil)
 	if err != nil {
 		logrus.Errorln(err)
+		return
 	}
 	// 自定义Header
 	req.Header.Set("User-Agent", randua())
 	resp, err := client.Do(req)
 	if err != nil {
 		logrus.Errorln(err)
+		return
 	}
 
 	defer resp.Body.Close()
 	bytes, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
 		logrus.Errorln(err)
+		return
 	}
 	//logrus.Println(string(bytes))
 	vtbStr, err := strconv.Unquote(strings.Replace(strconv.Quote(string(bytes)), `\\u`, `\u`, -1))
 	if err != nil {
 		logrus.Errorln(err)
+		return
 	}
 	// logrus.Println(vtbListStr)
 	secondCount := gjson.Get(vtbStr, "data.voices.#").Int()

plugin_vtb_quotation/vtb_quotation.go

@@ -22,7 +22,7 @@ const dbfile = dbpath + "vtb.db"
 
 var engine = control.Register("vtbquotation", &control.Options{
 	DisableOnDefault: false,
-	Help:             "vtbquotation\n- vtb语录\n- 随机vtb\n",
+	Help:             "vtbkeyboard.moe\n- vtb语录\n- 随机vtb",
 })
 
 func init() {