projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/html-title-load' into 'develop'
[akkoma]
/
lib
/
pleroma
/
conversation.ex
diff --git
a/lib/pleroma/conversation.ex
b/lib/pleroma/conversation.ex
index fb0dfedca11aa7b44c4e1e4ea2c65a948b5d8260..77933f0bec8eaee3163fc82a729d91def78c9aa4 100644
(file)
--- a/
lib/pleroma/conversation.ex
+++ b/
lib/pleroma/conversation.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Conversation do
# 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
Repo.get_by(__MODULE__, ap_id: ap_id)
end
- def maybe_
set_recipient
s(participation, activity) do
+ def maybe_
create_recipientship
s(participation, activity) do
participation = Repo.preload(participation, :recipients)
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
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)
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 ->
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)
{:ok, participation} =
Participation.create_for_user_and_conversation(user, conversation, opts)
- maybe_
set_recipient
s(participation, activity)
+ maybe_
create_recipientship
s(participation, activity)
participation
end)
participation
end)