diff --git a/plugins/discourse-narrative-bot/plugin.rb b/plugins/discourse-narrative-bot/plugin.rb index b51e3181473..e44a8ae1d25 100644 --- a/plugins/discourse-narrative-bot/plugin.rb +++ b/plugins/discourse-narrative-bot/plugin.rb @@ -119,7 +119,7 @@ after_initialize do end self.add_model_callback(User, :after_commit, on: :create) do - if SiteSetting.discourse_narrative_bot_welcome_post_delay == 0 + if SiteSetting.discourse_narrative_bot_welcome_post_delay == 0 && !self.staged self.enqueue_bot_welcome_post end end diff --git a/plugins/discourse-narrative-bot/spec/requests/discobot_welcome_post_spec.rb b/plugins/discourse-narrative-bot/spec/requests/discobot_welcome_post_spec.rb index f9087b74597..48113a40b3e 100644 --- a/plugins/discourse-narrative-bot/spec/requests/discobot_welcome_post_spec.rb +++ b/plugins/discourse-narrative-bot/spec/requests/discobot_welcome_post_spec.rb @@ -43,6 +43,17 @@ describe "Discobot welcome post" do expect(Jobs::NarrativeInit.jobs.first["args"].first["user_id"]).to eq(User.last.id) end end + end + context 'when user is staged' do + let(:staged_user) { Fabricate(:user, staged: true) } + + before do + SiteSetting.discourse_narrative_bot_welcome_post_type = 'welcome_message' + end + + it 'should not send welcome message' do + expect { staged_user }.to_not change { Jobs::SendDefaultWelcomeMessage.jobs.count } + end end end