logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe
commit: 19b5aea081d910dc129150d49d91ed8e78a9cdd3
parent: e80ed386be1522c03f2dbc7b719b2c6a5b920b16
Author: Shpuld Shpludson <shp@cock.li>
Date:   Sun,  7 Jul 2019 10:20:55 +0000

Merge branch 'preserve-follows-followers-visibility-settings' into 'develop'

Set hide_follows and hide_followers settings when parsing Mastodon format

See merge request pleroma/pleroma-fe!873

Diffstat:

Msrc/services/entity_normalizer/entity_normalizer.service.js3+++
Mtest/unit/specs/services/entity_normalizer/entity_normalizer.spec.js7+++++++
2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js @@ -70,6 +70,9 @@ export const parseUser = (data) => { output.muted = relationship.muting } + output.hide_follows = data.pleroma.hide_follows + output.hide_followers = data.pleroma.hide_followers + output.rights = { moderator: data.pleroma.is_moderator, admin: data.pleroma.is_admin diff --git a/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js b/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js @@ -282,6 +282,13 @@ describe('API Entities normalizer', () => { expect(parsedUser).to.have.property('description_html').that.contains('<img') }) + + it('adds hide_follows and hide_followers user settings', () => { + const user = makeMockUserMasto({ pleroma: { hide_followers: true, hide_follows: false } }) + + expect(parseUser(user)).to.have.property('hide_followers', true) + expect(parseUser(user)).to.have.property('hide_follows', false) + }) }) // We currently use QvitterAPI notifications only, and especially due to MastoAPI lacking is_seen, support for MastoAPI