From a2426de70cecca93367d886059abf1f8f9e2b5ff Mon Sep 17 00:00:00 2001 From: fumiama Date: Sat, 12 Feb 2022 23:38:45 +0800 Subject: [PATCH] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 3e4b0216b9f952b800e9be880acd744af3afe593 Merge: 970cb14 aaf832e Author: fumiama Date: Sat Feb 12 23:23:51 2022 +0800 Merge branch 'master' of https://github.com/MoYoez/ZeroBot-Plugin into MoYoez-master commit 970cb142256d4575b3e5170b9dfb9370f5802da5 Author: fumiama Date: Sat Feb 12 23:18:23 2022 +0800 ✨ 🐛 🔥 ⚡️ 🎨 fix: gif panic commit aaf832e3b50f62f119ded700bdd7bde5459a6d7a Author: MoeMagicMango Date: Sat Feb 12 21:06:21 2022 +0800 Update chat.go commit fae3458bcf806cbae9a2b8f691a2556082ec98ff Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat Feb 12 13:05:37 2022 +0000 🎨 改进代码样式 commit 610cae52299c8a3163dec3aeaa95ee2c76e3fb5f Author: MoeMagicMango Date: Sat Feb 12 21:05:08 2022 +0800 Update chat.go commit c445c61da52ab55eedf9c3f71481891f66799850 Author: MoeMagicMango Date: Sat Feb 12 20:58:57 2022 +0800 Delete data.go commit 70172f4d8bd0fb513680e5ff4c4333eba227cd4d Author: MoeMagicMango Date: Sat Feb 12 20:53:10 2022 +0800 换了个网易云音乐热评的API commit c8b4827e9184f211c9bee9ab252a3b4e1f23f2dd Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat Feb 12 12:50:57 2022 +0000 🎨 改进代码样式 commit a233586dfe4d3ef00fa7c23ec52f27653e51fc70 Author: MoeMagicMango Date: Sat Feb 12 20:50:21 2022 +0800 Update chat.go commit 87501f601124528bf3016745edf25d2abca1f6b3 Author: MoeMagicMango Date: Sat Feb 12 20:49:08 2022 +0800 Update data.go commit ecf641906507a84d0df8e09bba4e18034e170668 Author: MoeMagicMango Date: Sat Feb 12 20:48:14 2022 +0800 Update chat.go commit c3550503f0e2c55a3f1c9735722bc4efc94fb54a Author: MoeMagicMango Date: Sat Feb 12 20:47:47 2022 +0800 Delete plugin_purechat directory commit 1da3486d00a26ae287bffbb89b09096d5f064605 Author: MoeMagicMango Date: Sat Feb 12 20:46:34 2022 +0800 Add files via upload commit 34ed8c89fd87def3e76f03444ae6461563449348 Author: MoeMagicMango Date: Sat Feb 12 20:38:46 2022 +0800 Update main.go commit aa08eb012085cb3c78708857f5c0e7e06e6eaa41 Author: MoeMagicMango Date: Sat Feb 12 20:38:19 2022 +0800 修改过的回复 删掉了一些ex的词汇 commit faf198289f7e13e9d7302c673797eb281ab3c131 Author: MoeMagicMango Date: Sat Feb 12 20:29:59 2022 +0800 Update main.go commit 5ac3b7a7900bbc4d05659e111e817302a9061330 Author: MoeMagicMango Date: Sat Feb 12 20:28:48 2022 +0800 Update chat.go commit b046d45435ac47a595b8e375b86f0eaa8846b90e Author: MoeMagicMango Date: Sat Feb 12 20:25:23 2022 +0800 Rename purechat.go to chat.go commit 6bbcdfcd5825e4a5aa5bb8f70690694d20bcae7a Author: MoeMagicMango Date: Sat Feb 12 20:24:54 2022 +0800 Add files via upload commit e7630b59048a82f6696dcb834481ea7e8a8bf1ea Author: MoeMagicMango Date: Sat Feb 12 20:24:32 2022 +0800 Update purechat.go commit 36c903becef3b703d19dee45d639087db11fcb21 Author: MoeMagicMango Date: Sat Feb 12 20:23:01 2022 +0800 Create purechat.go --- README.md | 3 +- main.go | 2 ++ plugin_chat/chat.go | 20 ++---------- plugin_thesaurus/chat.go | 38 +++++++++++++++++++++++ {plugin_chat => plugin_thesaurus}/data.go | 6 ++-- plugin_wangyiyun/main.go | 4 +-- 6 files changed, 49 insertions(+), 24 deletions(-) create mode 100644 plugin_thesaurus/chat.go rename {plugin_chat => plugin_thesaurus}/data.go (82%) diff --git a/README.md b/README.md index 515114f8..9b1ffd76 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,8 @@ zerobot [-h] [-t token] [-u url] [-n nickname] [-p prefix] [-d|w] [-g 监听地 - [x] 空调关 - [x] 群温度 - [x] 设置温度[正整数] - - [x] @Bot mua | 啾咪 | 摸 | 上你 | 傻 | 裸 | 贴 | 老婆 | 抱 | 亲 | 一下 | 咬 | 操 | 123 | 进去 | 调教 | 搓 | 让 | 捏 | 挤 | 略 | 呐 | 原味 | 胖次 | 内裤 | 内衣 | 衣服 | ghs | 批 | 憨批 | kkp | 咕 | 骚 | 喜欢 | suki | 好き | 看 | 不能 | 砸了 | 透 | 口我 | 草我 | 自慰 | onani | オナニー | 炸了 | 色图 | 涩图 | 告白 | 对不起 | 回来 | 吻 | 软 | 壁咚 | 掰开 | 女友 | 是 | 喵 | 嗷呜 | 叫 | 拜 | 佬 | awsl | 臭 | 香 | 腿 | 张开 | 脚 | 脸 | 头发 | 手 | pr | 舔 | 小穴 | 腰 | 诶嘿嘿 | 可爱 | 扭蛋 | 鼻 | 眼 | 色气 | 推 | 床 | 举 | 手冲 | 饿 | 变 | 敲 | 爬 | 怕 | 冲 | 射 | 不穿 | 迫害 | 猫粮 | 揪尾巴 | 薄荷 | 早 | 晚安 | 揉 | 榨 | 掐 | 胸 | 奶子 | 欧派 | 嫩 | 蹭 | 牵手 | 握手 | 拍照 | w | 睡不着 | 欧尼酱 | 哥 | 爱你 | 过来 | 自闭 | 打不过 | 么么哒 | 很懂 | 膝枕 | 累了 | 安慰 | 洗澡 | 一起睡觉 | 一起 | 多大 | 姐姐 | 糖 | 嗦 | 牛子 | 🐂子 | 🐮子 | 嫌弃 | 紧 | baka | 笨蛋 | 插 | 插进来 | 屁股 | 翘 | 翘起来 | 抬 | 抬起 | 爸 | 傲娇 | rua | 咕噜咕噜 | 咕噜 | 上床 | 做爱 | 吃掉 | 吃 | 揪 | 种草莓 | 种草 | 掀 | 妹 | 病娇 | 嘻 +- **词典匹配回复** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_thesaurus"` + - [x] @Bot 关键词 - **ATRI** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_atri"` - [x] 具体指令看 /用法 atri - 注：本插件基于 [ATRI](https://github.com/Kyomotoi/ATRI) ，为 Golang 移植版 diff --git a/main.go b/main.go index 96769e79..5598fdcf 100644 --- a/main.go +++ b/main.go @@ -30,6 +30,8 @@ import ( _ "github.com/FloatTech/ZeroBot-Plugin/plugin_manager" // 群管 + _ "github.com/FloatTech/ZeroBot-Plugin/plugin_thesaurus" // 词典匹配回复 + // ^^^^ // // ^^^^^^^^^^^^^^ // // ^^^^^^^高优先级区^^^^^^^ // diff --git a/plugin_chat/chat.go b/plugin_chat/chat.go index a3dfa79f..b5bd79ee 100644 --- a/plugin_chat/chat.go +++ b/plugin_chat/chat.go @@ -14,24 +14,17 @@ import ( "github.com/FloatTech/zbputils/control/order" ) -const ( - dbpath = "data/Chat/" - dbfile = dbpath + "kimoi.json" -) - var ( poke = rate.NewManager(time.Minute*5, 8) // 戳一戳 engine = control.Register("chat", order.AcquirePrio(), &control.Options{ DisableOnDefault: false, - Help: "chat\n- [BOT名字]\n- [戳一戳BOT]\n- 空调开\n- 空调关\n- 群温度\n- 设置温度[正整数]\n- mua | 啾咪 | 摸 | 上你 | 傻 | 裸 | 贴 | 老婆 | 抱 | 亲 | 一下 | 咬 | 操 | 123 | 进去 | 调教 | 搓 | 让 | 捏 | 挤 | 略 | 呐 | 原味 | 胖次 | 内裤 | 内衣 | 衣服 | ghs | 批 | 憨批 | kkp | 咕 | 骚 | 喜欢 | suki | 好き | 看 | 不能 | 砸了 | 透 | 口我 | 草我 | 自慰 | onani | オナニー | 炸了 | 色图 | 涩图 | 告白 | 对不起 | 回来 | 吻 | 软 | 壁咚 | 掰开 | 女友 | 是 | 喵 | 嗷呜 | 叫 | 拜 | 佬 | awsl | 臭 | 香 | 腿 | 张开 | 脚 | 脸 | 头发 | 手 | pr | 舔 | 小穴 | 腰 | 诶嘿嘿 | 可爱 | 扭蛋 | 鼻 | 眼 | 色气 | 推 | 床 | 举 | 手冲 | 饿 | 变 | 敲 | 爬 | 怕 | 冲 | 射 | 不穿 | 迫害 | 猫粮 | 揪尾巴 | 薄荷 | 早 | 晚安 | 揉 | 榨 | 掐 | 胸 | 奶子 | 欧派 | 嫩 | 蹭 | 牵手 | 握手 | 拍照 | w | 睡不着 | 欧尼酱 | 哥 | 爱你 | 过来 | 自闭 | 打不过 | 么么哒 | 很懂 | 膝枕 | 累了 | 安慰 | 洗澡 | 一起睡觉 | 一起 | 多大 | 姐姐 | 糖 | 嗦 | 牛子 | 🐂子 | 🐮子 | 嫌弃 | 紧 | baka | 笨蛋 | 插 | 插进来 | 屁股 | 翘 | 翘起来 | 抬 | 抬起 | 爸 | 傲娇 | rua | 咕噜咕噜 | 咕噜 | 上床 | 做爱 | 吃掉 | 吃 | 揪 | 种草莓 | 种草 | 掀 | 妹 | 病娇 | 嘻", + Help: "chat\n- [BOT名字]\n- [戳一戳BOT]\n- 空调开\n- 空调关\n- 群温度\n- 设置温度[正整数]", }) - kimomap = make(kimo, 256) - chatList = make([]string, 0, 256) ) func init() { // 插件主体 // 被喊名字 - engine.OnFullMatch("", zero.OnlyToMe).SetBlock(true). + engine.OnMessage(zero.OnlyToMe).SetBlock(true). Handle(func(ctx *zero.Ctx) { var nickname = zero.BotConfig.NickName[0] time.Sleep(time.Second * 1) @@ -111,13 +104,4 @@ func init() { // 插件主体 )) } }) - initChatList(func() { - engine.OnFullMatchGroup(chatList, zero.OnlyToMe).SetBlock(true).Handle( - func(ctx *zero.Ctx) { - key := ctx.MessageString() - val := *kimomap[key] - text := val[rand.Intn(len(val))] - ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(text)) - }) - }) } diff --git a/plugin_thesaurus/chat.go b/plugin_thesaurus/chat.go new file mode 100644 index 00000000..f077b42c --- /dev/null +++ b/plugin_thesaurus/chat.go @@ -0,0 +1,38 @@ +// Package thesaurus 修改过的单纯回复插件 +package thesaurus + +import ( + "math/rand" + + control "github.com/FloatTech/zbputils/control" + zero "github.com/wdvxdr1123/ZeroBot" + "github.com/wdvxdr1123/ZeroBot/message" + + "github.com/FloatTech/zbputils/control/order" +) + +const ( + dbpath = "data/Chat/" + dbfile = dbpath + "kimoi.json" +) + +var ( + engine = control.Register("thesaurus", order.AcquirePrio(), &control.Options{ + DisableOnDefault: false, + Help: "thesaurus\n- 词典匹配回复", + }) + kimomap = make(kimo, 256) + chatList = make([]string, 0, 256) +) + +func init() { + initThesaurusList(func() { + engine.OnFullMatchGroup(chatList, zero.OnlyToMe).SetBlock(true).Handle( + func(ctx *zero.Ctx) { + key := ctx.MessageString() + val := *kimomap[key] + text := val[rand.Intn(len(val))] + ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(text)) // 来自于 https://github.com/Kyomotoi/AnimeThesaurus 的回复 经过二次修改 + }) + }) +} diff --git a/plugin_chat/data.go b/plugin_thesaurus/data.go similarity index 82% rename from plugin_chat/data.go rename to plugin_thesaurus/data.go index 4095aa24..0ee3a7a7 100644 --- a/plugin_chat/data.go +++ b/plugin_thesaurus/data.go @@ -1,4 +1,4 @@ -package chat +package thesaurus import ( "encoding/json" @@ -14,7 +14,7 @@ import ( type kimo = map[string]*[]string -func initChatList(postinit func()) { +func initThesaurusList(postinit func()) { go func() { defer order.DoneOnExit()() process.SleepAbout1sTo2s() @@ -30,7 +30,7 @@ func initChatList(postinit func()) { for k := range kimomap { chatList = append(chatList, k) } - logrus.Infoln("[chat]加载", len(chatList), "条kimoi") + logrus.Infoln("[thesaurus]加载", len(chatList), "条kimoi") postinit() }() } diff --git a/plugin_wangyiyun/main.go b/plugin_wangyiyun/main.go index 2209a65f..23f570d7 100644 --- a/plugin_wangyiyun/main.go +++ b/plugin_wangyiyun/main.go @@ -13,8 +13,8 @@ import ( ) const ( - wangyiyunURL = "http://ovooa.com/API/wyrp/api.php?type=text" - wangyiyunReferer = "http://ovooa.com/" + wangyiyunURL = "https://api.gmit.vip/Api/HotComments?format=text" + wangyiyunReferer = "https://api.gmit.vip/" ua = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.110 Safari/537.36" )