Remove html from user bios on display.

[akkoma] / lib / pleroma / web / twitter_api / representers / activity_representer.ex

diff --git a/lib/pleroma/web/twitter_api/representers/activity_representer.ex b/lib/pleroma/web/twitter_api/representers/activity_representer.ex
index affd435771e28d4f792d933b6041cd1bdbe58994..ade200268c0feba0fb7547c9750053ee14dc3d50 100644 (file)
--- a/lib/pleroma/web/twitter_api/representers/activity_representer.ex
+++ b/lib/pleroma/web/twitter_api/representers/activity_representer.ex
@@ -1,10 +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}
-  alias Calendar.Strftime
+  alias Pleroma.{Activity, User, Formatter}
   alias Pleroma.Web.TwitterAPI.TwitterAPI
-  alias Pleroma.Wi
 
   defp user_by_ap_id(user_list, ap_id) do
     Enum.find(user_list, fn (%{ap_id: user_id}) -> ap_id == user_id end)
@@ -29,7 +27,8 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
       "uri" => "tag:#{activity.data["id"]}:objectType=note",
       "created_at" => created_at,
       "retweeted_status" => retweeted_status,
-      "statusnet_conversation_id" => conversation_id(announced_activity)
+      "statusnet_conversation_id" => conversation_id(announced_activity),
+      "external_url" => activity.data["id"]
     }
   end
 
@@ -49,6 +48,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
       "uri" => "tag:#{activity.data["id"]}:objectType=Favourite",
       "created_at" => created_at,
       "in_reply_to_status_id" => liked_activity.id,
+      "external_url" => activity.data["id"]
     }
   end
 
@@ -67,9 +67,22 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
       "is_post_verb" => false,
       "created_at" => created_at,
       "in_reply_to_status_id" => nil,
+      "external_url" => activity.data["id"]
     }
   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
@@ -86,6 +99,8 @@ 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),
@@ -103,6 +118,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
       "repeat_num" => announcement_count,
       "favorited" => to_boolean(favorited),
       "repeated" => to_boolean(repeated),
+      "external_url" => activity.data["id"]
     }
   end
 
@@ -113,14 +129,6 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
     end
   end
 
-  defp date_to_asctime(date) do
-    with {:ok, date, _offset} <- date |> DateTime.from_iso8601 do
-      Strftime.strftime!(date, "%a %b %d %H:%M:%S %z %Y")
-    else _e ->
-      ""
-    end
-  end
-
   defp to_boolean(false) do
     false
   end