dkforest

commit dba1f410b790badcb3d1deecf199d2793fcc9433
parent 6ceed6bc02cedf4b763908ebcfaed9f21d40d062
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Mon, 22 May 2023 04:56:13 -0700

move code

Diffstat:
M
pkg/web/handlers/api/v1/handlers.go
 | 
21
+++++++++++----------

1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/pkg/web/handlers/api/v1/handlers.go b/pkg/web/handlers/api/v1/handlers.go
@@ -123,6 +123,17 @@ func GetChatMenuData(c echo.Context, room database.ChatRoom) ChatMenuData {
 		}
 	}
 	data.RoomName = room.Name
+
+	if _, found := c.QueryParams()["ml"]; found {
+		topBarQueryParams := url.Values{}
+		topBarQueryParams.Set("ml", "1")
+		topBarQueryParamsStr := topBarQueryParams.Encode()
+		if topBarQueryParamsStr != "" {
+			topBarQueryParamsStr = "&" + topBarQueryParamsStr
+		}
+		data.TopBarQueryParams = topBarQueryParamsStr
+	}
+
 	return data
 }
 
@@ -178,16 +189,6 @@ func chatMessages(c echo.Context) (status int, data ChatMessagesData) {
 
 	data.ManualRefreshTimeout = authUser.RefreshRate + 25
 	data.Messages = msgs
-
-	if _, found := c.QueryParams()["ml"]; found {
-		topBarQueryParams := url.Values{}
-		topBarQueryParams.Set("ml", "1")
-		topBarQueryParamsStr := topBarQueryParams.Encode()
-		if topBarQueryParamsStr != "" {
-			topBarQueryParamsStr = "&" + topBarQueryParamsStr
-		}
-		data.TopBarQueryParams = topBarQueryParamsStr
-	}
 	data.PreventRefresh = utils.DoParseBool(c.QueryParam("r"))
 
 	data.ReadMarker, _ = db.GetUserReadMarker(authUser.ID, room.ID)