Merge remote-tracking branch 'origin/develop' into reactions

[akkoma] / lib / pleroma / web / pleroma_api / pleroma_api_controller.ex

diff --git a/lib/pleroma/web/pleroma_api/pleroma_api_controller.ex b/lib/pleroma/web/pleroma_api/pleroma_api_controller.ex
index 759d8aef0208ad5f7370573b54936eb61d5ced4f..b6d2bf86bfb27b4d767aa877751b68c485a72171 100644 (file)
--- a/lib/pleroma/web/pleroma_api/pleroma_api_controller.ex
+++ b/lib/pleroma/web/pleroma_api/pleroma_api_controller.ex
@@ -9,9 +9,17 @@ defmodule Pleroma.Web.PleromaAPI.PleromaAPIController do
 
   alias Pleroma.Conversation.Participation
   alias Pleroma.Web.ActivityPub.ActivityPub
-  alias Pleroma.Web.MastodonAPI.StatusView
   alias Pleroma.Web.MastodonAPI.ConversationView
-  alias Pleroma.Repo
+  alias Pleroma.Web.MastodonAPI.StatusView
+
+  def conversation(%{assigns: %{user: user}} = conn, %{"id" => participation_id}) do
+    with %Participation{} = participation <- Participation.get(participation_id),
+         true <- user.id == participation.user_id do
+      conn
+      |> put_view(ConversationView)
+      |> render("participation.json", %{participation: participation, for: user})
+    end
+  end
 
   def conversation_statuses(
         %{assigns: %{user: user}} = conn,
@@ -25,8 +33,7 @@ defmodule Pleroma.Web.PleromaAPI.PleromaAPIController do
 
     participation =
       participation_id
-      |> Participation.get()
-      |> Repo.preload(:conversation)
+      |> Participation.get(preload: [:conversation])
 
     if user.id == participation.user_id do
       activities =
@@ -57,10 +64,10 @@ defmodule Pleroma.Web.PleromaAPI.PleromaAPIController do
       |> Participation.get()
 
     with true <- user.id == participation.user_id,
-         {:ok, _} <- Participation.set_recipients(participation, recipients) do
+         {:ok, participation} <- Participation.set_recipients(participation, recipients) do
       conn
       |> put_view(ConversationView)
-      |> render("participation.json", %{participation: participation, user: user})
+      |> render("participation.json", %{participation: participation, for: user})
     end
   end
 end