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

Update object correctly after setting context.

Browse Source
This commit is contained in:
Roger Braun 2017-04-14 18:59:11 +02:00
parent c83f279a7d
commit 7a47afed3c
2 changed files with 7 additions and 0 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

@ -204,6 +204,11 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
|> put_in(["object", "statusnetConversationId"], activity.id)
|> put_in(["statusnetConversationId"], activity.id)
object = Object.get_by_ap_id(activity.data["object"]["id"])
changeset = Ecto.Changeset.change(object, data: data["object"])
Repo.update(changeset)
changeset = Ecto.Changeset.change(activity, data: data)
Repo.update(changeset)
end

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

@ -48,6 +48,8 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
assert get_in(activity.data, ["statusnetConversationId"]) == activity.id
assert is_list(activity.data["object"]["attachment"])
assert activity.data["object"] == Object.get_by_ap_id(activity.data["object"]["id"]).data
end
test "create a status that is a reply" do