terrible no good massive refactor commit (oh yeah and built generic sessions for admin panel)

model/account.go

@@ -1,17 +1,20 @@
 package model
 
-import "time"
+import (
+	"database/sql"
+	"time"
+)
 
-const COOKIE_TOKEN string = "AM_TOKEN"
+const COOKIE_TOKEN string = "AM_SESSION"
 
 type (
     Account struct {
-        ID          string      `json:"id" db:"id"`
-        Username    string      `json:"username" db:"username"`
-        Password    string      `json:"password" db:"password"`
-        Email       string      `json:"email" db:"email"`
-        AvatarURL   string      `json:"avatar_url" db:"avatar_url"`
-        CreatedAt   time.Time   `json:"created_at" db:"created_at"`
+        ID          string          `json:"id" db:"id"`
+        Username    string          `json:"username" db:"username"`
+        Password    string          `json:"password" db:"password"`
+        Email       sql.NullString  `json:"email" db:"email"`
+        AvatarURL   sql.NullString  `json:"avatar_url" db:"avatar_url"`
+        CreatedAt   time.Time       `json:"created_at" db:"created_at"`
 
         Privileges  []AccountPrivilege  `json:"privileges"`
     }

model/session.go

@@ -1,11 +1,17 @@
 package model
 
-import "time"
+import (
+	"database/sql"
+	"time"
+)
 
-type Token struct {
+type Session struct {
     Token string `json:"token" db:"token"`
-    AccountID string `json:"-" db:"account"`
     UserAgent string `json:"user_agent" db:"user_agent"`
     CreatedAt time.Time `json:"created_at" db:"created_at"`
     ExpiresAt time.Time `json:"expires_at" db:"expires_at"`
+
+    Account *Account `json:"-" db:"account"`
+    Message sql.NullString `json:"-" db:"message"`
+    Error sql.NullString `json:"-" db:"error"`
 }