Merge branch 'main' into glitch-soc/merge-upstream

2022-11-07 07:50:47 +01:00
parent 54101563bb a70e2cd649
commit 6c0a6097ff
10 changed files with 19 additions and 15 deletions
--- a/app/models/account_migration.rb
+++ b/app/models/account_migration.rb
@ -58,7 +58,7 @@ class AccountMigration < ApplicationRecord
  private

  def set_target_account
-    self.target_account = ResolveAccountService.new.call(acct)
+    self.target_account = ResolveAccountService.new.call(acct, skip_cache: true)
  rescue Webfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError, Mastodon::Error
    # Validation will take care of it
  end