diff options
| author | shpuld <shp@cock.li> | 2018-12-22 17:32:35 +0200 |
|---|---|---|
| committer | shpuld <shp@cock.li> | 2018-12-22 17:32:35 +0200 |
| commit | f72b1d048e636c0637dfb1469c32875bcacce61f (patch) | |
| tree | 8711385018c1f04b14289024424becd0574b8386 /src/components/post_status_form | |
| parent | 4836c8ac74569668001f1adc39fe84377ddb7dba (diff) | |
| parent | e59b67e119f1f598354fb0dca86774e1b0f6c4c4 (diff) | |
Merge branch 'develop' into feature/replace-panel-switcher
Diffstat (limited to 'src/components/post_status_form')
| -rw-r--r-- | src/components/post_status_form/post_status_form.js | 6 |
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 |