From 9cef212ed279cc91a3bfcc9a0893a816dc60ef56 Mon Sep 17 00:00:00 2001 From: "byte[]" Date: Sat, 21 Dec 2019 09:46:58 -0500 Subject: [PATCH] fix warning in conversation controller --- .../controllers/conversation_controller.ex | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/lib/philomena_web/controllers/conversation_controller.ex b/lib/philomena_web/controllers/conversation_controller.ex index b53e479f..d92c5d6e 100644 --- a/lib/philomena_web/controllers/conversation_controller.ex +++ b/lib/philomena_web/controllers/conversation_controller.ex @@ -13,19 +13,17 @@ defmodule PhilomenaWeb.ConversationController do def index(conn, %{"with" => partner}) do user = conn.assigns.current_user - conversations = - Conversation - |> where([c], (c.from_id == ^user.id and c.to_id == ^partner and not c.from_hidden) or (c.to_id == ^user.id and c.from_id == ^partner and not c.to_hidden)) - |> load_conversations(conn) + Conversation + |> where([c], (c.from_id == ^user.id and c.to_id == ^partner and not c.from_hidden) or (c.to_id == ^user.id and c.from_id == ^partner and not c.to_hidden)) + |> load_conversations(conn) end def index(conn, _params) do user = conn.assigns.current_user - conversations = - Conversation - |> where([c], (c.from_id == ^user.id and not c.from_hidden) or (c.to_id == ^user.id and not c.to_hidden)) - |> load_conversations(conn) + Conversation + |> where([c], (c.from_id == ^user.id and not c.from_hidden) or (c.to_id == ^user.id and not c.to_hidden)) + |> load_conversations(conn) end defp load_conversations(queryable, conn) do