added atom feed

2 files changed, 20 insertions, 7 deletions

diff --git a/lib/pleroma/web/feed/feed_view.ex b/lib/pleroma/web/feed/feed_view.ex
index 2e7db1ebb..334802e0a 100644
--- a/lib/pleroma/web/feed/feed_view.ex
+++ b/lib/pleroma/web/feed/feed_view.ex
@@ -22,16 +22,28 @@ defmodule Pleroma.Web.Feed.FeedView do
 
   def pub_date(%DateTime{} = date), do: Timex.format!(date, "{RFC822}")
 
-  def prepare_activity(activity) do
+  def prepare_activity(activity, opts \\ []) do
     object = activity_object(activity)
 
+    actor =
+      if opts[:actor] do
+        Pleroma.User.get_cached_by_ap_id(activity.actor)
+      end
+
     %{
       activity: activity,
       data: Map.get(object, :data),
-      object: object
+      object: object,
+      actor: actor
     }
   end
 
+  def most_recent_update(activities) do
+    with %{updated_at: updated_at} <- List.first(activities) do
+      NaiveDateTime.to_iso8601(updated_at)
+    end
+  end
+
   def most_recent_update(activities, user) do
     (List.first(activities) || user).updated_at
     |> NaiveDateTime.to_iso8601()
diff --git a/lib/pleroma/web/feed/tag_controller.ex b/lib/pleroma/web/feed/tag_controller.ex
index 97ce147de..9b722336c 100644
--- a/lib/pleroma/web/feed/tag_controller.ex
+++ b/lib/pleroma/web/feed/tag_controller.ex
@@ -12,7 +12,7 @@ defmodule Pleroma.Web.Feed.TagController do
   import Pleroma.Web.ControllerHelper, only: [put_in_if_exist: 3]
 
   def feed(conn, %{"tag" => raw_tag} = params) do
-    tag = parse_tag(raw_tag)
+    {format, tag} = parse_tag(raw_tag)
 
     activities =
       %{"type" => ["Create"], "whole_db" => true, "tag" => tag}
@@ -22,19 +22,20 @@ defmodule Pleroma.Web.Feed.TagController do
     conn
     |> put_resp_content_type("application/atom+xml")
     |> put_view(FeedView)
-    |> render("tag.xml",
+    |> render("tag.#{format}",
       activities: activities,
       tag: tag,
       feed_config: Config.get([:feed])
     )
   end
 
+  @spec parse_tag(binary() | any()) :: {format :: String.t(), tag :: String.t()}
   defp parse_tag(raw_tag) when is_binary(raw_tag) do
     case Enum.reverse(String.split(raw_tag, ".")) do
-      [format | tag] when format in ["atom", "rss"] -> Enum.join(tag, ".")
-      _ -> raw_tag
+      [format | tag] when format in ["atom", "rss"] -> {format, Enum.join(tag, ".")}
+      _ -> {"rss", raw_tag}
     end
   end
 
-  defp parse_tag(raw_tag), do: raw_tag
+  defp parse_tag(raw_tag), do: {"rss", raw_tag}
 end