diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-02-03 14:37:54 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-02-03 14:37:54 +0000 |
| commit | 063b5ba52b0debc82a72ed666138b5fbab795fbf (patch) | |
| tree | aa0e52d2a2340b48f522675294f77399ab6a1572 /src/services | |
| parent | c7ee2ed83100e40247fc35be8b138befc44175bc (diff) | |
| parent | d4991d01625d27086759220f5d25af5311d5d4ed (diff) | |
Merge branch 'revert-886aa35e' into 'develop'
Revert "Merge branch 'feature/split-hide-network' into 'develop'"
See merge request pleroma/pleroma-fe!514
Diffstat (limited to 'src/services')
| -rw-r--r-- | src/services/api/api.service.js | 2 | ||||
| -rw-r--r-- | src/services/entity_normalizer/entity_normalizer.service.js | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js index 31b48cb6..5b0d8650 100644 --- a/src/services/api/api.service.js +++ b/src/services/api/api.service.js @@ -130,7 +130,7 @@ const updateBanner = ({credentials, params}) => { // description const updateProfile = ({credentials, params}) => { // Always include these fields, because they might be empty or false - const fields = ['description', 'locked', 'no_rich_text', 'hide_followings', 'hide_followers'] + const fields = ['description', 'locked', 'no_rich_text', 'hide_network'] let url = PROFILE_UPDATE_URL const form = new FormData() diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js index ff4b93ef..74422a49 100644 --- a/src/services/entity_normalizer/entity_normalizer.service.js +++ b/src/services/entity_normalizer/entity_normalizer.service.js @@ -100,8 +100,7 @@ export const parseUser = (data) => { output.rights = data.rights output.no_rich_text = data.no_rich_text output.default_scope = data.default_scope - output.hide_followings = data.hide_followings - output.hide_followers = data.hide_followers + output.hide_network = data.hide_network output.background_image = data.background_image // on mastoapi this info is contained in a "relationship" output.following = data.following |