X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpleroma%2Fweb%2Ftwitter_api%2Frepresenters%2Factivity_representer.ex;h=5199cef8e7a3004a3ee23fe06d7b06690a562a40;hb=611ca385dea3d611a97579000311cc42684305e6;hp=3fef8eec86653f1a7cc9641c08389b225f905419;hpb=95ab0dc3c5ea63048a98b5fb594d0163249be822;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 3fef8eec8..5199cef8e 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.Web.TwitterAPI.Representers.ObjectRepresenter
alias Pleroma.{Activity, User}
- alias Calendar.Strftime
- alias Pleroma.Web.TwitterAPI.TwitterAPI
+ 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,57 +21,104 @@ 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)
+ "statusnet_conversation_id" => conversation_id(announced_activity),
+ "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"],
+ "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
+ def to_map(%Activity{data: %{"type" => "Follow", "object" => followed_id}} = activity, %{user: user} = opts) do
+ created_at = activity.data["published"] || (DateTime.to_iso8601(activity.inserted_at))
+ 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"],
+ "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"],
+ "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"] || [])
@@ -78,20 +126,34 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
mentions = opts[:mentioned] || []
- attentions = activity.data["to"]
+ attentions = activity.recipients
|> 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)
+ tags = activity.data["object"]["tag"] || []
+ possibly_sensitive = activity.data["object"]["sensitive"] || Enum.member?(tags, "nsfw")
+
+ tags = if possibly_sensitive, do: Enum.uniq(["nsfw" | tags]), else: tags
+
+ 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"],
@@ -102,6 +164,10 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
"repeat_num" => announcement_count,
"favorited" => to_boolean(favorited),
"repeated" => to_boolean(repeated),
+ "external_url" => object["external_url"] || object["id"],
+ "tags" => tags,
+ "activity_type" => "post",
+ "possibly_sensitive" => possibly_sensitive
}
end
@@ -112,14 +178,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