merged main, dev, and i guess got accounts working??

i am so good at commit messages :3

admin/admin.go

@@ -2,23 +2,22 @@ package admin
 
 import (
 	"fmt"
-	"math/rand"
-	"os"
 	"time"
 
+	"arimelody-web/controller"
 	"arimelody-web/global"
+	"arimelody-web/model"
 )
 
 type (
     Session struct {
         Token   string
-        UserID  string
+        Account *model.Account
         Expires time.Time
     }
 )
 
 const TOKEN_LENGTH = 64
-const TOKEN_CHARS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
 var ADMIN_BYPASS = func() bool {
     if global.Args["adminBypass"] == "true" {
@@ -28,24 +27,12 @@ var ADMIN_BYPASS = func() bool {
     return false
 }()
 
-var ADMIN_ID_DISCORD = os.Getenv("DISCORD_ADMIN")
-
 var sessions []*Session
 
-func createSession(username string, expires time.Time) Session {
+func createSession(account *model.Account, expires time.Time) Session {
     return Session{
-        Token: string(generateToken()),
-        UserID: username,
+        Token: string(controller.GenerateAlnumString(TOKEN_LENGTH)),
+        Account: account,
         Expires: expires,
     }
 }
-
-func generateToken() string {
-    var token []byte
-
-    for i := 0; i < TOKEN_LENGTH; i++ {
-        token = append(token, TOKEN_CHARS[rand.Intn(len(TOKEN_CHARS))])
-    }
-
-    return string(token)
-}