From 511ccea5aa36b4b0098e49b409b335b0ce8f042e Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Mon, 12 Aug 2019 14:23:06 +0200
Subject: [PATCH] ConversationView: Align parameter names with other views.

---
 lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 4 ++--
 lib/pleroma/web/mastodon_api/views/conversation_view.ex | 2 +-
 lib/pleroma/web/pleroma_api/pleroma_api_controller.ex   | 4 ++--
 lib/pleroma/web/streamer.ex                             | 2 +-
 test/web/mastodon_api/conversation_view_test.exs        | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
index 0deeab2be..eb2351eb7 100644
--- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@ -1743,7 +1743,7 @@ def conversations(%{assigns: %{user: user}} = conn, params) do
 
     conversations =
       Enum.map(participations, fn participation ->
-        ConversationView.render("participation.json", %{participation: participation, user: user})
+        ConversationView.render("participation.json", %{participation: participation, for: user})
       end)
 
     conn
@@ -1756,7 +1756,7 @@ def conversation_read(%{assigns: %{user: user}} = conn, %{"id" => participation_
            Repo.get_by(Participation, id: participation_id, user_id: user.id),
          {:ok, participation} <- Participation.mark_as_read(participation) do
       participation_view =
-        ConversationView.render("participation.json", %{participation: participation, user: user})
+        ConversationView.render("participation.json", %{participation: participation, for: user})
 
       conn
       |> json(participation_view)
diff --git a/lib/pleroma/web/mastodon_api/views/conversation_view.ex b/lib/pleroma/web/mastodon_api/views/conversation_view.ex
index 4a81f0248..40acc07b3 100644
--- a/lib/pleroma/web/mastodon_api/views/conversation_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/conversation_view.ex
@@ -11,7 +11,7 @@ defmodule Pleroma.Web.MastodonAPI.ConversationView do
   alias Pleroma.Web.MastodonAPI.AccountView
   alias Pleroma.Web.MastodonAPI.StatusView
 
-  def render("participation.json", %{participation: participation, user: user}) do
+  def render("participation.json", %{participation: participation, for: user}) do
     participation = Repo.preload(participation, conversation: [], recipients: [])
 
     last_activity_id =
diff --git a/lib/pleroma/web/pleroma_api/pleroma_api_controller.ex b/lib/pleroma/web/pleroma_api/pleroma_api_controller.ex
index 3175a99b1..b5c3d2728 100644
--- a/lib/pleroma/web/pleroma_api/pleroma_api_controller.ex
+++ b/lib/pleroma/web/pleroma_api/pleroma_api_controller.ex
@@ -18,7 +18,7 @@ def conversation(%{assigns: %{user: user}} = conn, %{"id" => participation_id})
          true <- user.id == participation.user_id do
       conn
       |> put_view(ConversationView)
-      |> render("participation.json", %{participation: participation, user: user})
+      |> render("participation.json", %{participation: participation, for: user})
     end
   end
 
@@ -69,7 +69,7 @@ def update_conversation(
          {:ok, _} <- 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
diff --git a/lib/pleroma/web/streamer.ex b/lib/pleroma/web/streamer.ex
index 9ee331030..a0bb10895 100644
--- a/lib/pleroma/web/streamer.ex
+++ b/lib/pleroma/web/streamer.ex
@@ -209,7 +209,7 @@ def represent_conversation(%Participation{} = participation) do
       payload:
         Pleroma.Web.MastodonAPI.ConversationView.render("participation.json", %{
           participation: participation,
-          user: participation.user
+          for: participation.user
         })
         |> Jason.encode!()
     }
diff --git a/test/web/mastodon_api/conversation_view_test.exs b/test/web/mastodon_api/conversation_view_test.exs
index 27f668d9f..a2a880705 100644
--- a/test/web/mastodon_api/conversation_view_test.exs
+++ b/test/web/mastodon_api/conversation_view_test.exs
@@ -23,7 +23,7 @@ test "represents a Mastodon Conversation entity" do
     assert participation
 
     conversation =
-      ConversationView.render("participation.json", %{participation: participation, user: user})
+      ConversationView.render("participation.json", %{participation: participation, for: user})
 
     assert conversation.id == participation.id |> to_string()
     assert conversation.last_status.id == activity.id