diff options
| author | Shpuld Shpuldson <shp@cock.li> | 2021-01-22 12:04:58 +0200 |
|---|---|---|
| committer | Shpuld Shpuldson <shp@cock.li> | 2021-01-22 12:04:58 +0200 |
| commit | daa9f211a61fee0828c2fa576ec250c95bdd32b5 (patch) | |
| tree | 3f2c433b3f452ef3ccc27fa4a844420160596607 /src/services/entity_normalizer/entity_normalizer.service.js | |
| parent | 02ab803725e42a749c6c8f564e8093df70e97fc7 (diff) | |
| parent | 0358284ebf2accf6e0a20ec04e0448437827fadc (diff) | |
Merge branch 'develop' into fix/convert-more-hyperlinks-to-buttons
Diffstat (limited to 'src/services/entity_normalizer/entity_normalizer.service.js')
| -rw-r--r-- | src/services/entity_normalizer/entity_normalizer.service.js | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js index 625f593e..6ed663e1 100644 --- a/src/services/entity_normalizer/entity_normalizer.service.js +++ b/src/services/entity_normalizer/entity_normalizer.service.js @@ -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 |