Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream

Conflicts:
- `app/models/account.rb`:
  Upstream added new validations close to lines on which glitch-soc had
  modified validations to handle custom limits set through environment
  variables.
  Ported upstream changes.
- `config/initializers/content_security_policy.rb`:
  Upstream added `AZURE_ALIAS_HOST`. Glitch-soc's version of the file is
  completely different.
  Added `AZURE_ALIAS_HOST` to our version of the file.

spec/requests/api/v1/statuses/favourites_spec.rb

@@ -77,6 +77,12 @@ RSpec.describe 'Favourites' do
 
     let(:status) { Fabricate(:status) }
 
+    around do |example|
+      Sidekiq::Testing.fake! do
+        example.run
+      end
+    end
+
     it_behaves_like 'forbidden for wrong scope', 'read read:favourites'
 
     context 'with public status' do
@@ -88,6 +94,9 @@ RSpec.describe 'Favourites' do
         subject
 
         expect(response).to have_http_status(200)
+        expect(user.account.favourited?(status)).to be true
+
+        UnfavouriteWorker.drain
         expect(user.account.favourited?(status)).to be false
       end
 
@@ -110,6 +119,9 @@ RSpec.describe 'Favourites' do
         subject
 
         expect(response).to have_http_status(200)
+        expect(user.account.favourited?(status)).to be true
+
+        UnfavouriteWorker.drain
         expect(user.account.favourited?(status)).to be false
       end