From 241ff30af0a9ae729b808ec5c5257c7d8d1c6200 Mon Sep 17 00:00:00 2001
From: Joost De Cock <joost@joost.at>
Date: Sun, 20 Aug 2023 16:03:54 +0200
Subject: [PATCH] fix(backend): Merge JSON updates

---
 sites/backend/src/models/user.mjs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sites/backend/src/models/user.mjs b/sites/backend/src/models/user.mjs
index a7dab792bee..5d7cd61e516 100644
--- a/sites/backend/src/models/user.mjs
+++ b/sites/backend/src/models/user.mjs
@@ -868,7 +868,11 @@ UserModel.prototype.guardedUpdate = async function ({ body, user }) {
    */
   for (const field of this.jsonFields) {
     if (typeof body[field] !== 'undefined') {
-      if (typeof body[field] === 'object') data[field] = body[field]
+      if (typeof body[field] === 'object')
+        data[field] = {
+          ...this.clear[field],
+          ...body[field],
+        }
       else log.warn(body, `Tried to set JDON field ${field} to a non-object`)
     }
   }