diff options
| author | shpuld <shp@cock.li> | 2019-02-04 19:49:23 +0200 |
|---|---|---|
| committer | shpuld <shp@cock.li> | 2019-02-04 19:49:23 +0200 |
| commit | 54e7e0e31babbfb0c4ebc2e1a73012e1b1890231 (patch) | |
| tree | 7533728f9f115f877806694960dcaeb48d28dbd7 /src/components/user_settings/user_settings.js | |
| parent | 18ae7bd5f366598d46a65e9da1312c98f7bb00e7 (diff) | |
| parent | 3cd1deb133926281920f10c1ddd6eb694c09f44d (diff) | |
merge develop and fix conflicts AGAIN
Diffstat (limited to 'src/components/user_settings/user_settings.js')
| -rw-r--r-- | src/components/user_settings/user_settings.js | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/components/user_settings/user_settings.js b/src/components/user_settings/user_settings.js index 719a9c0c..9bd8aa00 100644 --- a/src/components/user_settings/user_settings.js +++ b/src/components/user_settings/user_settings.js @@ -10,8 +10,7 @@ const UserSettings = { newLocked: this.$store.state.users.currentUser.locked, newNoRichText: this.$store.state.users.currentUser.no_rich_text, newDefaultScope: this.$store.state.users.currentUser.default_scope, - hideFollowings: this.$store.state.users.currentUser.hide_followings, - hideFollowers: this.$store.state.users.currentUser.hide_followers, + newHideNetwork: this.$store.state.users.currentUser.hide_network, followList: null, followImportError: false, followsImported: false, @@ -67,8 +66,7 @@ const UserSettings = { /* eslint-disable camelcase */ const default_scope = this.newDefaultScope const no_rich_text = this.newNoRichText - const hide_followings = this.hideFollowings - const hide_followers = this.hideFollowers + const hide_network = this.newHideNetwork /* eslint-enable camelcase */ this.$store.state.api.backendInteractor .updateProfile({ @@ -80,8 +78,7 @@ const UserSettings = { /* eslint-disable camelcase */ default_scope, no_rich_text, - hide_followings, - hide_followers + hide_network /* eslint-enable camelcase */ }}).then((user) => { if (!user.error) { |