Fix subscriptions:clear task, refactor feeds, refactor streamable activites

and atom feed generation to some extent, as well as the way mentions are
stored

1 files changed, 11 insertions, 9 deletions

diff --git a/app/helpers/atom_builder_helper.rb b/app/helpers/atom_builder_helper.rb
index 51ab4da16..845190795 100644
--- a/app/helpers/atom_builder_helper.rb
+++ b/app/helpers/atom_builder_helper.rb
@@ -135,6 +135,10 @@ module AtomBuilderHelper
     xml.logo url
   end
 
+  def email(xml, email)
+    xml.email email
+  end
+
   def conditionally_formatted(activity)
     if activity.is_a?(Status)
       content_for_status(activity.reblog? ? activity.reblog : activity)
@@ -149,6 +153,7 @@ module AtomBuilderHelper
     object_type      xml, :person
     uri              xml, url_for_target(account)
     name             xml, account.username
+    email            xml, account.local? ? "#{account.acct}@#{Rails.configuration.x.local_domain}" : account.acct
     summary          xml, account.note
     link_alternate   xml, url_for_target(account)
     link_avatar      xml, account
@@ -171,16 +176,13 @@ module AtomBuilderHelper
 
     if stream_entry.targeted?
       target(xml) do
-        object_type    xml, stream_entry.target.object_type
-        simple_id      xml, uri_for_target(stream_entry.target)
-        title          xml, stream_entry.target.title
-        link_alternate xml, url_for_target(stream_entry.target)
-
-        # People have summary and portable contacts information
         if stream_entry.target.object_type == :person
-          summary          xml, stream_entry.target.content
-          portable_contact xml, stream_entry.target
-          link_avatar      xml, stream_entry.target
+          include_author xml, stream_entry.target
+        else
+          object_type    xml, stream_entry.target.object_type
+          simple_id      xml, uri_for_target(stream_entry.target)
+          title          xml, stream_entry.target.title
+          link_alternate xml, url_for_target(stream_entry.target)
         end
 
         # Statuses have content and author