moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set twitter-style possibly_sensitive boolena.

This commit is contained in:
Roger Braun 2017-08-24 16:27:37 +02:00
parent 5dc278b1a6
commit 67bfa19b35
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/pleroma/web/twitter_api/representers/activity_representer.ex
View File

@ -112,6 +112,9 @@ def to_map(%Activity{data: %{"object" => %{"content" => content} = object}} = ac
conversation_id = conversation_id(activity) conversation_id = conversation_id(activity)
tags = activity.data["object"]["tag"] || []
possibly_sensitive = Enum.member?(tags, "nsfw")
%{ %{
"id" => activity.id, "id" => activity.id,
"user" => UserView.render("show.json", %{user: user, for: opts[:for]}), "user" => UserView.render("show.json", %{user: user, for: opts[:for]}),
@ -129,8 +132,9 @@ def to_map(%Activity{data: %{"object" => %{"content" => content} = object}} = ac
"favorited" => to_boolean(favorited), "favorited" => to_boolean(favorited),
"repeated" => to_boolean(repeated), "repeated" => to_boolean(repeated),
"external_url" => object["external_url"], "external_url" => object["external_url"],
"tags" => activity.data["object"]["tag"] || [], "tags" => tags,
"activity_type" => "post" "activity_type" => "post",
"possibly_sensitive" => possibly_sensitive
} }
end end

3
test/web/twitter_api/representers/activity_representer_test.exs
View File

@ -130,7 +130,8 @@ test "an activity" do
"repeated" => false, "repeated" => false,
"external_url" => "some url", "external_url" => "some url",
"tags" => ["content", "mentioning", "nsfw"], "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 assert ActivityRepresenter.to_map(activity, %{user: user, for: follower, mentioned: [mentioned_user]}) == expected_status