From d3851361141ee2adebe70812f5435c38c3a49819 Mon Sep 17 00:00:00 2001
From: jomo <github@jomo.tv>
Date: Sun, 6 Jul 2014 05:07:30 +0200
Subject: [PATCH] mentioning fixes

---
 app/models/blogpost.rb                      | 2 +-
 app/models/comment.rb                       | 2 +-
 app/models/forumthread.rb                   | 2 +-
 app/models/threadreply.rb                   | 2 +-
 app/views/users/edit_notifications.html.erb | 3 +--
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/models/blogpost.rb b/app/models/blogpost.rb
index c1771db..8b72a5c 100644
--- a/app/models/blogpost.rb
+++ b/app/models/blogpost.rb
@@ -31,7 +31,7 @@ class Blogpost < ActiveRecord::Base
     mails = []
     new_mentions.each do |user|
       begin
-        mails << RedstonerMailer.new_post_mention_mail(user, self)
+        mails << RedstonerMailer.new_post_mention_mail(user, self) if user.normal? && user.confirmed? && user.mail_mention?
       rescue => e
         Rails.logger.error "---"
         Rails.logger.error "WARNING: Failed to create new_post_mention_mail (view) for post#: #{@self.id}, user: #{@user.name}, #{@user.email}"
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 2c092f4..1ae3b8b 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -63,7 +63,7 @@ class Comment < ActiveRecord::Base
     mails = []
     new_mentions.each do |user|
       begin
-        mails << RedstonerMailer.new_post_comment_mention_mail(user, self)
+        mails << RedstonerMailer.new_post_comment_mention_mail(user, self) if user.normal? && user.confirmed? && user.mail_mention?
       rescue => e
         Rails.logger.error "---"
         Rails.logger.error "WARNING: Failed to create new_post_comment_mention_mail (view) for reply#: #{@self.id}, user: #{@user.name}, #{@user.email}"
diff --git a/app/models/forumthread.rb b/app/models/forumthread.rb
index 54cfbca..158f31a 100644
--- a/app/models/forumthread.rb
+++ b/app/models/forumthread.rb
@@ -47,7 +47,7 @@ class Forumthread < ActiveRecord::Base
     mails = []
     new_mentions.each do |user|
       begin
-        mails << RedstonerMailer.new_thread_mention_mail(user, self)
+        mails << RedstonerMailer.new_thread_mention_mail(user, self) if user.normal? && user.confirmed? && user.mail_mention?
       rescue => e
         Rails.logger.error "---"
         Rails.logger.error "WARNING: Failed to create new_thread_mention_mail (view) for reply#: #{@self.id}, user: #{@user.name}, #{@user.email}"
diff --git a/app/models/threadreply.rb b/app/models/threadreply.rb
index 996a673..a5bd425 100644
--- a/app/models/threadreply.rb
+++ b/app/models/threadreply.rb
@@ -38,7 +38,7 @@ class Threadreply < ActiveRecord::Base
     mails = []
     new_mentions.each do |user|
       begin
-        mails << RedstonerMailer.new_thread_reply_mention_mail(user, self)
+        mails << RedstonerMailer.new_thread_reply_mention_mail(user, self) if user.normal? && user.confirmed? && user.mail_mention?
       rescue => e
         Rails.logger.error "---"
         Rails.logger.error "WARNING: Failed to create new_thread_reply_mention_mail (view) for reply#: #{@self.id}, user: #{@user.name}, #{@user.email}"
diff --git a/app/views/users/edit_notifications.html.erb b/app/views/users/edit_notifications.html.erb
index f08281c..4e6de12 100644
--- a/app/views/users/edit_notifications.html.erb
+++ b/app/views/users/edit_notifications.html.erb
@@ -37,8 +37,7 @@
       </tr>
       <tr>
         <td>
-          mentions me in a thread or comment<br>
-          <i>(Not yet implemented)</i>
+          mentions me in a thread or comment
         </td>
         <td>
           <%= f.check_box :mail_mention %>