From 1a3928b803d77ea619be3d0fffb07903123059d7 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Tue, 3 Oct 2017 15:41:27 +0800
Subject: [PATCH] More improvements to migration script.

---
 app/jobs/onceoff/migrate_from_slack_official.rb | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/jobs/onceoff/migrate_from_slack_official.rb b/app/jobs/onceoff/migrate_from_slack_official.rb
index 6bf330a..0ca16e3 100644
--- a/app/jobs/onceoff/migrate_from_slack_official.rb
+++ b/app/jobs/onceoff/migrate_from_slack_official.rb
@@ -1,8 +1,7 @@
 module Jobs
   class DiscourseChatMigrateFromSlackOfficial < Jobs::Onceoff
     def execute_onceoff(args)
-      # Check if slack plugin is installed by testing if the sitesetting exists
-      slack_installed = defined?(DiscourseSlack)
+      slack_installed = PluginStoreRow.where(plugin_name: 'discourse-slack-official').exists?
 
       if slack_installed
         already_setup_rules = DiscourseChat::Channel.with_provider('slack').exists?
@@ -17,9 +16,13 @@ module Jobs
           ActiveRecord::Base.transaction do
             migrate_settings
             migrate_data
-            SiteSetting.slack_enabled = false
-            SiteSetting.chat_integration_slack_enabled = true
-            SiteSetting.chat_integration_enabled = true
+            is_slack_enabled = SiteSetting.slack_enabled
+
+            if is_slack_enabled
+              SiteSetting.slack_enabled = false
+              SiteSetting.chat_integration_slack_enabled = true
+              SiteSetting.chat_integration_enabled = true
+            end
           end
         end
       end