Merge branch 'develop' into feature/return-link-for-password-reset

[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
 
-  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
@@ -70,7 +70,7 @@ defmodule Pleroma.Conversation do
           {:ok, participation} =
             Participation.create_for_user_and_conversation(user, conversation, opts)
 
-          maybe_set_recipients(participation, activity)
+          maybe_create_recipientships(participation, activity)
           participation
         end)