Prevent double insertions.

This commit is contained in:
Roger Braun 2017-05-07 20:13:10 +02:00
parent 4f9328c622
commit db08498a9f
2 changed files with 19 additions and 8 deletions

View File

@ -8,15 +8,19 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
|> Map.put_new_lazy("id", &generate_activity_id/0) |> Map.put_new_lazy("id", &generate_activity_id/0)
|> Map.put_new_lazy("published", &make_date/0) |> Map.put_new_lazy("published", &make_date/0)
map = if is_map(map["object"]) do with %Activity{} = activity <- Activity.get_by_ap_id(map["id"]) do
object = Map.put_new_lazy(map["object"], "id", &generate_object_id/0) {:ok, activity}
Repo.insert!(%Object{data: object}) else _e ->
Map.put(map, "object", object) map = if is_map(map["object"]) do
else object = Map.put_new_lazy(map["object"], "id", &generate_object_id/0)
map Repo.insert!(%Object{data: object})
end Map.put(map, "object", object)
else
map
end
Repo.insert(%Activity{data: map, local: local}) Repo.insert(%Activity{data: map, local: local})
end
end end
def create(to, actor, context, object, additional \\ %{}, published \\ nil, local \\ true) do def create(to, actor, context, object, additional \\ %{}, published \\ nil, local \\ true) do

View File

@ -7,6 +7,13 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
import Pleroma.Factory import Pleroma.Factory
describe "insertion" do describe "insertion" do
test "returns the activity if one with the same id is already in" do
activity = insert(:note_activity)
{:ok, new_activity}= ActivityPub.insert(activity.data)
assert activity == new_activity
end
test "inserts a given map into the activity database, giving it an id if it has none." do test "inserts a given map into the activity database, giving it an id if it has none." do
data = %{ data = %{
"ok" => true "ok" => true