dkforest

commit 3f51be3221b45c475a47082860b27d9d1f05e2fb
parent 189a39269605b0c28b2812ca24bd17d4936706e1
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Sun,  8 Jan 2023 00:09:23 -0800

cleanup

Diffstat:
M
pkg/database/tableSettings.go
 | 
2
+-
M
pkg/database/tableUsers.go
 | 
2
+-
M
pkg/web/handlers/admin.go
 | 
2
+-
M
pkg/web/handlers/api/v1/slashInterceptor.go
 | 
2
+-
M
pkg/web/handlers/handlers.go
 | 
10
+++++-----

5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/pkg/database/tableSettings.go b/pkg/database/tableSettings.go
@@ -38,7 +38,7 @@ func (s *Settings) Save() error {
 
 // DoSave settings in the database, ignore error
 func (s *Settings) DoSave() {
-	if err := DB.Save(s).Error; err != nil {
+	if err := s.Save(); err != nil {
 		logrus.Error(err)
 	}
 }
diff --git a/pkg/database/tableUsers.go b/pkg/database/tableUsers.go
@@ -248,7 +248,7 @@ func (u *User) Save() error {
 
 // DoSave user in the database, ignore error
 func (u *User) DoSave() {
-	if err := DB.Save(u).Error; err != nil {
+	if err := u.Save(); err != nil {
 		logrus.Error(err)
 	}
 }
diff --git a/pkg/web/handlers/admin.go b/pkg/web/handlers/admin.go
@@ -246,7 +246,7 @@ func AdminSettingsHandler(c echo.Context) error {
 			settings.ForumEnabled = utils.DoParseBool(c.Request().PostFormValue("forumEnabled"))
 			settings.MaybeAuthEnabled = utils.DoParseBool(c.Request().PostFormValue("maybeAuthEnabled"))
 			settings.CaptchaDifficulty = utils.DoParseInt64(c.Request().PostFormValue("captchaDifficulty"))
-			_ = settings.Save()
+			settings.DoSave()
 			config.ProtectHome.Store(settings.ProtectHome)
 			config.HomeUsersList.Store(settings.HomeUsersList)
 			config.ForceLoginCaptcha.Store(settings.ForceLoginCaptcha)
diff --git a/pkg/web/handlers/api/v1/slashInterceptor.go b/pkg/web/handlers/api/v1/slashInterceptor.go
@@ -247,7 +247,7 @@ func handleUnkickCmd(c *Command) (handled bool) {
 		}
 		database.NewAudit(*c.authUser, fmt.Sprintf("unkick %s #%d", user.Username, user.ID))
 		user.Verified = true
-		_ = user.Save()
+		user.DoSave()
 
 		// Display unkick message
 		database.CreateUnkickMsg(user, *c.authUser)
diff --git a/pkg/web/handlers/handlers.go b/pkg/web/handlers/handlers.go
@@ -391,7 +391,7 @@ func loginHandler(c echo.Context) error {
 
 func completeLogin(c echo.Context, user database.User) error {
 	user.LoginAttempts = 0
-	_ = user.Save()
+	user.DoSave()
 
 	for _, session := range database.GetActiveUserSessions(user.ID) {
 		msg := fmt.Sprintf(`New login`)
@@ -2940,7 +2940,7 @@ func SettingsWebsiteHandler(c echo.Context) error {
 		settings.SignupEnabled = utils.DoParseBool(c.Request().PostFormValue("signupEnabled"))
 		settings.ForumEnabled = utils.DoParseBool(c.Request().PostFormValue("forumEnabled"))
 		settings.SilentSelfKick = utils.DoParseBool(c.Request().PostFormValue("silentSelfKick"))
-		_ = settings.Save()
+		settings.DoSave()
 		config.SignupEnabled.Store(settings.SignupEnabled)
 		config.ForumEnabled.Store(settings.ForumEnabled)
 		config.SilentSelfKick.Store(settings.SilentSelfKick)
@@ -3466,7 +3466,7 @@ func AddPGPHandler(c echo.Context) error {
 
 			pgpTokenCache.Delete(authUser.ID)
 			authUser.GPGPublicKey = token.PKey
-			_ = authUser.Save()
+			authUser.DoSave()
 			return c.Redirect(http.StatusFound, "/settings/pgp")
 		}
 	}
@@ -3503,7 +3503,7 @@ func AddAgeHandler(c echo.Context) error {
 			}
 			ageTokenCache.Delete(authUser.ID)
 			authUser.AgePublicKey = token.PKey
-			_ = authUser.Save()
+			authUser.DoSave()
 			return c.Redirect(http.StatusFound, "/settings/age")
 		}
 	}
@@ -3637,7 +3637,7 @@ func TwoFactorAuthenticationDisableHandler(c echo.Context) error {
 	}
 	authUser.TwoFactorSecret = ""
 	authUser.TwoFactorRecovery = ""
-	_ = authUser.Save()
+	authUser.DoSave()
 	database.CreateSecurityLog(authUser.ID, database.TotpDisabledSecurityLog)
 	return c.Render(http.StatusOK, "flash", FlashResponse{"Two-factor authentication disabled", "/settings/account", "alert-success"})
 }