therwi/sunkkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

things

Browse source
This commit is contained in:
sadposter 2021-05-12 16:16:13 +01:00
parent 50d5ef7416
commit 350d0b0888
6 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -115,7 +115,7 @@ const PostStatusForm = {
? this.copyMessageScope
: this.$store.state.users.currentUser.default_scope
const { postContentType: contentType, sensitiveByDefault } = this.$store.getters.mergedConfig
const { postContentType: contentType, sensitiveByDefault, sensitiveIfSubject } = this.$store.getters.mergedConfig
return {
dropFiles: [],
@ -272,6 +272,8 @@ const PostStatusForm = {
if (this.preview) this.previewStatus()
},
async postStatus (event, newStatus, opts = {}) {
const { sensitiveIfSubject } = this.$store.getters.mergedConfig
if (this.posting && !this.optimisticPosting) { return }
if (this.disableSubmit) { return }
if (this.emojiInputShown) { return }
@ -307,7 +309,7 @@ const PostStatusForm = {
status: newStatus.status,
spoilerText: newStatus.spoilerText || null,
visibility: newStatus.visibility,
sensitive: newStatus.nsfw,
sensitive: (newStatus.nsfw || (sensitiveIfSubject && newStatus.spoilerText)),
media: newStatus.files,
store: this.$store,
inReplyToStatusId: this.replyTo,

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

@ -152,6 +152,11 @@
{{ $t('settings.sensitive_by_default') }}
</BooleanSetting>
</li>
<li>
<BooleanSetting path="sensitiveIfSubject">
{{ $t('settings.sensitive_if_subject') }}
</BooleanSetting>
</li>
<li>
<BooleanSetting path="autohideFloatingPostButton">
{{ $t('settings.autohide_floating_post_button') }}