Merge branch 'main' into glitch-soc/main

2022-12-09 16:48:55 +01:00
parent 859db01268 4555ecf995
commit e877bb47b8
102 changed files with 1909 additions and 3311 deletions
--- a/lib/mastodon/accounts_cli.rb
+++ b/lib/mastodon/accounts_cli.rb
@ -541,7 +541,7 @@ module Mastodon
      old_key = account.private_key
      new_key = OpenSSL::PKey::RSA.new(2048)
      account.update(private_key: new_key.to_pem, public_key: new_key.public_key.to_pem)
-      ActivityPub::UpdateDistributionWorker.perform_in(delay, account.id, sign_with: old_key)
+      ActivityPub::UpdateDistributionWorker.perform_in(delay, account.id, { 'sign_with' => old_key })
    end
  end
 end