Fix rubocop style issues

[rails.git] / app / models / user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index f6d7ee78d0364137bfad79f429d265076aa9fdb8..132f0de2170aff5edc6e09d70349b88c4be7d806 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -65,9 +65,7 @@ class User < ActiveRecord::Base
       if user.nil?
         users = where("LOWER(email) = LOWER(?) OR LOWER(display_name) = LOWER(?)", options[:username], options[:username])
 
-        if users.count == 1
-          user = users.first
-        end
+        user = users.first if users.count == 1
       end
 
       if user && PasswordHash.check(user.pass_crypt, user.pass_salt, options[:password])
@@ -211,8 +209,8 @@ class User < ActiveRecord::Base
   def spam_score
     changeset_score = changesets.size * 50
     trace_score = traces.size * 50
-    diary_entry_score = diary_entries.inject(0) { |s, e| s + e.body.spam_score }
-    diary_comment_score = diary_comments.inject(0) { |s, c| s + c.body.spam_score }
+    diary_entry_score = diary_entries.inject(0) { |a, e| a + e.body.spam_score }
+    diary_comment_score = diary_comments.inject(0) { |a, e| a + e.body.spam_score }
 
     score = description.spam_score / 4.0
     score += diary_entries.where("created_at > ?", 1.day.ago).count * 10