Fix #801 - Respect webfinger's canonical response of username/domain
This commit is contained in:
		
							parent
							
								
									a872f2f4c6
								
							
						
					
					
						commit
						b2a7218ab7
					
				
					 1 changed files with 1 additions and 2 deletions
				
			
		|  | @ -20,8 +20,6 @@ class FollowRemoteAccountService < BaseService | |||
| 
 | ||||
|     Rails.logger.debug "Looking up webfinger for #{uri}" | ||||
| 
 | ||||
|     account = Account.new(username: username, domain: domain) | ||||
| 
 | ||||
|     data = Goldfinger.finger("acct:#{uri}") | ||||
| 
 | ||||
|     raise Goldfinger::Error, 'Missing resource links' if data.link('http://schemas.google.com/g/2010#updates-from').nil? || data.link('salmon').nil? || data.link('http://webfinger.net/rel/profile-page').nil? || data.link('magic-public-key').nil? | ||||
|  | @ -37,6 +35,7 @@ class FollowRemoteAccountService < BaseService | |||
| 
 | ||||
|     domain_block = DomainBlock.find_by(domain: domain) | ||||
| 
 | ||||
|     account = Account.new(username: confirmed_username, domain: confirmed_domain) | ||||
|     account.remote_url  = data.link('http://schemas.google.com/g/2010#updates-from').href | ||||
|     account.salmon_url  = data.link('salmon').href | ||||
|     account.url         = data.link('http://webfinger.net/rel/profile-page').href | ||||
|  |  | |||
		Loading…
	
		Reference in a new issue