dkforest

commit e737ef6a0a83037efc02c273dd72bccf1742d8b9
parent 8baf04ccc6fc4b5f0c35ed9a285bec31b4f24d12
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Wed, 24 May 2023 03:38:31 -0700

have template code use config

Diffstat:
M
pkg/web/handlers/api/v1/data.go
 | 
25
+++++++++++++------------
M
pkg/web/handlers/api/v1/handlers.go
 | 
1
+
M
pkg/web/handlers/api/v1/messages.qtpl
 | 
4
++--
M
pkg/web/handlers/handlers.go
 | 
1
+

4 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/pkg/web/handlers/api/v1/data.go b/pkg/web/handlers/api/v1/data.go
@@ -31,18 +31,19 @@ type ChatMenuData struct {
 
 type ChatMessagesData struct {
 	ChatMenuData
-	NbButtons            int64
-	Messages             []database.ChatMessage
-	PreventRefresh       bool
-	RoomName             string
-	ManualRefreshTimeout int64
-	ReadMarker           database.ChatReadMarker
-	ForceManualRefresh   bool
-	NewMessageSound      bool
-	TaggedSound          bool
-	PmSound              bool
-	Error                string
-	ErrorTs              int64
+	DelayHideDeleteButton int64
+	NbButtons             int64
+	Messages              []database.ChatMessage
+	PreventRefresh        bool
+	RoomName              string
+	ManualRefreshTimeout  int64
+	ReadMarker            database.ChatReadMarker
+	ForceManualRefresh    bool
+	NewMessageSound       bool
+	TaggedSound           bool
+	PmSound               bool
+	Error                 string
+	ErrorTs               int64
 }
 
 func (c ChatMessagesData) MarshalJSON() ([]byte, error) {
diff --git a/pkg/web/handlers/api/v1/handlers.go b/pkg/web/handlers/api/v1/handlers.go
@@ -187,6 +187,7 @@ func chatMessages(c echo.Context) (status int, data ChatMessagesData) {
 		data.ForceManualRefresh = true
 	}
 
+	data.DelayHideDeleteButton = int64(config.EditMessageTimeLimit.Seconds())
 	data.ManualRefreshTimeout = authUser.RefreshRate + 25
 	data.Messages = msgs
 	data.PreventRefresh = utils.DoParseBool(c.QueryParam("r"))
diff --git a/pkg/web/handlers/api/v1/messages.qtpl b/pkg/web/handlers/api/v1/messages.qtpl
@@ -93,13 +93,13 @@
         line-height: 1;
     }
     .hide-after {
-        animation: 120s 1s forwards hide_btn;
+        animation: {%dl Data.DelayHideDeleteButton %}s 1s forwards hide_btn;
     }
     @keyframes hide_btn {
         100% { visibility: hidden;  }
     }
     .orange-after {
-        animation: 120s 1s forwards orange_btn;
+        animation: {%dl Data.DelayHideDeleteButton %}s 1s forwards orange_btn;
     }
     @keyframes orange_btn {
         100% { color: orange;  }
diff --git a/pkg/web/handlers/handlers.go b/pkg/web/handlers/handlers.go
@@ -4994,6 +4994,7 @@ func ChatStreamMessagesHandler(c echo.Context) error {
 	c.Response().Header().Set("Connection", "keep-alive")
 
 	data := v1.ChatMessagesData{}
+	data.DelayHideDeleteButton = int64(config.EditMessageTimeLimit.Seconds())
 	data.ChatMenuData.RoomName = room.Name
 	data.ManualRefreshTimeout = 0
 	_, _ = c.Response().Write([]byte(v1.GenerateStyle(authUser, data)))