Fixed some settings not using defaults from instance config. Made some parts of

code more readable

1 files changed, 5 insertions, 1 deletions

diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 0ce2aff0..89091f8e 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -41,12 +41,16 @@ const PostStatusForm = {
     const preset = this.$route.query.message
     let statusText = preset || ''
 
+    const scopeCopy = typeof this.$store.state.config.scopeCopy === 'undefined'
+          ? this.$store.state.instance.scopeCopy
+          : this.$store.state.config.scopeCopy
+
     if (this.replyTo) {
       const currentUser = this.$store.state.users.currentUser
       statusText = buildMentionsString({ user: this.repliedUser, attentions: this.attentions }, currentUser)
     }
 
-    const scope = (this.copyMessageScope && this.$store.state.config.scopeCopy || this.copyMessageScope === 'direct')
+    const scope = (this.copyMessageScope && scopeCopy || this.copyMessageScope === 'direct')
           ? this.copyMessageScope
           : this.$store.state.users.currentUser.default_scope