diff --git a/README.md b/README.md index fad2cf9a..913dcb03 100644 --- a/README.md +++ b/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][分钟] @@ -145,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"` diff --git a/plugin_chat/chat.go b/plugin_chat/chat.go index bc96964f..262d50d7 100644 --- a/plugin_chat/chat.go +++ b/plugin_chat/chat.go @@ -2,7 +2,6 @@ package chat import ( - "github.com/FloatTech/ZeroBot-Plugin/control" "math/rand" "strconv" "time" @@ -10,6 +9,8 @@ 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) // 戳一戳 diff --git a/plugin_manager/manager.go b/plugin_manager/manager.go index e9ead18e..ecfe4970 100644 --- a/plugin_manager/manager.go +++ b/plugin_manager/manager.go @@ -3,7 +3,6 @@ package manager import ( "fmt" - "github.com/FloatTech/ZeroBot-Plugin/control" "io" "math/rand" "os" @@ -18,6 +17,7 @@ import ( "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" diff --git a/plugin_sleep_manage/data.go b/plugin_sleep_manage/data.go index f8cd2ce6..8e4ddd21 100644 --- a/plugin_sleep_manage/data.go +++ b/plugin_sleep_manage/data.go @@ -1,10 +1,12 @@ 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" - log "github.com/sirupsen/logrus" - "os" ) func init() { diff --git a/plugin_sleep_manage/model/model.go b/plugin_sleep_manage/model/model.go index fe705cec..ad8ef2ad 100644 --- a/plugin_sleep_manage/model/model.go +++ b/plugin_sleep_manage/model/model.go @@ -1,11 +1,12 @@ package model import ( + "os" + "time" + "github.com/jinzhu/gorm" _ "github.com/logoove/sqlite" log "github.com/sirupsen/logrus" - "os" - "time" ) type SleepDB gorm.DB diff --git a/plugin_sleep_manage/sleep_manage.go b/plugin_sleep_manage/sleep_manage.go index 9eb37678..a2a74002 100644 --- a/plugin_sleep_manage/sleep_manage.go +++ b/plugin_sleep_manage/sleep_manage.go @@ -2,12 +2,14 @@ package plugin_sleep_manage import ( "fmt" - "github.com/FloatTech/ZeroBot-Plugin/control" - "github.com/FloatTech/ZeroBot-Plugin/plugin_sleep_manage/model" + "time" + log "github.com/sirupsen/logrus" zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" - "time" + + "github.com/FloatTech/ZeroBot-Plugin/control" + "github.com/FloatTech/ZeroBot-Plugin/plugin_sleep_manage/model" ) const dbpath = "data/SleepManage/" @@ -65,13 +67,13 @@ func timeDuration(time time.Duration) (hour, minute, second int64) { return hour, minute, second } -//只统计6点到12点的早安 +// 只统计6点到12点的早安 func isMorning(ctx *zero.Ctx) bool { now := time.Now().Hour() return now >= 6 && now <= 12 } -//只统计21点到凌晨3点的晚安 +// 只统计21点到凌晨3点的晚安 func isEvening(ctx *zero.Ctx) bool { now := time.Now().Hour() return now >= 21 || now <= 3