Anon/yandere_fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'breaking/adminapi-user-deactivated' into 'develop'

Browse Source 
Support old user.deactivated and new user.is_active fields

See merge request pleroma/pleroma-fe!1329
This commit is contained in:
feld 2021-01-20 22:49:42 +00:00
commit f614da2abb
1 changed files with 6 additions and 1 deletions
Show Stats 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.follow_request_count = data.pleroma.follow_request_count
output.tags = data.pleroma.tags 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.notification_settings = data.pleroma.notification_settings
output.unread_chat_count = data.pleroma.unread_chat_count output.unread_chat_count = data.pleroma.unread_chat_count