dkforest

commit 63d7e9a37dfd70b39195398f6b10f19aafb5b451
parent 1764298d8b98ff098f133cf2468e6893e321b8c1
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Tue, 18 Feb 2025 14:42:05 -0800

cleanup some code

Diffstat:
M
pkg/database/tableChatMessages.go
 | 
14
++++----------
M
pkg/utils/utils.go
 | 
8
++++++++
M
pkg/web/handlers/signup.go
 | 
6
++----

3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/pkg/database/tableChatMessages.go b/pkg/database/tableChatMessages.go
@@ -574,13 +574,11 @@ func (d *DkfDB) CreateMsg(raw, txt, roomKey string, roomID RoomID, userID UserID
 }
 
 func (d *DkfDB) CreateSysMsg(raw, txt, roomKey string, roomID RoomID, userID UserID) error {
-	_, err := d.createMsg(raw, txt, roomKey, roomID, userID, nil, false, true, false)
-	return err
+	return utils.Second(d.createMsg(raw, txt, roomKey, roomID, userID, nil, false, true, false))
 }
 
 func (d *DkfDB) CreateSysMsgPM(raw, txt, roomKey string, roomID RoomID, userID UserID, toUserID *UserID, skipNotify bool) error {
-	_, err := d.createMsg(raw, txt, roomKey, roomID, userID, toUserID, false, true, skipNotify)
-	return err
+	return utils.Second(d.createMsg(raw, txt, roomKey, roomID, userID, toUserID, false, true, skipNotify))
 }
 
 func (d *DkfDB) CreateKickMsg(kickedUser, kickedByUser User) {
@@ -588,9 +586,7 @@ func (d *DkfDB) CreateKickMsg(kickedUser, kickedByUser User) {
 	styledUsername := fmt.Sprintf(`<span %s>%s</span>`, kickedUser.GenerateChatStyle(), kickedUser.Username)
 	rawTxt := fmt.Sprintf("%s has been kicked. (%s)", kickedUser.Username, kickedByUser.Username)
 	txt := fmt.Sprintf("%s has been kicked. (%s)", styledUsername, kickedByUser.Username)
-	if err := d.CreateSysMsg(rawTxt, txt, "", config.GeneralRoomID, kickedByUser.ID); err != nil {
-		logrus.Error(err)
-	}
+	utils.LogErr(d.CreateSysMsg(rawTxt, txt, "", config.GeneralRoomID, kickedByUser.ID))
 }
 
 func (d *DkfDB) CreateUnkickMsg(kickedUser, kickedByUser User) {
@@ -598,9 +594,7 @@ func (d *DkfDB) CreateUnkickMsg(kickedUser, kickedByUser User) {
 	styledUsername := fmt.Sprintf(`<span %s>%s</span>`, kickedUser.GenerateChatStyle(), kickedUser.Username)
 	rawTxt := fmt.Sprintf("%s has been unkicked. (%s)", kickedUser.Username, kickedByUser.Username)
 	txt := fmt.Sprintf("%s has been unkicked. (%s)", styledUsername, kickedByUser.Username)
-	if err := d.CreateSysMsg(rawTxt, txt, "", config.GeneralRoomID, kickedByUser.ID); err != nil {
-		logrus.Error(err)
-	}
+	utils.LogErr(d.CreateSysMsg(rawTxt, txt, "", config.GeneralRoomID, kickedByUser.ID))
 }
 
 func (d *DkfDB) createMsg(raw, txt, roomKey string, roomID RoomID, userID UserID, toUserID *UserID, hellbanMsg, system, skipNotify bool) (out ChatMessage, err error) {
diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go
@@ -1151,3 +1151,11 @@ func (_ CryptoRandSource) Seed(_ int64) {}
 
 func False() bool { return false }
 func True() bool  { return true }
+
+func LogErr(err error) {
+	if err != nil {
+		logrus.Error(err)
+	}
+}
+
+func Second[T any, U any](_ T, v U) U { return v }
diff --git a/pkg/web/handlers/signup.go b/pkg/web/handlers/signup.go
@@ -6,11 +6,11 @@ import (
 	"dkforest/pkg/captcha"
 	"dkforest/pkg/config"
 	"dkforest/pkg/database"
+	"dkforest/pkg/utils"
 	hutils "dkforest/pkg/web/handlers/utils"
 	"encoding/json"
 	"fmt"
 	"github.com/labstack/echo"
-	"github.com/sirupsen/logrus"
 	"net/http"
 	"strings"
 	"time"
@@ -186,9 +186,7 @@ func signupHandler(c echo.Context) error {
 
 			// Display message in chat
 			txt := fmt.Sprintf("auto turn off registrations")
-			if err := db.CreateSysMsg(txt, txt, "", config.GeneralRoomID, userNull.ID); err != nil {
-				logrus.Error(err)
-			}
+			utils.LogErr(db.CreateSysMsg(txt, txt, "", config.GeneralRoomID, userNull.ID))
 		}
 	}