Rectify rubocop errors

abdelp · May 28, 2020 · b76759b · b76759b
1 parent 1c6628f
commit b76759b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
@@ -13,8 +13,8 @@ def send_button(user)
       end
 
       html = button_to title, link, class: 'btn btn-primary',
-                        disabled: pending_friend,
-                        data: { disabled_with: 'Pending' }
+                                    disabled: pending_friend,
+                                    data: { disabled_with: 'Pending' }
     end
 
     html.html_safe

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -19,8 +19,8 @@ def friends
   end
 
   def confirm_friend(user_id)
-    friendship = inverse_friendships.find { |friendship| friendship.user_id == user_id && friendship.status == 'p' }
-    friendship&.update_attribute(:status, 'a')
+    friendship = inverse_friendships.find { |f| f.user_id == user_id && f.status == 'p' }
+    friendship.update_attribute(:status, 'a')
   end
 
   def friend?(user)
@@ -33,12 +33,12 @@ def pending_users
   end
 
   def pending_friends
-    friends_array = friendships.map { |friendship| friendship.friend if friendship.status == 'p' }
+    friends_array = friendships.map { |f| f.friend if f.status == 'p' }
     friends_array.compact
   end
 
   def reject_friend(user)
-    friendship = inverse_friendships.find { |friendship| friendship.user == user }
-    friendship&.update_attribute(:status, 'r')
+    friendship = inverse_friendships.find { |f| f.user == user }
+    friendship.update_attribute(:status, 'r')
   end
 end