X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Ftwitter_api%2Frepresenters%2Factivity_representer.ex;h=1f11bc9ac5ba09a7f027b327ee49ef1f5d712544;hb=5a6f54b336c8cca7f6514bb9ce7db5b6c97f296f;hp=0303739f5b9fb7e6415ab170ac14342023866a64;hpb=a92a9dce94d2a2502750a4a258560283c21e2777;p=akkoma
diff --git a/lib/pleroma/web/twitter_api/representers/activity_representer.ex b/lib/pleroma/web/twitter_api/representers/activity_representer.ex
index 0303739f5..1f11bc9ac 100644
--- a/lib/pleroma/web/twitter_api/representers/activity_representer.ex
+++ b/lib/pleroma/web/twitter_api/representers/activity_representer.ex
@@ -1,9 +1,10 @@
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 Calendar.Strftime
- alias Pleroma.Web.TwitterAPI.TwitterAPI
+ alias Pleroma.Web.TwitterAPI.Representers.ObjectRepresenter
+ alias Pleroma.{Activity, User}
+ alias Pleroma.Web.TwitterAPI.{TwitterAPI, UserView}
+ alias Pleroma.Web.CommonAPI.Utils
+ alias Pleroma.Formatter
defp user_by_ap_id(user_list, ap_id) do
Enum.find(user_list, fn (%{ap_id: user_id}) -> ap_id == user_id end)
@@ -12,7 +13,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
def to_map(%Activity{data: %{"type" => "Announce", "actor" => actor, "published" => created_at}} = activity,
%{users: users, announced_activity: announced_activity} = opts) do
user = user_by_ap_id(users, actor)
- created_at = created_at |> date_to_asctime
+ created_at = created_at |> Utils.date_to_asctime
text = "#{user.nickname} retweeted a status."
@@ -20,72 +21,103 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
retweeted_status = to_map(announced_activity, Map.merge(%{user: announced_user}, opts))
%{
"id" => activity.id,
- "user" => UserRepresenter.to_map(user, opts),
+ "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
def to_map(%Activity{data: %{"type" => "Like", "published" => created_at}} = activity,
%{user: user, liked_activity: liked_activity} = opts) do
- created_at = created_at |> date_to_asctime
+ created_at = created_at |> Utils.date_to_asctime
text = "#{user.nickname} favorited a status."
%{
"id" => activity.id,
- "user" => UserRepresenter.to_map(user, opts),
+ "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
def to_map(%Activity{data: %{"type" => "Follow", "published" => created_at, "object" => followed_id}} = activity, %{user: user} = opts) do
- created_at = created_at |> date_to_asctime
+ created_at = created_at |> Utils.date_to_asctime
followed = User.get_cached_by_ap_id(followed_id)
text = "#{user.nickname} started following #{followed.nickname}"
%{
"id" => activity.id,
- "user" => UserRepresenter.to_map(user, opts),
+ "user" => UserView.render("show.json", %{user: user, for: opts[:for]}),
"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"]
+ "external_url" => activity.data["id"],
+ "activity_type" => "follow"
}
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)
+ # 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
- missing_tags = tags -- found_tags
- |> Enum.map(&"##{&1}")
+ 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
- Enum.join([content | missing_tags], "
\n")
+ 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"],
+ "activity_type" => "delete"
+ }
end
def to_map(%Activity{data: %{"object" => %{"content" => content} = object}} = activity, %{user: user} = opts) do
- created_at = object["published"] |> date_to_asctime
+ created_at = object["published"] |> Utils.date_to_asctime
like_count = object["like_count"] || 0
announcement_count = object["announcement_count"] || 0
favorited = opts[:for] && opts[:for].ap_id in (object["likes"] || [])
@@ -96,19 +128,29 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
attentions = activity.data["to"]
|> Enum.map(fn (ap_id) -> Enum.find(mentions, fn(user) -> ap_id == user.ap_id end) end)
|> Enum.filter(&(&1))
- |> Enum.map(fn (user) -> UserRepresenter.to_map(user, opts) end)
+ |> Enum.map(fn (user) -> UserView.render("show.json", %{user: user, for: opts[:for]}) end)
conversation_id = conversation_id(activity)
- content = content_with_tags(content, object["tag"])
+ tags = activity.data["object"]["tag"] || []
+ possibly_sensitive = Enum.member?(tags, "nsfw")
+
+ summary = activity.data["object"]["summary"]
+ content = if !!summary and summary != "" do
+ "#{activity.data["object"]["summary"]}
#{content}"
+ else
+ content
+ end
+
+ html = HtmlSanitizeEx.basic_html(content) |> Formatter.emojify(object["emoji"])
%{
"id" => activity.id,
- "user" => UserRepresenter.to_map(user, opts),
- "attentions" => [],
- "statusnet_html" => content,
+ "uri" => activity.data["object"]["id"],
+ "user" => UserView.render("show.json", %{user: user, for: opts[:for]}),
+ "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"],
@@ -119,7 +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"]
+ "external_url" => object["external_url"],
+ "tags" => tags,
+ "activity_type" => "post",
+ "possibly_sensitive" => possibly_sensitive
}
end
@@ -130,14 +175,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