Modifying request url for webfinger

Alessandro Beltrão
1 parent c5f8d13b
Showing 1 changed file with 2 additions and 3 deletions Show diff stats
app/models/concerns/external_user.rb
 require 'ostruct'
-require 'rails/commands/server'
  
 module ExternalUser
   extend ActiveSupport::Concern
@@ -19,8 +18,8 @@ module ExternalUser
   module ClassMethods
     def webfinger_lookup(login, domain, environment)
       if login && domain && environment.has_federated_network?(domain)
-        rails = Rails::Server.new
-        url = URI.parse('https://'+rails.options[:Host]+':'+rails.options[:Port].to_s+'/.well-known/webfinger?resource=acct:'+login+'@'+domain)
+        url = URI.parse('https://'+ domain +'/.well-known/webfinger?resource=acct:'+
+                         login+'@'+Environment.default.federated_networks.find_by_url(domain))
         req = Net::HTTP::Get.new(url.to_s)
         res = Net::HTTP.start(url.host, url.port) { |http| http.request(req) }
         JSON.parse(res.body)
1	1	require 'ostruct'
2		-require 'rails/commands/server'
3	2
4	3	module ExternalUser
5	4	extend ActiveSupport::Concern
...	...	@@ -19,8 +18,8 @@ module ExternalUser
19	18	module ClassMethods
20	19	def webfinger_lookup(login, domain, environment)
21	20	if login && domain && environment.has_federated_network?(domain)
22		- rails = Rails::Server.new
23		- url = URI.parse('https://'+rails.options[:Host]+':'+rails.options[:Port].to_s+'/.well-known/webfinger?resource=acct:'+login+'@'+domain)
	21	+ url = URI.parse('https://'+ domain +'/.well-known/webfinger?resource=acct:'+
	22	+ login+'@'+Environment.default.federated_networks.find_by_url(domain))
24	23	req = Net::HTTP::Get.new(url.to_s)
25	24	res = Net::HTTP.start(url.host, url.port) { \|http\| http.request(req) }
26	25	JSON.parse(res.body)
...	...