Better update messages

Author: Distortions81

factUpdater/fullPackage.go

@@ -5,6 +5,7 @@ import (
 	"ChatWire/cwlog"
 	"ChatWire/disc"
 	"ChatWire/fact"
+	"ChatWire/glob"
 	"fmt"
 	"os"
 	"strings"
@@ -29,6 +30,7 @@ func fullPackage(info *InfoData) error {
 	url := fmt.Sprintf("%v%v/%v/%v", baseDownloadURL, branch, info.Build, info.Distro)
 	var data []byte
 
+	glob.UpdateMessage = disc.SmartEditDiscordEmbed(cfg.Local.Channel.ChatChannel, glob.UpdateMessage, "Updating Factorio", "Downloading...", 0x0099ff)
 	cwlog.DoLogCW("Downloading: %v", url)
 
 	data, filename, err = httpGet(url)
@@ -39,6 +41,7 @@ func fullPackage(info *InfoData) error {
 	}
 
 	cwlog.DoLogCW("Download of %v complete, verifying...", filename)
+	glob.UpdateMessage = disc.SmartEditDiscordEmbed(cfg.Local.Channel.ChatChannel, glob.UpdateMessage, "Updating Factorio", "Verifying update.", 0x0099ff)
 
 	archive, err := checkFullPackage(data)
 	if err != nil {

factUpdater/latest.go

@@ -2,12 +2,18 @@ package factUpdater
 
 import (
 	"ChatWire/cfg"
+	"ChatWire/disc"
 	"ChatWire/fact"
+	"ChatWire/glob"
 	"encoding/json"
 	"fmt"
+
+	"github.com/bwmarrin/discordgo"
 )
 
 func DoQuickLatest(force bool) (*InfoData, string, bool, bool) {
+	glob.UpdateMessage = nil
+
 	info := &InfoData{Xreleases: cfg.Local.Options.ExpUpdates, Build: "headless", Distro: "linux64"}
 
 	if force {
@@ -36,11 +42,14 @@ func DoQuickLatest(force bool) (*InfoData, string, bool, bool) {
 	fact.NewVersion = newVersion.IntToString()
 
 	if isVersionNewerThan(*newVersion, oldVersion) || force {
+		glob.UpdateMessage = disc.SmartWriteDiscordEmbed(cfg.Local.Channel.ChatChannel, &discordgo.MessageEmbed{Title: "Updating Factorio", Description: "Found Factorio update: " + newVersion.IntToString(), Color: 0x0099ff})
+
 		info.VersInt = *newVersion
 		err := fullPackage(info)
 		if err != nil {
 			return info, fmt.Sprintf("DoQuickLatest: fullPackage: %v", err.Error()), true, false
 		}
+
 		return info, fmt.Sprintf("Factorio upgraded from %v to %v.", oldVersion.IntToString(), newVersion.IntToString()), false, false
 	} else if isVersionEqual(*newVersion, info.VersInt) {
 		return info, "Factorio is up-to-date.", false, true

glob/glob.go

@@ -127,8 +127,9 @@ type ChoiceData struct {
 }
 
 var (
-	BootMessage *discordgo.Message
-	QuitMessage *discordgo.Message
+	BootMessage   *discordgo.Message
+	QuitMessage   *discordgo.Message
+	UpdateMessage *discordgo.Message
 
 	FactorioContext context.Context
 	FactorioCancel  context.CancelFunc

support/factLauncher.go

@@ -115,7 +115,7 @@ func GetSaveGame(doInject bool) (foundGood bool, fileName string, fileDir string
 
 	/* We can't read saves dir */
 	if err != nil {
-		fact.LogCMS(cfg.Local.Channel.ChatChannel, "Unable to read saves folder, stopping.")
+		cwlog.DoLogCW("Unable to read saves folder, stopping.")
 		return false, "", ""
 	}
 
@@ -369,7 +369,6 @@ func launchFactorio() {
 	found, fileName, folderName := GetSaveGame(true)
 	if !found {
 		disc.SmartEditDiscordEmbed(cfg.Local.Channel.ChatChannel, msg, "ERROR", "Unable to access save-games.", 0xff0000)
-
 		fact.FactAutoStart = false
 		return
 	}

support/mainLoops.go

@@ -9,7 +9,6 @@ import (
 	"syscall"
 	"time"
 
-	embed "github.com/Clinet/discordgo-embed"
 	"github.com/bwmarrin/discordgo"
 
 	"ChatWire/banlist"
@@ -478,10 +477,10 @@ func MainLoops() {
 					/* Reboot anyway */
 					if glob.UpdateWarnCounter > glob.UpdateGraceMinutes {
 						msg := "(SYSTEM) Rebooting for Factorio update!"
-						fact.LogGameCMS(true, cfg.Local.Channel.ChatChannel, msg)
+						fact.FactChat(msg)
 						glob.UpdateWarnCounter = 0
 						fact.QuitFactorio("Rebooting for Factorio update: " + fact.NewVersion)
-						time.Sleep(time.Minute * 10)
+						time.Sleep(time.Minute * 15)
 					}
 					glob.UpdateWarnCounter = (glob.UpdateWarnCounter + 1)
 
@@ -593,20 +592,18 @@ func MainLoops() {
 		time.Sleep(time.Second * 15)
 		for glob.ServerRunning {
 			if cfg.Local.Options.AutoUpdate {
+				glob.UpdateMessage = nil
 				_, msg, err, upToDate := factUpdater.DoQuickLatest(false)
 				if msg != "" {
 					if !err && !upToDate {
+						glob.UpdateMessage = disc.SmartEditDiscordEmbed(cfg.Local.Channel.ChatChannel, glob.UpdateMessage, "Updated", msg, 0x0099ff)
 						cwlog.DoLogCW(msg)
-
-						myembed := embed.NewEmbed().
-							SetTitle("Factorio Updated").
-							SetDescription(msg).
-							SetColor(0x00ffff).MessageEmbed
-						disc.SmartWriteDiscordEmbed(cfg.Local.Channel.ChatChannel, myembed)
 					} else if err && !upToDate {
+						glob.UpdateMessage = disc.SmartEditDiscordEmbed(cfg.Local.Channel.ChatChannel, glob.UpdateMessage, "ERROR", msg, 0xFF0000)
 						cwlog.DoLogCW(msg)
 					}
 				}
+				glob.UpdateMessage = nil
 				time.Sleep(time.Minute * 10)
 				time.Sleep(time.Second * time.Duration(rand.Intn(300))) //Add 5 minutes of randomness
 			} else {