From dc8aec795e9c6b568d9fc25c5029dad7b7a4ff9a Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Sun, 4 Oct 2026 19:06:42 +0100
Subject: [PATCH] Fix N+1 queries in messages controller

---
 app/controllers/messages_controller.rb | 2 +-
 test/prosopite_todo.yml                | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 8656214dc..74fda75ef 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -19,7 +19,7 @@ class MessagesController < ApplicationController
   # Show a message
   def show
     @title = t ".title"
-    @message = Message.find(params.expect(:id))
+    @message = Message.preload(:sender, :recipient).find(params.expect(:id))
 
     if @message.recipient == current_user || @message.sender == current_user
       @message.message_read = true if @message.recipient == current_user
diff --git a/test/prosopite_todo.yml b/test/prosopite_todo.yml
index 3b0a55bd3..93f09bdff 100644
--- a/test/prosopite_todo.yml
+++ b/test/prosopite_todo.yml
@@ -5,7 +5,6 @@
 # `includes` or `preload`. Remove files from the list once they are fixed.
 
 - app/controllers/issues_controller.rb
-- app/controllers/messages_controller.rb
 - app/controllers/moderation_zones_controller.rb
 - app/controllers/user_blocks_controller.rb
 - app/helpers/user_helper.rb
-- 
2.47.3