jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dmails: send automated dmails from Danbooru.config.system_user.

Browse Source 
Sends automated dmails from `Danbooru.config.system_user`, rather than
whichever user is performing the action happens to be (usually User.admins.first).

Also adds a notice in the view that the dmail was automated.
This commit is contained in:
evazion
2017-02-23 20:15:29 -06:00
parent 1400f64338
commit b1af644f67
9 changed files with 40 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/user_name_change_request.rb
View File

@@ -52,7 +52,7 @@ class UserNameChangeRequest < ActiveRecord::Base
update_attributes(:status => "approved", :approver_id => CurrentUser.user.id)
user.update_attribute(:name, desired_name)
body = "Your name change request has been approved. Be sure to log in with your new user name."
Dmail.create_split(:title => "Name change request approved", :body => body, :to_id => user_id)
Dmail.create_automated(:title => "Name change request approved", :body => body, :to_id => user_id)
UserFeedback.create(:user_id => user_id, :category => "neutral", :body => "Name changed from #{original_name} to #{desired_name}")
ModAction.log("Name changed from #{original_name} to #{desired_name}")
end
@@ -60,7 +60,7 @@ class UserNameChangeRequest < ActiveRecord::Base
def reject!(reason)
update_attributes(:status => "rejected", :rejection_reason => reason)
body = "Your name change request has been rejected for the following reason: #{rejection_reason}"
Dmail.create_split(:title => "Name change request rejected", :body => body, :to_id => user_id)
Dmail.create_automated(:title => "Name change request rejected", :body => body, :to_id => user_id)
end
def not_limited