revert to using local setting for default nsfw since backend is broken

This commit is contained in:
Henry Jameson 2022-02-24 15:00:08 +02:00
parent 9623b0e140
commit f626da838a
3 changed files with 4 additions and 2 deletions

View File

@ -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 {

View File

@ -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>

View File

@ -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',