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

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

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/components/post_status_form/post_status_form.js
View file

@ -117,6 +117,7 @@ const PostStatusForm = {
? this.copyMessageScope ? this.copyMessageScope
: this.$store.state.users.currentUser.default_scope : this.$store.state.users.currentUser.default_scope
// const { defaultNSFW: sensitiveByDefault } = this.$store.state.serverSideConfig
const { postContentType: contentType, sensitiveByDefault } = this.$store.getters.mergedConfig const { postContentType: contentType, sensitiveByDefault } = this.$store.getters.mergedConfig
return { return {

3
src/components/settings_modal/tabs/general_tab.vue
View file

@ -221,7 +221,8 @@
</label> </label>
</li> </li>
<li> <li>
<BooleanSetting path="serverSide_defaultNSFW"> <!-- <BooleanSetting path="serverSide_defaultNSFW"> -->
<BooleanSetting path="sensitiveByDefault">
{{ $t('settings.sensitive_by_default') }} {{ $t('settings.sensitive_by_default') }}
</BooleanSetting> </BooleanSetting>
</li> </li>

2
src/modules/serverSideConfig.js
View file

@ -2,7 +2,7 @@ import { get, set } from 'lodash'
export const settingsMapGet = { export const settingsMapGet = {
'defaultScope': 'source.privacy', 'defaultScope': 'source.privacy',
'defaultNSFW': 'source.sensitive', 'defaultNSFW': 'source.sensitive', // BROKEN: pleroma/pleroma#2837
'stripRichContent': 'source.pleroma.no_rich_content', 'stripRichContent': 'source.pleroma.no_rich_content',
// Privacy // Privacy
'locked': 'locked', 'locked': 'locked',