From 89e4b3ebbd433032a2687712c9c6684902fe4ebe Mon Sep 17 00:00:00 2001
From: Alexander Strizhakov <alex.strizhakov@gmail.com>
Date: Fri, 13 Mar 2020 17:58:14 +0300
Subject: [PATCH] fix for content-type header for tag feed

---
 lib/pleroma/web/feed/tag_controller.ex |  2 +-
 test/web/feed/tag_controller_test.exs  | 22 ++++++++++++----------
 test/web/feed/user_controller_test.exs |  4 ++--
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/lib/pleroma/web/feed/tag_controller.ex b/lib/pleroma/web/feed/tag_controller.ex
index 904047b12..8133f8480 100644
--- a/lib/pleroma/web/feed/tag_controller.ex
+++ b/lib/pleroma/web/feed/tag_controller.ex
@@ -20,7 +20,7 @@ def feed(conn, %{"tag" => raw_tag} = params) do
       |> ActivityPub.fetch_public_activities()
 
     conn
-    |> put_resp_content_type("application/atom+xml")
+    |> put_resp_content_type("application/#{format}+xml")
     |> put_view(FeedView)
     |> render("tag.#{format}",
       activities: activities,
diff --git a/test/web/feed/tag_controller_test.exs b/test/web/feed/tag_controller_test.exs
index c774bd420..da1caf049 100644
--- a/test/web/feed/tag_controller_test.exs
+++ b/test/web/feed/tag_controller_test.exs
@@ -49,7 +49,7 @@ test "gets a feed (ATOM)", %{conn: conn} do
 
     response =
       conn
-      |> put_req_header("content-type", "application/atom+xml")
+      |> put_req_header("accept", "application/atom+xml")
       |> get(tag_feed_path(conn, :feed, "pleromaart.atom"))
       |> response(200)
 
@@ -65,12 +65,13 @@ test "gets a feed (ATOM)", %{conn: conn} do
     assert xpath(xml, ~x"//feed/entry/author/name/text()"ls) == [user.nickname, user.nickname]
     assert xpath(xml, ~x"//feed/entry/author/id/text()"ls) == [user.ap_id, user.ap_id]
 
-    resp =
+    conn =
       conn
-      |> put_req_header("content-type", "application/atom+xml")
+      |> put_req_header("accept", "application/atom+xml")
       |> get("/tags/pleromaart.atom", %{"max_id" => activity2.id})
-      |> response(200)
 
+    assert get_resp_header(conn, "content-type") == ["application/atom+xml; charset=utf-8"]
+    resp = response(conn, 200)
     xml = parse(resp)
 
     assert xpath(xml, ~x"//feed/title/text()") == '#pleromaart'
@@ -115,7 +116,7 @@ test "gets a feed (RSS)", %{conn: conn} do
 
     response =
       conn
-      |> put_req_header("content-type", "application/rss+xml")
+      |> put_req_header("accept", "application/rss+xml")
       |> get(tag_feed_path(conn, :feed, "pleromaart.rss"))
       |> response(200)
 
@@ -155,7 +156,7 @@ test "gets a feed (RSS)", %{conn: conn} do
 
     response =
       conn
-      |> put_req_header("content-type", "application/atom+xml")
+      |> put_req_header("accept", "application/rss+xml")
       |> get(tag_feed_path(conn, :feed, "pleromaart"))
       |> response(200)
 
@@ -165,12 +166,13 @@ test "gets a feed (RSS)", %{conn: conn} do
     assert xpath(xml, ~x"//channel/description/text()"s) ==
              "These are public toots tagged with #pleromaart. You can interact with them if you have an account anywhere in the fediverse."
 
-    resp =
+    conn =
       conn
-      |> put_req_header("content-type", "application/atom+xml")
-      |> get("/tags/pleromaart", %{"max_id" => activity2.id})
-      |> response(200)
+      |> put_req_header("accept", "application/rss+xml")
+      |> get("/tags/pleromaart.rss", %{"max_id" => activity2.id})
 
+    assert get_resp_header(conn, "content-type") == ["application/rss+xml; charset=utf-8"]
+    resp = response(conn, 200)
     xml = parse(resp)
 
     assert xpath(xml, ~x"//channel/title/text()") == '#pleromaart'
diff --git a/test/web/feed/user_controller_test.exs b/test/web/feed/user_controller_test.exs
index e3dfa88f1..5c91c33d8 100644
--- a/test/web/feed/user_controller_test.exs
+++ b/test/web/feed/user_controller_test.exs
@@ -19,7 +19,7 @@ defmodule Pleroma.Web.Feed.UserControllerTest do
   describe "feed" do
     clear_config([:feed])
 
-    test "gets an atom feed", %{conn: conn} do
+    test "gets a feed", %{conn: conn} do
       Config.put(
         [:feed, :post_title],
         %{max_length: 10, omission: "..."}
@@ -139,7 +139,7 @@ test "gets a rss feed", %{conn: conn} do
 
       resp =
         conn
-        |> put_req_header("accept", "application/atom+xml")
+        |> put_req_header("accept", "application/rss+xml")
         |> get("/users/#{user.nickname}/feed.rss", %{"max_id" => note_activity2.id})
         |> response(200)