From 859b55366f21000dd631611bdb09ac2138c53da6 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <svkn.87@gmail.com>
Date: Wed, 24 Apr 2024 00:20:14 +0530
Subject: [PATCH] DEV: don't send moderator welcome message to first admin.
(#26719)
We already skipping the admin welcome message for the first admin user. We should also skip the moderator message.
---
app/models/user.rb | 2 +-
spec/jobs/enable_bootstrap_mode_spec.rb | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/app/models/user.rb b/app/models/user.rb
index cff6927b602..65048da9b94 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -563,7 +563,7 @@ class User < ActiveRecord::Base
def enqueue_staff_welcome_message(role)
return unless staff?
- return if role == :admin && User.real.where(admin: true).count == 1
+ return if is_singular_admin?
Jobs.enqueue(
:send_system_message,
diff --git a/spec/jobs/enable_bootstrap_mode_spec.rb b/spec/jobs/enable_bootstrap_mode_spec.rb
index 6cd2f6e09f9..32c9ca25281 100644
--- a/spec/jobs/enable_bootstrap_mode_spec.rb
+++ b/spec/jobs/enable_bootstrap_mode_spec.rb
@@ -34,6 +34,7 @@ RSpec.describe Jobs::EnableBootstrapMode do
StaffActionLogger.any_instance.expects(:log_site_setting_change).times(4)
Jobs::EnableBootstrapMode.new.execute(user_id: admin.id)
expect(admin.reload.moderator).to be_truthy
+ expect(Jobs::SendSystemMessage.jobs.size).to eq(0)
end
end
end