diff options
author | Joe Chen <jc@unknwon.io> | 2022-11-27 19:36:10 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-27 19:36:10 +0800 |
commit | ae20d03aece78fb44dc1caaacfa40c3aa40c7949 (patch) | |
tree | 7e7b33f99eae57d8426eeead443276d5cbe0dd5a /internal/db/user.go | |
parent | 44333afd20a6312b617e0c33a497a4385ba3a250 (diff) |
refactor(db): migrate `UpdateUser` off `user.go` (#7267)
Diffstat (limited to 'internal/db/user.go')
-rw-r--r-- | internal/db/user.go | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/internal/db/user.go b/internal/db/user.go index cc2de95b..c2091e6f 100644 --- a/internal/db/user.go +++ b/internal/db/user.go @@ -19,10 +19,7 @@ import ( "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/db/errors" - "gogs.io/gogs/internal/errutil" "gogs.io/gogs/internal/repoutil" - "gogs.io/gogs/internal/strutil" - "gogs.io/gogs/internal/tool" "gogs.io/gogs/internal/userutil" ) @@ -42,48 +39,6 @@ func (u *User) AfterSet(colName string, _ xorm.Cell) { } } -// TODO(unknwon): Update call sites to use refactored methods and delete this one. -func updateUser(e Engine, u *User) error { - // Organization does not need email - if !u.IsOrganization() { - u.Email = strings.ToLower(u.Email) - has, err := e.Where("id!=?", u.ID).And("type=?", u.Type).And("email=?", u.Email).Get(new(User)) - if err != nil { - return err - } else if has { - return ErrEmailAlreadyUsed{args: errutil.Args{"email": u.Email}} - } - - if u.AvatarEmail == "" { - u.AvatarEmail = u.Email - } - u.Avatar = tool.HashEmail(u.AvatarEmail) - } - - u.LowerName = strings.ToLower(u.Name) - u.Location = strutil.Truncate(u.Location, 255) - u.Website = strutil.Truncate(u.Website, 255) - u.Description = strutil.Truncate(u.Description, 255) - - _, err := e.ID(u.ID).AllCols().Update(u) - return err -} - -// TODO(unknwon): Refactoring together with methods that do updates. -func (u *User) BeforeUpdate() { - if u.MaxRepoCreation < -1 { - u.MaxRepoCreation = -1 - } - u.UpdatedUnix = time.Now().Unix() -} - -// UpdateUser updates user's information. -// -// TODO(unknwon): Update call sites to use refactored methods and delete this one. -func UpdateUser(u *User) error { - return updateUser(x, u) -} - // deleteBeans deletes all given beans, beans should contain delete conditions. func deleteBeans(e Engine, beans ...interface{}) (err error) { for i := range beans { |