IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: missing email notifications for group mentions

Browse Source
This commit is contained in:
Sam 2015-12-01 12:12:55 +11:00
parent aa2f802247
commit 1f7c03df5c
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/jobs/regular/user_email.rb
View File

@ -57,9 +57,10 @@ module Jobs
return skip(skip_reason) if skip_reason return skip(skip_reason) if skip_reason
# Make sure that mailer exists # Make sure that mailer exists
raise Discourse::InvalidParameters.new(:type) unless UserNotifications.respond_to?(args[:type]) raise Discourse::InvalidParameters.new("type=#{args[:type]}") unless UserNotifications.respond_to?(args[:type])
message = UserNotifications.send(args[:type], @user, email_args) message = UserNotifications.send(args[:type], @user, email_args)
# Update the to address if we have a custom one # Update the to address if we have a custom one
if args[:to_address].present? if args[:to_address].present?
message.to = [args[:to_address]] message.to = [args[:to_address]]

7
app/mailers/user_notifications.rb
View File

@ -113,6 +113,13 @@ class UserNotifications < ActionMailer::Base
notification_email(user, opts) notification_email(user, opts)
end end
def group_mentioned(user, opts)
opts[:allow_reply_by_email] = true
opts[:use_site_subject] = true
opts[:show_category_in_subject] = true
notification_email(user, opts)
end
def user_posted(user, opts) def user_posted(user, opts)
opts[:allow_reply_by_email] = true opts[:allow_reply_by_email] = true
opts[:use_site_subject] = true opts[:use_site_subject] = true