Skip to content
Permalink
Browse files

Fixed the double mail bug

This should fix the double mail bug
  • Loading branch information...
Futsy
Futsy committed Dec 22, 2015
1 parent 544e226 commit e1fe02eacc4f564e4d0ae1689eaeaf0fffb50b11
Showing with 6 additions and 6 deletions.
  1. +1 −1 app/helpers/users_helper.rb
  2. +5 −5 app/models/threadreply.rb
@@ -8,7 +8,7 @@ def mentions(content)
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)
@@ -34,7 +34,7 @@ def edited?
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 @@ def send_new_reply_mail(old_content = "")
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}"

0 comments on commit e1fe02e

Please sign in to comment.
You can’t perform that action at this time.