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

Conflicts:
- `app/models/public_feed.rb`:
  Upstream refactored a bit, glitch-soc had specific code for local-only
  statuses.
  Updated glitch-soc's specific code accordingly.

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

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

diff --cc app/models/public_feed.rb
index 2839da5cb501ccaccf3498974f777172201b1dc7,5e4c3e1cee98bdb3365d392755f1849f1cddcce5..2528ef1b6f724d8fcf391e5df3015f3b3f461b30
--- 1/app/models/public_feed.rb
--- 2/app/models/public_feed.rb
+++ b/app/models/public_feed.rb
@@@ -35,12 -33,10 +35,14 @@@ class PublicFee
  
    private
  
-     local_account? && (local_only? || @options[:allow_local_only])
+   attr_reader :account, :options
+ 
 +  def allow_local_only?
++    local_account? && (local_only? || options[:allow_local_only])
 +  end
 +
    def with_reblogs?
-     @options[:with_reblogs]
+     options[:with_reblogs]
    end
  
    def with_replies?
@@@ -56,15 -52,11 +58,15 @@@
    end
  
    def account?
-     @account.present?
+     account.present?
    end
  
-     @account&.local?
 +  def local_account?
++    account&.local?
 +  end
 +
    def media_only?
-     @options[:only_media]
+     options[:only_media]
    end
  
    def public_scope
@@@ -91,14 -83,10 +93,14 @@@
      Status.joins(:media_attachments).group(:id)
    end
  
 +  def without_local_only_scope
 +    Status.not_local_only
 +  end
 +
    def account_filters_scope
-     Status.not_excluded_by_account(@account).tap do |scope|
-       scope.merge!(Status.not_domain_blocked_by_account(@account)) unless local_only?
-       scope.merge!(Status.in_chosen_languages(@account)) if @account.chosen_languages.present?
+     Status.not_excluded_by_account(account).tap do |scope|
+       scope.merge!(Status.not_domain_blocked_by_account(account)) unless local_only?
+       scope.merge!(Status.in_chosen_languages(account)) if account.chosen_languages.present?
      end
    end
  end

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

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

diff --cc package.json
Simple merge

diff --cc yarn.lock
Simple merge