💣💣💣

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
 )

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=

huso.go

@@ -20,7 +20,7 @@ import (
 )
 
 const (
-	husoVersion    = "1.5"
+	husoVersion    = "1.6"
 	registerSecret = "綾波レイ"
 	seasonStrJikan = "seasons/"
 	userApiJikan   = "users/"

labersack.go

@@ -3,6 +3,7 @@ package main
 import (
 	"fmt"
 	"strings"
+	"time"
 
 	"github.com/bwmarrin/discordgo"
 	"github.com/gookit/color"
@@ -62,14 +63,19 @@ func SendAppointBroadcast(creator string, app *Appointment) {
 	}
 }
 
-func AnnounceAppointmentSoon(app *Appointment) {
-	if app != nil && discc != nil {
-		watchData, err := GetAnimeWatchFromDb(app.Anime)
+func AnnounceBomb(animeId, meetingUnix int64, timer time.Duration) {
+	time.Sleep(timer)
+	AnnounceAppointmentSoon(animeId, meetingUnix)
+}
+
+func AnnounceAppointmentSoon(animeId, meetingUnix int64) {
+	if animeId != 0 && discc != nil {
+		watchData, err := GetAnimeWatchFromDb(animeId)
 		if err != nil {
 			color.Errorln(err.Error())
 			return
 		}
-		anime, err := SearchAnime(app.Anime)
+		anime, err := SearchAnime(animeId)
 		if err != nil {
 			color.Errorln(err.Error())
 			return
@@ -84,10 +90,10 @@ func AnnounceAppointmentSoon(app *Appointment) {
 			msgStart.WriteString(fmt.Sprintf("<@%d>", uData.DiscordID))
 		}
 
-		msgs := fmt.Sprintf("⏰ Appointment starting <t:%d:R>!\n[%s](%s%d) at\n<t:%d:F>", app.Time.Unix(), anime.Title, *husoWebAnimeUri, app.Anime, app.Time.Unix())
+		msgs := fmt.Sprintf("⏰ Appointment starting <t:%d:R>!\n[%s](%s%d) at\n<t:%d:F>", meetingUnix, anime.Title, *husoWebAnimeUri, animeId, meetingUnix)
 		msge := discordgo.MessageEmbed{
 			Description: msgs,
-			URL:         fmt.Sprintf("%s%d", *husoWebAnimeUri, app.Anime),
+			URL:         fmt.Sprintf("%s%d", *husoWebAnimeUri, animeId),
 			Thumbnail:   &discordgo.MessageEmbedThumbnail{URL: anime.ImageLargeURL},
 			Color:       7187428,
 			Footer: &discordgo.MessageEmbedFooter{

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(40*time.Minute).Before(a.Time) && time.Now().Add(60*time.Minute).After(a.Time) {
 				// This has not happened and is happening soon
-				AnnounceAppointmentSoon(&a)
+				go AnnounceBomb(a.Anime, a.Time.Unix(), time.Until(a.Time.Add(-25*time.Minute)))
 			}
 		}
 		if cleared > 0 {