dkforest

commit e46fdf9969e4b21bf548b448a2920cbe964a8426
parent 179a8b2a8f123e0a0630624cf2f345f76853b289
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Thu, 25 May 2023 19:12:00 -0700

simplify code

Diffstat:
M
pkg/database/tableUsers.go
 | 
8
++++++++
M
pkg/web/handlers/api/v1/handlers.go
 | 
8
+-------
M
pkg/web/handlers/handlers.go
 | 
6
+-----

3 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/pkg/database/tableUsers.go b/pkg/database/tableUsers.go
@@ -198,6 +198,14 @@ func (u *User) CanUpload() bool {
 	return u.CanUploadFile && (u.AccountOldEnough() || u.Vetted)
 }
 
+func (u *User) CountUIButtons() int64 {
+	bools := []bool{u.DisplayDeleteButton}
+	if u.IsModerator() {
+		bools = append(bools, u.DisplayHellbanButton, u.DisplayKickButton)
+	}
+	return utils.CountBools(bools...)
+}
+
 func (u *User) generateBaseStyle() string {
 	sb := strings.Builder{}
 	sb.WriteString(`color: `)
diff --git a/pkg/web/handlers/api/v1/handlers.go b/pkg/web/handlers/api/v1/handlers.go
@@ -191,14 +191,8 @@ func chatMessages(c echo.Context) (status int, data ChatMessagesData) {
 	data.ManualRefreshTimeout = authUser.RefreshRate + 25
 	data.Messages = msgs
 	data.PreventRefresh = utils.DoParseBool(c.QueryParam("r"))
-
 	data.ReadMarker, _ = db.GetUserReadMarker(authUser.ID, room.ID)
-
-	bools := []bool{authUser.DisplayDeleteButton}
-	if authUser.IsModerator() {
-		bools = append(bools, authUser.DisplayHellbanButton, authUser.DisplayKickButton)
-	}
-	data.NbButtons = utils.CountBools(bools...)
+	data.NbButtons = authUser.CountUIButtons()
 
 	if authUser.NotifyNewMessage || authUser.NotifyPmmed || authUser.NotifyTagged {
 		lastKnownDate := ""
diff --git a/pkg/web/handlers/handlers.go b/pkg/web/handlers/handlers.go
@@ -5082,11 +5082,7 @@ func ChatStreamMessagesHandler(c echo.Context) error {
 		}
 	}
 	data.Messages = msgs
-	bools := []bool{authUser.DisplayDeleteButton}
-	if authUser.IsModerator() {
-		bools = append(bools, authUser.DisplayHellbanButton, authUser.DisplayKickButton)
-	}
-	data.NbButtons = utils.CountBools(bools...)
+	data.NbButtons = authUser.CountUIButtons()
 	send("<div>" + v1.RenderMessages(authUser, data, csrf, config.NullUsername) + "</div>")
 	c.Response().Flush()