moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add delete to TwAPI representer correctly.

This commit is contained in:
Roger Braun 2017-09-04 20:48:29 +02:00
parent 1f9a5272e1
commit 632e1f7943
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/pleroma/web/twitter_api/representers/activity_representer.ex
View File

@ -100,7 +100,8 @@ def to_map(%Activity{data: %{"type" => "Delete", "published" => created_at, "obj
created_at = created_at |> Utils.date_to_asctime
%{
"id" => activity.data["object"],
"id" => activity.id,
"uri" => activity.data["object"],
"user" => UserView.render("show.json", %{user: user, for: opts[:for]}),
"attentions" => [],
"statusnet_html" => "deleted notice {{tag",
@ -135,6 +136,7 @@ def to_map(%Activity{data: %{"object" => %{"content" => content} = object}} = ac
%{
"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,
"text" => HtmlSanitizeEx.strip_tags(content),

6
lib/pleroma/web/twitter_api/twitter_api.ex
View File

@ -265,6 +265,12 @@ defp activity_to_status(%Activity{data: %{"type" => "Announce"}} = activity, opt
ActivityRepresenter.to_map(activity, Map.merge(opts, %{users: [user, announced_actor], announced_activity: announced_activity}))
end
defp activity_to_status(%Activity{data: %{"type" => "Delete"}} = activity, opts) do
actor = get_in(activity.data, ["actor"])
user = User.get_cached_by_ap_id(actor)
ActivityRepresenter.to_map(activity, Map.merge(opts, %{user: user}))
end
defp activity_to_status(activity, opts) do
actor = get_in(activity.data, ["actor"])
user = User.get_cached_by_ap_id(actor)