From: Thibaut Girka <thib@sitedethib.com>
Date: Sat, 4 May 2019 14:37:26 +0000 (+0200)
Subject: Merge branch 'master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=33c80e07838d932efc6214cb1642cefaeb624b67;p=mastodon.git

Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/models/media_attachment.rb
---

33c80e07838d932efc6214cb1642cefaeb624b67
diff --cc app/javascript/mastodon/features/compose/components/compose_form.js
index 13514fa0f,2b9da20d7..03738f1de
--- a/app/javascript/mastodon/features/compose/components/compose_form.js
+++ b/app/javascript/mastodon/features/compose/components/compose_form.js
@@@ -215,10 -213,9 +214,9 @@@ class ComposeForm extends ImmutablePure
              <UploadButtonContainer />
              <PollButtonContainer />
              <PrivacyDropdownContainer />
-             <SensitiveButtonContainer />
              <SpoilerButtonContainer />
            </div>
 -          <div className='character-counter__wrapper'><CharacterCounter max={500} text={text} /></div>
 +          <div className='character-counter__wrapper'><CharacterCounter max={maxChars} text={text} /></div>
          </div>
  
          <div className='compose-form__publish'>
diff --cc app/models/media_attachment.rb
index 81397a18e,ab794faa0..65f00e1c8
--- a/app/models/media_attachment.rb
+++ b/app/models/media_attachment.rb
@@@ -32,8 -32,12 +33,13 @@@ class MediaAttachment < ApplicationReco
    IMAGE_MIME_TYPES             = ['image/jpeg', 'image/png', 'image/gif', 'image/webp'].freeze
    VIDEO_MIME_TYPES             = ['video/webm', 'video/mp4', 'video/quicktime'].freeze
    VIDEO_CONVERTIBLE_MIME_TYPES = ['video/webm', 'video/quicktime'].freeze
 +  AUDIO_MIME_TYPES             = ['audio/mpeg', 'audio/mp4', 'audio/vnd.wav', 'audio/wav', 'audio/x-wav', 'audio/x-wave', 'audio/ogg',].freeze
  
+   BLURHASH_OPTIONS = {
+     x_comp: 4,
+     y_comp: 4,
+   }.freeze
+ 
    IMAGE_STYLES = {
      original: {
        pixels: 1_638_400, # 1280x1280px
@@@ -186,13 -175,11 +195,13 @@@
  
      def file_processors(f)
        if f.file_content_type == 'image/gif'
-         [:gif_transcoder]
+         [:gif_transcoder, :blurhash_transcoder]
        elsif VIDEO_MIME_TYPES.include? f.file_content_type
-         [:video_transcoder]
+         [:video_transcoder, :blurhash_transcoder]
 +      elsif AUDIO_MIME_TYPES.include? f.file_content_type
 +        [:audio_transcoder]
        else
-         [:lazy_thumbnail]
+         [:lazy_thumbnail, :blurhash_transcoder]
        end
      end
    end