From: Thibaut Girka <thib@sitedethib.com>
Date: Sat, 31 Aug 2019 11:09:21 +0000 (+0200)
Subject: Fix auto-added media icons when a CW is set but no content text
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=3619e904da5b22017776abc2f1452f1535205d11;p=mastodon.git

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

diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index b36471339..5d17f111b 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -49,7 +49,13 @@ class PostStatusService < BaseService
   def preprocess_attributes!
     if @text.blank? && @options[:spoiler_text].present?
      @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
     @visibility   = @options[:visibility] || @account.user&.setting_default_privacy
     @visibility   = :unlisted if @visibility == :public && @account.silenced?