From 13b2335ae83d527d9af9c37e7b18a086d49598be Mon Sep 17 00:00:00 2001 From: daru Date: Fri, 29 Jul 2022 18:43:00 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go.mod | 2 +- go.sum | 2 ++ labersack.go | 6 ++++++ praktikant.go | 6 +++--- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index a64a95e..1b8fbdd 100644 --- a/go.mod +++ b/go.mod @@ -26,5 +26,5 @@ require ( github.com/xujiajun/mmap-go v1.0.1 // indirect github.com/xujiajun/utils v0.0.0-20190123093513-8bf096c4f53b // indirect golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect - golang.org/x/sys v0.0.0-20220727055044-e65921a090b8 // indirect + golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect ) diff --git a/go.sum b/go.sum index 0bc7f98..0c68db5 100644 --- a/go.sum +++ b/go.sum @@ -74,6 +74,8 @@ golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220405210540-1e041c57c461/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220727055044-e65921a090b8 h1:dyU22nBWzrmTQxtNrr4dzVOvaw35nUYE279vF9UmsI8= golang.org/x/sys v0.0.0-20220727055044-e65921a090b8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 h1:WIoqL4EROvwiPdUtaip4VcDdpZ4kha7wBWZrbVKCIZg= +golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= diff --git a/labersack.go b/labersack.go index 330e616..49936cb 100644 --- a/labersack.go +++ b/labersack.go @@ -3,6 +3,7 @@ package main import ( "fmt" "strings" + "time" "github.com/bwmarrin/discordgo" "github.com/gookit/color" @@ -62,6 +63,11 @@ func SendAppointBroadcast(creator string, app *Appointment) { } } +func AnnounceBomb(app *Appointment, timer time.Duration) { + time.Sleep(timer) + AnnounceAppointmentSoon(app) +} + func AnnounceAppointmentSoon(app *Appointment) { if app != nil && discc != nil { watchData, err := GetAnimeWatchFromDb(app.Anime) diff --git a/praktikant.go b/praktikant.go index c98347a..af052c7 100644 --- a/praktikant.go +++ b/praktikant.go @@ -12,7 +12,7 @@ import ( ) func Arbeiten() { - for range time.Tick(29 * time.Minute) { + for range time.Tick(20 * time.Minute) { Arbeit() } } @@ -38,9 +38,9 @@ func Arbeit() { } else { cleared++ } - } else if time.Now().Add(4*time.Minute).Before(a.Time) && time.Now().Add(33*time.Minute).After(a.Time) { + } else if time.Now().Add(20*time.Minute).Before(a.Time) && time.Now().Add(40*time.Minute).After(a.Time) { // This has not happened and is happening soon - AnnounceAppointmentSoon(&a) + go AnnounceBomb(&a, time.Until(a.Time.Add(-20*time.Minute))) } } if cleared > 0 {