X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Ffeed%2Ftag_controller.ex;h=218cdbdf3aa3c65f6341ee24150779f746250b96;hb=48f7e12e6c139e9cfc8e68b4eaf1695019c9d246;hp=97ce147de9845ca00ac1e189b3b703883b17393e;hpb=a5db044e579ed9923e610cdf89dff6146d9b0986;p=akkoma

diff --git a/lib/pleroma/web/feed/tag_controller.ex b/lib/pleroma/web/feed/tag_controller.ex
index 97ce147de..218cdbdf3 100644
--- a/lib/pleroma/web/feed/tag_controller.ex
+++ b/lib/pleroma/web/feed/tag_controller.ex
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.Feed.TagController do
@@ -9,32 +9,40 @@ defmodule Pleroma.Web.Feed.TagController do
   alias Pleroma.Web.ActivityPub.ActivityPub
   alias Pleroma.Web.Feed.FeedView
 
-  import Pleroma.Web.ControllerHelper, only: [put_in_if_exist: 3]
+  def feed(conn, params) do
+    if Config.get!([:instance, :public]) do
+      render_feed(conn, params)
+    else
+      render_error(conn, :not_found, "Not found")
+    end
+  end
 
-  def feed(conn, %{"tag" => raw_tag} = params) do
-    tag = parse_tag(raw_tag)
+  defp render_feed(conn, %{"tag" => raw_tag} = params) do
+    {format, tag} = parse_tag(raw_tag)
 
     activities =
-      %{"type" => ["Create"], "whole_db" => true, "tag" => tag}
-      |> put_in_if_exist("max_id", params["max_id"])
+      %{type: ["Create"], tag: tag}
+      |> Pleroma.Maps.put_if_present(:max_id, params["max_id"])
       |> ActivityPub.fetch_public_activities()
 
     conn
-    |> put_resp_content_type("application/atom+xml")
+    |> put_resp_content_type("application/#{format}+xml")
     |> put_view(FeedView)
-    |> render("tag.xml",
+    |> render("tag.#{format}",
       activities: activities,
       tag: tag,
       feed_config: Config.get([:feed])
     )
   end
 
-  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
+  @spec parse_tag(binary() | any()) :: {format :: String.t(), tag :: String.t()}
+  defp parse_tag(raw_tag) do
+    case is_binary(raw_tag) && Enum.reverse(String.split(raw_tag, ".")) do
+      [format | tag] when format in ["rss", "atom"] ->
+        {format, Enum.join(tag, ".")}
+
+      _ ->
+        {"atom", raw_tag}
     end
   end
-
-  defp parse_tag(raw_tag), do: raw_tag
 end