args over envars, some music gateway fixes

admin/admin.go

@@ -3,8 +3,9 @@ package admin
 import (
 	"fmt"
 	"math/rand"
-	"os"
 	"time"
+
+	"arimelody.me/arimelody.me/global"
 )
 
 type (
@@ -19,19 +20,19 @@ const TOKEN_LENGTH = 64
 const TOKEN_CHARS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
 var ADMIN_BYPASS = func() bool {
-    if os.Getenv("ARIMELODY_ADMIN_BYPASS") == "true" {
-        fmt.Println("WARNING: Admin login is currently BYPASSED by ARIMELODY_ADMIN_BYPASS.")
+    if global.Args["adminBypass"] == "true" {
+        fmt.Println("WARN: Admin login is currently BYPASSED. (-adminBypass)")
         return true
     }
     return false
 }()
 
 var ADMIN_ID_DISCORD = func() string {
-    envvar := os.Getenv("DISCORD_ADMIN_ID")
-    if envvar == "" {
-        fmt.Printf("DISCORD_ADMIN_ID was not provided. Admin login will be unavailable.\n")
+    id := global.Args["discordAdmin"]
+    if id == "" {
+        fmt.Printf("WARN: Discord admin ID (-discordAdmin) was not provided. Admin login will be unavailable.\n")
     }
-    return envvar
+    return id
 }()
 
 var sessions []*Session