autonomic-cooperative/gotosocial
0
0
Fork 0
Code Releases Activity

some fiddling with tests

Browse Source
This commit is contained in:
tsmethurst
2021-03-26 23:48:21 +01:00
parent dd65b25523
commit 998adc5591
7 changed files with 93 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/db/pg.go
View File

@ -379,7 +379,7 @@ func (ps *postgresService) IsUsernameAvailable(username string) error {
// if no error we fail because it means we found something
// if error but it's not pg.ErrNoRows then we fail
// if err is pg.ErrNoRows we're good, we found nothing so continue
if err := ps.conn.Model(&model.Account{}).Where("username = ?").Where("domain = ?", nil).Select(); err == nil {
if err := ps.conn.Model(&model.Account{}).Where("username = ?", username).Where("domain = ?", nil).Select(); err == nil {
return fmt.Errorf("username %s already in use", username)
} else if err != pg.ErrNoRows {
return fmt.Errorf("db error: %s", err)
@ -404,8 +404,8 @@ func (ps *postgresService) IsEmailAvailable(email string) error {
return fmt.Errorf("db error: %s", err)
}
// check if this email is associated with an account already
if err := ps.conn.Model(&model.Account{}).Where("email = ?", email).WhereOr("unconfirmed_email = ?", email).Select(); err == nil {
// check if this email is associated with a user already
if err := ps.conn.Model(&model.User{}).Where("email = ?", email).WhereOr("unconfirmed_email = ?", email).Select(); err == nil {
// fail because we found something
return fmt.Errorf("email %s already in use", email)
} else if err != pg.ErrNoRows {