Merge branch 'develop' into issue/1276

[akkoma] / lib / pleroma / web / metadata.ex

diff --git a/lib/pleroma/web/metadata.ex b/lib/pleroma/web/metadata.ex
index be3c384ae9e19961d58a2f2bdfccf21f1769a89f..8761260f2cd7398fd244f2b8397a160adfb60eb9 100644 (file)
--- a/lib/pleroma/web/metadata.ex
+++ b/lib/pleroma/web/metadata.ex
@@ -1,6 +1,7 @@
 # Pleroma: A lightweight social networking server
 # Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Pleroma.Web.Metadata do
   alias Phoenix.HTML
 
@@ -29,11 +30,11 @@ defmodule Pleroma.Web.Metadata do
     end
   end
 
-  def activity_nsfw?(%{data: %{"object" => %{"tag" => tags}}}) do
-    if(Pleroma.Config.get([__MODULE__, :unfurl_nsfw], false) == false) do
-      Enum.any?(tags, fn tag -> tag == "nsfw" end)
-    else
-      false
-    end
+  def activity_nsfw?(%{data: %{"sensitive" => sensitive}}) do
+    Pleroma.Config.get([__MODULE__, :unfurl_nsfw], false) == false and sensitive
+  end
+
+  def activity_nsfw?(_) do
+    false
   end
 end