diff --git a/api.go b/api.go index ef5a307..ae2c8fc 100644 --- a/api.go +++ b/api.go @@ -16,7 +16,7 @@ import ( var ( client *http.Client requestCounter uint - lastReload int64 + lastReload time.Time parsePattern = regexp.MustCompile(`\s*(.+)\n\s+(.+)\n\s+(\d+)\s*`) cachedLocations []Location cachedLocationsMap map[uint]Location @@ -24,7 +24,8 @@ var ( ) func init() { - cacheExpiry = time.Now().Add(-time.Second) // Set the cache as expired initially + lastReload = time.Now().Add(-time.Hour * 24 * 365) // Set the last reload time to a year ago + cacheExpiry = time.Now().Add(-time.Second) // Set the cache as expired initially cookies, err := cookiejar.New(nil) if err != nil { log.Fatal(err) @@ -75,13 +76,13 @@ func reload() { // Attempts to reload the current session based on a given location's name. // This uses the current request counter and last reload time to determine if a reload is necessary. func tryReload() { - currentTime := time.Now().Unix() - lastReloadDiff := currentTime - lastReload + currentTime := time.Now() + lastReloadDiff := currentTime.Sub(lastReload) if requestCounter >= 10 { log.Info("Reloading session due to request count...") } else if lastReloadDiff >= 15*60 { - log.Info("Reloading session due to time...") + log.Infof("Reloading session due to time (%s)...", lastReloadDiff) } else { return } diff --git a/main.go b/main.go index 976fadb..69ea692 100644 --- a/main.go +++ b/main.go @@ -41,11 +41,11 @@ func Bot() { // Login handler session.AddHandler(func(s *discordgo.Session, r *discordgo.Ready) { - log.Printf("Logged in as: %v#%v", s.State.User.Username, s.State.User.Discriminator) + log.Infof("Logged in as: %v#%v", s.State.User.Username, s.State.User.Discriminator) - // Count serers + // Count servers guilds := s.State.Guilds - log.Printf("Connected to %d server%s", len(guilds), Plural(len(guilds))) + log.Debugf("Connected to %d server%s", len(guilds), Plural(len(guilds))) }) // Open the session @@ -70,7 +70,7 @@ func Bot() { signal.Notify(stop, os.Interrupt) // Register commands - log.Printf("Adding %d command%s...", len(commandDefinitions), Plural(len(commandDefinitions))) + log.Debugf("Adding %d command%s...", len(commandDefinitions), Plural(len(commandDefinitions))) registeredCommands := make([]*discordgo.ApplicationCommand, len(commandDefinitions)) for definitionIndex, commandDefinition := range commandDefinitions { command, err := session.ApplicationCommandCreate(session.State.User.ID, os.Getenv("BOT_TARGET_GUILD"), commandDefinition) @@ -90,7 +90,7 @@ func Bot() { <-stop // Remove commands - log.Infof("Removing %d command%s...\n", len(registeredCommands), Plural(len(registeredCommands))) + log.Debugf("Removing %d command%s...\n", len(registeredCommands), Plural(len(registeredCommands))) for _, v := range registeredCommands { log.Debugf("Removing '%v' command (%v)", v.Name, v.ID) err := session.ApplicationCommandDelete(session.State.User.ID, os.Getenv("BOT_TARGET_GUILD"), v.ID) @@ -132,13 +132,11 @@ func main() { switch command { case "scan": - log.Info("Running scan") + log.Info("Scanning...") Scan() case "bot": - log.Info("Running bot") - Bot() default: - log.Info("Running bot (default)") + log.Info("Starting bot...") Bot() } }