From 9b0b33cc20a2266377832a8cd0c1c286a0d265b0 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Wed, 6 Sep 2023 15:12:14 -0400
Subject: [PATCH 1/2] fix: bump chat message delay by 10x to 2000ms, re: #11983

---
 install/data/defaults.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/data/defaults.json b/install/data/defaults.json
index e32f98fd27..eeec153f1b 100644
--- a/install/data/defaults.json
+++ b/install/data/defaults.json
@@ -20,7 +20,7 @@
     "disableChat": 0,
     "chatEditDuration": 0,
     "chatDeleteDuration": 0,
-    "chatMessageDelay": 200,
+    "chatMessageDelay": 2000,
     "notificationSendDelay": 60,
     "newbiePostDelayThreshold": 3,
     "postQueue": 0,

From 88dd21e26fa08ce46efdad4726ff12b04b379266 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Wed, 6 Sep 2023 15:21:40 -0400
Subject: [PATCH 2/2] fix: better labels in ACP chat settings, #11983

---
 public/language/en-GB/admin/settings/chat.json | 8 +++++---
 src/views/admin/settings/chat.tpl              | 4 ++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/public/language/en-GB/admin/settings/chat.json b/public/language/en-GB/admin/settings/chat.json
index e4946458bd..102dd5aa3b 100644
--- a/public/language/en-GB/admin/settings/chat.json
+++ b/public/language/en-GB/admin/settings/chat.json
@@ -1,4 +1,5 @@
 {
+	"zero-is-disabled": "Enter 0 to disable this restriction",
 	"chat-settings": "Chat Settings",
 	"disable": "Disable chat",
 	"disable-editing": "Disable chat message editing/deletion",
@@ -7,7 +8,8 @@
 	"max-chat-room-name-length": "Maximum length of chat room names",
 	"max-room-size": "Maximum number of users in chat rooms",
 	"delay": "Time between chat messages in milliseconds",
-	"notification-delay": "Notification delay for chat messages. (0 for no delay)",
-	"restrictions.seconds-edit-after": "Number of seconds a chat message will remain editable. (0 disabled)",
-	"restrictions.seconds-delete-after": "Number of seconds a chat message will remain deletable. (0 disabled)"
+	"notification-delay": "Notification delay for chat messages",
+	"notification-delay-help": "Additional messages sent between this time are collated, and the user is notified once per delay period. Set this to 0 to disable the delay.",
+	"restrictions.seconds-edit-after": "Number of seconds a chat message will remain editable.",
+	"restrictions.seconds-delete-after": "Number of seconds a chat message will remain deletable."
 }
\ No newline at end of file
diff --git a/src/views/admin/settings/chat.tpl b/src/views/admin/settings/chat.tpl
index 62fbd3c199..852a039597 100644
--- a/src/views/admin/settings/chat.tpl
+++ b/src/views/admin/settings/chat.tpl
@@ -24,16 +24,19 @@
 				<div class="mb-3">
 					<label class="form-label" for="chatEditDuration">[[admin/settings/chat:restrictions.seconds-edit-after]]</label>
 					<input id="chatEditDuration" type="text" class="form-control" value="0" data-field="chatEditDuration">
+					<p class="form-text">[[admin/settings/chat:zero-is-disabled]]</p>
 				</div>
 
 				<div class="mb-3">
 					<label class="form-label" for="chatDeleteDuration">[[admin/settings/chat:restrictions.seconds-delete-after]]</label>
 					<input id="chatDeleteDuration" type="text" class="form-control" value="0" data-field="chatDeleteDuration">
+					<p class="form-text">[[admin/settings/chat:zero-is-disabled]]</p>
 				</div>
 
 				<div class="mb-3">
 					<label class="form-label" for="maximumChatRoomNameLength">[[admin/settings/chat:max-chat-room-name-length]]</label>
 					<input id="maximumChatRoomNameLength" type="text" class="form-control" value="50" data-field="maximumChatRoomNameLength">
+					<p class="form-text">[[admin/settings/chat:zero-is-disabled]]</p>
 				</div>
 
 				<div class="mb-3">
@@ -55,6 +58,7 @@
 				<div class="mb-3">
 					<label class="form-label" for="notificationSendDelay">[[admin/settings/chat:notification-delay]]</label>
 					<input id="notificationSendDelay" type="text" class="form-control" value="60" data-field="notificationSendDelay">
+					<p class="form-text">[[admin/settings/chat:notification-delay-help]]</p>
 				</div>
 			</div>
 		</div>