AkkomaGang
/
akkoma-fe
4
13
Fork 56
Code Issues 73 Pull Requests 18 Projects Releases 1 Wiki Activity

Move scope logic to function
ci/woodpecker/pr/woodpecker Pipeline was successful Details

This commit is contained in:
Sol Fisher Romanoff 2022-07-11 12:00:28 +03:00
parent 7af3ef4913
commit cf8324c6c5
Signed by untrusted user who does not match committer: nbsp
GPG Key ID: 9D3F2B64F2341B62
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/components/post_status_form/post_status_form.js
View File

@ -112,19 +112,11 @@ const PostStatusForm = {
const preset = this.$route.query.message
let statusText = preset || ''
const { scopeCopy } = this.$store.getters.mergedConfig
if (this.replyTo) {
const currentUser = this.$store.state.users.currentUser
statusText = buildMentionsString({ user: this.repliedUser, attentions: this.attentions }, currentUser)
}
const scope = (this.copyMessageScope && (
(this.copyMessageScope !== 'public' && this.$store.state.users.currentUser.default_scope !== 'private' && scopeCopy) ||
this.copyMessageScope === 'direct'))
? this.copyMessageScope
: this.$store.state.users.currentUser.default_scope
const { postContentType: contentType, sensitiveByDefault, sensitiveIfSubject } = this.$store.getters.mergedConfig
return {
@ -141,7 +133,7 @@ const PostStatusForm = {
files: [],
poll: {},
mediaDescriptions: {},
visibility: scope,
visibility: this.suggestedVisibility(),
contentType
},
caret: 0,
@ -616,6 +608,19 @@ const PostStatusForm = {
},
openProfileTab () {
this.$store.dispatch('openSettingsModalTab', 'profile')
},
suggestedVisibility () {
if (this.copyMessageScope) {
if (this.copyMessageScope === 'direct') {
return this.copyMessageScope
}
if (this.$store.getters.mergedConfig.scopeCopy) {
if (this.copyMessageScope !== 'public' && this.$store.state.users.currentUser.default_scope !== 'private') {
return this.copyMessageScope
}
}
}
return this.$store.state.users.currentUser.default_scope
}
}
}