invert negation in if/else - relationships_controller (#11505)

* invert negation in if/else
publiclab · Oct 21, 2022 · a5aecc3 · a5aecc3
1 parent 91f5036
commit a5aecc3
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/app/controllers/relationships_controller.rb b/app/controllers/relationships_controller.rb
@@ -4,16 +4,16 @@ class RelationshipsController < ApplicationController
   def create
     user = User.find(params[:followed_id])
     respond_to do |format|
-      if !current_user.following?(user)
-        current_user.follow(user)
-        format.html { redirect_to URI.parse(request.referer || "/").path, notice: "You have started following " + user.username }
-        format.js { render "create", locals: { following: true, profile_user: user } }
-      else
+      if current_user.following?(user)
         format.html {
           flash[:error] = "Error in following user"
           redirect_to URI.parse(request.referer || "/").path
         }
         format.js { render "create", locals: { following: false, profile_user: user } }
+      else
+        current_user.follow(user)
+        format.html { redirect_to URI.parse(request.referer || "/").path, notice: "You have started following #{user.username}" }
+        format.js { render "create", locals: { following: true, profile_user: user } }
       end
     end
   end
@@ -22,16 +22,16 @@ def destroy
     user = User.find_by_id(params[:id])
     relation = Relationship.where(follower_id: current_user.id, followed_id: params[:id])
     respond_to do |format|
-      if !relation.nil?
-        current_user.unfollow(user)
-        format.html { redirect_to URI.parse(request.referer || "/").path, notice: "You have unfollowed " + user.username }
-        format.js { render "destroy", locals: { unfollowing: true, profile_user: user } }
-      else
+      if relation.nil?
         format.html {
           flash[:error] = "Error in unfollowing user"
           redirect_to URI.parse(request.referer || "/").path
         }
         format.js { render "destroy", locals: { unfollowing: false, profile_user: user } }
+      else
+        current_user.unfollow(user)
+        format.html { redirect_to URI.parse(request.referer || "/").path, notice: "You have  unfollowing #{user.username}" }
+        format.js { render "destroy", locals: { unfollowing: true, profile_user: user } }
       end
     end
   end