Northern_Lights/ZeroBot-Plugin
1
0
Fork 0
mirror of https://github.com/FloatTech/ZeroBot-Plugin.git synced 2025-12-20 22:40:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

✨ 修复 timer 计时错误

Browse Source
This commit is contained in:
fumiama 2021-10-26 16:05:28 +08:00
parent 7b52599da7
commit 043b543cfa
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugin_manager/manager.go
View File

@ -57,7 +57,10 @@ var (
func init() { // 插件主体 func init() { // 插件主体
loadConfig() loadConfig()
go func() {
time.Sleep(time.Second + time.Millisecond*time.Duration(rand.Intn(1000)))
clock = timer.NewClock(timerfile) clock = timer.NewClock(timerfile)
}()
// 菜单 // 菜单
zero.OnFullMatch("群管系统", zero.AdminPermission).SetBlock(true).FirstPriority(). zero.OnFullMatch("群管系统", zero.AdminPermission).SetBlock(true).FirstPriority().
Handle(func(ctx *zero.Ctx) { Handle(func(ctx *zero.Ctx) {

24
plugin_manager/timer/timer.go
View File

@ -62,7 +62,7 @@ func (ts *Timer) nextDuration() time.Duration {
isThisMinute := ts.Minute < 0 || ts.Minute == int32(time.Now().Minute()) isThisMinute := ts.Minute < 0 || ts.Minute == int32(time.Now().Minute())
if !isThisMinute { if !isThisMinute {
d, over := nextDistance(ts.Minute, time.Now().Minute(), time.Minute, time.Hour) d, over := nextDistance(ts.Minute, time.Now().Minute(), time.Minute, time.Hour)
if !(ts.Hour > 0 && over) { if !(ts.Hour >= 0 && over) {
sleepdur = d sleepdur = d
} }
} }
@ -92,15 +92,31 @@ func (c *Clock) RegisterTimer(ts *Timer, save bool) {
} }
log.Printf("[群管]注册计时器[%t]%s", ts.Enable, key) log.Printf("[群管]注册计时器[%t]%s", ts.Enable, key)
for ts.Enable { for ts.Enable {
dur := time.Minute dur := ts.nextDuration()
isThisMonth := ts.Month < 0 || ts.Month == int32(time.Now().Month()) isThisMonth := ts.Month < 0 || ts.Month == int32(time.Now().Month())
if isThisMonth { if isThisMonth {
isThisDay := ts.Day < 0 || ts.Day == int32(time.Now().Day()) isThisDay := ts.Day < 0 || ts.Day == int32(time.Now().Day())
isThisWeek := ts.Week < 0 || ts.Week == int32(time.Now().Weekday()) isThisWeek := ts.Week < 0 || ts.Week == int32(time.Now().Weekday())
if isThisDay || isThisWeek { if !isThisDay && !isThisWeek {
dur = ts.nextDuration() if ts.Day == 0 {
d, over := nextDistance(ts.Week, int(time.Now().Weekday()), time.Hour*24*7, time.Hour*24*7)
if !(over && ts.Month > 0 && time.Now().Add(time.Hour*24*7).Month() != time.Now().Month()) {
dur += d
}
} else if ts.Day < int32(time.Now().Day()) {
if ts.Month < 0 {
dur += time.Until(time.Date(time.Now().Year(), time.Month(ts.Month)+1, int(ts.Day), time.Now().Hour(), time.Now().Minute(), time.Now().Second(), time.Now().Nanosecond(), time.Now().Location()))
} else {
dur += time.Until(time.Date(time.Now().Year()+1, time.Month(ts.Month), int(ts.Day), time.Now().Hour(), time.Now().Minute(), time.Now().Second(), time.Now().Nanosecond(), time.Now().Location()))
} }
} }
}
} else if ts.Month < int32(time.Now().Month()) {
dur += time.Until(time.Date(time.Now().Year()+1, time.Month(ts.Month), int(ts.Day), time.Now().Hour(), time.Now().Minute(), time.Now().Second(), time.Now().Nanosecond(), time.Now().Location()))
} else {
dur += time.Until(time.Date(time.Now().Year(), time.Month(ts.Month), int(ts.Day), time.Now().Hour(), time.Now().Minute(), time.Now().Second(), time.Now().Nanosecond(), time.Now().Location()))
}
log.Printf("[群管]计时器%s将睡眠%ds", key, dur/time.Second)
time.Sleep(dur) time.Sleep(dur)
if ts.Enable { if ts.Enable {
zero.RangeBot(func(id int64, ctx *zero.Ctx) bool { zero.RangeBot(func(id int64, ctx *zero.Ctx) bool {