Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source 
Set hide_follows and hide_followers settings when parsing Mastodon format

See merge request pleroma/pleroma-fe!873
This commit is contained in:
Shpuld Shpludson 2019-07-07 10:20:55 +00:00
commit 19b5aea081
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/services/entity_normalizer/entity_normalizer.service.js
View file

@ -70,6 +70,9 @@ export const parseUser = (data) => {
output.muted = relationship.muting output.muted = relationship.muting
} }
output.hide_follows = data.pleroma.hide_follows
output.hide_followers = data.pleroma.hide_followers
output.rights = { output.rights = {
moderator: data.pleroma.is_moderator, moderator: data.pleroma.is_moderator,
admin: data.pleroma.is_admin admin: data.pleroma.is_admin

7
test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
View file

@ -282,6 +282,13 @@ describe('API Entities normalizer', () => {
expect(parsedUser).to.have.property('description_html').that.contains('<img') 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 // We currently use QvitterAPI notifications only, and especially due to MastoAPI lacking is_seen, support for MastoAPI