Browse Source

fix random avatars (#1147)

tags/v1.1.0
Lunny Xiao 7 years ago
parent
commit
5d40db629c
2 changed files with 11 additions and 1 deletions
  1. 3
    1
      models/org.go
  2. 8
    0
      models/user.go

+ 3
- 1
models/org.go View File

@@ -135,7 +135,9 @@ func CreateOrganization(org, owner *User) (err error) {
if _, err = sess.Insert(org); err != nil {
return fmt.Errorf("insert organization: %v", err)
}
org.GenerateRandomAvatar()
if err = org.generateRandomAvatar(sess); err != nil {
return fmt.Errorf("generate random avatar: %v", err)
}

// Add initial creator to organization and owner team.
if _, err = sess.Insert(&OrgUser{

+ 8
- 0
models/user.go View File

@@ -287,6 +287,10 @@ func (u *User) CustomAvatarPath() string {

// GenerateRandomAvatar generates a random avatar for user.
func (u *User) GenerateRandomAvatar() error {
return u.generateRandomAvatar(x)
}

func (u *User) generateRandomAvatar(e Engine) error {
seed := u.Email
if len(seed) == 0 {
seed = u.Name
@@ -308,6 +312,10 @@ func (u *User) GenerateRandomAvatar() error {
}
defer fw.Close()

if _, err := e.Id(u.ID).Cols("avatar").Update(u); err != nil {
return err
}

if err = png.Encode(fw, img); err != nil {
return fmt.Errorf("Encode: %v", err)
}

Loading…
Cancel
Save