diff --git a/data b/data index d5ec0411..32dffa9c 160000 --- a/data +++ b/data @@ -1 +1 @@ -Subproject commit d5ec04118feb3a9071b9290a4b6db327c206fca8 +Subproject commit 32dffa9c507055b583935a94712ea8b8c79100e6 diff --git a/go.mod b/go.mod index f65fc813..605efbd8 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/FloatTech/sqlite v1.6.2 github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b github.com/FloatTech/zbpctrl v1.5.3-0.20230514154630-b74e6fcca380 - github.com/FloatTech/zbputils v1.6.2-0.20230831134542-28c5ba506758 + github.com/FloatTech/zbputils v1.6.2-0.20230903052647-820a67856603 github.com/RomiChan/syncx v0.0.0-20221202055724-5f842c53020e github.com/RomiChan/websocket v1.4.3-0.20220227141055-9b2c6168c9c5 github.com/antchfx/htmlquery v1.2.5 diff --git a/go.sum b/go.sum index d874e87f..ddf9df06 100644 --- a/go.sum +++ b/go.sum @@ -18,10 +18,8 @@ github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b h1:tvciXWq2nuvTbFeJG github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b/go.mod h1:fHZFWGquNXuHttu9dUYoKuNbm3dzLETnIOnm1muSfDs= github.com/FloatTech/zbpctrl v1.5.3-0.20230514154630-b74e6fcca380 h1:qmwoT8xVaND01aCdwy+5/j6z490nehQWZAVyTBN8ahU= github.com/FloatTech/zbpctrl v1.5.3-0.20230514154630-b74e6fcca380/go.mod h1:gkGC1C1eEUd/Ld/ja68zas5j2ZktIZCdnj2FMaM+Au0= -github.com/FloatTech/zbputils v1.6.2-0.20230728081122-94d4d957f3bf h1:PwH9aMnmN+m204cVIqUrI3e7nsdQi/IGW012Fjzb1bs= -github.com/FloatTech/zbputils v1.6.2-0.20230728081122-94d4d957f3bf/go.mod h1:JRnGR7EGeEQgxOs+c0rZAhrS9Es2BTcGHdIDHXIPRzQ= -github.com/FloatTech/zbputils v1.6.2-0.20230831134542-28c5ba506758 h1:z0hhIwGN8ifKExa6xkujZwAQwJNU6AnELt+/A6nAdcY= -github.com/FloatTech/zbputils v1.6.2-0.20230831134542-28c5ba506758/go.mod h1:JRnGR7EGeEQgxOs+c0rZAhrS9Es2BTcGHdIDHXIPRzQ= +github.com/FloatTech/zbputils v1.6.2-0.20230903052647-820a67856603 h1:06zrK+XJCOLhW+HADibOmeqcVEC6vwFGRQiDRyvioWQ= +github.com/FloatTech/zbputils v1.6.2-0.20230903052647-820a67856603/go.mod h1:JRnGR7EGeEQgxOs+c0rZAhrS9Es2BTcGHdIDHXIPRzQ= github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc= github.com/RomiChan/syncx v0.0.0-20221202055724-5f842c53020e h1:wR3MXQ3VbUlPKOOUwLOYgh/QaJThBTYtsl673O3lqSA= github.com/RomiChan/syncx v0.0.0-20221202055724-5f842c53020e/go.mod h1:vD7Ra3Q9onRtojoY5sMCLQ7JBgjUsrXDnDKyFxqpf9w= diff --git a/main.go b/main.go index 043fa850..6d277fe4 100644 --- a/main.go +++ b/main.go @@ -34,7 +34,7 @@ import ( _ "github.com/FloatTech/ZeroBot-Plugin/plugin/chat" // 基础词库 - _ "github.com/FloatTech/ZeroBot-Plugin/plugin/sleep_manage" // 统计睡眠时间 + _ "github.com/FloatTech/ZeroBot-Plugin/plugin/sleepmanage" // 统计睡眠时间 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/atri" // ATRI词库 @@ -61,18 +61,18 @@ import ( // vvvv // _ "github.com/FloatTech/ZeroBot-Plugin/plugin/ahsai" // ahsai tts - _ "github.com/FloatTech/ZeroBot-Plugin/plugin/ai_false" // 服务器监控 + _ "github.com/FloatTech/ZeroBot-Plugin/plugin/aifalse" // 服务器监控 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/aipaint" // ai绘图 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/aiwife" // 随机老婆 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/alipayvoice" // 支付宝到账语音 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/autowithdraw" // 触发者撤回时也自动撤回 - _ "github.com/FloatTech/ZeroBot-Plugin/plugin/b14" // base16384加解密 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/baidu" // 百度一下 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/baiduaudit" // 百度内容审核 + _ "github.com/FloatTech/ZeroBot-Plugin/plugin/base16384" // base16384加解密 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/base64gua" // base64卦加解密 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/baseamasiro" // base天城文加解密 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/bilibili" // b站相关 - _ "github.com/FloatTech/ZeroBot-Plugin/plugin/book_review" // 哀伤雪刃吧推书记录 + _ "github.com/FloatTech/ZeroBot-Plugin/plugin/bookreview" // 哀伤雪刃吧推书记录 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/cangtoushi" // 藏头诗 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/chess" // 国际象棋 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/choose" // 选择困难症帮手 @@ -86,7 +86,7 @@ import ( _ "github.com/FloatTech/ZeroBot-Plugin/plugin/dish" // 程序员做饭指南 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/drawlots" // 多功能抽签 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/dress" // 女装 - _ "github.com/FloatTech/ZeroBot-Plugin/plugin/drift_bottle" // 漂流瓶 + _ "github.com/FloatTech/ZeroBot-Plugin/plugin/driftbottle" // 漂流瓶 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/emojimix" // 合成emoji _ "github.com/FloatTech/ZeroBot-Plugin/plugin/event" // 好友申请群聊邀请事件处理 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/font" // 渲染任意文字到图片 @@ -100,7 +100,7 @@ import ( _ "github.com/FloatTech/ZeroBot-Plugin/plugin/hitokoto" // 一言 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/hs" // 炉石 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/hyaku" // 百人一首 - _ "github.com/FloatTech/ZeroBot-Plugin/plugin/image_finder" // 关键字搜图 + _ "github.com/FloatTech/ZeroBot-Plugin/plugin/imgfinder" // 关键字搜图 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/inject" // 注入指令 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/jandan" // 煎蛋网无聊图 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/jiami" // 兽语加密 @@ -112,14 +112,14 @@ import ( _ "github.com/FloatTech/ZeroBot-Plugin/plugin/midicreate" // 简易midi音乐制作 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/moegoe" // 日韩 VITS 模型拟声 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/moyu" // 摸鱼 - _ "github.com/FloatTech/ZeroBot-Plugin/plugin/moyu_calendar" // 摸鱼人日历 + _ "github.com/FloatTech/ZeroBot-Plugin/plugin/moyucalendar" // 摸鱼人日历 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/music" // 点歌 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/nativesetu" // 本地涩图 - _ "github.com/FloatTech/ZeroBot-Plugin/plugin/nativewife" // 本地老婆 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/nbnhhsh" // 拼音首字母缩写释义工具 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/nihongo" // 日语语法学习 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/novel" // 铅笔小说网搜索 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/nsfw" // nsfw图片识别 + _ "github.com/FloatTech/ZeroBot-Plugin/plugin/nwife" // 本地老婆 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/omikuji" // 浅草寺求签 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/qqwife" // 一群一天一夫一妻制群老婆 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/quan" // QQ权重查询 @@ -139,16 +139,16 @@ import ( _ "github.com/FloatTech/ZeroBot-Plugin/plugin/tracemoe" // 搜番 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/translation" // 翻译 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/vitsnyaru" // vits猫雷 - _ "github.com/FloatTech/ZeroBot-Plugin/plugin/vtb_quotation" // vtb语录 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/vtbmusic" // vtb点歌 + _ "github.com/FloatTech/ZeroBot-Plugin/plugin/vtbquotation" // vtb语录 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/wallet" // 钱包 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/wangyiyun" // 网易云音乐热评 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/wantquotes" // 据意查句 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/warframeapi" // warframeAPI插件 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/wenben" // 文本指令大全 - _ "github.com/FloatTech/ZeroBot-Plugin/plugin/wenxinAI" // 百度文心AI画图 + _ "github.com/FloatTech/ZeroBot-Plugin/plugin/wenxinvilg" // 百度文心AI画图 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/wife" // 抽老婆 - _ "github.com/FloatTech/ZeroBot-Plugin/plugin/word_count" // 聊天热词 + _ "github.com/FloatTech/ZeroBot-Plugin/plugin/wordcount" // 聊天热词 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/wordle" // 猜单词 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/ygo" // 游戏王相关插件 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/ymgal" // 月幕galgame diff --git a/plugin/ahsai/ahsai.go b/plugin/ahsai/ahsai.go index 73d6df91..697cf295 100644 --- a/plugin/ahsai/ahsai.go +++ b/plugin/ahsai/ahsai.go @@ -27,7 +27,7 @@ var ( ) func init() { - engine := control.Register("ahsai", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "フリーテキスト音声合成", Help: "- 使[伊織弓鶴|紲星あかり|結月ゆかり|京町セイカ|東北きりたん|東北イタコ|ついなちゃん標準語|ついなちゃん関西弁|音街ウナ|琴葉茜|吉田くん|民安ともえ|桜乃そら|月読アイ|琴葉葵|東北ずん子|月読ショウタ|水奈瀬コウ]说(日语)", diff --git a/plugin/ai_false/ai_false.go b/plugin/aifalse/main.go similarity index 99% rename from plugin/ai_false/ai_false.go rename to plugin/aifalse/main.go index 230ebfae..0ed7ba5e 100644 --- a/plugin/ai_false/ai_false.go +++ b/plugin/aifalse/main.go @@ -51,7 +51,7 @@ var ( ) func init() { // 插件主体 - engine := control.Register("aifalse", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "自检, 全局限速", Help: "- 查询计算机当前活跃度: [检查身体 | 自检 | 启动自检 | 系统状态]\n" + diff --git a/plugin/aipaint/aipaint.go b/plugin/aipaint/aipaint.go index e6771bd1..6e370a64 100644 --- a/plugin/aipaint/aipaint.go +++ b/plugin/aipaint/aipaint.go @@ -46,7 +46,7 @@ func (r *result) String() string { } func init() { // 插件主体 - engine := control.Register("aipaint", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "ai绘图", Help: "- [ ai绘图 | 生成色图 | 生成涩图 | ai画图 ] xxx\n" + diff --git a/plugin/aiwife/non-existent.go b/plugin/aiwife/non-existent.go index 1de27467..e4b89490 100644 --- a/plugin/aiwife/non-existent.go +++ b/plugin/aiwife/non-existent.go @@ -17,7 +17,7 @@ const ( ) func init() { // 插件主体 - control.Register("aiwife", &ctrl.Options[*zero.Ctx]{ + control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "ai随机生成老婆", Help: "- waifu | 随机waifu", diff --git a/plugin/alipayvoice/alipayvoice.go b/plugin/alipayvoice/alipayvoice.go index 18a27c2c..dad75146 100644 --- a/plugin/alipayvoice/alipayvoice.go +++ b/plugin/alipayvoice/alipayvoice.go @@ -16,7 +16,7 @@ const ( ) func init() { // 插件主体 - engine := control.Register("alipayvoice", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "支付宝到账语音", Help: "- 支付宝到账 1", diff --git a/plugin/antiabuse/anti.go b/plugin/antiabuse/anti.go index c9f19bd1..b4ba459f 100644 --- a/plugin/antiabuse/anti.go +++ b/plugin/antiabuse/anti.go @@ -38,7 +38,7 @@ func onDel(uid int64, _ struct{}) { } func init() { - engine := control.Register("antiabuse", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "违禁词检测", Help: "- /[添加|删除|查看]违禁词", diff --git a/plugin/atri/atri.go b/plugin/atri/atri.go index 0b533113..cb0fcfff 100644 --- a/plugin/atri/atri.go +++ b/plugin/atri/atri.go @@ -48,7 +48,7 @@ func isAtriSleeping(*zero.Ctx) bool { } func init() { // 插件主体 - engine := control.Register("atri", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "atri人格文本回复", Help: "本插件基于 ATRI ，为 Golang 移植版\n" + diff --git a/plugin/autowithdraw/main.go b/plugin/autowithdraw/main.go index 1960b33e..89e532b9 100644 --- a/plugin/autowithdraw/main.go +++ b/plugin/autowithdraw/main.go @@ -10,7 +10,7 @@ import ( ) func init() { - control.Register("autowithdraw", &ctrl.Options[*zero.Ctx]{ + control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "触发者撤回时也自动撤回", Help: "- 撤回一条消息\n", diff --git a/plugin/baidu/search.go b/plugin/baidu/search.go index 4942d24d..3b44544a 100644 --- a/plugin/baidu/search.go +++ b/plugin/baidu/search.go @@ -27,7 +27,7 @@ type result struct { } func init() { // 主函数 - en := control.Register("baidu", &ctrl.Options[*zero.Ctx]{ + en := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Help: "百科\n" + "- 百度/百科/维基/wiki[关键字]", diff --git a/plugin/baiduaudit/audit.go b/plugin/baiduaudit/audit.go index 6827ad7d..da62d48f 100644 --- a/plugin/baiduaudit/audit.go +++ b/plugin/baiduaudit/audit.go @@ -34,7 +34,7 @@ var ( ) func init() { - engine := control.Register("baiduaudit", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "百度内容审核", Help: "##该功能来自百度内容审核, 需购买相关服务, 并创建app##\n" + diff --git a/plugin/b14/main.go b/plugin/base16384/main.go similarity index 97% rename from plugin/b14/main.go rename to plugin/base16384/main.go index bce15ad0..ac8a9c91 100644 --- a/plugin/b14/main.go +++ b/plugin/base16384/main.go @@ -12,7 +12,7 @@ import ( ) func init() { - en := control.Register("base16384", &ctrl.Options[*zero.Ctx]{ + en := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "base16384加解密", Help: "- 加密xxx\n- 解密xxx\n- 用yyy加密xxx\n- 用yyy解密xxx", diff --git a/plugin/base64gua/main.go b/plugin/base64gua/main.go index 833bdf02..2e99c0e8 100644 --- a/plugin/base64gua/main.go +++ b/plugin/base64gua/main.go @@ -12,7 +12,7 @@ import ( ) func init() { - en := control.Register("base64gua", &ctrl.Options[*zero.Ctx]{ + en := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "六十四卦加解密", Help: "- 六十四卦加密xxx\n- 六十四卦解密xxx\n- 六十四卦用yyy加密xxx\n- 六十四卦用yyy解密xxx", diff --git a/plugin/baseamasiro/main.go b/plugin/baseamasiro/main.go index 951f12a0..e160247d 100644 --- a/plugin/baseamasiro/main.go +++ b/plugin/baseamasiro/main.go @@ -12,7 +12,7 @@ import ( ) func init() { - en := control.Register("baseamasiro", &ctrl.Options[*zero.Ctx]{ + en := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "天城文加解密", Help: "- 天城文加密xxx\n- 天城文解密xxx\n- 天城文用yyy加密xxx\n- 天城文用yyy解密xxx", diff --git a/plugin/bilibili/bilibili.go b/plugin/bilibili/bilibili.go index 60250b2d..9451dffe 100644 --- a/plugin/bilibili/bilibili.go +++ b/plugin/bilibili/bilibili.go @@ -48,7 +48,7 @@ var ( // 查成分的 func init() { - engine := control.Register("bilibili", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "b站查成分查弹幕", Help: "- >vup info [xxx]\n" + diff --git a/plugin/book_review/book_review.go b/plugin/bookreview/book_review.go similarity index 97% rename from plugin/book_review/book_review.go rename to plugin/bookreview/book_review.go index 47ba6752..7336f68c 100644 --- a/plugin/book_review/book_review.go +++ b/plugin/bookreview/book_review.go @@ -16,7 +16,7 @@ import ( ) func init() { - engine := control.Register("bookreview", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "哀伤雪刃推书书评", Help: "- 书评[xxx]\n- 随机书评", diff --git a/plugin/book_review/model.go b/plugin/bookreview/model.go similarity index 100% rename from plugin/book_review/model.go rename to plugin/bookreview/model.go diff --git a/plugin/breakrepeat/breakrepeat.go b/plugin/breakrepeat/breakrepeat.go index f5e85dab..13326949 100644 --- a/plugin/breakrepeat/breakrepeat.go +++ b/plugin/breakrepeat/breakrepeat.go @@ -16,7 +16,7 @@ const throttle = 3 // 不可超过 9 var sm syncx.Map[int64, string] func init() { - engine := control.Register("breakrepeat", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "打断复读", Help: "- 打断" + strconv.Itoa(throttle) + "次以上复读\n", diff --git a/plugin/cangtoushi/cangtoushi.go b/plugin/cangtoushi/cangtoushi.go index b0793f88..74e5455a 100644 --- a/plugin/cangtoushi/cangtoushi.go +++ b/plugin/cangtoushi/cangtoushi.go @@ -30,7 +30,7 @@ var ( ) func init() { - engine := control.Register("cangtoushi", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "藏头诗, 藏尾诗", Help: "- 藏头诗[xxx]\n- 藏尾诗[xxx]", diff --git a/plugin/chat/chat.go b/plugin/chat/chat.go index dc159d5e..205a9af7 100644 --- a/plugin/chat/chat.go +++ b/plugin/chat/chat.go @@ -15,7 +15,7 @@ import ( var ( poke = rate.NewManager[int64](time.Minute*5, 8) // 戳一戳 - engine = control.Register("chat", &ctrl.Options[*zero.Ctx]{ + engine = control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "基础反应, 群空调", Help: "chat\n- [BOT名字]\n- [戳一戳BOT]\n- 空调开\n- 空调关\n- 群温度\n- 设置温度[正整数]", diff --git a/plugin/chess/chess.go b/plugin/chess/chess.go index ec4552c1..9ae65c60 100644 --- a/plugin/chess/chess.go +++ b/plugin/chess/chess.go @@ -30,7 +30,7 @@ const helpString = `- 参与/创建一盘游戏：「下棋」(chess) var ( limit = ctxext.NewLimiterManager(time.Microsecond*2500, 1) tempFileDir string - engine = control.Register("chess", &ctrl.Options[*zero.Ctx]{ + engine = control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "国际象棋", Help: helpString, diff --git a/plugin/choose/choose.go b/plugin/choose/choose.go index 36fe4a91..7ec2a714 100644 --- a/plugin/choose/choose.go +++ b/plugin/choose/choose.go @@ -13,7 +13,7 @@ import ( ) func init() { - engine := control.Register("choose", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "选择困难症帮手", Help: "例: 选择可口可乐还是百事可乐\n" + diff --git a/plugin/chouxianghua/chouxianghua.go b/plugin/chouxianghua/chouxianghua.go index e4d7ae80..c7e07105 100644 --- a/plugin/chouxianghua/chouxianghua.go +++ b/plugin/chouxianghua/chouxianghua.go @@ -14,7 +14,7 @@ import ( ) func init() { - en := control.Register("chouxianghua", &ctrl.Options[*zero.Ctx]{ + en := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "翻译为抽象话", Help: "- 抽象翻译xxx", diff --git a/plugin/chrev/init.go b/plugin/chrev/init.go index 605788a8..8b0bb1f1 100644 --- a/plugin/chrev/init.go +++ b/plugin/chrev/init.go @@ -12,7 +12,7 @@ import ( func init() { // 初始化engine - engine := control.Register("chrev", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "英文字符翻转", Help: "例: 翻转 I love you", diff --git a/plugin/coser/coser.go b/plugin/coser/coser.go index 73b87ed2..201099d6 100644 --- a/plugin/coser/coser.go +++ b/plugin/coser/coser.go @@ -53,7 +53,7 @@ func init() { if err != nil { panic(err) } - control.Register("coser", &ctrl.Options[*zero.Ctx]{ + control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "三次元coser", Help: "- coser", diff --git a/plugin/cpstory/cpstory.go b/plugin/cpstory/cpstory.go index e44327de..1d38ad97 100644 --- a/plugin/cpstory/cpstory.go +++ b/plugin/cpstory/cpstory.go @@ -16,7 +16,7 @@ import ( ) func init() { - engine := control.Register("cpstory", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "cp短打", // 这里也许有更好的名字 Help: "- 组cp[@xxx][@xxx]\n- 磕cp大老师 雪乃", diff --git a/plugin/curse/curse.go b/plugin/curse/curse.go index 7116f1e4..e0761d03 100644 --- a/plugin/curse/curse.go +++ b/plugin/curse/curse.go @@ -21,7 +21,7 @@ const ( ) func init() { - engine := control.Register("curse", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: true, Brief: "骂人反击", Help: "- 骂我\n- 大力骂我", diff --git a/plugin/dailynews/dailynews.go b/plugin/dailynews/dailynews.go index 3ed761c2..a36b635d 100644 --- a/plugin/dailynews/dailynews.go +++ b/plugin/dailynews/dailynews.go @@ -14,7 +14,7 @@ import ( const api = "http://dwz.2xb.cn/zaob" func init() { - engine := control.Register("dailynews", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "今日早报", Help: "- 今日早报", diff --git a/plugin/danbooru/main.go b/plugin/danbooru/main.go index bf9d947e..3fab22af 100644 --- a/plugin/danbooru/main.go +++ b/plugin/danbooru/main.go @@ -17,7 +17,7 @@ import ( ) func init() { // 插件主体 - engine := control.Register("danbooru", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "二次元图片标签识别", Help: "- 鉴赏图片[图片]", diff --git a/plugin/diana/bing.go b/plugin/diana/bing.go index fd7ff5a4..9343a6df 100644 --- a/plugin/diana/bing.go +++ b/plugin/diana/bing.go @@ -12,7 +12,7 @@ import ( "github.com/FloatTech/ZeroBot-Plugin/plugin/diana/data" ) -var engine = control.Register("diana", &ctrl.Options[*zero.Ctx]{ +var engine = control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "嘉然相关", // 也许使用常用功能当Brief更好 Help: "- 小作文\n" + diff --git a/plugin/dish/dish.go b/plugin/dish/dish.go index c3cccccf..d6b5e2b0 100644 --- a/plugin/dish/dish.go +++ b/plugin/dish/dish.go @@ -30,7 +30,7 @@ var ( ) func init() { - en := control.Register("dish", &ctrl.Options[*zero.Ctx]{ + en := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "程序员做饭指南", Help: "-怎么做[xxx]|烹饪[xxx]|随机菜谱|随便做点菜", diff --git a/plugin/drawlots/main.go b/plugin/drawlots/main.go index 9154629e..8f3a6ad2 100644 --- a/plugin/drawlots/main.go +++ b/plugin/drawlots/main.go @@ -40,7 +40,7 @@ var ( } return lotsList }() - en = control.Register("drawlots", &ctrl.Options[*zero.Ctx]{ + en = control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "多功能抽签", Help: "支持图包文件夹和gif抽签\n" + diff --git a/plugin/dress/dress.go b/plugin/dress/dress.go index e9b22f62..d8f7407b 100644 --- a/plugin/dress/dress.go +++ b/plugin/dress/dress.go @@ -18,7 +18,7 @@ import ( ) func init() { // 插件主体 - engine := control.Register("dress", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "女装", Help: "女装\n" + diff --git a/plugin/drift_bottle/main.go b/plugin/driftbottle/main.go similarity index 98% rename from plugin/drift_bottle/main.go rename to plugin/driftbottle/main.go index 1417f251..8aba986d 100644 --- a/plugin/drift_bottle/main.go +++ b/plugin/driftbottle/main.go @@ -33,7 +33,7 @@ var seaLocker sync.RWMutex // We need a container to inject what we need :( func init() { - en := control.Register("driftbottle", &ctrl.Options[*zero.Ctx]{ + en := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "漂流瓶", Help: "- @bot pick" + "- @bot throw xxx (xxx为投递内容)", diff --git a/plugin/emojimix/mix.go b/plugin/emojimix/mix.go index cb98bffa..eef35e72 100644 --- a/plugin/emojimix/mix.go +++ b/plugin/emojimix/mix.go @@ -17,7 +17,7 @@ import ( const bed = "https://www.gstatic.com/android/keyboard/emojikitchen/%d/u%x/u%x_u%x.png" func init() { - control.Register("emojimix", &ctrl.Options[*zero.Ctx]{ + control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "合成emoji", Help: "- [emoji][emoji]", diff --git a/plugin/event/event.go b/plugin/event/event.go index bc1cb508..bcf73923 100644 --- a/plugin/event/event.go +++ b/plugin/event/event.go @@ -15,7 +15,7 @@ import ( ) func init() { - engine := control.Register("event", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "好友申请和群聊邀请事件处理", Help: "- [开启|关闭]自动同意[申请|邀请|主人]\n" + diff --git a/plugin/font/main.go b/plugin/font/main.go index b3b2f61b..6c85e995 100644 --- a/plugin/font/main.go +++ b/plugin/font/main.go @@ -22,7 +22,7 @@ import ( ) func init() { - control.Register("font", &ctrl.Options[*zero.Ctx]{ + control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "渲染任意文字到图片", Help: "- (用[字体])渲染(抖动)文字xxx\n可选字体: [终末体|终末变体|紫罗兰体|樱酥体|Consolas体|粗苹方体|未来荧黑体|Gugi体|八丸体|Impact体|猫啃体|苹方体]", diff --git a/plugin/fortune/fortune.go b/plugin/fortune/fortune.go index 30f367e5..705f852d 100644 --- a/plugin/fortune/fortune.go +++ b/plugin/fortune/fortune.go @@ -48,7 +48,7 @@ var ( func init() { // 插件主体 - en := control.Register("fortune", &ctrl.Options[*zero.Ctx]{ + en := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "每日运势", Help: "- 运势 | 抽签\n" + diff --git a/plugin/funny/laugh.go b/plugin/funny/laugh.go index 86d28077..52de4b14 100644 --- a/plugin/funny/laugh.go +++ b/plugin/funny/laugh.go @@ -24,7 +24,7 @@ type joke struct { var db = &sql.Sqlite{} func init() { - en := control.Register("funny", &ctrl.Options[*zero.Ctx]{ + en := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "讲个笑话", Help: "- 讲个笑话[@xxx|qq号|人名] | 夸夸[@xxx|qq号|人名] ", diff --git a/plugin/genshin/ys.go b/plugin/genshin/ys.go index 63bd1bed..a2213a01 100644 --- a/plugin/genshin/ys.go +++ b/plugin/genshin/ys.go @@ -35,7 +35,7 @@ var ( ) func init() { - engine := control.Register("genshin", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "原神模拟抽卡", Help: "- 原神十连\n- 切换原神卡池", diff --git a/plugin/gif/run.go b/plugin/gif/run.go index cd278aea..bf9f036e 100644 --- a/plugin/gif/run.go +++ b/plugin/gif/run.go @@ -126,7 +126,7 @@ func init() { // 插件主体 for k := range cmdMap { cmd = append(cmd, k) } - en := control.Register("gif", &ctrl.Options[*zero.Ctx]{ + en := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "制图", Help: "下为制图命令:\n" + diff --git a/plugin/github/repo_searcher.go b/plugin/github/repo_searcher.go index 7f9f2842..9821c30e 100644 --- a/plugin/github/repo_searcher.go +++ b/plugin/github/repo_searcher.go @@ -18,7 +18,7 @@ import ( ) func init() { // 插件主体 - control.Register("github", &ctrl.Options[*zero.Ctx]{ + control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "GitHub仓库搜索", Help: "- >github [xxx]\n" + diff --git a/plugin/guessmusic/main.go b/plugin/guessmusic/main.go index fa1621bf..061a94b3 100644 --- a/plugin/guessmusic/main.go +++ b/plugin/guessmusic/main.go @@ -31,7 +31,7 @@ var ( // 用户数据 cfg config // 插件主体 - engine = control.Register("guessmusic", &ctrl.Options[*zero.Ctx]{ + engine = control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "猜歌插件", Help: "------bot主人指令------\n" + diff --git a/plugin/heisi/heisi.go b/plugin/heisi/heisi.go index 7da43956..3d9b5548 100644 --- a/plugin/heisi/heisi.go +++ b/plugin/heisi/heisi.go @@ -66,7 +66,7 @@ func init() { // 插件主体 panic(err) } - engine := control.Register("heisi", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "黑丝", Help: "- 来点黑丝\n- 来点白丝\n- 来点jk\n- 来点巨乳\n- 来点足控\n- 来点网红", diff --git a/plugin/hitokoto/hitokoto.go b/plugin/hitokoto/hitokoto.go index c08c2f5f..a8001e64 100644 --- a/plugin/hitokoto/hitokoto.go +++ b/plugin/hitokoto/hitokoto.go @@ -18,7 +18,7 @@ import ( ) func init() { // 插件主体 - engine := control.Register("hitokoto", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "一言", Help: "- 一言[xxx]\n" + diff --git a/plugin/hs/run.go b/plugin/hs/run.go index efd48111..f61af21d 100644 --- a/plugin/hs/run.go +++ b/plugin/hs/run.go @@ -41,7 +41,7 @@ const ( ) func init() { - engine := control.Register("hs", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "炉石搜卡", Help: "- 搜卡[xxxx]\n" + diff --git a/plugin/hyaku/main.go b/plugin/hyaku/main.go index 6ba4ae41..7c7c3199 100644 --- a/plugin/hyaku/main.go +++ b/plugin/hyaku/main.go @@ -51,7 +51,7 @@ func (l *line) String() string { var lines [100]*line func init() { - engine := control.Register("hyaku", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "百人一首", Help: "- 百人一首(随机发一首)\n" + diff --git a/plugin/image_finder/keyword.go b/plugin/imgfinder/keyword.go similarity index 98% rename from plugin/image_finder/keyword.go rename to plugin/imgfinder/keyword.go index d4bbd155..ce8b25a3 100644 --- a/plugin/image_finder/keyword.go +++ b/plugin/imgfinder/keyword.go @@ -62,7 +62,7 @@ type resultjson struct { var hrefre = regexp.MustCompile(``) func init() { - control.Register("imgfinder", &ctrl.Options[*zero.Ctx]{ + control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "关键字搜图", Help: "- 来张 [xxx]", diff --git a/plugin/inject/main.go b/plugin/inject/main.go index 43055bef..7e422dad 100644 --- a/plugin/inject/main.go +++ b/plugin/inject/main.go @@ -9,7 +9,7 @@ import ( ) func init() { - en := control.Register("inject", &ctrl.Options[*zero.Ctx]{ + en := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "注入指令", Help: "- run[CQ码]", diff --git a/plugin/jandan/jandan.go b/plugin/jandan/jandan.go index 3c54cfbe..873f98b1 100644 --- a/plugin/jandan/jandan.go +++ b/plugin/jandan/jandan.go @@ -23,7 +23,7 @@ const ( ) func init() { - engine := control.Register("jandan", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "煎蛋网无聊图", Help: "- 来份[屌|弔|吊]图\n- 更新[屌|弔|吊]图\n", diff --git a/plugin/jiami/jiami.go b/plugin/jiami/jiami.go index 9849054c..4cb05b96 100644 --- a/plugin/jiami/jiami.go +++ b/plugin/jiami/jiami.go @@ -25,7 +25,7 @@ type nmd struct { // struct解析格式大概是 } func init() { // 主函数 - en := control.Register("jiami", &ctrl.Options[*zero.Ctx]{ + en := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "兽语加解密", Help: "兽语加解密\n" + diff --git a/plugin/jptingroom/jptingroom.go b/plugin/jptingroom/jptingroom.go index a901a2e3..611b184c 100644 --- a/plugin/jptingroom/jptingroom.go +++ b/plugin/jptingroom/jptingroom.go @@ -15,7 +15,7 @@ import ( ) func init() { // 插件主体 - engine := control.Register("jptingroom", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "日语听力学习材料", Help: "- 随机日语听力\n" + diff --git a/plugin/juejuezi/juejuezi.go b/plugin/juejuezi/juejuezi.go index e651e59e..d701991d 100644 --- a/plugin/juejuezi/juejuezi.go +++ b/plugin/juejuezi/juejuezi.go @@ -23,7 +23,7 @@ const ( ) func init() { - control.Register("juejuezi", &ctrl.Options[*zero.Ctx]{ + control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "绝绝子生成器", Help: "例: 喝奶茶绝绝子\n绝绝子吃饭", diff --git a/plugin/kfccrazythursday/kfccrazythursday.go b/plugin/kfccrazythursday/kfccrazythursday.go index e7f071ff..22faee50 100644 --- a/plugin/kfccrazythursday/kfccrazythursday.go +++ b/plugin/kfccrazythursday/kfccrazythursday.go @@ -15,7 +15,7 @@ const ( ) func init() { - engine := control.Register("kfccrazythursday", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "疯狂星期四", Help: "疯狂星期四\n", diff --git a/plugin/lolicon/lolicon.go b/plugin/lolicon/lolicon.go index cf956f7e..516a4ca3 100644 --- a/plugin/lolicon/lolicon.go +++ b/plugin/lolicon/lolicon.go @@ -32,7 +32,7 @@ var ( ) func init() { - en := control.Register("lolicon", &ctrl.Options[*zero.Ctx]{ + en := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "随机图片", Help: "- 随机图片\n" + diff --git a/plugin/magicprompt/magicprompt.go b/plugin/magicprompt/magicprompt.go index 1f0d4d32..d0901984 100644 --- a/plugin/magicprompt/magicprompt.go +++ b/plugin/magicprompt/magicprompt.go @@ -23,7 +23,7 @@ const ( ) func init() { // 插件主体 - engine := control.Register("magicprompt", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "MagicPrompt-Stable-Diffusion吟唱提示", Help: "- 吟唱提示 xxx", diff --git a/plugin/manager/manager.go b/plugin/manager/manager.go index a159781f..d4dcec52 100644 --- a/plugin/manager/manager.go +++ b/plugin/manager/manager.go @@ -64,7 +64,7 @@ var ( ) func init() { // 插件主体 - engine := control.Register("manager", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "群管插件", Help: hint, diff --git a/plugin/midicreate/midicreate.go b/plugin/midicreate/midicreate.go index 0e6f5eb6..73cf1acf 100644 --- a/plugin/midicreate/midicreate.go +++ b/plugin/midicreate/midicreate.go @@ -28,7 +28,7 @@ import ( ) func init() { - engine := control.Register("midicreate", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "midi音乐制作", Help: "- midi制作 CCGGAAGR FFEEDDCR GGFFEEDR GGFFEEDR CCGGAAGR FFEEDDCR\n" + diff --git a/plugin/moegoe/main.go b/plugin/moegoe/main.go index 68c0f123..5b43f177 100644 --- a/plugin/moegoe/main.go +++ b/plugin/moegoe/main.go @@ -31,7 +31,7 @@ var speakers = map[string]uint{ var 原 = newapikeystore("./data/tts/o.txt") func init() { - en := control.Register("moegoe", &ctrl.Options[*zero.Ctx]{ + en := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "日韩中 VITS 模型拟声", Help: "- 让[宁宁|爱瑠|芳乃|茉子|丛雨|小春|七海]说(日语)\n" + diff --git a/plugin/moyu/holiday_test.go b/plugin/moyu/holiday_test.go index 529b311c..013dd522 100644 --- a/plugin/moyu/holiday_test.go +++ b/plugin/moyu/holiday_test.go @@ -23,31 +23,31 @@ func TestSetHoliday(t *testing.T) { t.Fatal(err) } - err = SetHoliday("元旦", 1, 2023, 1, 1) + err = SetHoliday("元旦", 1, 2024, 1, 1) if err != nil { t.Fatal(err) } - err = SetHoliday("春节", 7, 2023, 1, 21) + err = SetHoliday("春节", 7, 2024, 2, 10) if err != nil { t.Fatal(err) } - err = SetHoliday("清明节", 1, 2023, 4, 5) + err = SetHoliday("清明节", 1, 2024, 4, 5) if err != nil { t.Fatal(err) } - err = SetHoliday("劳动节", 1, 2023, 5, 1) + err = SetHoliday("劳动节", 1, 2024, 5, 1) if err != nil { t.Fatal(err) } - err = SetHoliday("端午节", 1, 2023, 6, 22) + err = SetHoliday("端午节", 1, 2023, 6, 10) if err != nil { t.Fatal(err) } - err = SetHoliday("中秋节", 1, 2023, 9, 29) + err = SetHoliday("中秋节", 2, 2023, 9, 29) if err != nil { t.Fatal(err) } - err = SetHoliday("国庆节", 7, 2023, 10, 1) + err = SetHoliday("国庆节", 6, 2023, 10, 1) if err != nil { t.Fatal(err) } diff --git a/plugin/moyu/run.go b/plugin/moyu/run.go index 1783c982..bed95ceb 100644 --- a/plugin/moyu/run.go +++ b/plugin/moyu/run.go @@ -18,7 +18,7 @@ var ( ) func init() { // 插件主体 - control.Register("moyu", &ctrl.Options[*zero.Ctx]{ + control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: true, Brief: "摸鱼提醒", Help: "- /启用 moyu\n" + diff --git a/plugin/moyu_calendar/calendar.go b/plugin/moyucalendar/calendar.go similarity index 92% rename from plugin/moyu_calendar/calendar.go rename to plugin/moyucalendar/calendar.go index 9c37be28..b9dc68a5 100644 --- a/plugin/moyu_calendar/calendar.go +++ b/plugin/moyucalendar/calendar.go @@ -10,7 +10,7 @@ import ( ) func init() { - control.Register("moyucalendar", &ctrl.Options[*zero.Ctx]{ + control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: true, Brief: "摸鱼人日历", Help: "- /启用 moyucalendar\n" + diff --git a/plugin/music/selecter.go b/plugin/music/selecter.go index 71333457..d4b40a93 100644 --- a/plugin/music/selecter.go +++ b/plugin/music/selecter.go @@ -22,7 +22,7 @@ import ( ) func init() { - control.Register("music", &ctrl.Options[*zero.Ctx]{ + control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "点歌", Help: "- 点歌[xxx]\n" + diff --git a/plugin/nativesetu/main.go b/plugin/nativesetu/main.go index 6e7ef679..3f98341b 100644 --- a/plugin/nativesetu/main.go +++ b/plugin/nativesetu/main.go @@ -23,7 +23,7 @@ var ( ) func init() { - engine := control.Register("nativesetu", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "本地涩图", Help: "- 本地[xxx]\n" + diff --git a/plugin/nbnhhsh/nbnhhsh.go b/plugin/nbnhhsh/nbnhhsh.go index 12ef8dda..f12f931e 100644 --- a/plugin/nbnhhsh/nbnhhsh.go +++ b/plugin/nbnhhsh/nbnhhsh.go @@ -15,7 +15,7 @@ import ( ) func init() { - control.Register("nbnhhsh", &ctrl.Options[*zero.Ctx]{ + control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "拼音首字母释义工具", Help: "- ?? [缩写]", diff --git a/plugin/nihongo/nihongo.go b/plugin/nihongo/nihongo.go index 842c8568..45326251 100644 --- a/plugin/nihongo/nihongo.go +++ b/plugin/nihongo/nihongo.go @@ -15,7 +15,7 @@ import ( ) func init() { - engine := control.Register("nihongo", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "日语学习", Help: "- 日语语法[xxx](使用tag随机)\n" + diff --git a/plugin/novel/qianbi.go b/plugin/novel/qianbi.go index 964b9c8a..f5223e0c 100644 --- a/plugin/novel/qianbi.go +++ b/plugin/novel/qianbi.go @@ -48,7 +48,7 @@ var ( ) func init() { - engine := control.Register("novel", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Extra: control.ExtraFromString("novel"), Brief: "铅笔小说网搜索", diff --git a/plugin/nsfw/main.go b/plugin/nsfw/main.go index 1c76929f..703619e3 100644 --- a/plugin/nsfw/main.go +++ b/plugin/nsfw/main.go @@ -14,7 +14,7 @@ import ( const hso = "https://gchat.qpic.cn/gchatpic_new//--4234EDEC5F147A4C319A41149D7E0EA9/0" func init() { - engine := control.Register("nsfw", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "nsfw图片识别", Help: "- nsfw打分[图片]", @@ -33,7 +33,7 @@ func init() { ctx.Send(message.ReplyWithMessage(ctx.Event.MessageID, message.Text(judge(p)))) } }) - control.Register("nsfwauto", &ctrl.Options[*zero.Ctx]{ + control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: true, Brief: "nsfw图片自动识别", Help: "- 当图片属于非 neutral 类别时自动发送评价", diff --git a/plugin/nativewife/main.go b/plugin/nwife/main.go similarity index 98% rename from plugin/nativewife/main.go rename to plugin/nwife/main.go index f54fd5cb..79bade41 100644 --- a/plugin/nativewife/main.go +++ b/plugin/nwife/main.go @@ -23,7 +23,7 @@ import ( ) func init() { - engine := control.Register("nwife", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "本地老婆", Help: "- 抽wife[@xxx]\n- 添加wife[名字][图片]\n- 删除wife[名字]\n- [让 | 不让]所有人均可添加wife", diff --git a/plugin/omikuji/sensou.go b/plugin/omikuji/sensou.go index 0fd84a6a..daa4dbec 100644 --- a/plugin/omikuji/sensou.go +++ b/plugin/omikuji/sensou.go @@ -20,7 +20,7 @@ import ( const bed = "https://gitcode.net/u011570312/senso-ji-omikuji/-/raw/main/" func init() { // 插件主体 - engine := control.Register("omikuji", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "浅草寺求签", Help: "- 求签 | 占卜\n- 解签", diff --git a/plugin/qqwife/command.go b/plugin/qqwife/command.go index bfc1696f..6915272b 100644 --- a/plugin/qqwife/command.go +++ b/plugin/qqwife/command.go @@ -56,7 +56,7 @@ var ( 民政局 = &婚姻登记{ db: &sql.Sqlite{}, } - engine = control.Register("qqwife", &ctrl.Options[*zero.Ctx]{ + engine = control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "一群一天一夫一妻制群老婆", Help: "- 娶群友\n- 群老婆列表\n- [允许|禁止]自由恋爱\n- [允许|禁止]牛头人\n- 设置CD为xx小时 →(默认12小时)\n- 重置花名册\n- 重置所有花名册(用于清除所有群数据及其设置)\n- 查好感度[对方Q号|@对方QQ]\n- 好感度列表\n- 好感度数据整理 (当好感度列表出现重复名字时使用)\n" + diff --git a/plugin/quan/quan.go b/plugin/quan/quan.go index 07271ddb..9cd35ede 100644 --- a/plugin/quan/quan.go +++ b/plugin/quan/quan.go @@ -24,7 +24,7 @@ type result struct { } func init() { // 主函数 - en := control.Register("quan", &ctrl.Options[*zero.Ctx]{ + en := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "QQ权重查询", Help: "权重查询方式\n" + diff --git a/plugin/qzone/qzone.go b/plugin/qzone/qzone.go index e6942b38..166ebd56 100644 --- a/plugin/qzone/qzone.go +++ b/plugin/qzone/qzone.go @@ -36,7 +36,7 @@ const ( ) func init() { - engine := control.Register("qzone", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "QQ空间表白墙", Help: "- 登录QQ空间 (Cookie过期很快, 要经常登录)\n" + diff --git a/plugin/realcugan/realcugan.go b/plugin/realcugan/realcugan.go index 0c3f65d5..65b94557 100644 --- a/plugin/realcugan/realcugan.go +++ b/plugin/realcugan/realcugan.go @@ -24,7 +24,7 @@ const ( ) func init() { // 插件主体 - engine := control.Register("realcugan", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "Real-CUGAN清晰术", Help: "- 清晰术(双重吟唱|三重吟唱|四重吟唱)(强力术式|中等术式|弱术式|不变式|原式)[图片]", diff --git a/plugin/reborn/main.go b/plugin/reborn/main.go index cdfba310..222da370 100644 --- a/plugin/reborn/main.go +++ b/plugin/reborn/main.go @@ -15,7 +15,7 @@ import ( ) func init() { - en := control.Register("reborn", &ctrl.Options[*zero.Ctx]{ + en := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "投胎模拟器", Help: "- reborn", diff --git a/plugin/runcode/code_runner.go b/plugin/runcode/code_runner.go index 359e70c6..944889f5 100644 --- a/plugin/runcode/code_runner.go +++ b/plugin/runcode/code_runner.go @@ -15,7 +15,7 @@ import ( var ro = runoob.NewRunOOB("066417defb80d038228de76ec581a50a") func init() { - control.Register("runcode", &ctrl.Options[*zero.Ctx]{ + control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "在线代码运行", Help: ">runcode [language] [code block]\n" + diff --git a/plugin/saucenao/searcher.go b/plugin/saucenao/searcher.go index e51b692d..843a16eb 100644 --- a/plugin/saucenao/searcher.go +++ b/plugin/saucenao/searcher.go @@ -29,7 +29,7 @@ var ( ) func init() { // 插件主体 - engine := control.Register("saucenao", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "以图搜图", Help: "- 以图搜图 | 搜索图片 | 以图识图[图片]\n" + diff --git a/plugin/scale/main.go b/plugin/scale/main.go index e22eab90..12fa6fe8 100644 --- a/plugin/scale/main.go +++ b/plugin/scale/main.go @@ -31,7 +31,7 @@ import ( ) func init() { - engine := control.Register("scale", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "二次元图片放大", Help: "- 放大图片[图片]", diff --git a/plugin/score/sign_in.go b/plugin/score/sign_in.go index 17185d44..61303a00 100644 --- a/plugin/score/sign_in.go +++ b/plugin/score/sign_in.go @@ -35,7 +35,7 @@ const ( var ( rankArray = [...]int{0, 10, 20, 50, 100, 200, 350, 550, 750, 1000, 1200} - engine = control.Register("score", &ctrl.Options[*zero.Ctx]{ + engine = control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "签到", Help: "- 签到\n- 获得签到背景[@xxx] | 获得签到背景\n- 设置签到预设(0~3)\n- 查看等级排名\n注:为跨群排名\n- 查看我的钱包\n- 查看钱包排名\n注:为本群排行，若群人数太多不建议使用该功能!!!", diff --git a/plugin/setutime/setu_geter.go b/plugin/setutime/setu_geter.go index b78ab103..1e8eeeeb 100644 --- a/plugin/setutime/setu_geter.go +++ b/plugin/setutime/setu_geter.go @@ -52,7 +52,7 @@ var pool = &imgpool{ } func init() { // 插件主体 - engine := control.Register("setutime", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "涩图", Help: "- 来份[涩图/二次元/风景/车万]\n" + diff --git a/plugin/shadiao/shadiao.go b/plugin/shadiao/shadiao.go index a9b7ee46..66a83f0f 100644 --- a/plugin/shadiao/shadiao.go +++ b/plugin/shadiao/shadiao.go @@ -27,7 +27,7 @@ const ( ) var ( - engine = control.Register("shadiao", &ctrl.Options[*zero.Ctx]{ + engine = control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "沙雕app", // 也许可以更好 Help: "- 哄我\n- 渣我\n- 来碗绿茶\n- 发个朋友圈\n- 来碗毒鸡汤\n- 讲个段子\n- 马丁路德骂我\n", diff --git a/plugin/shindan/shindan.go b/plugin/shindan/shindan.go index 57d8d8ae..18c1844e 100644 --- a/plugin/shindan/shindan.go +++ b/plugin/shindan/shindan.go @@ -14,7 +14,7 @@ import ( ) func init() { - engine := control.Register("shindan", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "shindan测定", Help: "- 今天是什么少女[@xxx]\n" + diff --git a/plugin/sleep_manage/model.go b/plugin/sleepmanage/model.go similarity index 100% rename from plugin/sleep_manage/model.go rename to plugin/sleepmanage/model.go diff --git a/plugin/sleep_manage/sleep_manage.go b/plugin/sleepmanage/sleep_manage.go similarity index 97% rename from plugin/sleep_manage/sleep_manage.go rename to plugin/sleepmanage/sleep_manage.go index d7d5b2be..2f05f4ea 100644 --- a/plugin/sleep_manage/sleep_manage.go +++ b/plugin/sleepmanage/sleep_manage.go @@ -14,7 +14,7 @@ import ( ) func init() { - engine := control.Register("sleepmanage", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "睡眠小助手", Help: "- 早安\n- 晚安", diff --git a/plugin/steam/steam.go b/plugin/steam/steam.go index fe913fa7..457c01f4 100644 --- a/plugin/steam/steam.go +++ b/plugin/steam/steam.go @@ -17,7 +17,7 @@ import ( ) var ( - engine = control.Register("steam", &ctrl.Options[*zero.Ctx]{ + engine = control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Extra: control.ExtraFromString("steam"), Brief: "steam相关插件", diff --git a/plugin/tarot/tarot.go b/plugin/tarot/tarot.go index bb9a6c7e..442313b8 100644 --- a/plugin/tarot/tarot.go +++ b/plugin/tarot/tarot.go @@ -51,7 +51,7 @@ var ( ) func init() { - engine := control.Register("tarot", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "塔罗牌", Help: "- 抽[塔罗牌|大阿卡纳|小阿卡纳]\n" + diff --git a/plugin/thesaurus/chat.go b/plugin/thesaurus/chat.go index 1f75bcd4..99d0f849 100644 --- a/plugin/thesaurus/chat.go +++ b/plugin/thesaurus/chat.go @@ -26,7 +26,7 @@ import ( ) func init() { - engine := control.Register("thesaurus", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "词典匹配回复", Help: "- 切换[kimo|傲娇|可爱|🦙]词库\n- 设置词库触发概率0.x (0TL [好|good]", diff --git a/plugin/vitsnyaru/vitsnyaru.go b/plugin/vitsnyaru/vitsnyaru.go index a729e82d..709bc5b4 100644 --- a/plugin/vitsnyaru/vitsnyaru.go +++ b/plugin/vitsnyaru/vitsnyaru.go @@ -21,7 +21,7 @@ const ( ) func init() { // 插件主体 - engine := control.Register("vitsnyaru", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "vits猫雷", Help: "- 让猫雷说 xxx", diff --git a/plugin/vtbmusic/vtbmusic.go b/plugin/vtbmusic/vtbmusic.go index bbee2ab9..835ff567 100644 --- a/plugin/vtbmusic/vtbmusic.go +++ b/plugin/vtbmusic/vtbmusic.go @@ -95,7 +95,7 @@ type musicList struct { } func init() { // 插件主体 - engine := control.Register("vtbmusic", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "vtbmusic.com点歌", Help: "- vtb点歌\n" + diff --git a/plugin/vtb_quotation/model/model.go b/plugin/vtbquotation/model/model.go similarity index 100% rename from plugin/vtb_quotation/model/model.go rename to plugin/vtbquotation/model/model.go diff --git a/plugin/vtb_quotation/vtb_quotation.go b/plugin/vtbquotation/vtb_quotation.go similarity index 98% rename from plugin/vtb_quotation/vtb_quotation.go rename to plugin/vtbquotation/vtb_quotation.go index 8735c381..4aa3e6b7 100644 --- a/plugin/vtb_quotation/vtb_quotation.go +++ b/plugin/vtbquotation/vtb_quotation.go @@ -24,13 +24,13 @@ import ( "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/img/text" - "github.com/FloatTech/ZeroBot-Plugin/plugin/vtb_quotation/model" + "github.com/FloatTech/ZeroBot-Plugin/plugin/vtbquotation/model" ) var reg = regexp.MustCompile(".*/(.*)") func init() { - engine := control.Register("vtbquotation", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "vtb语录", Help: "- vtb语录\n- 随机vtb\n- 更新vtb\n来源: vtbkeyboard.moe", diff --git a/plugin/wallet/wallet.go b/plugin/wallet/wallet.go index e8c4898c..9791cf82 100644 --- a/plugin/wallet/wallet.go +++ b/plugin/wallet/wallet.go @@ -20,7 +20,7 @@ import ( ) func init() { - en := control.Register("wallet", &ctrl.Options[*zero.Ctx]{ + en := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "钱包", Help: "- 查看我的钱包\n- 查看钱包排名", diff --git a/plugin/wangyiyun/main.go b/plugin/wangyiyun/main.go index 9ea3f6f4..5c56d1d6 100644 --- a/plugin/wangyiyun/main.go +++ b/plugin/wangyiyun/main.go @@ -18,7 +18,7 @@ const ( ) func init() { - control.Register("wangyiyun", &ctrl.Options[*zero.Ctx]{ + control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "网易云热评", Help: "- 来份网易云热评", diff --git a/plugin/wantquotes/wantquotes.go b/plugin/wantquotes/wantquotes.go index 25cb0361..7c3662b9 100644 --- a/plugin/wantquotes/wantquotes.go +++ b/plugin/wantquotes/wantquotes.go @@ -60,7 +60,7 @@ type Quotes struct { } func init() { - engine := control.Register("wantquotes", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Extra: control.ExtraFromString("wantquotes"), Brief: "据意查句", diff --git a/plugin/warframeapi/main.go b/plugin/warframeapi/main.go index a28a5907..1fb04d4e 100644 --- a/plugin/warframeapi/main.go +++ b/plugin/warframeapi/main.go @@ -17,7 +17,7 @@ import ( ) func init() { - eng := control.Register("warframeapi", &ctrl.Options[*zero.Ctx]{ + eng := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "星际战甲", Help: "- wf时间同步\n" + diff --git a/plugin/wenben/wenben.go b/plugin/wenben/wenben.go index 273286f2..51f66405 100644 --- a/plugin/wenben/wenben.go +++ b/plugin/wenben/wenben.go @@ -30,7 +30,7 @@ type rspData struct { } func init() { // 主函数 - en := control.Register("wenben", &ctrl.Options[*zero.Ctx]{ + en := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "天气/拼音查询", Help: "文本命令大全\n" + diff --git a/plugin/wenxinAI/wenxinAI.go b/plugin/wenxinvilg/main.go similarity index 99% rename from plugin/wenxinAI/wenxinAI.go rename to plugin/wenxinvilg/main.go index 9f1c3790..701a7eb4 100644 --- a/plugin/wenxinAI/wenxinAI.go +++ b/plugin/wenxinvilg/main.go @@ -67,7 +67,7 @@ func init() { // 插件主体 defer process.GlobalInitMutex.Unlock() name = zero.BotConfig.NickName[0] }() - engine := control.Register("wenxinvilg", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "文心AI画图", Help: "基于百度文心的免费AI画图插件,\n因为是免费的,图片质量你懂的。\n" + diff --git a/plugin/wife/main.go b/plugin/wife/main.go index 1658f876..a353ee3a 100644 --- a/plugin/wife/main.go +++ b/plugin/wife/main.go @@ -16,7 +16,7 @@ import ( ) func init() { - engine := control.Register("wife", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Help: "- 抽老婆", Brief: "从老婆库抽每日老婆", diff --git a/plugin/word_count/word_count.go b/plugin/wordcount/main.go similarity index 98% rename from plugin/word_count/word_count.go rename to plugin/wordcount/main.go index 57b09dd9..bb91222d 100644 --- a/plugin/word_count/word_count.go +++ b/plugin/wordcount/main.go @@ -32,7 +32,7 @@ var ( ) func init() { - engine := control.Register("wordcount", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "聊天热词", Help: "- 热词 [群号] [消息数目]|热词 123456 1000", diff --git a/plugin/wordle/wordle.go b/plugin/wordle/wordle.go index f163e0ca..3a361584 100644 --- a/plugin/wordle/wordle.go +++ b/plugin/wordle/wordle.go @@ -61,7 +61,7 @@ type dictionary map[int]struct { var words = make(dictionary) func init() { - en := control.Register("wordle", &ctrl.Options[*zero.Ctx]{ + en := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "猜单词", Help: "- 个人猜单词\n" + diff --git a/plugin/wtf/main.go b/plugin/wtf/main.go index a3290d32..b24f1ab1 100644 --- a/plugin/wtf/main.go +++ b/plugin/wtf/main.go @@ -13,7 +13,7 @@ import ( ) func init() { - en := control.Register("wtf", &ctrl.Options[*zero.Ctx]{ + en := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "鬼东西", Help: "- 鬼东西列表\n- 查询鬼东西[序号][@xxx]", diff --git a/plugin/ymgal/ymgal.go b/plugin/ymgal/ymgal.go index 024e0a50..4b492a49 100644 --- a/plugin/ymgal/ymgal.go +++ b/plugin/ymgal/ymgal.go @@ -13,7 +13,7 @@ import ( ) func init() { - engine := control.Register("ymgal", &ctrl.Options[*zero.Ctx]{ + engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{ DisableOnDefault: false, Brief: "月慕galgame相关", Help: "- 随机galCG\n- 随机gal表情包\n- galCG[xxx]\n- gal表情包[xxx]\n- 更新gal",