about summary refs log tree commit diff
path: root/app/services/process_feed_service.rb
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-09-21 01:34:14 +0200
committerEugen Rochko <eugen@zeonfederated.com>2016-09-21 01:50:31 +0200
commit4bec613897d8835bb78202c7a36691b654f14967 (patch)
tree9df22828377cbf32002086c64fb0c5cdae790e95 /app/services/process_feed_service.rb
parent6d89edc4f772b10b61f9747482a155666077f20b (diff)
Fix #24 - Thread resolving for remote statuses
This is a big one, so let me enumerate:

Accounts as well as stream entry pages now contain Link headers that
reference the Atom feed and Webfinger URL for the former and Atom entry
for the latter. So you only need to HEAD those resources to get that
information, no need to download and parse HTML <link>s.

ProcessFeedService will now queue ThreadResolveWorker for each remote
status that it cannot find otherwise. Furthermore, entries are now
processed in reverse order (from bottom to top) in case a newer entry
references a chronologically previous one.

ThreadResolveWorker uses FetchRemoteStatusService to obtain a status
and attach the child status it was queued for to it.

FetchRemoteStatusService looks up the URL, first with a HEAD, tests
if it's an Atom feed, in which case it processes it directly. Next
for Link headers to the Atom feed, in which case that is fetched
and processed. Lastly if it's HTML, it is checked for <link>s to the Atom
feed, and if such is found, that is fetched and processed. The account for
the status is derived from author/name attribute in the XML and the hostname
in the URL (domain). FollowRemoteAccountService and ProcessFeedService
are used.

This means that potentially threads are resolved recursively until a dead-end
is encountered, however it is performed asynchronously over background jobs,
so it should be ok.
Diffstat (limited to 'app/services/process_feed_service.rb')
-rw-r--r--app/services/process_feed_service.rb22
1 files changed, 21 insertions, 1 deletions
diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb
index a69205494..49834f5c1 100644
--- a/app/services/process_feed_service.rb
+++ b/app/services/process_feed_service.rb
@@ -2,10 +2,11 @@ class ProcessFeedService < BaseService
   # Create local statuses from an Atom feed
   # @param [String] body Atom feed
   # @param [Account] account Account this feed belongs to
+  # @return [Enumerable] created statuses
   def call(body, account)
     xml = Nokogiri::XML(body)
     update_remote_profile_service.(xml.at_xpath('/xmlns:feed/xmlns:author'), account) unless xml.at_xpath('/xmlns:feed').nil?
-    xml.xpath('//xmlns:entry').each { |entry| process_entry(account, entry) }
+    xml.xpath('//xmlns:entry').reverse_each.map { |entry| process_entry(account, entry) }.compact
   end
 
   private
@@ -45,6 +46,8 @@ class ProcessFeedService < BaseService
 
       DistributionWorker.perform_async(status.id)
     end
+
+    return status
   end
 
   def record_remote_mentions(status, links)
@@ -103,6 +106,10 @@ class ProcessFeedService < BaseService
   def add_reply!(entry, status)
     status.thread = find_original_status(entry, thread_id(entry))
     status.save!
+
+    if status.thread.nil? && !thread_href(entry).nil?
+      ThreadResolveWorker.perform_async(status.id, thread_href(entry))
+    end
   end
 
   def delete_post!(status)
@@ -131,6 +138,13 @@ class ProcessFeedService < BaseService
 
     status = Status.new(account: account, uri: target_id(xml), text: target_content(xml), url: target_url(xml), created_at: published(xml), updated_at: updated(xml))
     status.thread = find_original_status(xml, thread_id(xml))
+    status.save
+
+    if status.saved? && status.thread.nil? && !thread_href(xml).nil?
+      ThreadResolveWorker.perform_async(status.id, thread_href(xml))
+    end
+
+    status
   rescue Goldfinger::Error, HTTP::Error
     nil
   end
@@ -153,6 +167,12 @@ class ProcessFeedService < BaseService
     nil
   end
 
+  def thread_href(xml)
+    xml.at_xpath('./thr:in-reply-to').attribute('href').value
+  rescue
+    nil
+  end
+
   def target_id(xml)
     xml.at_xpath('.//activity:object/xmlns:id').content
   rescue