summaryrefslogtreecommitdiff
path: root/src/server/api/endpoints/i/update_client_setting.ts
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-03-29 14:48:47 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-03-29 14:48:47 +0900
commitbfc193d8cd9aecdb82d585e8b4e101deac60a5bb (patch)
tree8b4dac3a56cf703650c8207f9279028a8560a96b /src/server/api/endpoints/i/update_client_setting.ts
parentresolve conflict (diff)
downloadsharkey-bfc193d8cd9aecdb82d585e8b4e101deac60a5bb.tar.gz
sharkey-bfc193d8cd9aecdb82d585e8b4e101deac60a5bb.tar.bz2
sharkey-bfc193d8cd9aecdb82d585e8b4e101deac60a5bb.zip
Resolve conflicts
Diffstat (limited to 'src/server/api/endpoints/i/update_client_setting.ts')
-rw-r--r--src/server/api/endpoints/i/update_client_setting.ts4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/api/endpoints/i/update_client_setting.ts b/src/server/api/endpoints/i/update_client_setting.ts
index c772ed5dc3..a0bef5e595 100644
--- a/src/server/api/endpoints/i/update_client_setting.ts
+++ b/src/server/api/endpoints/i/update_client_setting.ts
@@ -22,14 +22,14 @@ module.exports = async (params, user) => new Promise(async (res, rej) => {
if (valueErr) return rej('invalid value param');
const x = {};
- x[`account.client_settings.${name}`] = value;
+ x[`account.clientSettings.${name}`] = value;
await User.update(user._id, {
$set: x
});
// Serialize
- user.account.client_settings[name] = value;
+ user.account.clientSettings[name] = value;
const iObj = await pack(user, user, {
detail: true,
includeSecrets: true