squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' into refactor/user-view

Browse Source
This commit is contained in:
Roger Braun 2017-06-20 11:49:41 +02:00
commit 1e6491ec96
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/object.ex
View File

@ -43,6 +43,6 @@ defmodule Pleroma.Object do
end end
def context_mapping(context) do def context_mapping(context) do
%Object{data: %{"id" => context}} Object.change(%Object{}, %{data: %{"id" => context}})
end end
end end

12
lib/pleroma/web/twitter_api/twitter_api.ex
View File

@ -282,10 +282,14 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
def context_to_conversation_id(context) do def context_to_conversation_id(context) do
with %Object{id: id} <- Object.get_cached_by_ap_id(context) do with %Object{id: id} <- Object.get_cached_by_ap_id(context) do
id id
else _e -> else _e ->
changeset = Object.context_mapping(context) changeset = Object.context_mapping(context)
{:ok, %{id: id}} = Repo.insert(changeset) case Repo.insert(changeset) do
id {: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
end end