diff options
| author | feld <feld@feld.me> | 2021-01-20 22:49:42 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2021-01-20 22:49:42 +0000 |
| commit | f614da2abb0f89d4a27474d7287f62968f8b3c56 (patch) | |
| tree | bf71bd9a44f5fb53295d7ed04cd89192f292de0f /src | |
| parent | e14917e28daa3ddf2ae54d40ec11f718170dba03 (diff) | |
| parent | 831cf9eafb193acb3cce1c3b5f705819ea41912b (diff) | |
Merge branch 'breaking/adminapi-user-deactivated' into 'develop'
Support old user.deactivated and new user.is_active fields
See merge request pleroma/pleroma-fe!1329
Diffstat (limited to 'src')
| -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 |