From 3c5fbd3ce1f0980fe6490c1720201ce223ec8355 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Wed, 30 Jan 2019 18:03:16 -0500
Subject: [PATCH] FIX: do not send welcome message to staged users

---
 plugins/discourse-narrative-bot/plugin.rb             |  2 +-
 .../spec/requests/discobot_welcome_post_spec.rb       | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

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