github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-24 02:22:40 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: only send user suspension emails if email message provided (#12666)

Browse Source 
This makes behavior consistent with documentation:

API:

> Will send an email with this message when present

Web UI:

> Optionally, provide more information about the suspension and it will be emailed to the user
This commit is contained in:
Ryan Mulligan
2021-04-12 08:03:10 -07:00
committed by GitHub
parent 65647000a1
commit 045adb76f2
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/users_controller.rb
View File

@ -124,12 +124,14 @@ class Admin::UsersController < Admin::AdminController
end end
@user.logged_out @user.logged_out
if message && !message.empty?
Jobs.enqueue( Jobs.enqueue(
:critical_user_email, :critical_user_email,
type: :account_suspended, type: :account_suspended,
user_id: @user.id, user_id: @user.id,
user_history_id: user_history.id user_history_id: user_history.id
) )
end
DiscourseEvent.trigger( DiscourseEvent.trigger(
:user_suspended, :user_suspended,

3
spec/requests/admin/users_controller_spec.rb
View File

@ -133,10 +133,13 @@ RSpec.describe Admin::UsersController do
it "works properly" do it "works properly" do
expect(user).not_to be_suspended expect(user).not_to be_suspended
expect do
put "/admin/users/#{user.id}/suspend.json", params: { put "/admin/users/#{user.id}/suspend.json", params: {
suspend_until: 5.hours.from_now, suspend_until: 5.hours.from_now,
reason: "because I said so" reason: "because I said so"
} }
end.to change { Jobs::CriticalUserEmail.jobs.size }.by(0)
expect(response.status).to eq(200) expect(response.status).to eq(200)