dkforest

commit 4f3ba46ef785309dbfeb500509d704ba61c0ee89
parent 4451c18c66657ea2348e23dd628e6385b9b00327
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Wed,  9 Nov 2022 20:33:13 -0800

remove useless code

Diffstat:
M
pkg/database/tableUsers.go
 | 
4
++--
M
pkg/web/handlers/data.go
 | 
1
-
M
pkg/web/handlers/handlers.go
 | 
5
++---

3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/pkg/database/tableUsers.go b/pkg/database/tableUsers.go
@@ -451,8 +451,8 @@ func CanUseUsername(username string, isFirstUser bool) error {
 }
 
 // CreateUser ...
-func CreateUser(username, password, repassword, gpgPublicKey string, temp bool, registrationDuration int64, signupInfoEnc string) (User, UserErrors) {
-	return createUser(username, password, repassword, gpgPublicKey, false, true, temp, false, false, registrationDuration, signupInfoEnc)
+func CreateUser(username, password, repassword string, temp bool, registrationDuration int64, signupInfoEnc string) (User, UserErrors) {
+	return createUser(username, password, repassword, "", false, true, temp, false, false, registrationDuration, signupInfoEnc)
 }
 
 func CreateFirstUser(username, password, repassword string) (User, UserErrors) {
diff --git a/pkg/web/handlers/data.go b/pkg/web/handlers/data.go
@@ -61,7 +61,6 @@ type signupData struct {
 	Username         string
 	Password         string
 	RePassword       string
-	GPGPublicKey     string
 	CaptchaImg       string
 	CaptchaID        string
 	Captcha          string
diff --git a/pkg/web/handlers/handlers.go b/pkg/web/handlers/handlers.go
@@ -860,7 +860,6 @@ func signupHandler(c echo.Context) error {
 		data.Username = strings.TrimSpace(c.Request().PostFormValue("username"))
 		data.Password = c.Request().PostFormValue("password")
 		data.RePassword = c.Request().PostFormValue("repassword")
-		data.GPGPublicKey = c.Request().PostFormValue("gpg_public_key")
 		captchaID := c.Request().PostFormValue("captcha_id")
 		captchaInput := c.Request().PostFormValue("captcha")
 		captchaInputImg := c.Request().PostFormValue("captcha_img")
@@ -897,7 +896,7 @@ func signupHandler(c echo.Context) error {
 		signupInfoEnc, _ := json.Marshal(signupInfo)
 
 		registrationDuration := time.Now().UnixMilli() - start
-		newUser, errs := database.CreateUser(data.Username, data.Password, data.RePassword, data.GPGPublicKey, false, registrationDuration, string(signupInfoEnc))
+		newUser, errs := database.CreateUser(data.Username, data.Password, data.RePassword, false, registrationDuration, string(signupInfoEnc))
 		if errs.HasError() {
 			data.Errors = errs
 			return c.Render(http.StatusOK, "signup", data)
@@ -2252,7 +2251,7 @@ func chatHandler(c echo.Context, redRoom bool) error {
 
 		if authUser == nil {
 			password := utils.GenerateToken()
-			newUser, errs := database.CreateUser(data.GuestUsername, password, password, "", true, 0, "")
+			newUser, errs := database.CreateUser(data.GuestUsername, password, password, true, 0, "")
 			if errs.HasError() {
 				data.ErrGuestUsername = errs.Username
 				return c.Render(http.StatusOK, "chat-password", data)