dkforest

commit a9d5019ad44faa3089507fe49dd2238c298b79ac
parent 001eef30e198b6e78793684b0e61d37a121d87cf
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Wed, 24 May 2023 23:35:26 -0700

simplify code

Diffstat:
M
pkg/web/handlers/handlers.go
 | 
34
+++++++++++++++++++---------------

1 file changed, 19 insertions(+), 15 deletions(-)
diff --git a/pkg/web/handlers/handlers.go b/pkg/web/handlers/handlers.go
@@ -4976,6 +4976,24 @@ func verifyMsgAuth(db *database.DkfDB, authUser *database.User, msg *database.Ch
 	return true
 }
 
+func manualPreload(db *database.DkfDB, msg *database.ChatMessage) {
+	if msg.GroupID != nil {
+		if msg.Group == nil {
+			group, _ := db.GetRoomGroupByID(msg.RoomID, *msg.GroupID)
+			msg.Group = &group
+		}
+	}
+	if msg.ToUserID != nil {
+		if msg.ToUser == nil {
+			toUser, _ := db.GetUserByID(*msg.ToUserID)
+			msg.ToUser = &toUser
+		}
+	}
+	if msg.User.ID == 0 {
+		msg.User, _ = db.GetUserByID(msg.UserID)
+	}
+}
+
 func ChatStreamMessagesHandler(c echo.Context) error {
 	db := c.Get("database").(*database.DkfDB)
 	authUser := c.Get("authUser").(*database.User)
@@ -5094,21 +5112,7 @@ Loop:
 			continue
 		}
 
-		if msg.GroupID != nil {
-			if msg.Group == nil {
-				group, _ := db.GetRoomGroupByID(msg.RoomID, *msg.GroupID)
-				msg.Group = &group
-			}
-		}
-		if msg.ToUserID != nil {
-			if msg.ToUser == nil {
-				toUser, _ := db.GetUserByID(*msg.ToUserID)
-				msg.ToUser = &toUser
-			}
-		}
-		if msg.User.ID == 0 {
-			msg.User, _ = db.GetUserByID(msg.UserID)
-		}
+		manualPreload(db, msg)
 
 		if (pmOnlyQuery == database.PmOnly && msg.ToUser == nil) ||
 			(pmOnlyQuery == database.PmNone && msg.ToUser != nil) ||