mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-24 05:25:08 +01:00
Code Issues Projects Releases Wiki Activity

Use Account#find_remote method when possible

Browse Source
This commit is contained in:
Eugen Rochko 2016-10-10 17:30:49 +02:00
parent cfba03bd27
commit 38ce960ff9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/process_feed_service.rb
View File

@ -147,7 +147,7 @@ class ProcessFeedService < BaseService
username = xml.at_xpath('./activity:object/xmlns:author/xmlns:name').content username = xml.at_xpath('./activity:object/xmlns:author/xmlns:name').content
url = xml.at_xpath('./activity:object/xmlns:author/xmlns:uri').content url = xml.at_xpath('./activity:object/xmlns:author/xmlns:uri').content
domain = Addressable::URI.parse(url).host domain = Addressable::URI.parse(url).host
account = Account.find_by(username: username, domain: domain) account = Account.find_remote(username, domain)
if account.nil? if account.nil?
account = follow_remote_account_service.call("#{username}@#{domain}") account = follow_remote_account_service.call("#{username}@#{domain}")