From dd661487d8c94829fabc1d6d09b6623d2556e5db Mon Sep 17 00:00:00 2001
From: xpmb <contrib@xpmb.me>
Date: Sat, 27 Sep 2025 22:46:51 +0200
Subject: [PATCH 1/6] feat: add option to hide message body in push
 notifications

---
 client/components/Settings/Notifications.vue | 11 +++++++++++
 client/js/settings.ts                        |  3 +++
 client/js/socket-events/msg.ts               | 15 +++++++++++----
 server/plugins/irc-events/message.ts         |  9 ++++++++-
 4 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/client/components/Settings/Notifications.vue b/client/components/Settings/Notifications.vue
index 4599c7c0..36e27d28 100644
--- a/client/components/Settings/Notifications.vue
+++ b/client/components/Settings/Notifications.vue
@@ -90,6 +90,17 @@
 			</label>
 		</div>
 
+		<div>
+			<label class="opt">
+				<input
+					:checked="store.state.settings.hideMessagePreviews"
+					type="checkbox"
+					name="hideMessagePreviews"
+				/>
+				Hide message previews in push notifications
+			</label>
+		</div>
+
 		<div v-if="!store.state.serverConfiguration?.public">
 			<label class="opt">
 				<label for="highlights" class="opt">
diff --git a/client/js/settings.ts b/client/js/settings.ts
index 3411f479..ef44a497 100644
--- a/client/js/settings.ts
+++ b/client/js/settings.ts
@@ -73,6 +73,9 @@ const defaultConfig = {
 	notifyAllMessages: {
 		default: false,
 	},
+	hideMessagePreviews: {
+		default: false,
+	},
 	showSeconds: {
 		default: false,
 	},
diff --git a/client/js/socket-events/msg.ts b/client/js/socket-events/msg.ts
index af53a631..08d3f87e 100644
--- a/client/js/socket-events/msg.ts
+++ b/client/js/socket-events/msg.ts
@@ -136,9 +136,19 @@ function notifyMessage(
 				// TODO: fix msg type and get rid of that conditional
 				const nick = msg.from && msg.from.nick ? msg.from.nick : "unkonown";
 
+				// Check if user has disabled message previews
+				if (store.state.settings.hideMessagePreviews) {
+					body = "You have a new message";
+				} else {
+					body = cleanIrcMessage(msg.text ? msg.text : "");
+				}
+
 				if (msg.type === MessageType.INVITE) {
 					title = "New channel invite:";
-					body = nick + " invited you to " + msg.channel;
+
+					if (!store.state.settings.hideMessagePreviews) {
+						body = nick + " invited you to " + msg.channel;
+					}
 				} else {
 					title = nick;
 
@@ -149,9 +159,6 @@ function notifyMessage(
 					if (msg.type === MessageType.MESSAGE) {
 						title += " says:";
 					}
-
-					// TODO: fix msg type and get rid of that conditional
-					body = cleanIrcMessage(msg.text ? msg.text : "");
 				}
 
 				const timestamp = Date.parse(String(msg.time));
diff --git a/server/plugins/irc-events/message.ts b/server/plugins/irc-events/message.ts
index f35538f0..281b5b14 100644
--- a/server/plugins/irc-events/message.ts
+++ b/server/plugins/irc-events/message.ts
@@ -179,7 +179,14 @@ export default <IrcEventHandler>function (irc, network) {
 		// Do not send notifications if the channel is muted or for messages older than 15 minutes (znc buffer for example)
 		if (!chan.muted && msg.highlight && (!data.time || data.time > Date.now() - 900000)) {
 			let title = chan.name;
-			let body = cleanMessage;
+			let body: string;
+
+			// Check if user has disabled message previews
+			if (client.config.clientSettings.hideMessagePreviews) {
+				body = "sent you a message";
+			} else {
+				body = cleanMessage;
+			}
 
 			if (msg.type === MessageType.ACTION) {
 				// For actions, do not include colon in the message

From 21f64def4c08b063f9b02fde609d68d4d124d892 Mon Sep 17 00:00:00 2001
From: xpmb <contrib@xpmb.me>
Date: Sat, 27 Sep 2025 22:53:30 +0200
Subject: [PATCH 2/6] chore: fix typo

---
 client/js/socket-events/msg.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/js/socket-events/msg.ts b/client/js/socket-events/msg.ts
index 08d3f87e..2c4dacac 100644
--- a/client/js/socket-events/msg.ts
+++ b/client/js/socket-events/msg.ts
@@ -134,7 +134,7 @@ function notifyMessage(
 				let title: string;
 				let body: string;
 				// TODO: fix msg type and get rid of that conditional
-				const nick = msg.from && msg.from.nick ? msg.from.nick : "unkonown";
+				const nick = msg.from && msg.from.nick ? msg.from.nick : "unknown";
 
 				// Check if user has disabled message previews
 				if (store.state.settings.hideMessagePreviews) {

From b4fdd5e20e1d3e51652d43aa9e8f163adf22599f Mon Sep 17 00:00:00 2001
From: xpmb <contrib@xpmb.me>
Date: Fri, 3 Oct 2025 20:29:58 +0200
Subject: [PATCH 3/6] feat: add general notification settings

Introduces a general notification settings section in the user interface.
Moves the "hide message preview" setting under a top-level "notifications" key for better organization and clarity.
---
 client/components/Settings/Notifications.vue | 23 ++++++++++----------
 client/js/settings.ts                        |  9 +++++---
 client/js/socket-events/msg.ts               |  5 +++--
 server/plugins/irc-events/message.ts         |  2 +-
 4 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/client/components/Settings/Notifications.vue b/client/components/Settings/Notifications.vue
index 36e27d28..a5f1ec62 100644
--- a/client/components/Settings/Notifications.vue
+++ b/client/components/Settings/Notifications.vue
@@ -1,5 +1,17 @@
 <template>
 	<div>
+		<h2>General</h2>
+		<div>
+			<label class="opt">
+				<input
+					:checked="store.state.settings.notifications.hideMessagePreview"
+					type="checkbox"
+					name="hideMessagePreview"
+				/>
+				Hide message preview in all notifications
+			</label>
+		</div>
+
 		<template v-if="!store.state.serverConfiguration?.public">
 			<h2>Push Notifications</h2>
 			<div>
@@ -90,17 +102,6 @@
 			</label>
 		</div>
 
-		<div>
-			<label class="opt">
-				<input
-					:checked="store.state.settings.hideMessagePreviews"
-					type="checkbox"
-					name="hideMessagePreviews"
-				/>
-				Hide message previews in push notifications
-			</label>
-		</div>
-
 		<div v-if="!store.state.serverConfiguration?.public">
 			<label class="opt">
 				<label for="highlights" class="opt">
diff --git a/client/js/settings.ts b/client/js/settings.ts
index ef44a497..4f123a75 100644
--- a/client/js/settings.ts
+++ b/client/js/settings.ts
@@ -73,9 +73,6 @@ const defaultConfig = {
 	notifyAllMessages: {
 		default: false,
 	},
-	hideMessagePreviews: {
-		default: false,
-	},
 	showSeconds: {
 		default: false,
 	},
@@ -148,6 +145,12 @@ const defaultConfig = {
 	searchEnabled: {
 		default: false,
 	},
+	notifications: {
+		default: {
+			hideMessagePreview: false,
+		},
+		sync: "always",
+	},
 };
 
 export const config = normalizeConfig(defaultConfig);
diff --git a/client/js/socket-events/msg.ts b/client/js/socket-events/msg.ts
index 2c4dacac..350dc359 100644
--- a/client/js/socket-events/msg.ts
+++ b/client/js/socket-events/msg.ts
@@ -137,16 +137,17 @@ function notifyMessage(
 				const nick = msg.from && msg.from.nick ? msg.from.nick : "unknown";
 
 				// Check if user has disabled message previews
-				if (store.state.settings.hideMessagePreviews) {
+				if (store.state.settings.notifications.hideMessagePreview) {
 					body = "You have a new message";
 				} else {
+					// TODO: fix msg type and get rid of that conditional
 					body = cleanIrcMessage(msg.text ? msg.text : "");
 				}
 
 				if (msg.type === MessageType.INVITE) {
 					title = "New channel invite:";
 
-					if (!store.state.settings.hideMessagePreviews) {
+					if (!store.state.settings.notifications.hideMessagePreview) {
 						body = nick + " invited you to " + msg.channel;
 					}
 				} else {
diff --git a/server/plugins/irc-events/message.ts b/server/plugins/irc-events/message.ts
index 281b5b14..055f2b6f 100644
--- a/server/plugins/irc-events/message.ts
+++ b/server/plugins/irc-events/message.ts
@@ -182,7 +182,7 @@ export default <IrcEventHandler>function (irc, network) {
 			let body: string;
 
 			// Check if user has disabled message previews
-			if (client.config.clientSettings.hideMessagePreviews) {
+			if (client.config.clientSettings.notifications.hideMessagePreview) {
 				body = "sent you a message";
 			} else {
 				body = cleanMessage;

From 804ae887a6c802d3f6b93916a5088a521625c0da Mon Sep 17 00:00:00 2001
From: xpmb <contrib@xpmb.me>
Date: Fri, 3 Oct 2025 21:17:23 +0200
Subject: [PATCH 4/6] fix: handle storage of nested settings object

---
 client/components/Settings/Notifications.vue |  2 +-
 client/components/Windows/Settings.vue       | 19 +++++++++++++++++++
 client/js/store-settings.ts                  | 14 +++++++++++++-
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/client/components/Settings/Notifications.vue b/client/components/Settings/Notifications.vue
index a5f1ec62..51e86cca 100644
--- a/client/components/Settings/Notifications.vue
+++ b/client/components/Settings/Notifications.vue
@@ -6,7 +6,7 @@
 				<input
 					:checked="store.state.settings.notifications.hideMessagePreview"
 					type="checkbox"
-					name="hideMessagePreview"
+					name="notifications.hideMessagePreview"
 				/>
 				Hide message preview in all notifications
 			</label>
diff --git a/client/components/Windows/Settings.vue b/client/components/Windows/Settings.vue
index 0fa95372..ad9388c2 100644
--- a/client/components/Windows/Settings.vue
+++ b/client/components/Windows/Settings.vue
@@ -45,6 +45,25 @@ export default defineComponent({
 				value = (event.target as HTMLInputElement).value;
 			}
 
+			// Handle nested settings
+			if (name.includes(".")) {
+				const [parentKey, childKey] = name.split(".");
+				const currentParentValue = store.state.settings[parentKey];
+
+				if (typeof currentParentValue === "object" && currentParentValue !== null) {
+					const newParentValue = {
+						...currentParentValue,
+						[childKey]: value,
+					};
+					void store.dispatch("settings/update", {
+						name: parentKey,
+						value: newParentValue,
+						sync: true,
+					});
+					return;
+				}
+			}
+
 			void store.dispatch("settings/update", {name, value, sync: true});
 		};
 
diff --git a/client/js/store-settings.ts b/client/js/store-settings.ts
index bc914be9..4d0f356d 100644
--- a/client/js/store-settings.ts
+++ b/client/js/store-settings.ts
@@ -110,7 +110,19 @@ function assignStoredSettings(
 			typeof storedSettings[key] !== "undefined" &&
 			typeof defaultSettings[key] === typeof storedSettings[key]
 		) {
-			newSettings[key] = storedSettings[key];
+			// Handle nested objects by merging them
+			if (
+				typeof defaultSettings[key] === "object" &&
+				defaultSettings[key] !== null &&
+				!Array.isArray(defaultSettings[key])
+			) {
+				newSettings[key] = {
+					...defaultSettings[key],
+					...storedSettings[key],
+				};
+			} else {
+				newSettings[key] = storedSettings[key];
+			}
 		}
 	}
 

From 5acee92fb2bbab7f3d16fae7a96c451f2fc68737 Mon Sep 17 00:00:00 2001
From: xpmb <contrib@xpmb.me>
Date: Fri, 3 Oct 2025 21:43:04 +0200
Subject: [PATCH 5/6] fix: handle possibly undefined new setting

This prevents errors when these settings are not explicitly defined in the
user's configuration.
---
 server/plugins/irc-events/message.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/plugins/irc-events/message.ts b/server/plugins/irc-events/message.ts
index 055f2b6f..3edae906 100644
--- a/server/plugins/irc-events/message.ts
+++ b/server/plugins/irc-events/message.ts
@@ -182,7 +182,7 @@ export default <IrcEventHandler>function (irc, network) {
 			let body: string;
 
 			// Check if user has disabled message previews
-			if (client.config.clientSettings.notifications.hideMessagePreview) {
+			if (client.config.clientSettings?.notifications?.hideMessagePreview) {
 				body = "sent you a message";
 			} else {
 				body = cleanMessage;

From 80db482aaceb6c50cc021fcda7dc9715363f505b Mon Sep 17 00:00:00 2001
From: xpmb <contrib@xpmb.me>
Date: Fri, 3 Oct 2025 22:10:52 +0200
Subject: [PATCH 6/6] fix: sync across devices for nested settings

---
 server/server.ts | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/server/server.ts b/server/server.ts
index 4d63bfad..6a844005 100644
--- a/server/server.ts
+++ b/server/server.ts
@@ -718,16 +718,17 @@ function initializeClient(
 				return;
 			}
 
-			if (
-				typeof newSetting.value === "object" ||
-				typeof newSetting.name !== "string" ||
-				newSetting.name[0] === "_"
-			) {
+			if (typeof newSetting.name !== "string" || newSetting.name[0] === "_") {
+				return;
+			}
+
+			// Allow plain objects for nested settings, but reject arrays and null
+			if (typeof newSetting.value === "object" && !_.isPlainObject(newSetting.value)) {
 				return;
 			}
 
 			// We do not need to do write operations and emit events if nothing changed.
-			if (client.config.clientSettings[newSetting.name] !== newSetting.value) {
+			if (!_.isEqual(client.config.clientSettings[newSetting.name], newSetting.value)) {
 				client.config.clientSettings[newSetting.name] = newSetting.value;
 
 				// Pass the setting to all clients.