From bf6aa6f1a8460448d51dc69e05257058b3d56a43 Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Sun, 16 Jun 2019 12:57:58 +0300
Subject: [PATCH] Fix report content stopping to be nullable

---
 lib/pleroma/web/admin_api/views/report_view.ex | 9 ++++++++-
 test/web/admin_api/views/report_view_test.exs  | 6 +++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/lib/pleroma/web/admin_api/views/report_view.ex b/lib/pleroma/web/admin_api/views/report_view.ex
index a17a23ca3..e7db3a8ff 100644
--- a/lib/pleroma/web/admin_api/views/report_view.ex
+++ b/lib/pleroma/web/admin_api/views/report_view.ex
@@ -24,6 +24,13 @@ def render("show.json", %{report: report}) do
     [account_ap_id | status_ap_ids] = report.data["object"]
     account = User.get_cached_by_ap_id(account_ap_id)
 
+    content =
+      unless is_nil(report.data["content"]) do
+        HTML.filter_tags(report.data["content"])
+      else
+        nil
+      end
+
     statuses =
       Enum.map(status_ap_ids, fn ap_id ->
         Activity.get_by_ap_id_with_object(ap_id)
@@ -33,7 +40,7 @@ def render("show.json", %{report: report}) do
       id: report.id,
       account: AccountView.render("account.json", %{user: account}),
       actor: AccountView.render("account.json", %{user: user}),
-      content: HTML.filter_tags(report.data["content"]),
+      content: content,
       created_at: created_at,
       statuses: StatusView.render("index.json", %{activities: statuses, as: :activity}),
       state: report.data["state"]
diff --git a/test/web/admin_api/views/report_view_test.exs b/test/web/admin_api/views/report_view_test.exs
index 51c26a117..f35f36cac 100644
--- a/test/web/admin_api/views/report_view_test.exs
+++ b/test/web/admin_api/views/report_view_test.exs
@@ -17,7 +17,7 @@ test "renders a report" do
     {:ok, activity} = CommonAPI.report(user, %{"account_id" => other_user.id})
 
     expected = %{
-      content: "",
+      content: nil,
       actor: AccountView.render("account.json", %{user: user}),
       account: AccountView.render("account.json", %{user: other_user}),
       statuses: [],
@@ -41,7 +41,7 @@ test "includes reported statuses" do
       CommonAPI.report(user, %{"account_id" => other_user.id, "status_ids" => [activity.id]})
 
     expected = %{
-      content: "",
+      content: nil,
       actor: AccountView.render("account.json", %{user: user}),
       account: AccountView.render("account.json", %{user: other_user}),
       statuses: [StatusView.render("status.json", %{activity: activity})],
@@ -92,7 +92,7 @@ test "sanitizes report description" do
     data = Map.put(activity.data, "content", "<script> alert('hecked :D:D:D:D:D:D:D') </script>")
     activity = Map.put(activity, :data, data)
 
-    refute %{content: "<script> alert('hecked :D:D:D:D:D:D:D') </script>"} ==
+    refute "<script> alert('hecked :D:D:D:D:D:D:D') </script>" ==
              ReportView.render("show.json", %{report: activity})[:content]
   end
 end