dkforest

commit f241f2fba828fa1d976fb8c8120c95f3e6a10dda
parent 989f2121e8c47825c1929e4c9533d3e34bbbf308
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Sat, 30 Dec 2023 17:57:54 -0500

cleanup

Diffstat:
M
pkg/database/tableUsers.go
 | 
5
+++++
M
pkg/web/handlers/admin.go
 | 
3
+--
M
pkg/web/handlers/interceptors/bangInterceptor.go
 | 
3
+--
M
pkg/web/handlers/interceptors/slashInterceptor.go
 | 
3
+--

4 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/pkg/database/tableUsers.go b/pkg/database/tableUsers.go
@@ -368,6 +368,11 @@ func (u *User) SetPmMode(db *DkfDB, pmMode int64) {
 	db.db.Exec(`UPDATE users SET pm_mode = ? WHERE id = ?`, u.PmMode, u.ID)
 }
 
+func (u *User) ResetTutorial(db *DkfDB) {
+	u.ChatTutorial = 0
+	db.db.Exec(`UPDATE users SET chat_tutorial = ? WHERE id = ?`, u.ChatTutorial, u.ID)
+}
+
 func (u *User) ToggleDisplayHellbanned(db *DkfDB) {
 	u.DisplayHellbanned = !u.DisplayHellbanned
 	db.db.Exec(`UPDATE users SET display_hellbanned = ? WHERE id = ?`, u.DisplayHellbanned, u.ID)
diff --git a/pkg/web/handlers/admin.go b/pkg/web/handlers/admin.go
@@ -634,8 +634,7 @@ func AdminEditUserHandler(c echo.Context) error {
 
 	formName := c.Request().PostFormValue("formName")
 	if formName == "reset_tutorial" {
-		user.ChatTutorial = 0
-		user.DoSave(db)
+		user.ResetTutorial(db)
 		return c.Redirect(http.StatusFound, "/admin/users/"+userID.String()+"/edit")
 	}
 
diff --git a/pkg/web/handlers/interceptors/bangInterceptor.go b/pkg/web/handlers/interceptors/bangInterceptor.go
@@ -30,7 +30,6 @@ CryptBB: ` + config.CryptbbOnion
 }
 
 func handleRtutoBangCmd(cmd *command.Command) {
-	cmd.AuthUser.ChatTutorial = 0
-	cmd.AuthUser.DoSave(cmd.DB)
+	cmd.AuthUser.ResetTutorial(cmd.DB)
 	cmd.Err = command.ErrRedirect
 }
diff --git a/pkg/web/handlers/interceptors/slashInterceptor.go b/pkg/web/handlers/interceptors/slashInterceptor.go
@@ -435,8 +435,7 @@ func handleResetTutorialCmd(c *command.Command) (handled bool) {
 		}
 		if c.AuthUser.IsAdmin || !user.IsModerator() {
 			c.DB.NewAudit(*c.AuthUser, fmt.Sprintf("rtuto %s #%d", user.Username, user.ID))
-			user.ChatTutorial = 0
-			user.DoSave(c.DB)
+			user.ResetTutorial(c.DB)
 		}
 		c.Err = command.ErrRedirect
 		return true