diff options
| author | Shpuld Shpludson <shp@cock.li> | 2018-12-19 04:51:21 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2018-12-19 04:51:21 +0000 |
| commit | c54b1fd0c517145f323f5fe0df9af5131137406a (patch) | |
| tree | 4bd9b7de1c1822db373364659bc311b8de711fb6 /src/components/post_status_form | |
| parent | 562c68a51c9746650fabfc5c641816396439c791 (diff) | |
| parent | c7514be46fd9dbffdeb92cd01799a8dc6497011b (diff) | |
Merge branch 'fix_defaults' into 'develop'
Fixed some settings not using defaults from instance config.
Closes #228
See merge request pleroma/pleroma-fe!429
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 |