From 243c349366a8de9499d09fe665f757bea600ddf6 Mon Sep 17 00:00:00 2001
From: Justin Hawkins <justin@hawkins.id.au>
Date: Sun, 1 May 2022 17:01:02 +0930
Subject: [PATCH] Tidy up, add discord link

---
 dau.go         | 28 +++++++++-------------------
 dau_windows.go | 11 +++++++++++
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/dau.go b/dau.go
index db86e07..d31aa08 100644
--- a/dau.go
+++ b/dau.go
@@ -11,8 +11,6 @@ import (
 	"strings"
 	"time"
 
-	_ "embed"
-
 	_ "image/gif"
 	_ "image/jpeg"
 	_ "image/png"
@@ -35,33 +33,26 @@ type watch struct {
 	uploader     *upload.Uploader
 }
 
-//go:embed dau.ico
-var appIcon []byte
-
-//go:generate goversioninfo -icon=dau.ico
-
-// -manifest=testdata/resource/goversioninfo.exe.manifest
-
 func main() {
 
 	parseOptions()
 
-	// grab the config, register to notice changes
-	config := config.DefaultConfigService()
+	// grab the conf, register to notice changes
+	conf := config.DefaultConfigService()
 	configChanged := make(chan bool)
-	config.Changed = configChanged
-	config.LoadOrInit()
+	conf.Changed = configChanged
+	conf.LoadOrInit()
 
 	// create the uploader
 	up := upload.NewUploader()
 
 	// log.Print("Opening web browser")
 	// open.Start("http://localhost:9090")
-	web := web.WebService{Config: config, Uploader: up}
+	web := web.WebService{Config: conf, Uploader: up}
 	web.StartWebServer()
 
-	if config.Config.OpenBrowserOnStart {
-		openWebBrowser(config.Config.Port)
+	if conf.Config.OpenBrowserOnStart {
+		openWebBrowser(conf.Config.Port)
 	}
 
 	go func() {
@@ -79,10 +70,9 @@ func main() {
 	// create the watchers, restart them if config changes
 	// blocks forever
 	go func() {
-		startWatchers(config, up, configChanged)
+		startWatchers(conf, up, configChanged)
 	}()
-
-	mainloop(config)
+	mainloop(conf)
 
 }
 
diff --git a/dau_windows.go b/dau_windows.go
index 75bad2b..a1eacda 100644
--- a/dau_windows.go
+++ b/dau_windows.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	_ "embed"
 	"fmt"
 	"github.com/getlantern/systray"
 	"github.com/skratchdot/open-golang/open"
@@ -9,6 +10,13 @@ import (
 	"github.com/tardisx/discord-auto-upload/version"
 )
 
+//go:embed dau.ico
+var appIcon []byte
+
+//go:generate goversioninfo -icon=dau.ico
+
+// -manifest=testdata/resource/goversioninfo.exe.manifest
+
 func mainloop(c *config.ConfigService) {
 	systray.Run(func() { onReady(c) }, onExit)
 }
@@ -20,6 +28,7 @@ func onReady(c *config.ConfigService) {
 	systray.SetTooltip(fmt.Sprintf("discord-auto-upload %s", version.CurrentVersion))
 	openApp := systray.AddMenuItem("Open", "Open in web browser")
 	gh := systray.AddMenuItem("Github", "Open project page")
+	discord := systray.AddMenuItem("Discord", "Join us on discord")
 	ghr := systray.AddMenuItem("Release Notes", "Open project release notes")
 	quit := systray.AddMenuItem("Quit", "Quit")
 
@@ -37,6 +46,8 @@ func onReady(c *config.ConfigService) {
 				open.Start("https://github.com/tardisx/discord-auto-upload")
 			case <-ghr.ClickedCh:
 				open.Start(fmt.Sprintf("https://github.com/tardisx/discord-auto-upload/releases/tag/%s", version.CurrentVersion))
+			case <-discord.ClickedCh:
+				open.Start("https://discord.gg/eErG9sntbZ")
 			}
 		}
 	}()