diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mastodon/accounts_cli.rb | 2 | ||||
| -rw-r--r-- | lib/tasks/tests.rake | 14 |
2 files changed, 13 insertions, 3 deletions
diff --git a/lib/mastodon/accounts_cli.rb b/lib/mastodon/accounts_cli.rb index c8a8448ed..77cbef84e 100644 --- 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 diff --git a/lib/tasks/tests.rake b/lib/tasks/tests.rake index 96d2f7112..1dd25abb9 100644 --- a/lib/tasks/tests.rake +++ b/lib/tasks/tests.rake @@ -43,6 +43,16 @@ namespace :tests do puts 'CustomFilterKeyword records not created as expected' exit(1) end + + unless Admin::ActionLog.find_by(target_type: 'DomainBlock', target_id: 1).human_identifier == 'example.org' + puts 'Admin::ActionLog domain block records not updated as expected' + exit(1) + end + + unless Admin::ActionLog.find_by(target_type: 'EmailDomainBlock', target_id: 1).human_identifier == 'example.org' + puts 'Admin::ActionLog email domain block records not updated as expected' + exit(1) + end end desc 'Populate the database with test data for 2.4.3' @@ -84,8 +94,8 @@ namespace :tests do VALUES (1, 'destroy', 'Account', 1, now(), now()), (1, 'destroy', 'User', 1, now(), now()), - (1, 'destroy', 'DomainBlock', 1312, now(), now()), - (1, 'destroy', 'EmailDomainBlock', 1312, now(), now()), + (1, 'destroy', 'DomainBlock', 1, now(), now()), + (1, 'destroy', 'EmailDomainBlock', 1, now(), now()), (1, 'destroy', 'Status', 1, now(), now()), (1, 'destroy', 'CustomEmoji', 3, now(), now()); SQL |