1 files changed, 31 insertions, 33 deletions
diff --git a/lib/pleroma/web/templates/feed/feed/_tag_activity.atom.eex b/lib/pleroma/web/templates/feed/feed/_tag_activity.atom.eex
index 7e2e587e1..25980c1e4 100644
--- a/lib/pleroma/web/templates/feed/feed/_tag_activity.atom.eex
+++ b/lib/pleroma/web/templates/feed/feed/_tag_activity.atom.eex
@@ -1,12 +1,22 @@
 <entry>
-    <activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
-    <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
+  <activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
+  <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
 
     <%= render Phoenix.Controller.view_module(@conn), "_tag_author.atom", assigns %>
 
-    <id><%= @data["id"] %></id>
-    <title><%= activity_title(@data, Keyword.get(@feed_config, :post_title, %{})) %></title>
-    <content type="html"><%= activity_content(@data) %></content>
+  <id><%= @data["id"] %></id>
+  <title><%= activity_title(@data, Keyword.get(@feed_config, :post_title, %{})) %></title>
+  <content type="html"><%= activity_description(@data) %></content>
+  <published><%= to_rfc3339(@activity.data["published"]) %></published>
+  <updated><%= to_rfc3339(@activity.data["published"]) %></updated>
+  <ostatus:conversation ref="<%= activity_context(@activity) %>">
+    <%= activity_context(@activity) %>
+  </ostatus:conversation>
+  <link href="<%= activity_context(@activity) %>" rel="ostatus:conversation"/>
+
+  <%= if @data["summary"] != "" do %>
+    <summary><%= @data["summary"] %></summary>
+  <% end %>
 
   <%= if @activity.local do %>
     <link type="application/atom+xml" href='<%= @data["id"] %>' rel="self"/>
@@ -15,37 +25,25 @@
     <link type="text/html" href='<%= @data["external_url"] %>' rel="alternate"/>
   <% end %>
 
-    <published><%= @activity.data["published"] %></published>
-    <updated><%= @activity.data["published"] %></updated>
-
-    <ostatus:conversation ref="<%= activity_context(@activity) %>">
-      <%= activity_context(@activity) %>
-    </ostatus:conversation>
-    <link href="<%= activity_context(@activity) %>" rel="ostatus:conversation"/>
-
-   <%= if @data["summary"] do %>
-    <summary><%= @data["summary"] %></summary>
-   <% end %>
-
-    <%= for id <- @activity.recipients do %>
-      <%= if id == Pleroma.Constants.as_public() do %>
+  <%= for id <- @activity.recipients do %>
+    <%= if id == Pleroma.Constants.as_public() do %>
+      <link rel="mentioned"
+            ostatus:object-type="http://activitystrea.ms/schema/1.0/collection"
+            href="http://activityschema.org/collection/public"/>
+    <% else %>
+      <%= unless Regex.match?(~r/^#{Pleroma.Web.Endpoint.url()}.+followers$/, id) do %>
         <link rel="mentioned"
-          ostatus:object-type="http://activitystrea.ms/schema/1.0/collection"
-          href="http://activityschema.org/collection/public"/>
-      <% else %>
-        <%= unless Regex.match?(~r/^#{Pleroma.Web.Endpoint.url()}.+followers$/, id) do %>
-          <link rel="mentioned"
-            ostatus:object-type="http://activitystrea.ms/schema/1.0/person"
-            href="<%= id %>" />
-        <% end %>
+              ostatus:object-type="http://activitystrea.ms/schema/1.0/person"
+              href="<%= id %>" />
       <% end %>
     <% end %>
+  <% end %>
 
-    <%= for tag <- Pleroma.Object.hashtags(@object) do %>
-      <category term="<%= tag %>"></category>
-    <% end %>
+  <%= for tag <- Pleroma.Object.hashtags(@object) do %>
+    <category term="<%= tag %>"></category>
+  <% end %>
 
-    <%= for {emoji, file} <- @data["emoji"] || %{} do %>
-      <link name="<%= emoji %>" rel="emoji" href="<%= file %>"/>
-    <% end %>
+  <%= for {emoji, file} <- @data["emoji"] || %{} do %>
+    <link name="<%= emoji %>" rel="emoji" href="<%= file %>"/>
+  <% end %>
 </entry>