From: Roger Braun <roger@rogerbraun.net>
Date: Sun, 30 Apr 2017 12:26:29 +0000 (+0200)
Subject: Don't set statusnetConversationIds on replies anymore.
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=09f7ed421497e12797f30ae34e0f2346f1b6a428;p=akkoma

Don't set statusnetConversationIds on replies anymore.
---

diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex
index 13dc3bd49..85fac9146 100644
--- a/lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api.ex
@@ -58,11 +58,8 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
         "actor" => user.ap_id,
         "inReplyTo" => inReplyTo.data["object"]["id"],
         "inReplyToStatusId" => inReplyTo.id,
-        "statusnetConversationId" => inReplyTo.data["statusnetConversationId"]
-      }
-      additional = %{
-        "statusnetConversationId" => inReplyTo.data["statusnetConversationId"]
       }
+      additional = %{}
 
       [to, context, object, additional]
       else
diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs
index eb061d334..207d9d12a 100644
--- a/test/web/twitter_api/twitter_api_test.exs
+++ b/test/web/twitter_api/twitter_api_test.exs
@@ -67,8 +67,6 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
 
     assert get_in(reply.data, ["context"]) == get_in(activity.data, ["context"])
     assert get_in(reply.data, ["object", "context"]) == get_in(activity.data, ["object", "context"])
-    assert get_in(reply.data, ["statusnetConversationId"]) == get_in(activity.data, ["statusnetConversationId"])
-    assert get_in(reply.data, ["object", "statusnetConversationId"]) == get_in(activity.data, ["object", "statusnetConversationId"])
     assert get_in(reply.data, ["object", "inReplyTo"]) == get_in(activity.data, ["object", "id"])
     assert get_in(reply.data, ["object", "inReplyToStatusId"]) == activity.id
     assert Enum.member?(get_in(reply.data, ["to"]), "some_cool_id")