dkforest

commit c9c7b997bd5319980e2a6989fdec5bde493062af
parent 6432ea4392a3cd354669b3a06242941224d8f892
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Mon, 29 May 2023 02:54:39 -0700

simplify code

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

2 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/pkg/web/handlers/api/v1/handlers.go b/pkg/web/handlers/api/v1/handlers.go
@@ -20,7 +20,6 @@ import (
 	"golang.org/x/net/websocket"
 	"io"
 	"net/http"
-	"net/url"
 	"regexp"
 	"strings"
 	"time"
@@ -128,13 +127,7 @@ 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
+		data.TopBarQueryParams = "&ml=1"
 	}
 
 	return data
diff --git a/pkg/web/handlers/handlers.go b/pkg/web/handlers/handlers.go
@@ -5065,13 +5065,7 @@ func ChatStreamMessagesHandler(c echo.Context) error {
 
 	data := v1.ChatMessagesData{}
 	if _, found := c.QueryParams()["ml"]; found {
-		topBarQueryParams := url.Values{}
-		topBarQueryParams.Set("ml", "1")
-		topBarQueryParamsStr := topBarQueryParams.Encode()
-		if topBarQueryParamsStr != "" {
-			topBarQueryParamsStr = "&" + topBarQueryParamsStr
-		}
-		data.TopBarQueryParams = topBarQueryParamsStr
+		data.TopBarQueryParams = "&ml=1"
 	}
 	data.ReadMarker, _ = db.GetUserReadMarker(authUser.ID, room.ID)
 	data.ChatMenuData.RoomName = room.Name