From 80f0d710fd487648faf316c9dac2edaea231d4ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javi=20Mart=C3=ADn?= <javim@elretirao.net>
Date: Fri, 24 Nov 2023 14:41:03 +0100
Subject: [PATCH] Simplify direct messages resource loading

---
 app/controllers/direct_messages_controller.rb | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/app/controllers/direct_messages_controller.rb b/app/controllers/direct_messages_controller.rb
index 79fe5a400..33996565c 100644
--- a/app/controllers/direct_messages_controller.rb
+++ b/app/controllers/direct_messages_controller.rb
@@ -1,16 +1,13 @@
 class DirectMessagesController < ApplicationController
-  load_and_authorize_resource
+  load_and_authorize_resource :user, instance_name: :receiver
+  load_and_authorize_resource through: :receiver, through_association: :direct_messages_received
 
   def new
-    @receiver = User.find(params[:user_id])
-    @direct_message = DirectMessage.new(receiver: @receiver)
   end
 
   def create
-    @sender = current_user
-    @receiver = User.find(params[:user_id])
+    @direct_message.sender = current_user
 
-    @direct_message = DirectMessage.new(parsed_params)
     if @direct_message.save
       Mailer.direct_message_for_receiver(@direct_message).deliver_later
       Mailer.direct_message_for_sender(@direct_message).deliver_later
@@ -23,7 +20,6 @@ class DirectMessagesController < ApplicationController
   end
 
   def show
-    @direct_message = DirectMessage.find(params[:id])
   end
 
   private
@@ -35,8 +31,4 @@ class DirectMessagesController < ApplicationController
     def allowed_params
       [:title, :body]
     end
-
-    def parsed_params
-      direct_message_params.merge(sender: @sender, receiver: @receiver)
-    end
 end