Fix #54 - Fetch remote accounts by URL from mentions

Fetching atom extracted from FetchRemoteAccountService and FetchRemoteStatusService
into FetchAtomService. Mentions of the constant "http://activityschema.org/collection/public"
skipped as it's not a real URL/user.

6 files changed, 81 insertions, 58 deletions

diff --git a/app/services/fan_out_on_write_service.rb b/app/services/fan_out_on_write_service.rb
index b8e2f5c22..2d18709d6 100644
--- a/app/services/fan_out_on_write_service.rb
+++ b/app/services/fan_out_on_write_service.rb
@@ -23,7 +23,7 @@ class FanOutOnWriteService < BaseService
   def deliver_to_mentioned(status)
     status.mentions.each do |mention|
       mentioned_account = mention.account
-      next unless mentioned_account.local?
+      next if !mentioned_account.local? || mentioned_account.id == status.account_id
       FeedManager.instance.push(:mentions, mentioned_account, status)
     end
   end
diff --git a/app/services/fetch_atom_service.rb b/app/services/fetch_atom_service.rb
new file mode 100644
index 000000000..57f789ada
--- /dev/null
+++ b/app/services/fetch_atom_service.rb
@@ -0,0 +1,46 @@
+class FetchAtomService < BaseService
+  def call(url)
+    response = http_client.head(url)
+
+    Rails.logger.debug "Remote status HEAD request returned code #{response.code}"
+    return nil if response.code != 200
+
+    if response.mime_type == 'application/atom+xml'
+      return [url, fetch(url)]
+    elsif !response['Link'].blank?
+      return process_headers(response)
+    else
+      return process_html(fetch(url))
+    end
+  end
+
+  private
+
+  def process_html(body)
+    Rails.logger.debug "Processing HTML"
+
+    page = Nokogiri::HTML(body)
+    alternate_link = page.xpath('//link[@rel="alternate"]').find { |link| link['type'] == 'application/atom+xml' }
+
+    return nil if alternate_link.nil?
+    return [alternate_link['href'], fetch(alternate_link['href'])]
+  end
+
+  def process_headers(response)
+    Rails.logger.debug "Processing link header"
+
+    link_header    = LinkHeader.parse(response['Link'])
+    alternate_link = link_header.find_link(['rel', 'alternate'], ['type', 'application/atom+xml'])
+
+    return nil if alternate_link.nil?
+    return [alternate_link.href, fetch(alternate_link.href)]
+  end
+
+  def fetch(url)
+    http_client.get(url).to_s
+  end
+
+  def http_client
+    HTTP.timeout(:per_operation, write: 20, connect: 20, read: 50)
+  end
+end
diff --git a/app/services/fetch_feed_service.rb b/app/services/fetch_feed_service.rb
deleted file mode 100644
index f18e9fc06..000000000
--- a/app/services/fetch_feed_service.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-class FetchFeedService < BaseService
-  # Fetch an account's feed and process it
-  # @param [Account] account
-  def call(account)
-    process_service.(http_client.get(account.remote_url), account)
-  end
-
-  private
-
-  def process_service
-    @process_service ||= ProcessFeedService.new
-  end
-
-  def http_client
-    HTTP
-  end
-end
diff --git a/app/services/fetch_remote_account_service.rb b/app/services/fetch_remote_account_service.rb
new file mode 100644
index 000000000..d24ac2a37
--- /dev/null
+++ b/app/services/fetch_remote_account_service.rb
@@ -0,0 +1,22 @@
+class FetchRemoteAccountService < BaseService
+  def call(url)
+    atom_url, body = FetchAtomService.new.(url)
+
+    return nil if atom_url.nil?
+    return process_atom(atom_url, body)
+  end
+
+  private
+
+  def process_atom(url, body)
+    url_parts = Addressable::URI.parse(url)
+    username  = xml.at_xpath('//xmlns:author/xmlns:name').try(:content)
+    domain    = url_parts.host
+
+    return nil if username.nil?
+
+    Rails.logger.debug "Going to webfinger #{username}@#{domain}"
+
+    return FollowRemoteAccountService.new.("#{username}@#{domain}")
+  end
+end
diff --git a/app/services/fetch_remote_status_service.rb b/app/services/fetch_remote_status_service.rb
index c872cb385..7613607b4 100644
--- a/app/services/fetch_remote_status_service.rb
+++ b/app/services/fetch_remote_status_service.rb
@@ -1,17 +1,9 @@
 class FetchRemoteStatusService < BaseService
   def call(url)
-    response = http_client.head(url)
+    atom_url, body = FetchAtomService.new.(url)
 
-    Rails.logger.debug "Remote status HEAD request returned code #{response.code}"
-    return nil if response.code != 200
-
-    if response.mime_type == 'application/atom+xml'
-      return process_atom(url, fetch(url))
-    elsif !response['Link'].blank?
-      return process_headers(response)
-    else
-      return process_html(fetch(url))
-    end
+    return nil if atom_url.nil?
+    return process_atom(atom_url, body)
   end
 
   private
@@ -29,26 +21,6 @@ class FetchRemoteStatusService < BaseService
     return statuses.first
   end
 
-  def process_html(body)
-    Rails.logger.debug "Processing HTML for remote status"
-
-    page = Nokogiri::HTML(body)
-    alternate_link = page.xpath('//link[@rel="alternate"]').find { |link| link['type'] == 'application/atom+xml' }
-
-    return nil if alternate_link.nil?
-    return process_atom(alternate_link['href'], fetch(alternate_link['href']))
-  end
-
-  def process_headers(response)
-    Rails.logger.debug "Processing link header for remote status"
-
-    link_header    = LinkHeader.parse(response['Link'])
-    alternate_link = link_header.find_link(['rel', 'alternate'], ['type', 'application/atom+xml'])
-
-    return nil if alternate_link.nil?
-    return process_atom(alternate_link.href, fetch(alternate_link.href))
-  end
-
   def extract_author(url, xml)
     url_parts = Addressable::URI.parse(url)
     username  = xml.at_xpath('//xmlns:author/xmlns:name').try(:content)
@@ -60,12 +32,4 @@ class FetchRemoteStatusService < BaseService
 
     return FollowRemoteAccountService.new.("#{username}@#{domain}")
   end
-
-  def fetch(url)
-    http_client.get(url).to_s
-  end
-
-  def http_client
-    HTTP.timeout(:per_operation, write: 20, connect: 20, read: 50)
-  end
 end
diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb
index 5e760bc75..47992b246 100644
--- a/app/services/process_feed_service.rb
+++ b/app/services/process_feed_service.rb
@@ -57,7 +57,11 @@ class ProcessFeedService < BaseService
     # and tidier
 
     links.each do |mention_link|
-      href = Addressable::URI.parse(mention_link.attribute('href').value)
+      href_val = mention_link.attribute('href').value
+
+      next if href_val == 'http://activityschema.org/collection/public'
+      
+      href = Addressable::URI.parse(href_val)
 
       if href.host == Rails.configuration.x.local_domain
         # A local user is mentioned
@@ -72,6 +76,10 @@ class ProcessFeedService < BaseService
         # This is kinda dodgy because URLs could change, we don't index them
         mentioned_account = Account.find_by(url: href.to_s)
 
+        if mentioned_account.nil?
+          mentioned_account = FetchRemoteAccountService.new.(href)
+        end
+
         unless mentioned_account.nil?
           mentioned_account.mentions.where(status: status).first_or_create(status: status)
         end