Return statusnet_conversation_id in TwAPI.

2 files changed, 7 insertions, 6 deletions

diff --git a/lib/pleroma/web/twitter_api/representers/activity_representer.ex b/lib/pleroma/web/twitter_api/representers/activity_representer.ex
index 3b0683043..05d130639 100644
--- a/lib/pleroma/web/twitter_api/representers/activity_representer.ex
+++ b/lib/pleroma/web/twitter_api/representers/activity_representer.ex
@@ -15,7 +15,8 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
       "is_local" => true,
       "is_post_verb" => true,
       "created_at" => published,
-      "in_reply_to_status_id" => activity.data["object"]["inReplyToStatusId"]
+      "in_reply_to_status_id" => activity.data["object"]["inReplyToStatusId"],
+      "statusnet_conversation_id" => activity.data["object"]["statusnetConversationId"]
     }
   end
 end
diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex
index 7bbab14c5..07893e565 100644
--- a/lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api.ex
@@ -34,8 +34,8 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
                |> put_in(["object", "context"], context)
                |> put_in(["object", "inReplyTo"], inReplyTo.data["object"]["id"])
                |> put_in(["object", "inReplyToStatusId"], inReplyToId)
-               |> put_in(["statusnet_conversation_id"], inReplyTo.data["statusnet_conversation_id"])
-               |> put_in(["object", "statusnet_conversation_id"], inReplyTo.data["statusnet_conversation_id"])
+               |> put_in(["statusnetConversationId"], inReplyTo.data["statusnetConversationId"])
+               |> put_in(["object", "statusnetConversationId"], inReplyTo.data["statusnetConversationId"])
                else _e ->
                  activity
                end
@@ -72,12 +72,12 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
   end
 
   defp add_conversation_id(activity) do
-    if is_integer(activity.data["statusnet_conversation_id"]) do
+    if is_integer(activity.data["statusnetConversationId"]) do
       {:ok, activity}
     else
       data = activity.data
-      |> put_in(["object", "statusnet_conversation_id"], activity.id)
-      |> put_in(["statusnet_conversation_id"], activity.id)
+      |> put_in(["object", "statusnetConversationId"], activity.id)
+      |> put_in(["statusnetConversationId"], activity.id)
 
       changeset = Ecto.Changeset.change(activity, data: data)
       Repo.update(changeset)