hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into feat/report-notification

Browse source
This commit is contained in:
Shpuld Shpuldson 2021-01-27 13:24:19 +02:00
commit 8334649c11
19 changed files with 684 additions and 211 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -188,7 +188,12 @@ export const parseUser = (data) => {
output.follow_request_count = data.pleroma.follow_request_count
output.tags = data.pleroma.tags
output.deactivated = data.pleroma.deactivated
// deactivated was changed to is_active in Pleroma 2.3.0
// so check if is_active is present
output.deactivated = typeof data.pleroma.is_active !== 'undefined'
? !data.pleroma.is_active // new backend
: data.pleroma.deactivated // old backend
output.notification_settings = data.pleroma.notification_settings
output.unread_chat_count = data.pleroma.unread_chat_count