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

Conflicts:
- app/models/media_attachment.rb

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc app/controllers/auth/registrations_controller.rb
Simple merge

diff --cc app/controllers/settings/notifications_controller.rb
Simple merge

diff --cc app/javascript/mastodon/features/compose/components/compose_form.js
index 13514fa0ff590ac545008d5f07369a588000fd61,2b9da20d7f369b30a7679c966eba24fadec4595b..03738f1def96eede6dfaa2ea327967d5ec7da111
--- 1/app/javascript/mastodon/features/compose/components/compose_form.js
--- 2/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/javascript/styles/mastodon/components.scss
Simple merge

diff --cc app/models/media_attachment.rb
index 81397a18e386ab13ce548319c8b35ffc3ec5c3a6,ab794faa055655823c5cc49b0d8c57ca6196acc9..65f00e1c866df6404179c52dd745c025472e39d7
--- 1/app/models/media_attachment.rb
--- 2/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

diff --cc app/models/user.rb
Simple merge

diff --cc app/views/stream_entries/_simple_status.html.haml
Simple merge

diff --cc config/locales/en.yml
Simple merge

diff --cc db/schema.rb
Simple merge

diff --cc lib/mastodon/version.rb
Simple merge

diff --cc package.json
Simple merge

diff --cc yarn.lock
Simple merge