Browse Source

Extra line in one file somehow?

master
Mike Barnes 5 months ago
parent
commit
21f64683b0
  1. 3
      app/lib/webfinger.rb
  2. 1
      app/services/resolve_account_service.rb

3
app/lib/webfinger.rb

@ -49,11 +49,8 @@ class Webfinger
res.body_with_limit
elsif res.code == 404 && use_fallback
body_from_host_meta
<<<<<<< HEAD
=======
elsif res.code == 410
raise Webfinger::GoneError, "#{@uri} is gone from the server"
>>>>>>> v3.3.0
else
raise Webfinger::Error, "Request for #{@uri} returned HTTP #{res.code}"
end

1
app/services/resolve_account_service.rb

@ -88,7 +88,6 @@ class ResolveAccountService < BaseService
@domain = confirmed_domain
return
end
end
# Account doesn't match, so it may have been redirected
@webfinger = webfinger!("acct:#{confirmed_username}@#{confirmed_domain}")

Loading…
Cancel
Save