diff options
| author | lain <lain@soykaf.club> | 2021-01-07 11:09:18 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2021-01-07 11:09:18 +0000 |
| commit | cf0eb0c1c5c945c660295f51c99fe157b2b8229c (patch) | |
| tree | 9b9ad23ec0f83628db7f7878498e0382bec4cb1d /lib/pleroma/conversation.ex | |
| parent | 4d56aca9040f87708e38a050071aa9d3dc977c45 (diff) | |
| parent | d44850d7a5d1303c1c9d185fc5eb6642823b3ec4 (diff) | |
| download | pleroma-cf0eb0c1c5c945c660295f51c99fe157b2b8229c.tar.gz | |
Merge branch 'object-normalize-refactor' into 'develop'
Object: Rework how Object.normalize works
See merge request pleroma/pleroma!3229
Diffstat (limited to 'lib/pleroma/conversation.ex')
| -rw-r--r-- | lib/pleroma/conversation.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/conversation.ex b/lib/pleroma/conversation.ex index 77933f0be..e15259091 100644 --- a/lib/pleroma/conversation.ex +++ b/lib/pleroma/conversation.ex @@ -5,6 +5,7 @@ defmodule Pleroma.Conversation do alias Pleroma.Conversation.Participation alias Pleroma.Conversation.Participation.RecipientShip + alias Pleroma.Object alias Pleroma.Repo alias Pleroma.User use Ecto.Schema @@ -58,7 +59,7 @@ defmodule Pleroma.Conversation do def create_or_bump_for(activity, opts \\ []) do with true <- Pleroma.Web.ActivityPub.Visibility.is_direct?(activity), "Create" <- activity.data["type"], - object <- Pleroma.Object.normalize(activity), + %Object{} = object <- Object.normalize(activity, fetch: false), true <- object.data["type"] in ["Note", "Question"], ap_id when is_binary(ap_id) and byte_size(ap_id) > 0 <- object.data["context"] do {:ok, conversation} = create_for_ap_id(ap_id) |