Merge commit '4896d2c4c6d3bd6b878c5a075b6611c65d4203b2' into glitch-soc/merge-upstream

Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream changed stuff too close to glitch-soc's theming system changes.
  Applied upstream's changes.
- `streaming/index.js`:
  Upstream refactored a bunch of stuff where our code was different due to
  local-only posts.
  Applied upstream's changes while taking care of local-only posts.

app/workers/activitypub/fetch_all_replies_worker.rb

@@ -11,9 +11,10 @@ class ActivityPub::FetchAllRepliesWorker
 
   sidekiq_options queue: 'pull', retry: 3
 
-  # Global max replies to fetch per request (all replies, recursively)
-  MAX_REPLIES = (ENV['FETCH_REPLIES_MAX_GLOBAL'] || 1000).to_i
-  MAX_PAGES = (ENV['FETCH_REPLIES_MAX_PAGES'] || 500).to_i
+  # Max number of replies to fetch - total, recursively through a whole reply tree
+  MAX_REPLIES = 1000
+  # Max number of replies Collection pages to fetch - total
+  MAX_PAGES = 500
 
   def perform(root_status_id, options = {})
     @batch = WorkerBatch.new(options['batch_id'])