Commit 1e6491ec authored by lain's avatar lain
Browse files

Merge branch 'develop' into refactor/user-view

parents 069daf64 af49c111
......@@ -43,6 +43,6 @@ defmodule Pleroma.Object do
end
def context_mapping(context) do
%Object{data: %{"id" => context}}
Object.change(%Object{}, %{data: %{"id" => context}})
end
end
......@@ -282,10 +282,14 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
def context_to_conversation_id(context) do
with %Object{id: id} <- Object.get_cached_by_ap_id(context) do
id
else _e ->
changeset = Object.context_mapping(context)
{:ok, %{id: id}} = Repo.insert(changeset)
id
else _e ->
changeset = Object.context_mapping(context)
case Repo.insert(changeset) do
{:ok, %{id: id}} -> id
# 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).id
end
end
end
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment