From 337c8c8dc1b0890e0a4647a7c1e420d84f04854c Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Mon, 21 Aug 2023 03:00:28 +0300 Subject: [PATCH] Refactor diaries index with guard clauses --- app/controllers/diary_entries_controller.rb | 36 ++++++++------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/app/controllers/diary_entries_controller.rb b/app/controllers/diary_entries_controller.rb index 94876e72a..3b5497766 100644 --- a/app/controllers/diary_entries_controller.rb +++ b/app/controllers/diary_entries_controller.rb @@ -17,31 +17,23 @@ class DiaryEntriesController < ApplicationController def index if params[:display_name] - @user = User.active.find_by(:display_name => params[:display_name]) + lookup_user + return unless @user - if @user - @title = t ".user_title", :user => @user.display_name - entries = @user.diary_entries - else - render_unknown_user params[:display_name] - return - end + @title = t ".user_title", :user => @user.display_name + entries = @user.diary_entries elsif params[:friends] - if current_user - @title = t ".title_followed" - entries = DiaryEntry.where(:user => current_user.followings) - else - require_user - return - end + require_user + return unless current_user + + @title = t ".title_followed" + entries = DiaryEntry.where(:user => current_user.followings) elsif params[:nearby] - if current_user - @title = t ".title_nearby" - entries = DiaryEntry.where(:user => current_user.nearby) - else - require_user - return - end + require_user + return unless current_user + + @title = t ".title_nearby" + entries = DiaryEntry.where(:user => current_user.nearby) else entries = DiaryEntry.joins(:user).where(:users => { :status => %w[active confirmed] }) -- 2.39.5