From 8cfef5ce1a110c8007252c8e4f5a32f855584b5d Mon Sep 17 00:00:00 2001
From: Daniel O'Connor <daniel.oconnor@gmail.com>
Date: Sun, 26 Apr 2026 13:09:00 +0000
Subject: [PATCH] Rubocop fixes

---
 app/controllers/blocks_controller.rb       | 2 +-
 app/controllers/messages_controller.rb     | 2 +-
 app/models/comment.rb                      | 7 ++++---
 app/models/follow.rb                       | 7 ++++---
 app/models/like.rb                         | 7 ++++---
 db/migrate/20250901144900_create_blocks.rb | 2 +-
 spec/controllers/forums_controller_spec.rb | 8 ++++----
 spec/requests/forums_spec.rb               | 4 ++--
 8 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/app/controllers/blocks_controller.rb b/app/controllers/blocks_controller.rb
index 06521ac18..dac453387 100644
--- a/app/controllers/blocks_controller.rb
+++ b/app/controllers/blocks_controller.rb
@@ -12,7 +12,7 @@ class BlocksController < ApplicationController
     else
       flash[:error] = "Already blocking or error while blocking."
     end
-    redirect_back fallback_location: root_path
+    redirect_back_or_to(root_path)
   end
 
   def destroy
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 974c09d29..6c2466336 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -39,7 +39,7 @@ class MessagesController < ApplicationController
       recipient = Member.find(params[:recipient_id])
       if recipient.already_blocking?(current_member)
         flash[:error] = "You cannot send a message to a member who has blocked you."
-        redirect_back fallback_location: root_path
+        redirect_back_or_to(root_path)
         return
       end
       body = params[:body]
diff --git a/app/models/comment.rb b/app/models/comment.rb
index b6b80b241..584eb02e1 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -31,8 +31,9 @@ class Comment < ApplicationRecord
 
   def author_is_not_blocked
     return unless author
-    if commentable.author.already_blocking?(author)
-      errors.add(:base, "You cannot comment on a post of a member who has blocked you.")
-    end
+
+    return unless commentable.author.already_blocking?(author)
+
+    errors.add(:base, "You cannot comment on a post of a member who has blocked you.")
   end
 end
diff --git a/app/models/follow.rb b/app/models/follow.rb
index e86c0dddd..94843e936 100644
--- a/app/models/follow.rb
+++ b/app/models/follow.rb
@@ -20,8 +20,9 @@ class Follow < ApplicationRecord
 
   def follower_is_not_blocked
     return unless follower
-    if followed.already_blocking?(follower)
-      errors.add(:base, "You cannot follow a member who has blocked you.")
-    end
+
+    return unless followed.already_blocking?(follower)
+
+    errors.add(:base, "You cannot follow a member who has blocked you.")
   end
 end
diff --git a/app/models/like.rb b/app/models/like.rb
index 493ed938c..ab07bfb72 100644
--- a/app/models/like.rb
+++ b/app/models/like.rb
@@ -19,9 +19,10 @@ class Like < ApplicationRecord
 
   def member_is_not_blocked
     return unless member
+
     author = likeable_author
-    if author && author.already_blocking?(member)
-      errors.add(:base, "You cannot like content of a member who has blocked you.")
-    end
+    return unless author&.already_blocking?(member)
+
+    errors.add(:base, "You cannot like content of a member who has blocked you.")
   end
 end
diff --git a/db/migrate/20250901144900_create_blocks.rb b/db/migrate/20250901144900_create_blocks.rb
index 3c386d5aa..52e15361f 100644
--- a/db/migrate/20250901144900_create_blocks.rb
+++ b/db/migrate/20250901144900_create_blocks.rb
@@ -8,6 +8,6 @@ class CreateBlocks < ActiveRecord::Migration[6.1]
 
       t.timestamps
     end
-    add_index :blocks, [:blocker_id, :blocked_id], unique: true
+    add_index :blocks, %i(blocker_id blocked_id), unique: true
   end
 end
diff --git a/spec/controllers/forums_controller_spec.rb b/spec/controllers/forums_controller_spec.rb
index 634b092c1..37adab6d7 100644
--- a/spec/controllers/forums_controller_spec.rb
+++ b/spec/controllers/forums_controller_spec.rb
@@ -49,9 +49,9 @@ describe ForumsController do
         let(:valid_attributes) { { name: "New Forum", description: "A new forum", owner_id: admin.id } }
 
         it "creates a new Forum" do
-          expect {
+          expect do
             post :create, params: { forum: valid_attributes }
-          }.to change(Forum, :count).by(1)
+          end.to change(Forum, :count).by(1)
         end
 
         it "redirects to the created forum" do
@@ -81,9 +81,9 @@ describe ForumsController do
     describe "DELETE #destroy" do
       it "destroys the requested forum" do
         forum # ensure forum exists
-        expect {
+        expect do
           delete :destroy, params: { id: forum.to_param }
-        }.to change(Forum, :count).by(-1)
+        end.to change(Forum, :count).by(-1)
       end
 
       it "redirects to the forums list" do
diff --git a/spec/requests/forums_spec.rb b/spec/requests/forums_spec.rb
index 35b2757aa..5cdcdda13 100644
--- a/spec/requests/forums_spec.rb
+++ b/spec/requests/forums_spec.rb
@@ -37,9 +37,9 @@ describe "Forums" do
       before { sign_in admin }
 
       it "creates a new forum" do
-        expect {
+        expect do
           post forums_path, params: { forum: { name: "New Request Forum", description: "Desc", owner_id: admin.id } }
-        }.to change(Forum, :count).by(1)
+        end.to change(Forum, :count).by(1)
         expect(response).to redirect_to(forum_path(Forum.last))
       end
     end