diff options
Diffstat (limited to 'internal/db/user_mail.go')
| -rw-r--r-- | internal/db/user_mail.go | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/internal/db/user_mail.go b/internal/db/user_mail.go index 1608dc19..f73278b6 100644 --- a/internal/db/user_mail.go +++ b/internal/db/user_mail.go @@ -9,16 +9,17 @@ import ( "strings" "gogs.io/gogs/internal/db/errors" + "gogs.io/gogs/internal/errutil" ) -// EmailAdresses is the list of all email addresses of a user. Can contain the +// EmailAddresses is the list of all email addresses of a user. Can contain the // primary email address, but is not obligatory. type EmailAddress struct { ID int64 - UID int64 `xorm:"INDEX NOT NULL"` - Email string `xorm:"UNIQUE NOT NULL"` - IsActivated bool - IsPrimary bool `xorm:"-" json:"-"` + UID int64 `xorm:"INDEX NOT NULL" gorm:"INDEX"` + Email string `xorm:"UNIQUE NOT NULL" gorm:"UNIQUE"` + IsActivated bool `gorm:"NOT NULL;DEFAULT:FALSE"` + IsPrimary bool `xorm:"-" gorm:"-" json:"-"` } // GetEmailAddresses returns all email addresses belongs to given user. @@ -68,7 +69,7 @@ func isEmailUsed(e Engine, email string) (bool, error) { } // We need to check primary email of users as well. - return e.Where("type=?", USER_TYPE_INDIVIDUAL).And("email=?", email).Get(new(User)) + return e.Where("type=?", UserIndividual).And("email=?", email).Get(new(User)) } // IsEmailUsed returns true if the email has been used. @@ -82,7 +83,7 @@ func addEmailAddress(e Engine, email *EmailAddress) error { if err != nil { return err } else if used { - return ErrEmailAlreadyUsed{email.Email} + return ErrEmailAlreadyUsed{args: errutil.Args{"email": email.Email}} } _, err = e.Insert(email) @@ -105,7 +106,7 @@ func AddEmailAddresses(emails []*EmailAddress) error { if err != nil { return err } else if used { - return ErrEmailAlreadyUsed{emails[i].Email} + return ErrEmailAlreadyUsed{args: errutil.Args{"email": emails[i].Email}} } } |