h/oslstats
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development' into staging

Browse Source
This commit is contained in:
Haelnorr
2026-03-05 18:57:37 +11:00
parent 8fa086e3e8 2b5c43cf61
commit 36b42d6267
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
internal/db/player.go
View File

@@ -28,14 +28,15 @@ func (p *Player) DisplayName() string {
// NewPlayer creates a new player in the database. If there is an existing user with the same // NewPlayer creates a new player in the database. If there is an existing user with the same
// discordID, it will automatically link that user to the player // discordID, it will automatically link that user to the player
func NewPlayer(ctx context.Context, tx bun.Tx, discordID string, audit *AuditMeta) (*Player, error) { func NewPlayer(ctx context.Context, tx bun.Tx, name, discordID string, audit *AuditMeta) (*Player, error) {
player := &Player{DiscordID: discordID} player := &Player{DiscordID: discordID, Name: name}
user, err := GetUserByDiscordID(ctx, tx, discordID) user, err := GetUserByDiscordID(ctx, tx, discordID)
if err != nil && !IsBadRequest(err) { if err != nil && !IsBadRequest(err) {
return nil, errors.Wrap(err, "GetUserByDiscordID") return nil, errors.Wrap(err, "GetUserByDiscordID")
} }
if user != nil { if user != nil {
player.UserID = &user.ID player.UserID = &user.ID
player.Name = user.Username
} }
err = Insert(tx, player). err = Insert(tx, player).
WithAudit(audit, nil).Exec(ctx) WithAudit(audit, nil).Exec(ctx)
@@ -56,7 +57,7 @@ func (u *User) ConnectPlayer(ctx context.Context, tx bun.Tx, audit *AuditMeta) e
return errors.Wrap(err, "GetByField") return errors.Wrap(err, "GetByField")
} }
// Player doesn't exist, create a new one // Player doesn't exist, create a new one
player, err = NewPlayer(ctx, tx, u.DiscordID, audit) player, err = NewPlayer(ctx, tx, u.Username, u.DiscordID, audit)
if err != nil { if err != nil {
return errors.Wrap(err, "NewPlayer") return errors.Wrap(err, "NewPlayer")
} }