dkforest

commit 821f6801d9f05bd967c84f9157e7723574a39590
parent 1dfc3026d9e93aafdd71f74b370c8c9ad37408f5
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Fri, 29 Dec 2023 20:56:44 -0500

cleanup

Diffstat:
M
pkg/web/handlers/api/v1/topBarHandler.go
 | 
5
+++--
M
pkg/web/handlers/interceptors/slashInterceptor.go
 | 
5
+++--

2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/pkg/web/handlers/api/v1/topBarHandler.go b/pkg/web/handlers/api/v1/topBarHandler.go
@@ -133,8 +133,9 @@ func ChatTopBarHandler(c echo.Context) error {
 	var data chatTopBarData
 	data.RoomName = c.Param("roomName")
 
+	redirectPmUsernameQP := command.RedirectPmUsernameQP
 	queryParams := c.QueryParams()
-	pmUsername := c.QueryParam(command.RedirectPmUsernameQP)
+	pmUsername := c.QueryParam(redirectPmUsernameQP)
 	origMl := utils.DoParseBool(c.QueryParam(command.RedirectMultilineQP))
 	data.QueryParams = queryParams.Encode()
 	queryParams.Set(command.RedirectMultilineQP, "1")
@@ -150,7 +151,7 @@ func ChatTopBarHandler(c echo.Context) error {
 		}
 	}
 	if pmUsername != "" {
-		redirectQP.Set(command.RedirectPmUsernameQP, pmUsername)
+		redirectQP.Set(redirectPmUsernameQP, pmUsername)
 	}
 
 	room, roomKey, err := dutils.GetRoomAndKey(db, c, data.RoomName)
diff --git a/pkg/web/handlers/interceptors/slashInterceptor.go b/pkg/web/handlers/interceptors/slashInterceptor.go
@@ -983,9 +983,10 @@ func handlePMCmd(c *command.Command) (handled bool) {
 		}
 
 		if strings.TrimSpace(newMsg) == "" {
-			newURL := fmt.Sprintf("/api/v1/chat/messages/%s/stream?pmusername=%s", c.Room.Name, username)
+			redirectPmUsernameQP := command.RedirectPmUsernameQP
+			newURL := fmt.Sprintf("/api/v1/chat/messages/%s/stream?%s=%s", c.Room.Name, redirectPmUsernameQP, username)
 			database.MsgPubSub.Pub("refresh_"+string(c.AuthUser.Username), database.ChatMessageType{Typ: database.Redirect, NewURL: newURL})
-			c.RedirectQP.Set(command.RedirectPmUsernameQP, username.String())
+			c.RedirectQP.Set(redirectPmUsernameQP, username.String())
 			c.Err = command.ErrRedirect
 			return true
 		}