limepotato/akkoma
1
0
Fork 0
Code Pull requests Activity

Revert "Add invisible tags to TwAPI output."

Browse source 
This reverts commit a92a9dce94.
This commit is contained in:
Roger Braun 2017-06-18 18:59:13 +02:00
parent d00571ff75
commit fa82822932
3 changed files with 6 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/pleroma/web/twitter_api/representers/activity_representer.ex
View file

@ -1,7 +1,8 @@
defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
use Pleroma.Web.TwitterAPI.Representers.BaseRepresenter use Pleroma.Web.TwitterAPI.Representers.BaseRepresenter
alias Pleroma.Web.TwitterAPI.Representers.{UserRepresenter, ObjectRepresenter} alias Pleroma.Web.TwitterAPI.Representers.{UserRepresenter, ObjectRepresenter}
alias Pleroma.{Activity, User, Formatter} alias Pleroma.{Activity, User}
alias Calendar.Strftime
alias Pleroma.Web.TwitterAPI.TwitterAPI alias Pleroma.Web.TwitterAPI.TwitterAPI
defp user_by_ap_id(user_list, ap_id) do defp user_by_ap_id(user_list, ap_id) do
@ -71,18 +72,6 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
} }
end end
def content_with_tags(content, tags) do
tags = tags || []
text_content = HtmlSanitizeEx.strip_tags(content)
found_tags = Formatter.parse_tags(text_content)
|> Enum.map(fn ({_, tag}) -> tag end)
missing_tags = tags -- found_tags
|> Enum.map(&"##{&1}")
Enum.join([content | missing_tags], "<br>\n")
end
def to_map(%Activity{data: %{"object" => %{"content" => content} = object}} = activity, %{user: user} = opts) do def to_map(%Activity{data: %{"object" => %{"content" => content} = object}} = activity, %{user: user} = opts) do
created_at = object["published"] |> date_to_asctime created_at = object["published"] |> date_to_asctime
like_count = object["like_count"] || 0 like_count = object["like_count"] || 0
@ -99,8 +88,6 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
conversation_id = conversation_id(activity) conversation_id = conversation_id(activity)
content = content_with_tags(content, object["tag"])
%{ %{
"id" => activity.id, "id" => activity.id,
"user" => UserRepresenter.to_map(user, opts), "user" => UserRepresenter.to_map(user, opts),

6
test/web/twitter_api/representers/activity_representer_test.exs
View file

@ -67,7 +67,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
} }
} }
content_html = "<script>alert('YAY')</script>Some #content #mentioning <a href='#{mentioned_user.ap_id}'>@shp</a>" content_html = "<script>alert('YAY')</script>Some content mentioning <a href='#{mentioned_user.ap_id}'>@shp</shp>"
content = HtmlSanitizeEx.strip_tags(content_html) content = HtmlSanitizeEx.strip_tags(content_html)
date = DateTime.from_naive!(~N[2016-05-24 13:26:08.003], "Etc/UTC") |> DateTime.to_iso8601 date = DateTime.from_naive!(~N[2016-05-24 13:26:08.003], "Etc/UTC") |> DateTime.to_iso8601
@ -108,8 +108,8 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
"user" => UserRepresenter.to_map(user, %{for: follower}), "user" => UserRepresenter.to_map(user, %{for: follower}),
"is_local" => true, "is_local" => true,
"attentions" => [], "attentions" => [],
"statusnet_html" => HtmlSanitizeEx.basic_html(content_html) <> "<br />\n#nsfw", "statusnet_html" => HtmlSanitizeEx.basic_html(content_html),
"text" => content <> "\n#nsfw", "text" => 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,