From c7514be46fd9dbffdeb92cd01799a8dc6497011b Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Tue, 18 Dec 2018 23:31:10 +0300 Subject: Fixed some settings not using defaults from instance config. Made some parts of code more readable --- src/components/status/status.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/components/status/status.js') diff --git a/src/components/status/status.js b/src/components/status/status.js index 47a62fdf..e683056f 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -188,7 +188,9 @@ const Status = { }, replySubject () { if (!this.status.summary) return '' - const behavior = this.$store.state.config.subjectLineBehavior + const behavior = typeof this.$store.state.config.subjectLineBehavior === 'undefined' + ? this.$store.state.instance.subjectLineBehavior + : this.$store.state.config.subjectLineBehavior const startsWithRe = this.status.summary.match(/^re[: ]/i) if (behavior !== 'noop' && startsWithRe || behavior === 'masto') { return this.status.summary -- cgit v1.2.3-70-g09d2