tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Wrap connection errors in Webfinger#perform (#40135)

Browse Source
This commit is contained in:
Claire 2026-08-12 15:57:32 +02:00 committed by Tarrien
parent 7a5a849e66
commit ddfdc1fef3
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/lib/webfinger.rb
View File

@ -61,6 +61,8 @@ class Webfinger
raise Webfinger::Error, "Invalid JSON in response for #{@uri}" raise Webfinger::Error, "Invalid JSON in response for #{@uri}"
rescue Addressable::URI::InvalidURIError rescue Addressable::URI::InvalidURIError
raise Webfinger::Error, "Invalid URI for #{@uri}" raise Webfinger::Error, "Invalid URI for #{@uri}"
rescue *Mastodon::HTTP_CONNECTION_ERRORS => e
raise Webfinger::Error, "Error performing webfinger query for #{@uri}: #{e}"
end end
private private

2
app/models/remote_follow.rb
View File

@ -66,7 +66,7 @@ class RemoteFollow
def acct_resource def acct_resource
@acct_resource ||= Webfinger.new("acct:#{acct}").perform @acct_resource ||= Webfinger.new("acct:#{acct}").perform
rescue Webfinger::Error, *Mastodon::HTTP_CONNECTION_ERRORS rescue Webfinger::Error
nil nil
end end