big ole refactor
This commit is contained in:
@@ -12,8 +12,6 @@ import (
|
||||
"github.com/uptrace/bun"
|
||||
)
|
||||
|
||||
var CurrentUser hwsauth.ContextLoader[*User]
|
||||
|
||||
type User struct {
|
||||
bun.BaseModel `bun:"table:users,alias:u"`
|
||||
|
||||
@@ -29,8 +27,10 @@ func (u *User) GetID() int {
|
||||
return u.ID
|
||||
}
|
||||
|
||||
var CurrentUser hwsauth.ContextLoader[*User]
|
||||
|
||||
// CreateUser creates a new user with the given username and password
|
||||
func CreateUser(ctx context.Context, tx bun.Tx, username string, discorduser *discordgo.User) (*User, error) {
|
||||
func CreateUser(ctx context.Context, tx bun.Tx, username string, discorduser *discordgo.User, audit *AuditMeta) (*User, error) {
|
||||
if discorduser == nil {
|
||||
return nil, errors.New("user cannot be nil")
|
||||
}
|
||||
@@ -39,8 +39,10 @@ func CreateUser(ctx context.Context, tx bun.Tx, username string, discorduser *di
|
||||
CreatedAt: time.Now().Unix(),
|
||||
DiscordID: discorduser.ID,
|
||||
}
|
||||
audit.u = user
|
||||
|
||||
err := Insert(tx, user).
|
||||
WithAudit(audit, nil).
|
||||
Returning("id").
|
||||
Exec(ctx)
|
||||
if err != nil {
|
||||
|
||||
Reference in New Issue
Block a user