diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-08-24 16:27:37 +0200 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-08-24 16:27:37 +0200 |
| commit | 67bfa19b35af6ae4a064b02f3888dd11a218f6fb (patch) | |
| tree | 061c3f6571ed3b554f4b5da50ab73e970c7739f1 | |
| parent | 5dc278b1a68a244ad09853ef3e9a100851a51420 (diff) | |
| download | pleroma-67bfa19b35af6ae4a064b02f3888dd11a218f6fb.tar.gz pleroma-67bfa19b35af6ae4a064b02f3888dd11a218f6fb.zip | |
Set twitter-style possibly_sensitive boolena.
| -rw-r--r-- | lib/pleroma/web/twitter_api/representers/activity_representer.ex | 8 | ||||
| -rw-r--r-- | test/web/twitter_api/representers/activity_representer_test.exs | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/lib/pleroma/web/twitter_api/representers/activity_representer.ex b/lib/pleroma/web/twitter_api/representers/activity_representer.ex index 16a2f6810..bc3de0e90 100644 --- 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 diff --git a/test/web/twitter_api/representers/activity_representer_test.exs b/test/web/twitter_api/representers/activity_representer_test.exs index f9998e614..4f090ee8e 100644 --- a/test/web/twitter_api/representers/activity_representer_test.exs +++ b/test/web/twitter_api/representers/activity_representer_test.exs @@ -130,7 +130,8 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do "repeated" => false, "external_url" => "some url", "tags" => ["content", "mentioning", "nsfw"], - "activity_type" => "post" + "activity_type" => "post", + "possibly_sensitive" => true } assert ActivityRepresenter.to_map(activity, %{user: user, for: follower, mentioned: [mentioned_user]}) == expected_status |