diff options
| author | lain <lain@soykaf.club> | 2019-08-05 15:33:22 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-08-05 15:33:22 +0200 |
| commit | b64b6fee2a78fbfbc557b89550128494ca7d2894 (patch) | |
| tree | 9fc2d60777a8d158d455350df33cb9cce169cd0e /lib/pleroma/web/common_api/utils.ex | |
| parent | 3af6d14da769aa5adfdd6360b43c691fd8c8eed5 (diff) | |
| download | pleroma-b64b6fee2a78fbfbc557b89550128494ca7d2894.tar.gz | |
CommonAPI: Replies to conversations also get the correct context id.
Diffstat (limited to 'lib/pleroma/web/common_api/utils.ex')
| -rw-r--r-- | lib/pleroma/web/common_api/utils.ex | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex index e70ba7d43..425b6d656 100644 --- a/lib/pleroma/web/common_api/utils.ex +++ b/lib/pleroma/web/common_api/utils.ex @@ -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 |