Merge branch 'hj.doc-install' into 'develop'

[akkoma] / lib / pleroma / web / twitter_api / representers / activity_representer.ex

diff --git a/lib/pleroma/web/twitter_api/representers/activity_representer.ex b/lib/pleroma/web/twitter_api/representers/activity_representer.ex
index 16a2f6810d1d7feb90cf0187ad37dcc544c2f22a..bc3de0e90d4b20c2478bcde1fc91d7c56430d46b 100644 (file)
--- a/lib/pleroma/web/twitter_api/representers/activity_representer.ex
+++ b/lib/pleroma/web/twitter_api/representers/activity_representer.ex
@@ -112,6 +112,9 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
 
     conversation_id = conversation_id(activity)
 
+    tags = activity.data["object"]["tag"] || []
+    possibly_sensitive = Enum.member?(tags, "nsfw")
+
     %{
       "id" => activity.id,
       "user" => UserView.render("show.json", %{user: user, for: opts[:for]}),
@@ -129,8 +132,9 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
       "favorited" => to_boolean(favorited),
       "repeated" => to_boolean(repeated),
       "external_url" => object["external_url"],
-      "tags" => activity.data["object"]["tag"] || [],
-      "activity_type" => "post"
+      "tags" => tags,
+      "activity_type" => "post",
+      "possibly_sensitive" => possibly_sensitive
     }
   end