From fcb5a85cdd21b8a48c16cd02885933bcbdb07ec2 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 17 Jan 2017 20:09:03 +0100
Subject: Add sounds for notifications. Boop by @jk@mastodon.social

---
 app/assets/javascripts/components/reducers/settings.jsx | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'app/assets/javascripts/components/reducers')

diff --git a/app/assets/javascripts/components/reducers/settings.jsx b/app/assets/javascripts/components/reducers/settings.jsx
index 8bd9edae2..8acc3faca 100644
--- a/app/assets/javascripts/components/reducers/settings.jsx
+++ b/app/assets/javascripts/components/reducers/settings.jsx
@@ -23,6 +23,13 @@ const initialState = Immutable.Map({
       favourite: true,
       reblog: true,
       mention: true
+    }),
+
+    sounds: Immutable.Map({
+      follow: true,
+      favourite: true,
+      reblog: true,
+      mention: true
     })
   })
 });
@@ -30,7 +37,7 @@ const initialState = Immutable.Map({
 export default function settings(state = initialState, action) {
   switch(action.type) {
   case STORE_HYDRATE:
-    return state.merge(action.state.get('settings'));
+    return state.mergeDeep(action.state.get('settings'));
   case SETTING_CHANGE:
     return state.setIn(action.key, action.value);
   default:
-- 
cgit