diff options
| author | ThibG <thib@sitedethib.com> | 2019-08-31 19:44:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-31 19:44:47 +0200 |
| commit | 147e90f35d9aadfbe15d044f3ce48be77e26968a (patch) | |
| tree | b8aad6a1a34cd897bdb187cdf1fb1cacf7ac721c /app/services/post_status_service.rb | |
| parent | 2848c08953a8555e06791170dbf1090575e05d8a (diff) | |
| parent | ef270ed0df5a247b77853610f2f108206828a67a (diff) | |
Merge pull request #1209 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/services/post_status_service.rb')
| -rw-r--r-- | app/services/post_status_service.rb | 8 |
1 files changed, 7 insertions, 1 deletions
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? |