Commit 0e3e60d2 authored by Eugen Rochko's avatar Eugen Rochko
Browse files

Fix account migration form ever using outdated account data

parent 0cdb0775
......@@ -31,7 +31,7 @@ class Form::Redirect
def set_target_account
@target_account =
@target_account =, skip_cache: true)
rescue Webfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError, Mastodon::Error
# Validation will take care of it
......@@ -13,6 +13,7 @@ class ResolveAccountService < BaseService
# @param [Hash] options
# @option options [Boolean] :redirected Do not follow further Webfinger redirects
# @option options [Boolean] :skip_webfinger Do not attempt any webfinger query or refreshing account data
# @option options [Boolean] :skip_cache Get the latest data from origin even if cache is not due to update yet
# @return [Account]
def call(uri, options = {})
return if uri.blank?
......@@ -120,7 +121,7 @@ class ResolveAccountService < BaseService
return false if @options[:check_delivery_availability] && !DeliveryFailureTracker.available?(@domain)
return false if @options[:skip_webfinger]
@account.nil? || @account.possibly_stale?
@options[:skip_cache] || @account.nil? || @account.possibly_stale?
def activitypub_ready?
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment