From a8c6b3f538dc97b93411213f72e90c16156f3926 Mon Sep 17 00:00:00 2001 From: shpuld Date: Thu, 31 Jan 2019 21:19:41 +0200 Subject: Change video playing default without bothering making it an instance configurable --- src/components/status/status.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/components/status/status.js') diff --git a/src/components/status/status.js b/src/components/status/status.js index ec4de516..c07c60e1 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -222,9 +222,9 @@ const Status = { if (this.attachmentSize === 'hide') { return [] } - return this.$store.state.config.playVideosInline - ? ['image'] - : ['image', 'video'] + return this.$store.state.config.playVideosInModal + ? ['image', 'video'] + : ['image'] }, galleryAttachments () { return this.status.attachments.filter( -- cgit v1.2.3-70-g09d2 From 7d93beb96d5564b263341891ab7e9038c8d7223d Mon Sep 17 00:00:00 2001 From: Joshua Burch Date: Fri, 1 Feb 2019 17:40:06 -0500 Subject: fix #157 show screen_name when name is empty in retweet --- src/components/status/status.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/components/status/status.js') diff --git a/src/components/status/status.js b/src/components/status/status.js index ec4de516..aaac5b71 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -87,7 +87,7 @@ const Status = { } }, retweet () { return !!this.statusoid.retweeted_status }, - retweeter () { return this.statusoid.user.name }, + retweeter () { return this.statusoid.user.name || this.statusoid.user.screen_name }, retweeterHtml () { return this.statusoid.user.name_html }, status () { if (this.retweet) { -- cgit v1.2.3-70-g09d2