projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release/1.1.8' into 'stable'
[akkoma]
/
lib
/
pleroma
/
conversation.ex
diff --git
a/lib/pleroma/conversation.ex
b/lib/pleroma/conversation.ex
index fb0dfedca11aa7b44c4e1e4ea2c65a948b5d8260..be5821ad73c16b79c182c537c41fa9dea5fcc97b 100644
(file)
--- a/
lib/pleroma/conversation.ex
+++ b/
lib/pleroma/conversation.ex
@@
-40,7
+40,7
@@
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)
if participation.recipients |> Enum.empty?() do
participation = Repo.preload(participation, :recipients)
if participation.recipients |> Enum.empty?() do
@@
-70,7
+70,7
@@
defmodule Pleroma.Conversation do
{: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)