dkforest

commit f0be01a424df9258abb3e0a641a38723972126e1
parent 542a16fd971200319a895fd3e5f2c6fa72fc2855
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Mon, 22 May 2023 07:40:30 -0700

fix

Diffstat:
M
pkg/web/handlers/api/v1/messages.qtpl
 | 
6
+++---
M
pkg/web/handlers/api/v1/messages.qtpl.go
 | 
6
+++---
M
pkg/web/handlers/handlers.go
 | 
2
+-

3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pkg/web/handlers/api/v1/messages.qtpl b/pkg/web/handlers/api/v1/messages.qtpl
@@ -180,7 +180,7 @@
         {%- if Data.ForceManualRefresh -%}
             <div id="manualrefresh">
                 <h4>Manual refresh required</h4>
-                <form method="get" action="/chat/{%s Data.RoomName %}" target="_top">
+                <form method="get" action="/chat/{%s Data.ChatMenuData.RoomName %}" target="_top">
                     <input type="submit" value="Reload" />
                 </form>
             </div>
@@ -194,7 +194,7 @@
         {%- endif -%}
 
         {%- if Data.Error != "" -%}
-            <a href="/api/v1/chat/messages/{%s Data.RoomName %}" id="msg-err">× {%s Data.Error %}</a>
+            <a href="/api/v1/chat/messages/{%s Data.ChatMenuData.RoomName %}" id="msg-err">× {%s Data.Error %}</a>
         {%- endif -%}
 
         {%- if Data.PmSound || Data.TaggedSound -%}
@@ -269,7 +269,7 @@
 
 {%- func RenderMessages(AuthUser *database.User, Data ChatMessagesData, CSRF, NullUsername string) -%}
     {%- code
-        baseTopBarURL := "/api/v1/chat/top-bar/" + Data.RoomName
+        baseTopBarURL := "/api/v1/chat/top-bar/" + Data.ChatMenuData.RoomName
         readMarkerRendered := false
         isFirstMsg := true
     -%}
diff --git a/pkg/web/handlers/api/v1/messages.qtpl.go b/pkg/web/handlers/api/v1/messages.qtpl.go
@@ -294,7 +294,7 @@ func StreamMessages(qw422016 *qt422016.Writer, VERSION, CSRF, NullUsername strin
                 <h4>Manual refresh required</h4>
                 <form method="get" action="/chat/`)
 //line messages.qtpl:183
-		qw422016.E().S(Data.RoomName)
+		qw422016.E().S(Data.ChatMenuData.RoomName)
 //line messages.qtpl:183
 		qw422016.N().S(`" target="_top">
                     <input type="submit" value="Reload" />
@@ -321,7 +321,7 @@ func StreamMessages(qw422016 *qt422016.Writer, VERSION, CSRF, NullUsername strin
 //line messages.qtpl:196
 		qw422016.N().S(`            <a href="/api/v1/chat/messages/`)
 //line messages.qtpl:197
-		qw422016.E().S(Data.RoomName)
+		qw422016.E().S(Data.ChatMenuData.RoomName)
 //line messages.qtpl:197
 		qw422016.N().S(`" id="msg-err">× `)
 //line messages.qtpl:197
@@ -603,7 +603,7 @@ func RenderRightColumn(AuthUser *database.User, Data ChatMenuData) string {
 //line messages.qtpl:270
 func StreamRenderMessages(qw422016 *qt422016.Writer, AuthUser *database.User, Data ChatMessagesData, CSRF, NullUsername string) {
 //line messages.qtpl:272
-	baseTopBarURL := "/api/v1/chat/top-bar/" + Data.RoomName
+	baseTopBarURL := "/api/v1/chat/top-bar/" + Data.ChatMenuData.RoomName
 	readMarkerRendered := false
 	isFirstMsg := true
 
diff --git a/pkg/web/handlers/handlers.go b/pkg/web/handlers/handlers.go
@@ -4940,7 +4940,7 @@ func ChatStreamMessagesHandler(c echo.Context) error {
 	c.Response().Header().Set("Connection", "keep-alive")
 
 	data := v1.ChatMessagesData{}
-	data.RoomName = room.Name
+	data.ChatMenuData.RoomName = room.Name
 	_, _ = c.Response().Write([]byte(v1.GenerateStyle(authUser, data)))
 	_, _ = c.Response().Write([]byte(fmt.Sprintf(`<div style="display:flex;flex-direction:column-reverse;" id="msgs">`)))
 	c.Response().Flush()