diff options
Diffstat (limited to 'internal/db/bundb/admin.go')
| -rw-r--r-- | internal/db/bundb/admin.go | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/internal/db/bundb/admin.go b/internal/db/bundb/admin.go index 61ae1e044..fb1fb9d6c 100644 --- a/internal/db/bundb/admin.go +++ b/internal/db/bundb/admin.go @@ -44,21 +44,21 @@ import ( const rsaKeyBits = 2048 type adminDB struct { - conn *DBConn + db *WrappedDB state *state.State } -func (a *adminDB) IsUsernameAvailable(ctx context.Context, username string) (bool, db.Error) { - q := a.conn. +func (a *adminDB) IsUsernameAvailable(ctx context.Context, username string) (bool, error) { + q := a.db. NewSelect(). TableExpr("? AS ?", bun.Ident("accounts"), bun.Ident("account")). Column("account.id"). Where("? = ?", bun.Ident("account.username"), username). Where("? IS NULL", bun.Ident("account.domain")) - return a.conn.NotExists(ctx, q) + return a.db.NotExists(ctx, q) } -func (a *adminDB) IsEmailAvailable(ctx context.Context, email string) (bool, db.Error) { +func (a *adminDB) IsEmailAvailable(ctx context.Context, email string) (bool, error) { // parse the domain from the email m, err := mail.ParseAddress(email) if err != nil { @@ -67,12 +67,12 @@ func (a *adminDB) IsEmailAvailable(ctx context.Context, email string) (bool, db. domain := strings.Split(m.Address, "@")[1] // domain will always be the second part after @ // check if the email domain is blocked - emailDomainBlockedQ := a.conn. + emailDomainBlockedQ := a.db. NewSelect(). TableExpr("? AS ?", bun.Ident("email_domain_blocks"), bun.Ident("email_domain_block")). Column("email_domain_block.id"). Where("? = ?", bun.Ident("email_domain_block.domain"), domain) - emailDomainBlocked, err := a.conn.Exists(ctx, emailDomainBlockedQ) + emailDomainBlocked, err := a.db.Exists(ctx, emailDomainBlockedQ) if err != nil { return false, err } @@ -81,16 +81,16 @@ func (a *adminDB) IsEmailAvailable(ctx context.Context, email string) (bool, db. } // check if this email is associated with a user already - q := a.conn. + q := a.db. NewSelect(). TableExpr("? AS ?", bun.Ident("users"), bun.Ident("user")). Column("user.id"). Where("? = ?", bun.Ident("user.email"), email). WhereOr("? = ?", bun.Ident("user.unconfirmed_email"), email) - return a.conn.NotExists(ctx, q) + return a.db.NotExists(ctx, q) } -func (a *adminDB) NewSignup(ctx context.Context, newSignup gtsmodel.NewSignup) (*gtsmodel.User, db.Error) { +func (a *adminDB) NewSignup(ctx context.Context, newSignup gtsmodel.NewSignup) (*gtsmodel.User, error) { // If something went wrong previously while doing a new // sign up with this username, we might already have an // account, so check first. @@ -220,17 +220,17 @@ func (a *adminDB) NewSignup(ctx context.Context, newSignup gtsmodel.NewSignup) ( return user, nil } -func (a *adminDB) CreateInstanceAccount(ctx context.Context) db.Error { +func (a *adminDB) CreateInstanceAccount(ctx context.Context) error { username := config.GetHost() - q := a.conn. + q := a.db. NewSelect(). TableExpr("? AS ?", bun.Ident("accounts"), bun.Ident("account")). Column("account.id"). Where("? = ?", bun.Ident("account.username"), username). Where("? IS NULL", bun.Ident("account.domain")) - exists, err := a.conn.Exists(ctx, q) + exists, err := a.db.Exists(ctx, q) if err != nil { return err } @@ -277,18 +277,18 @@ func (a *adminDB) CreateInstanceAccount(ctx context.Context) db.Error { return nil } -func (a *adminDB) CreateInstanceInstance(ctx context.Context) db.Error { +func (a *adminDB) CreateInstanceInstance(ctx context.Context) error { protocol := config.GetProtocol() host := config.GetHost() // check if instance entry already exists - q := a.conn. + q := a.db. NewSelect(). Column("instance.id"). TableExpr("? AS ?", bun.Ident("instances"), bun.Ident("instance")). Where("? = ?", bun.Ident("instance.domain"), host) - exists, err := a.conn.Exists(ctx, q) + exists, err := a.db.Exists(ctx, q) if err != nil { return err } @@ -309,13 +309,13 @@ func (a *adminDB) CreateInstanceInstance(ctx context.Context) db.Error { URI: fmt.Sprintf("%s://%s", protocol, host), } - insertQ := a.conn. + insertQ := a.db. NewInsert(). Model(i) _, err = insertQ.Exec(ctx) if err != nil { - return a.conn.ProcessError(err) + return a.db.ProcessError(err) } log.Infof(ctx, "created instance instance %s with id %s", host, i.ID) |