treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Fix auto-added media icons when a CW is set but no content text

remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
Thibaut Girka 2019-08-31 13:09:21 +02:00
parent e519b47da6
commit 3619e904da
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/services/post_status_service.rb
View File

@ -49,7 +49,13 @@ class PostStatusService < BaseService
def preprocess_attributes! def preprocess_attributes!
if @text.blank? && @options[:spoiler_text].present? if @text.blank? && @options[:spoiler_text].present?
@text = '.' @text = '.'
@text = @media.find(&:video?) ? '📹' : '🖼' if @media.size > 0 if @media.find(&:video?) || @media.find(&:gifv?)
@text = '📹'
elsif @media.find(&:audio?)
@text = '🎵'
elsif @media.find(&:image?)
@text = '🖼'
end
end end
@visibility = @options[:visibility] || @account.user&.setting_default_privacy @visibility = @options[:visibility] || @account.user&.setting_default_privacy
@visibility = :unlisted if @visibility == :public && @account.silenced? @visibility = :unlisted if @visibility == :public && @account.silenced?