diff options
author | Roger Braun <roger@rogerbraun.net> | 2017-04-30 14:02:04 +0200 |
---|---|---|
committer | Roger Braun <roger@rogerbraun.net> | 2017-04-30 14:02:04 +0200 |
commit | 009fcd2acfdc3ae3ba4b706eb71c50015227de50 (patch) | |
tree | f89cf4f9198eebf42ce9d86f7b29efb2bbcdbfd1 /lib | |
parent | 379caca01d818613ba7e013e8f0bebba160c6871 (diff) | |
download | pleroma-009fcd2acfdc3ae3ba4b706eb71c50015227de50.tar.gz |
Stop adding statusnetConversationIds.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pleroma/web/activity_pub/activity_pub.ex | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index 82f9fcc1c..9441a37ab 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -33,8 +33,6 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do |> Map.merge(additional) with {:ok, activity} <- insert(activity) do - {:ok, activity} = add_conversation_id(activity) - if actor.local do Pleroma.Web.Federator.enqueue(:publish, activity) end @@ -43,24 +41,6 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do end end - defp add_conversation_id(activity) do - if is_integer(activity.data["statusnetConversationId"]) do - {:ok, activity} - else - data = activity.data - |> 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 - end - def like(%User{ap_id: ap_id} = user, %Object{data: %{ "id" => id}} = object) do cond do # There's already a like here, so return the original activity. |