Revert "Add invisible tags to TwAPI output."

This reverts commit a92a9dce94d2a2502750a4a258560283c21e2777.

diff --git a/lib/pleroma/web/twitter_api/representers/activity_representer.ex b/lib/pleroma/web/twitter_api/representers/activity_representer.ex
index a36b873e411d21a2f2cd9b26b02fc1750bb294bd..adb3f89ea351c525f8f90f5ed069aa96a8034ddd 100644 (file)
--- 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], "<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),

diff --git a/test/support/httpoison_mock.ex b/test/support/httpoison_mock.ex
index 54375d92974c2c7c21bb4ac2c626f49d7d7a2ecc..420d42a0def34a70e999ca850caa6bffeffdaaf6 100644 (file)
--- a/test/support/httpoison_mock.ex
+++ b/test/support/httpoison_mock.ex
@@ -23,7 +23,7 @@ defmodule HTTPoisonMock do
       body: File.read!("test/fixtures/httpoison_mock/https___social.heldscal.la_user_23211.xml")
     }}
   end
-
+  
   def get("https://social.heldscal.la/.well-known/webfinger", [Accept: "application/xrd+xml"], [params: [resource: "https://social.heldscal.la/user/29191"]]) do
     {:ok, %Response{
       status_code: 200,

diff --git a/test/web/twitter_api/representers/activity_representer_test.exs b/test/web/twitter_api/representers/activity_representer_test.exs
index db5981b5812b54dcd25a9eeaa1017bcc02d898ca..96178c2ccff95c082e91ecebfe21c8fbbf02e8b6 100644 (file)
--- a/test/web/twitter_api/representers/activity_representer_test.exs
+++ b/test/web/twitter_api/representers/activity_representer_test.exs
@@ -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)
     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}),
       "is_local" => true,
       "attentions" => [],
-      "statusnet_html" => HtmlSanitizeEx.basic_html(content_html) <> "<br />\n#nsfw",
-      "text" => content <> "\n#nsfw",
+      "statusnet_html" => HtmlSanitizeEx.basic_html(content_html),
+      "text" => content,
       "is_post_verb" => true,
       "created_at" => "Tue May 24 13:26:08 +0000 2016",
       "in_reply_to_status_id" => 213123,