From af7bd12bd38bcf32693f48ead2bf0046b13a69aa Mon Sep 17 00:00:00 2001 From: Matt Lindsey Date: Sun, 8 Dec 2024 15:11:28 -0500 Subject: [PATCH] Cleanup controller and view --- app/controllers/messages_controller.rb | 8 +------- app/views/conversations/index.html.erb | 4 +--- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index bb0e9506..01590b89 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -4,7 +4,6 @@ class MessagesController < ApplicationController before_action :set_version, only: [:index, :update] before_action :set_conversation, only: [:index] - before_action :set_query, only: [:index, :new] before_action :set_assistant, only: [:index, :new, :edit, :create] before_action :set_message, only: [:show, :edit, :update] before_action :set_nav_conversations, only: [:index, :new] @@ -73,10 +72,6 @@ def set_conversation @conversation = Current.user.conversations.find(params[:conversation_id]) end - def set_query - @query = params[:query] - end - def set_assistant @assistant = Current.user.assistants_including_deleted.find_by(slug: params[:assistant_id]) @assistant ||= @conversation.latest_message_for_version(@version).assistant @@ -87,9 +82,8 @@ def set_message redirect_to root_url, status: :unauthorized if @message.conversation.user != Current.user end - # TODO: Can this taken out with the turbo-frame added? def set_nav_conversations - @nav_conversations = Conversation.grouped_by_increasing_time_interval_for_user(Current.user, @query) + @nav_conversations = Conversation.grouped_by_increasing_time_interval_for_user(Current.user) end def set_nav_assistants diff --git a/app/views/conversations/index.html.erb b/app/views/conversations/index.html.erb index df824ea2..46243332 100644 --- a/app/views/conversations/index.html.erb +++ b/app/views/conversations/index.html.erb @@ -1,3 +1 @@ - - <%= render "nav_conversations" %> - +<%= render "nav_conversations" %>