Update mastodon_api_controller.ex
authorshadowfacts <me@shadowfacts.net>
Mon, 3 Sep 2018 01:52:02 +0000 (01:52 +0000)
committershadowfacts <me@shadowfacts.net>
Mon, 3 Sep 2018 01:52:02 +0000 (01:52 +0000)
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex

index b3c2340106ddc42fa6744bab5cf61415e56f8656..576e9d3ce52d79c81923dce3f9f1d563d85fa9d6 100644 (file)
@@ -1029,11 +1029,13 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
     created_at =
       NaiveDateTime.to_iso8601(created_at)
       |> String.replace(~r/(\.\d+)?$/, ".000Z", global: false)
+      
+    id = id |> to_string
 
     case activity.data["type"] do
       "Create" ->
         %{
-          id: id |> to_string,
+          id: id,
           type: "mention",
           created_at: created_at,
           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"])
 
         %{
-          id: id |> to_string,
+          id: id,
           type: "favourite",
           created_at: created_at,
           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"])
 
         %{
-          id: id |> to_string,
+          id: id,
           type: "reblog",
           created_at: created_at,
           account: AccountView.render("account.json", %{user: actor}),
@@ -1064,7 +1066,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
 
       "Follow" ->
         %{
-          id: id |> to_string,
+          id: id,
           type: "follow",
           created_at: created_at,
           account: AccountView.render("account.json", %{user: actor})