logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 7a47afed3c52f537e9a4851372d76ccf95459799
parent: c83f279a7d1d9061dff6fb2f3f36740abad2e85c
Author: Roger Braun <roger@rogerbraun.net>
Date:   Fri, 14 Apr 2017 18:59:11 +0200

Update object correctly after setting context.

Diffstat:

Mlib/pleroma/web/twitter_api/twitter_api.ex5+++++
Mtest/web/twitter_api/twitter_api_test.exs2++
2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex @@ -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 diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs @@ -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