hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki 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
commit fa82822932
3 changed files with 6 additions and 19 deletions
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
use Pleroma.Web.TwitterAPI.Representers.BaseRepresenter
alias Pleroma.Web.TwitterAPI.Representers.{UserRepresenter, ObjectRepresenter}
alias Pleroma.{Activity, User, Formatter}
alias Pleroma.{Activity, User}
alias Calendar.Strftime
alias Pleroma.Web.TwitterAPI.TwitterAPI
defp user_by_ap_id(user_list, ap_id) do
@ -71,18 +72,6 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
}
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
created_at = object["published"] |> date_to_asctime
like_count = object["like_count"] || 0
@ -99,8 +88,6 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
conversation_id = conversation_id(activity)
content = content_with_tags(content, object["tag"])
%{
"id" => activity.id,
"user" => UserRepresenter.to_map(user, opts),