From fa828229326c5c0d8fc2d119e8cf0d70a63c5ef9 Mon Sep 17 00:00:00 2001 From: Roger Braun Date: Sun, 18 Jun 2017 18:59:13 +0200 Subject: Revert "Add invisible tags to TwAPI output." This reverts commit a92a9dce94d2a2502750a4a258560283c21e2777. --- .../twitter_api/representers/activity_representer.ex | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'lib') diff --git a/lib/pleroma/web/twitter_api/representers/activity_representer.ex b/lib/pleroma/web/twitter_api/representers/activity_representer.ex index a36b873e4..adb3f89ea 100644 --- a/lib/pleroma/web/twitter_api/representers/activity_representer.ex +++ b/lib/pleroma/web/twitter_api/representers/activity_representer.ex @@ -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], "
\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), -- cgit v1.2.3