Fixed the double mail bug

This should fix the double mail bug

2 files changed, 6 insertions, 6 deletions

diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index 6d2700b..93067e8 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -8,7 +8,7 @@ require "open-uri"
       user = User.find_by_ign(w[1..-1])
       users << user if user && user.normal? && user.confirmed? && user.mail_mention?
     end
-    users
+    users.uniq
   end
 
   def get_youtube(yt_name)
diff --git a/app/models/threadreply.rb b/app/models/threadreply.rb
index 1ca428d..0f2faca 100644
--- a/app/models/threadreply.rb
+++ b/app/models/threadreply.rb
@@ -34,7 +34,7 @@ class Threadreply < ActiveRecord::Base
   end
 
   def send_new_reply_mail(old_content = "")
-    userids = new_mentions = mentions(content) - mentions(old_content)
+    users = mentions(content) - mentions(old_content)
 
     # thread + replies
     posts = thread.replies.to_a
@@ -44,17 +44,17 @@ class Threadreply < ActiveRecord::Base
       posts.each do |post|
         # don't send mail to the author of this reply, don't send to banned/disabled users
         if post.author != author && post.author.normal? && post.author.confirmed? # &&
-          userids << post.author.id if post.author.mail_other_thread_reply?
+          users << post.author if post.author.mail_other_thread_reply?
         end
       end
     end
     # making sure we don't send multiple mails to the same user
-    userids.uniq!
+    users.uniq!
 
     mails = []
-    userids.each do |uid|
+    users.each do |usr|
       begin
-        mails << RedstonerMailer.new_thread_reply_mail(User.find(uid), self)
+        mails << RedstonerMailer.new_thread_reply_mail(usr, self)
       rescue => e
         Rails.logger.error "---"
         Rails.logger.error "WARNING: Failed to create new_thread_reply_mail (view) for reply#: #{@self.id}, user: #{@user.name}, #{@user.email}"