From fc12b63fcc41a06ee818428640f962fbea536e1f Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Tue, 21 May 2019 23:35:40 +0300 Subject: mastoapi login works --- .../entity_normalizer/entity_normalizer.service.js | 23 ++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) (limited to 'src/services/entity_normalizer/entity_normalizer.service.js') diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js index 46ca7602..f14c483c 100644 --- a/src/services/entity_normalizer/entity_normalizer.service.js +++ b/src/services/entity_normalizer/entity_normalizer.service.js @@ -72,6 +72,27 @@ export const parseUser = (data) => { moderator: data.pleroma.is_moderator, admin: data.pleroma.is_admin } + // TODO: Clean up in UI? This is duplication from what BE does for qvitterapi + if (output.rights.admin) { + output.role = 'admin' + } else if (output.rights.moderator) { + output.role = 'moderator' + } else { + output.role = 'member' + } + } + + if (data.source) { + output.description = data.source.note + output.default_scope = data.source.privacy + if (data.source.pleroma) { + if (data.source.pleroma.show_role) { + console.log(data.source) + console.log(data.pleroma) + } + output.no_rich_text = data.source.pleroma.no_rich_text + output.show_role = data.source.pleroma.show_role + } } // TODO: handle is_local @@ -106,8 +127,6 @@ export const parseUser = (data) => { output.muted = data.muted - // QVITTER ONLY FOR NOW - // Really only applies to logged in user, really.. I THINK if (data.rights) { output.rights = { moderator: data.rights.delete_others_notice, -- cgit v1.2.3-70-g09d2 From a7b0b07e6fc81aa30769059ada197c824dfb0efb Mon Sep 17 00:00:00 2001 From: HJ <30-hj@users.noreply.git.pleroma.social> Date: Wed, 12 Jun 2019 11:44:14 +0000 Subject: Apply suggestion to src/services/entity_normalizer/entity_normalizer.service.js --- src/services/entity_normalizer/entity_normalizer.service.js | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/services/entity_normalizer/entity_normalizer.service.js') diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js index f14c483c..d68e5f72 100644 --- a/src/services/entity_normalizer/entity_normalizer.service.js +++ b/src/services/entity_normalizer/entity_normalizer.service.js @@ -86,10 +86,6 @@ export const parseUser = (data) => { output.description = data.source.note output.default_scope = data.source.privacy if (data.source.pleroma) { - if (data.source.pleroma.show_role) { - console.log(data.source) - console.log(data.pleroma) - } output.no_rich_text = data.source.pleroma.no_rich_text output.show_role = data.source.pleroma.show_role } -- cgit v1.2.3-70-g09d2