Preload message sender associations to try and improve performance

Author: rsmithlal

app/controllers/better_together/conversations_controller.rb

@@ -30,7 +30,7 @@ def create
     end
 
     def show # rubocop:todo Metrics/MethodLength
-      @messages = @conversation.messages.order(:created_at)
+      @messages = @conversation.messages.with_rich_text_content.includes(sender: [ :string_translations ]).order(:created_at)
       @message = @conversation.messages.build
 
       respond_to do |format|
@@ -63,7 +63,7 @@ def conversation_params
     end
 
     def set_conversation
-      @conversation = Conversation.find(params[:id])
+      @conversation = @conversations.find(params[:id])
     end
 
     def set_conversations