hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

CommonAPI: Replies to conversations also get the correct context id.

Browse source
This commit is contained in:
lain 2019-08-05 15:33:22 +02:00
commit b64b6fee2a
3 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/pleroma/web/common_api/utils.ex
View file

@ -244,8 +244,12 @@ defmodule Pleroma.Web.CommonAPI.Utils do
defp maybe_add_nsfw_tag(data, _), do: data
def make_context(%Activity{data: %{"context" => context}}), do: context
def make_context(_), do: Utils.generate_context_id()
def make_context(_, %Participation{} = participation) do
Repo.preload(participation, :conversation).conversation.ap_id
end
def make_context(%Activity{data: %{"context" => context}}, _), do: context
def make_context(_, _), do: Utils.generate_context_id()
def maybe_add_attachments(parsed, _attachments, true = _no_links), do: parsed