From 1899c22078f1aba2c22891fd1d9736aa7c9cc74d Mon Sep 17 00:00:00 2001
From: Miroslav Pejic <miroslav.pejic.85@gmail.com>
Date: Fri, 31 Oct 2025 23:49:32 +0100
Subject: [PATCH] [mirotalk] - fix config merge

---
 app/src/server.js   |  2 +-
 package.json        |  2 +-
 public/js/brand.js  |  2 +-
 public/js/client.js | 33 ++++++++++++++++++++++++++-------
 4 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/app/src/server.js b/app/src/server.js
index f3600ab7..60cb1f1e 100755
--- a/app/src/server.js
+++ b/app/src/server.js
@@ -45,7 +45,7 @@ dependencies: {
  * @license For commercial use or closed source, contact us at license.mirotalk@gmail.com or purchase directly from CodeCanyon
  * @license CodeCanyon: https://codecanyon.net/item/mirotalk-p2p-webrtc-realtime-video-conferences/38376661
  * @author  Miroslav Pejic - miroslav.pejic.85@gmail.com
- * @version 1.6.14
+ * @version 1.6.15
  *
  */
 
diff --git a/package.json b/package.json
index 9a810177..391f234a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "mirotalk",
-    "version": "1.6.14",
+    "version": "1.6.15",
     "description": "A free WebRTC browser-based video call",
     "main": "server.js",
     "scripts": {
diff --git a/public/js/brand.js b/public/js/brand.js
index d12bc8c7..fda0229a 100644
--- a/public/js/brand.js
+++ b/public/js/brand.js
@@ -75,7 +75,7 @@ let brand = {
     },
     about: {
         imageUrl: '../images/mirotalk-logo.gif',
-        title: 'WebRTC P2P v1.6.14',
+        title: 'WebRTC P2P v1.6.15',
         html: `
             <button 
                 id="support-button" 
diff --git a/public/js/client.js b/public/js/client.js
index 02e09cfd..fd8ae2f6 100644
--- a/public/js/client.js
+++ b/public/js/client.js
@@ -15,7 +15,7 @@
  * @license For commercial use or closed source, contact us at license.mirotalk@gmail.com or purchase directly from CodeCanyon
  * @license CodeCanyon: https://codecanyon.net/item/mirotalk-p2p-webrtc-realtime-video-conferences/38376661
  * @author  Miroslav Pejic - miroslav.pejic.85@gmail.com
- * @version 1.6.14
+ * @version 1.6.15
  *
  */
 
@@ -1487,11 +1487,8 @@ async function getButtons() {
         });
         const serverButtons = response.data.message;
         if (serverButtons) {
-            // Merge serverButtons into BUTTONS, keeping the existing keys in BUTTONS if they are not present in serverButtons
-            buttons = {
-                ...buttons, // Spread current BUTTONS first to keep existing keys
-                ...serverButtons, // Overwrite or add new keys from serverButtons
-            };
+            // Merge serverButtons into BUTTONS, keeping nested keys intact by performing a deep merge
+            buttons = mergeConfig(buttons || {}, serverButtons);
             console.log('AXIOS ROOM BUTTONS SETTINGS', {
                 serverButtons: serverButtons,
                 clientButtons: buttons,
@@ -1502,6 +1499,28 @@ async function getButtons() {
     }
 }
 
+/**
+ * Deep merge two objects
+ * @param {object} target target object
+ * @param {object} source source object
+ * @returns {object} merged object
+ */
+function mergeConfig(target, source) {
+    if (typeof target !== 'object' || target === null) return source;
+    if (typeof source !== 'object' || source === null) return source;
+    const output = Array.isArray(target) ? target.slice() : { ...target };
+    for (const key of Object.keys(source)) {
+        const srcVal = source[key];
+        const tgtVal = output[key];
+        if (srcVal && typeof srcVal === 'object' && !Array.isArray(srcVal)) {
+            output[key] = mergeConfig(tgtVal || {}, srcVal);
+        } else {
+            output[key] = srcVal;
+        }
+    }
+    return output;
+}
+
 /**
  * Get user name from OIDC profile
  * @returns {string} Peer Name
@@ -12264,7 +12283,7 @@ function showAbout() {
     Swal.fire({
         background: swBg,
         position: 'center',
-        title: brand.about?.title && brand.about.title.trim() !== '' ? brand.about.title : 'WebRTC P2P v1.6.14',
+        title: brand.about?.title && brand.about.title.trim() !== '' ? brand.about.title : 'WebRTC P2P v1.6.15',
         imageUrl: brand.about?.imageUrl && brand.about.imageUrl.trim() !== '' ? brand.about.imageUrl : images.about,
         customClass: { image: 'img-about' },
         html: `