Merge branch 'stats-daemon' into 'develop'

[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 9be7338c71178a52d79234bf2707f3294555e10c..1f11bc9ac5ba09a7f027b327ee49ef1f5d712544 100644 (file)
--- a/lib/pleroma/web/twitter_api/representers/activity_representer.ex
+++ b/lib/pleroma/web/twitter_api/representers/activity_representer.ex
@@ -2,7 +2,8 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
   use Pleroma.Web.TwitterAPI.Representers.BaseRepresenter
   alias Pleroma.Web.TwitterAPI.Representers.ObjectRepresenter
   alias Pleroma.{Activity, User}
-  alias Pleroma.Web.TwitterAPI.{TwitterAPI, UserView, Utils}
+  alias Pleroma.Web.TwitterAPI.{TwitterAPI, UserView}
+  alias Pleroma.Web.CommonAPI.Utils
   alias Pleroma.Formatter
 
   defp user_by_ap_id(user_list, ap_id) do
@@ -23,13 +24,14 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
       "user" => UserView.render("show.json", %{user: user, for: opts[:for]}),
       "statusnet_html" => text,
       "text" => text,
-      "is_local" => true,
+      "is_local" => activity.local,
       "is_post_verb" => false,
       "uri" => "tag:#{activity.data["id"]}:objectType=note",
       "created_at" => created_at,
       "retweeted_status" => retweeted_status,
       "statusnet_conversation_id" => conversation_id(announced_activity),
-      "external_url" => activity.data["id"]
+      "external_url" => activity.data["id"],
+      "activity_type" => "repeat"
     }
   end
 
@@ -44,12 +46,13 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
       "user" => UserView.render("show.json", %{user: user, for: opts[:for]}),
       "statusnet_html" => text,
       "text" => text,
-      "is_local" => true,
+      "is_local" => activity.local,
       "is_post_verb" => false,
       "uri" => "tag:#{activity.data["id"]}:objectType=Favourite",
       "created_at" => created_at,
       "in_reply_to_status_id" => liked_activity.id,
-      "external_url" => activity.data["id"]
+      "external_url" => activity.data["id"],
+      "activity_type" => "like"
     }
   end
 
@@ -64,11 +67,52 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
       "attentions" => [],
       "statusnet_html" => text,
       "text" => text,
-      "is_local" => true,
+      "is_local" => activity.local,
+      "is_post_verb" => false,
+      "created_at" => created_at,
+      "in_reply_to_status_id" => nil,
+      "external_url" => activity.data["id"],
+      "activity_type" => "follow"
+    }
+  end
+
+  # TODO:
+  # Make this more proper. Just a placeholder to not break the frontend.
+  def to_map(%Activity{data: %{"type" => "Undo", "published" => created_at, "object" => undid_activity }} = activity, %{user: user} = opts) do
+    created_at = created_at |> Utils.date_to_asctime
+
+    text = "#{user.nickname} undid the action at #{undid_activity}"
+    %{
+      "id" => activity.id,
+      "user" => UserView.render("show.json", %{user: user, for: opts[:for]}),
+      "attentions" => [],
+      "statusnet_html" => text,
+      "text" => text,
+      "is_local" => activity.local,
+      "is_post_verb" => false,
+      "created_at" => created_at,
+      "in_reply_to_status_id" => nil,
+      "external_url" => activity.data["id"],
+      "activity_type" => "undo"
+    }
+  end
+
+  def to_map(%Activity{data: %{"type" => "Delete", "published" => created_at, "object" => _ }} = activity, %{user: user} = opts) do
+    created_at = created_at |> Utils.date_to_asctime
+
+    %{
+      "id" => activity.id,
+      "uri" => activity.data["object"],
+      "user" => UserView.render("show.json", %{user: user, for: opts[:for]}),
+      "attentions" => [],
+      "statusnet_html" => "deleted notice {{tag",
+      "text" => "deleted notice {{tag" ,
+      "is_local" => activity.local,
       "is_post_verb" => false,
       "created_at" => created_at,
       "in_reply_to_status_id" => nil,
-      "external_url" => activity.data["id"]
+      "external_url" => activity.data["id"],
+      "activity_type" => "delete"
     }
   end
 
@@ -88,12 +132,25 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
 
     conversation_id = conversation_id(activity)
 
+    tags = activity.data["object"]["tag"] || []
+    possibly_sensitive = Enum.member?(tags, "nsfw")
+
+    summary = activity.data["object"]["summary"]
+    content = if !!summary and summary != "" do
+      "<span>#{activity.data["object"]["summary"]}</span><br />#{content}</span>"
+    else
+      content
+    end
+
+    html = HtmlSanitizeEx.basic_html(content) |> Formatter.emojify(object["emoji"])
+
     %{
       "id" => activity.id,
+      "uri" => activity.data["object"]["id"],
       "user" => UserView.render("show.json", %{user: user, for: opts[:for]}),
-      "statusnet_html" => HtmlSanitizeEx.basic_html(content) |> Formatter.finmojifiy,
+      "statusnet_html" => html,
       "text" => HtmlSanitizeEx.strip_tags(content),
-      "is_local" => true,
+      "is_local" => activity.local,
       "is_post_verb" => true,
       "created_at" => created_at,
       "in_reply_to_status_id" => object["inReplyToStatusId"],
@@ -104,8 +161,10 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
       "repeat_num" => announcement_count,
       "favorited" => to_boolean(favorited),
       "repeated" => to_boolean(repeated),
-      "external_url" => activity.data["id"],
-      "tags" => activity.data["object"]["tag"] || []
+      "external_url" => object["external_url"],
+      "tags" => tags,
+      "activity_type" => "post",
+      "possibly_sensitive" => possibly_sensitive
     }
   end