squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

TwitterAPI: Display cws.

Browse Source
This commit is contained in:
Roger Braun 2017-10-31 17:43:37 +01:00
parent 4cbf17dac6
commit 04217f52c9
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -135,6 +135,12 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
tags = activity.data["object"]["tag"] || [] tags = activity.data["object"]["tag"] || []
possibly_sensitive = Enum.member?(tags, "nsfw") possibly_sensitive = Enum.member?(tags, "nsfw")
content = if activity.data["object"]["summary"] do
"<span>#{activity.data["object"]["summary"]}</span><br>#{content}</span>"
else
content
end
html = HtmlSanitizeEx.basic_html(content) |> Formatter.emojify(object["emoji"]) html = HtmlSanitizeEx.basic_html(content) |> Formatter.emojify(object["emoji"])
%{ %{

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

@ -91,6 +91,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
"published" => date, "published" => date,
"type" => "Note", "type" => "Note",
"content" => content_html, "content" => content_html,
"summary" => "2hu",
"inReplyToStatusId" => 213123, "inReplyToStatusId" => 213123,
"attachment" => [ "attachment" => [
object object
@ -110,14 +111,14 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
local: false local: false
} }
expected_html = "alert('YAY')Some <img height='32px' width='32px' alt='2hu' title='2hu' src='corndog.png' /> content mentioning <a href=\"#{mentioned_user.ap_id}\">@shp</a>" expected_html = "<span>2hu</span><br />alert('YAY')Some <img height='32px' width='32px' alt='2hu' title='2hu' src='corndog.png' /> content mentioning <a href=\"#{mentioned_user.ap_id}\">@shp</a>"
expected_status = %{ expected_status = %{
"id" => activity.id, "id" => activity.id,
"user" => UserView.render("show.json", %{user: user, for: follower}), "user" => UserView.render("show.json", %{user: user, for: follower}),
"is_local" => false, "is_local" => false,
"statusnet_html" => expected_html, "statusnet_html" => expected_html,
"text" => content, "text" => "2hu" <> content,
"is_post_verb" => true, "is_post_verb" => true,
"created_at" => "Tue May 24 13:26:08 +0000 2016", "created_at" => "Tue May 24 13:26:08 +0000 2016",
"in_reply_to_status_id" => 213123, "in_reply_to_status_id" => 213123,