diff options
| author | Henry Jameson <me@hjkos.com> | 2022-02-24 15:00:08 +0200 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2022-02-24 15:00:08 +0200 |
| commit | f626da838a7abeb3a2d3cd5f71ee4eb2ca272361 (patch) | |
| tree | 62d6922ae3caa78b2912e6393f71ce50aaa1eb43 | |
| parent | 9623b0e1409e85c5598989f0cd13f3ccbb504bd2 (diff) | |
revert to using local setting for default nsfw since backend is broken
| -rw-r--r-- | src/components/post_status_form/post_status_form.js | 1 | ||||
| -rw-r--r-- | src/components/settings_modal/tabs/general_tab.vue | 3 | ||||
| -rw-r--r-- | src/modules/serverSideConfig.js | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js index fe07309f..9d7bbd75 100644 --- a/src/components/post_status_form/post_status_form.js +++ b/src/components/post_status_form/post_status_form.js @@ -117,6 +117,7 @@ const PostStatusForm = { ? this.copyMessageScope : this.$store.state.users.currentUser.default_scope + // const { defaultNSFW: sensitiveByDefault } = this.$store.state.serverSideConfig const { postContentType: contentType, sensitiveByDefault } = this.$store.getters.mergedConfig return { diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue index 4accf0c1..5db70d77 100644 --- a/src/components/settings_modal/tabs/general_tab.vue +++ b/src/components/settings_modal/tabs/general_tab.vue @@ -221,7 +221,8 @@ </label> </li> <li> - <BooleanSetting path="serverSide_defaultNSFW"> + <!-- <BooleanSetting path="serverSide_defaultNSFW"> --> + <BooleanSetting path="sensitiveByDefault"> {{ $t('settings.sensitive_by_default') }} </BooleanSetting> </li> diff --git a/src/modules/serverSideConfig.js b/src/modules/serverSideConfig.js index 75ea91be..ea2dc5e3 100644 --- a/src/modules/serverSideConfig.js +++ b/src/modules/serverSideConfig.js @@ -2,7 +2,7 @@ import { get, set } from 'lodash' export const settingsMapGet = { 'defaultScope': 'source.privacy', - 'defaultNSFW': 'source.sensitive', + 'defaultNSFW': 'source.sensitive', // BROKEN: pleroma/pleroma#2837 'stripRichContent': 'source.pleroma.no_rich_content', // Privacy 'locked': 'locked', |