squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't set statusnetConversationIds on replies anymore.

Browse Source
This commit is contained in:
Roger Braun 2017-04-30 14:26:29 +02:00
parent 009fcd2acf
commit 09f7ed4214
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,11 +58,8 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
"actor" => user.ap_id, "actor" => user.ap_id,
"inReplyTo" => inReplyTo.data["object"]["id"], "inReplyTo" => inReplyTo.data["object"]["id"],
"inReplyToStatusId" => inReplyTo.id, "inReplyToStatusId" => inReplyTo.id,
"statusnetConversationId" => inReplyTo.data["statusnetConversationId"]
}
additional = %{
"statusnetConversationId" => inReplyTo.data["statusnetConversationId"]
} }
additional = %{}
[to, context, object, additional] [to, context, object, additional]
else else

2
test/web/twitter_api/twitter_api_test.exs
View File

@ -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, ["context"]) == get_in(activity.data, ["context"])
assert get_in(reply.data, ["object", "context"]) == get_in(activity.data, ["object", "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", "inReplyTo"]) == get_in(activity.data, ["object", "id"])
assert get_in(reply.data, ["object", "inReplyToStatusId"]) == activity.id assert get_in(reply.data, ["object", "inReplyToStatusId"]) == activity.id
assert Enum.member?(get_in(reply.data, ["to"]), "some_cool_id") assert Enum.member?(get_in(reply.data, ["to"]), "some_cool_id")