Revert "Merge branch 'object-creation' into 'develop'"

This reverts merge request !802
This commit is contained in:
lambda 2019-02-11 08:07:39 +00:00
commit d53e36bf1e
4 changed files with 19 additions and 53 deletions

View file

@ -142,8 +142,14 @@ defmodule Pleroma.Web.ActivityPub.Utils do
context = context || generate_id("contexts")
changeset = Object.context_mapping(context)
with {:ok, object} <- Object.insert_or_get(changeset) do
object
case Repo.insert(changeset) do
{:ok, object} ->
object
# This should be solved by an upsert, but it seems ecto
# has problems accessing the constraint inside the jsonb.
{:error, _} ->
Object.get_cached_by_ap_id(context)
end
end