therwi/sunkkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
wire up notification settings

See merge request pleroma/pleroma-fe!809
This commit is contained in:
kaniini 2019-06-01 05:16:15 +00:00
commit b4796ccbf6
6 changed files with 77 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/services/entity_normalizer/entity_normalizer.service.js
View file

@ -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
}