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

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc app/controllers/home_controller.rb
Simple merge

diff --cc app/javascript/styles/mastodon/components.scss
Simple merge

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

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

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

diff --cc app/services/post_status_service.rb
index 333bf88d8145ac7f13f4fd9dcffb45d3d0c1a42e,b470a40e9d2cb142723ec0406d06ed63d5eddaee..d2cca145b5430e017815c7d98fd9d992e56c4376
--- 1/app/services/post_status_service.rb
--- 2/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@@ -47,12 -47,9 +47,12 @@@ class PostStatusService < BaseServic
    private
  
    def preprocess_attributes!
 -    @text         = @options.delete(:spoiler_text) if @text.blank? && @options[:spoiler_text].present?
 +    if @text.blank? && @options[:spoiler_text].present?
 +     @text = '.'
 +     @text = @media.find(&:video?) ? '📹' : '🖼' if @media.size > 0
 +    end
      @visibility   = @options[:visibility] || @account.user&.setting_default_privacy
-     @visibility   = :unlisted if @visibility == :public && @account.silenced
+     @visibility   = :unlisted if @visibility == :public && @account.silenced?
      @scheduled_at = @options[:scheduled_at]&.to_datetime
      @scheduled_at = nil if scheduled_in_the_past?
    rescue ArgumentError

diff --cc app/services/process_mentions_service.rb
Simple merge

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

diff --cc db/schema.rb
Simple merge

diff --cc spec/lib/feed_manager_spec.rb
Simple merge

diff --cc spec/services/notify_service_spec.rb
index 7bfca7fb5efe4bba243266d61b12d986f96425aa,a387d9407e2d3c499c39b135d5ef3371482b299e..a68fdd8dfd16784dcbb59ea97f4da560957c3c30
--- 1/spec/services/notify_service_spec.rb
--- 2/spec/services/notify_service_spec.rb
+++ b/spec/services/notify_service_spec.rb
@@@ -44,10 -44,10 +44,10 @@@ RSpec.describe NotifyService, type: :se
    end
  
    it 'does not notify when recipient is suspended' do
-     recipient.update(suspended: true)
+     recipient.suspend!
      is_expected.to_not change(Notification, :count)
    end
 -
 +  
    context 'for direct messages' do
      let(:activity) { Fabricate(:mention, account: recipient, status: Fabricate(:status, account: sender, visibility: :direct)) }