Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-28 13:47:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove WebfingerHelper module & move usage inline (#31203)

Browse Source
This commit is contained in:
Matt Jankowski
2024-10-01 05:54:42 -04:00
committed by Claire
parent ce2481a81b
commit 66ef4b9984
4 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/services/activitypub/fetch_remote_actor_service.rb
View File

@@ -3,7 +3,6 @@
class ActivityPub::FetchRemoteActorService < BaseService
include JsonLdHelper
include DomainControlHelper
include WebfingerHelper
class Error < StandardError; end
@@ -45,7 +44,7 @@ class ActivityPub::FetchRemoteActorService < BaseService
private
def check_webfinger!
webfinger = webfinger!("acct:#{@username}@#{@domain}")
webfinger = Webfinger.new("acct:#{@username}@#{@domain}").perform
confirmed_username, confirmed_domain = split_acct(webfinger.subject)
if @username.casecmp(confirmed_username).zero? && @domain.casecmp(confirmed_domain).zero?
@@ -54,7 +53,7 @@ class ActivityPub::FetchRemoteActorService < BaseService
return
end
webfinger = webfinger!("acct:#{confirmed_username}@#{confirmed_domain}")
webfinger = Webfinger.new("acct:#{confirmed_username}@#{confirmed_domain}").perform
@username, @domain = split_acct(webfinger.subject)
raise Webfinger::RedirectError, "Too many webfinger redirects for URI #{@uri} (stopped at #{@username}@#{@domain})" unless confirmed_username.casecmp(@username).zero? && confirmed_domain.casecmp(@domain).zero?