Merge branch 'feature/notification-controls' into 'develop'

wire up notification settings

See merge request pleroma/pleroma-fe!809

1 files changed, 3 insertions, 2 deletions

diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index a2bb6e4c..1f03058d 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -134,15 +134,16 @@ export const parseUser = (data) => {
 
   if (data.pleroma) {
     output.follow_request_count = data.pleroma.follow_request_count
-  }
 
-  if (data.pleroma) {
     output.tags = data.pleroma.tags
     output.deactivated = data.pleroma.deactivated
+
+    output.notification_settings = data.pleroma.notification_settings
   }
 
   output.tags = output.tags || []
   output.rights = output.rights || {}
+  output.notification_settings = output.notification_settings || {}
 
   return output
 }