Update user avatar name

models/migrations/v115.go

@@ -5,12 +5,11 @@
 package migrations
 
 import (
+	"crypto/md5"
 	"fmt"
 	"io"
 	"os"
 	"path/filepath"
-	"strconv"
-	"strings"
 
 	"code.gitea.io/gitea/modules/setting"
 
@@ -36,37 +35,35 @@ func renameExistingUserAvatarName(x *xorm.Engine) error {
 
 	deleteList := make([]string, 0, len(users))
 	for _, user := range users {
-		if !strings.HasPrefix(user.Avatar, strconv.FormatInt(user.ID, 10)+"-") {
-			oldAvatar := user.Avatar
-			newAvatar := fmt.Sprintf("%d-%s", user.ID, user.Avatar)
+		oldAvatar := user.Avatar
+		newAvatar := fmt.Sprintf("%x", md5.Sum([]byte(fmt.Sprintf("%d-%s", user.ID, user.Avatar))))
 
-			if _, err := os.Stat(filepath.Join(setting.AvatarUploadPath, oldAvatar)); err != nil {
-				continue
-			}
-
-			fr, err := os.Open(filepath.Join(setting.AvatarUploadPath, oldAvatar))
-			if err != nil {
-				return err
-			}
-			defer fr.Close()
+		if _, err := os.Stat(filepath.Join(setting.AvatarUploadPath, oldAvatar)); err != nil {
+			continue
+		}
 
-			fw, err := os.Create(filepath.Join(setting.AvatarUploadPath, newAvatar))
-			if err != nil {
-				return err
-			}
-			defer fw.Close()
+		fr, err := os.Open(filepath.Join(setting.AvatarUploadPath, oldAvatar))
+		if err != nil {
+			return err
+		}
+		defer fr.Close()
 
-			if _, err := io.Copy(fw, fr); err != nil {
-				return err
-			}
+		fw, err := os.Create(filepath.Join(setting.AvatarUploadPath, newAvatar))
+		if err != nil {
+			return err
+		}
+		defer fw.Close()
 
-			user.Avatar = newAvatar
-			if _, err := sess.ID(user.ID).Update(&user); err != nil {
-				return err
-			}
+		if _, err := io.Copy(fw, fr); err != nil {
+			return err
+		}
 
-			deleteList = append(deleteList, filepath.Join(setting.AvatarUploadPath, oldAvatar))
+		user.Avatar = newAvatar
+		if _, err := sess.ID(user.ID).Update(&user); err != nil {
+			return err
 		}
+
+		deleteList = append(deleteList, filepath.Join(setting.AvatarUploadPath, oldAvatar))
 	}
 	for _, file := range deleteList {
 		if err := os.Remove(file); err != nil {

models/user.go

@@ -525,7 +525,7 @@ func (u *User) UploadAvatar(data []byte) error {
 	// If we prefix it with u.ID, it will be separated
 	// Otherwise, if any of the users delete his avatar
 	// Other users will lose their avatars too.
-	u.Avatar = fmt.Sprintf("%d-%x", u.ID, md5.Sum(data))
+	u.Avatar = fmt.Sprintf("%x", md5.Sum([]byte(fmt.Sprintf("%d-%x", u.ID, md5.Sum(data)))))
 	if err = updateUser(sess, u); err != nil {
 		return fmt.Errorf("updateUser: %v", err)
 	}