fixed the double mail bug #1

Merged
ThatSimplex merged 1 commits from master into master 2015-12-23 05:42:49 -05:00
2 changed files with 6 additions and 6 deletions

View File

@@ -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)

View File

@@ -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}"