Merge commit '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream

Conflicts:
- `app/controllers/authorize_interactions_controller.rb`:
  Small conflict due to our theming system.
- `streaming/index.js`:
  Upstream refactored part of the streaming server.
  We had some extra logic for handling local-only posts.
  Applied the refactor.

config/routes/api.rb

@@ -124,6 +124,10 @@ namespace :api, format: false do
       resource :activity, only: [:show], controller: 'instances/activity'
     end
 
+    namespace :peers do
+      get :search, to: 'search#index'
+    end
+
     resource :domain_blocks, only: [:show, :create, :destroy]
 
     resource :directory, only: [:show]