X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpleroma%2Fconversation.ex;h=77933f0bec8eaee3163fc82a729d91def78c9aa4;hb=d77fd6b3d0f0d13e601244bab46152420f598080;hp=fb0dfedca11aa7b44c4e1e4ea2c65a948b5d8260;hpb=f88560accd801ac88c60344cef93ef00cf136069;p=akkoma
diff --git a/lib/pleroma/conversation.ex b/lib/pleroma/conversation.ex
index fb0dfedca..77933f0be 100644
--- a/lib/pleroma/conversation.ex
+++ b/lib/pleroma/conversation.ex
@@ -1,5 +1,5 @@
# Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors
+# Copyright © 2017-2020 Pleroma Authors
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Conversation do
@@ -40,10 +40,10 @@ defmodule Pleroma.Conversation do
Repo.get_by(__MODULE__, ap_id: ap_id)
end
- def maybe_set_recipients(participation, activity) do
+ def maybe_create_recipientships(participation, activity) do
participation = Repo.preload(participation, :recipients)
- if participation.recipients |> Enum.empty?() do
+ if Enum.empty?(participation.recipients) do
recipients = User.get_all_by_ap_id(activity.recipients)
RecipientShip.create(recipients, participation)
end
@@ -63,14 +63,18 @@ defmodule Pleroma.Conversation do
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)
- users = User.get_users_from_set(activity.recipients, false)
+ users = User.get_users_from_set(activity.recipients, local_only: false)
participations =
Enum.map(users, fn user ->
+ invisible_conversation = Enum.any?(users, &User.blocks?(user, &1))
+
+ opts = Keyword.put(opts, :invisible_conversation, invisible_conversation)
+
{:ok, participation} =
Participation.create_for_user_and_conversation(user, conversation, opts)
- maybe_set_recipients(participation, activity)
+ maybe_create_recipientships(participation, activity)
participation
end)