merge main into dev

admin/admin.go

@@ -3,7 +3,6 @@ package admin
 import (
 	"fmt"
 	"math/rand"
-	"os"
 	"time"
 
 	"arimelody-web/global"
@@ -28,20 +27,12 @@ var ADMIN_BYPASS = func() bool {
     return false
 }()
 
-var ADMIN_ID_DISCORD = func() string {
-    id := os.Getenv("DISCORD_ADMIN")
-    if id == "" {
-        // fmt.Printf("WARN: Discord admin ID (DISCORD_ADMIN) was not provided.\n")
-    }
-    return id
-}()
-
 var sessions []*Session
 
-func createSession(username string, expires time.Time) Session {
+func createSession(userID string, expires time.Time) Session {
     return Session{
         Token: string(generateToken()),
-        UserID: username,
+        UserID: userID,
         Expires: expires,
     }
 }