dkforest

commit 9965f53e3de5701b587ced3b4b4693d44ddfddc4
parent a5c6e02965f679c918ebb78b792578c62c52749b
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Mon, 23 Jan 2023 14:39:58 -0800

safer user rename from admin form

Diffstat:
M
pkg/web/handlers/admin.go
 | 
7
+------

1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/pkg/web/handlers/admin.go b/pkg/web/handlers/admin.go
@@ -531,14 +531,9 @@ func AdminEditUserHandler(c echo.Context) error {
 	data.ChatColor = c.FormValue("chat_color")
 	data.ChatFont = utils.DoParseInt64(c.FormValue("chat_font"))
 	if data.Username != user.Username {
-		if _, err := database.ValidateUsername(data.Username, false); err != nil {
+		if err := database.CanRenameTo(user.Username, data.Username); err != nil {
 			data.Errors.Username = err.Error()
 		}
-		var existingUser database.User
-		database.DB.Select("username").Where("(username = ? COLLATE NOCASE) and id != ?", data.Username, user.ID).First(&existingUser)
-		if existingUser.Username != "" && existingUser.Username == data.Username {
-			data.Errors.Username = "Username already exists"
-		}
 	}
 	// Edit password
 	var hashedPassword string