mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-12-23 16:40:29 +00:00
Code Issues Projects Releases Wiki Activity

Update mastodon_api_controller.ex

Browse source
This commit is contained in:
shadowfacts 2018-09-03 01:52:02 +00:00
parent 2b2bd0e047
commit 26f8697400
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
View file

@ -1030,10 +1030,12 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
NaiveDateTime.to_iso8601(created_at) NaiveDateTime.to_iso8601(created_at)
|> String.replace(~r/(\.\d+)?$/, ".000Z", global: false) |> String.replace(~r/(\.\d+)?$/, ".000Z", global: false)
id = id |> to_string
case activity.data["type"] do case activity.data["type"] do
"Create" -> "Create" ->
%{ %{
id: id |> to_string, id: id,
type: "mention", type: "mention",
created_at: created_at, created_at: created_at,
account: AccountView.render("account.json", %{user: actor}), account: AccountView.render("account.json", %{user: actor}),
@ -1044,7 +1046,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
liked_activity = Activity.get_create_activity_by_object_ap_id(activity.data["object"]) liked_activity = Activity.get_create_activity_by_object_ap_id(activity.data["object"])
%{ %{
id: id |> to_string, id: id,
type: "favourite", type: "favourite",
created_at: created_at, created_at: created_at,
account: AccountView.render("account.json", %{user: actor}), account: AccountView.render("account.json", %{user: actor}),
@ -1055,7 +1057,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
announced_activity = Activity.get_create_activity_by_object_ap_id(activity.data["object"]) announced_activity = Activity.get_create_activity_by_object_ap_id(activity.data["object"])
%{ %{
id: id |> to_string, id: id,
type: "reblog", type: "reblog",
created_at: created_at, created_at: created_at,
account: AccountView.render("account.json", %{user: actor}), account: AccountView.render("account.json", %{user: actor}),
@ -1064,7 +1066,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
"Follow" -> "Follow" ->
%{ %{
id: id |> to_string, id: id,
type: "follow", type: "follow",
created_at: created_at, created_at: created_at,
account: AccountView.render("account.json", %{user: actor}) account: AccountView.render("account.json", %{user: actor})