more refactors :)

This commit is contained in:
2026-02-08 20:52:58 +11:00
parent d038f7a42d
commit fa3b8e3982
10 changed files with 28 additions and 50 deletions

View File

@@ -80,7 +80,7 @@ func (u *User) GetDiscordToken(ctx context.Context, tx bun.Tx) (*DiscordToken, e
Limit(1).
Scan(ctx)
if err != nil {
if err == sql.ErrNoRows {
if errors.Is(err, sql.ErrNoRows) {
return nil, nil
}
return nil, errors.Wrap(err, "tx.NewSelect")
@@ -90,10 +90,12 @@ func (u *User) GetDiscordToken(ctx context.Context, tx bun.Tx) (*DiscordToken, e
// Convert reverts the token back into a *discord.Token
func (t *DiscordToken) Convert() *discord.Token {
expiresIn := t.ExpiresAt - time.Now().Unix()
expiresIn = max(expiresIn, 0)
token := &discord.Token{
AccessToken: t.AccessToken,
RefreshToken: t.RefreshToken,
ExpiresIn: int(t.ExpiresAt - time.Now().Unix()),
ExpiresIn: int(expiresIn),
Scope: t.Scope,
TokenType: t.TokenType,
}