dkforest

commit 189a39269605b0c28b2812ca24bd17d4936706e1
parent a3382daf314b29870e715c37bbdfa5869d52c20a
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Sat,  7 Jan 2023 22:32:36 -0800

cleanup

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

1 file changed, 4 insertions(+), 16 deletions(-)
diff --git a/pkg/web/handlers/handlers.go b/pkg/web/handlers/handlers.go
@@ -3016,20 +3016,8 @@ func changeAvatarForm(c echo.Context, data settingsAccountData) error {
 	}
 
 	// Validate image type and determine extension
-	var ext string
-	switch handler.Header.Get("Content-Type") {
-	case "image/jpeg":
-		ext = ".jpg"
-	case "image/png":
-		ext = ".png"
-	case "image/gif":
-		ext = ".gif"
-	case "image/bmp":
-		ext = ".bmp"
-	case "image/webp":
-		ext = ".webp"
-	default:
-		data.ErrorAvatar = "Image must be JPEG, PNG, WEBP, BMP or GIF."
+	if handler.Header.Get("Content-Type") != filetype {
+		data.ErrorAvatar = "Content-Type does not match mimetype"
 		return c.Render(http.StatusOK, "settings.account", data)
 	}
 
@@ -3043,9 +3031,9 @@ func changeAvatarForm(c echo.Context, data settingsAccountData) error {
 		return c.Render(http.StatusOK, "settings.account", data)
 	}
 
-	if ext == ".jpg" {
+	if filetype == "image/jpeg" {
 		fileBytes, err = utils.ReencodeJpg(fileBytes)
-	} else if ext == ".png" {
+	} else if filetype == "image/png" {
 		fileBytes, err = utils.ReencodePng(fileBytes)
 	}
 	if err != nil {