slack-smart-bot 1.8.1 → 1.10.0

data/lib/slack/smart-bot/commands/on_bot/run_repl.rb

@@ -4,25 +4,22 @@ class SlackSmartBot
   # help: `run repl SESSION_NAME ENV_VAR=VALUE ENV_VAR=VALUE`
   # help: `run live SESSION_NAME`
   # help: `run irb SESSION_NAME`
-  # help: 
   # help:     Will run the repl session specified and return the output. 
   # help:     You can supply the Environmental Variables you need for the Session
   # help:     It will return only the values that were print out on the repl with puts, print, p or pp
   # help:     Example:
   # help:       _run repl CreateCustomer LOCATION=spain HOST='https://10.30.40.50:8887'_
+  # help:     <https://github.com/MarioRuiz/slack-smart-bot#repl|more info>
   # help:
   def run_repl(dest, user, session_name, env_vars, rules_file)
     #todo: add tests
     from = user.name
-    if config[:allow_access].key?(__method__) and !config[:allow_access][__method__].include?(user.name) and !config[:allow_access][__method__].include?(user.id) and 
-      (!user.key?(:enterprise_user) or ( user.key?(:enterprise_user) and !config[:allow_access][__method__].include?(user[:enterprise_user].id)))
-      respond "You don't have access to use this command, please contact an Admin to be able to use it: <@#{config.admins.join(">, <@")}>"
-    else
+    if has_access?(__method__, user)
       save_stats(__method__)
       Dir.mkdir("#{config.path}/repl") unless Dir.exist?("#{config.path}/repl")
       Dir.mkdir("#{config.path}/repl/#{@channel_id}") unless Dir.exist?("#{config.path}/repl/#{@channel_id}")
       if File.exist?("#{config.path}/repl/#{@channel_id}/#{session_name}.run")
-        if @repls.key?(session_name) and @repls[session_name][:type] == :private and 
+        if @repls.key?(session_name) and (@repls[session_name][:type] == :private or @repls[session_name][:type] == :private_clean) and 
           @repls[session_name][:creator_name]!=user.name and 
           !config.admins.include?(user.name)
           respond "The REPL with session name: #{session_name} is private", dest
@@ -44,7 +41,8 @@ class SlackSmartBot
               eval(File.new(config.path+rules_file).read) if File.exist?(config.path+rules_file)
             end
           end
-          if File.exist?("#{project_folder}/.smart-bot-repl")
+          if File.exist?("#{project_folder}/.smart-bot-repl") and 
+            ((@repls.key?(session_name) and @repls[session_name][:type] != :private_clean and @repls[session_name][:type] != :public_clean) or !@repls.key?(session_name))
             content += File.read("#{project_folder}/.smart-bot-repl")
             content += "\n"
           end

data/lib/slack/smart-bot/commands/on_bot/see_repls.rb

@@ -2,19 +2,17 @@ class SlackSmartBot
   # help: ----------------------------------------------
   # help: `see repls`
   # help: `see irbs`
-  # help:    It will display the repls
+  # help:     It will display the repls
+  # help:     <https://github.com/MarioRuiz/slack-smart-bot#repl|more info>
   # help:
   def see_repls(dest, user, typem)
     #todo: add tests
     save_stats(__method__)
     from = user.name
-    if config[:allow_access].key?(__method__) and !config[:allow_access][__method__].include?(user.name) and !config[:allow_access][__method__].include?(user.id) and 
-      (!user.key?(:enterprise_user) or ( user.key?(:enterprise_user) and !config[:allow_access][__method__].include?(user[:enterprise_user].id)))
-      respond "You don't have access to use this command, please contact an Admin to be able to use it: <@#{config.admins.join(">, <@")}>"
-    else
+    if has_access?(__method__, user)
       message = ""
       @repls.sort.to_h.each do |session_name, repl|
-        if (repl.creator_name == user.name or repl.type == :public) or (config.admins.include?(user.name) and typem == :on_dm)
+        if (repl.creator_name == user.name or repl.type == :public or repl.type == :public_clean) or (config.admins.include?(user.name) and typem == :on_dm)
           message += "(#{repl.type}) *#{session_name}*: #{repl.description} / created: #{repl.created} / accessed: #{repl.accessed} / creator: #{repl.creator_name} / runs: #{repl.runs_by_creator+repl.runs_by_others} / gets: #{repl.gets} \n"
         end
       end

data/lib/slack/smart-bot/commands/on_bot/see_shortcuts.rb

@@ -3,36 +3,52 @@ class SlackSmartBot
   # help: `see shortcuts`
   # help: `see sc`
   # help:    It will display the shortcuts stored for the user and for :all
+  # help:    <https://github.com/MarioRuiz/slack-smart-bot#shortcuts|more info>
   # help:
   def see_shortcuts(dest, user, typem)
     save_stats(__method__)
     from = user.name
-    if config[:allow_access].key?(__method__) and !config[:allow_access][__method__].include?(user.name) and !config[:allow_access][__method__].include?(user.id) and 
-      (!user.key?(:enterprise_user) or ( user.key?(:enterprise_user) and !config[:allow_access][__method__].include?(user[:enterprise_user].id)))
-      respond "You don't have access to use this command, please contact an Admin to be able to use it: <@#{config.admins.join(">, <@")}>"
-    else
+    if has_access?(__method__, user)
       unless typem == :on_extended
         msg = ""
-        if @shortcuts[:all].keys.size > 0
+        if @shortcuts[:all].keys.size > 0 or @shortcuts_global[:all].keys.size > 0
           msg = "*Available shortcuts for all:*\n"
-          @shortcuts[:all].each { |name, value|
-            msg += "    _#{name}: #{value}_\n"
-          }
+          
+          if @shortcuts[:all].keys.size > 0
+            @shortcuts[:all].each { |name, value|
+              msg += "    _#{name}: #{value}_\n"
+            }
+          end
+          if @shortcuts_global[:all].keys.size > 0
+            @shortcuts_global[:all].each { |name, value|
+              msg += "    _#{name} (global): #{value}_\n"
+            }
+          end
           respond msg, dest
         end
-
+        msg2 = ''
         if @shortcuts.keys.include?(from) and @shortcuts[from].keys.size > 0
           new_hash = @shortcuts[from].dup
           @shortcuts[:all].keys.each { |k| new_hash.delete(k) }
           if new_hash.keys.size > 0
-            msg = "*Available shortcuts for #{from}:*\n"
+            msg2 = "*Available shortcuts for #{from}:*\n"
             new_hash.each { |name, value|
-              msg += "    _#{name}: #{value}_\n"
+              msg2 += "    _#{name}: #{value}_\n"
+            }
+          end
+        end
+        if @shortcuts_global.keys.include?(from) and @shortcuts_global[from].keys.size > 0
+          new_hash = @shortcuts_global[from].dup
+          @shortcuts_global[:all].keys.each { |k| new_hash.delete(k) }
+          if new_hash.keys.size > 0
+            msg2 = "*Available shortcuts for #{from}:*\n" if msg2 == ''
+            new_hash.each { |name, value|
+              msg2 += "    _#{name} (global): #{value}_\n"
             }
-            respond msg, dest
           end
         end
-        respond "No shortcuts found", dest if msg == ""
+        respond msg2 unless msg2 == ''
+        respond "No shortcuts found" if (msg + msg2) == ""
       end
     end
   end

data/lib/slack/smart-bot/commands/on_extended/bot_rules.rb

@@ -2,29 +2,59 @@ class SlackSmartBot
   def bot_rules(dest, help_command, typem, rules_file, user)
     save_stats(__method__)
     from = user.name
-    if config[:allow_access].key?(__method__) and !config[:allow_access][__method__].include?(user.name) and !config[:allow_access][__method__].include?(user.id) and 
-      (!user.key?(:enterprise_user) or ( user.key?(:enterprise_user) and !config[:allow_access][__method__].include?(user[:enterprise_user].id)))
-      respond "You don't have access to use this command, please contact an Admin to be able to use it: <@#{config.admins.join(">, <@")}>"
-    else
+    if has_access?(__method__, user)
       if typem == :on_extended or typem == :on_call #for the other cases above.
-        help_filtered = get_help(rules_file, dest, from, true)
+        output = []
+        if help_command.to_s != ''
+          help_command = '' if help_command.to_s.match?(/^\s*expanded\s*$/i) or help_command.to_s.match?(/^\s*extended\s*$/i)
+          expanded = true
+        else
+          expanded = false
+        end 
+  
+        help_filtered = get_help(rules_file, dest, from, true, expanded)
 
+        commands = []
+        commands_search = []
         if help_command.to_s != ""
           help_found = false
           help_filtered.split(/^\s*-------*$/).each do |h|
             if h.match?(/[`_]#{help_command}/i)
-              respond "*#{config.channel}*:#{h}", dest
+              output << "*#{config.channel}*:#{h}"
               help_found = true
+              commands << h
+            elsif !h.match?(/\A\s*\*/) and !h.match?(/\A\s*=+/) #to avoid general messages for bot help *General rules...*
+              all_found = true
+              help_command.to_s.split(' ') do |hc|
+                unless hc.match?(/^\s*\z/)
+                  if !h.match?(/#{hc}/i)
+                    all_found = false                  
+                  end
+                end
+              end
+              commands_search << h if all_found
+            end
+          end
+          if commands.size < 10 and help_command.to_s!='' and commands_search.size > 0
+            commands_search.shuffle!
+            (10-commands.size).times do |n|
+              unless commands_search[n].nil?
+                output << commands_search[n]
+                help_found = true
+              end
             end
           end
-          respond("*#{config.channel}*: I didn't find any command starting by `#{help_command}`", dest) unless help_found
+          unless help_found
+            output << "*#{config.channel}*: I didn't find any command with `#{help_command}`"
+          end
+
         else
           message = "-\n\n\n===================================\n*Rules from channel #{config.channel}*\n"
           if typem == :on_extended
             message += "To run the commands on this extended channel, add `!`, `!!` or `^` before the command.\n"
           end
           message += help_filtered
-          respond message, dest
+          output << message
         end
 
         unless rules_file.empty?
@@ -33,11 +63,27 @@ class SlackSmartBot
           end
         end
         if defined?(git_project) and git_project.to_s != "" and help_command.to_s == ""
-          respond "Git project: #{git_project}", dest
+          output << "Git project: #{git_project}"
         else
           def git_project() "" end
           def project_folder() "" end
         end
+        unless expanded
+          message_not_expanded = "If you want to see the *expanded* version of *`bot rules`*, please call  *`bot rules expanded`*\n"
+          message_not_expanded += "Also to get specific *expanded* help for a specific command or rule call *`bot rules COMMAND`*\n"
+          output << message_not_expanded
+        end
+        if output.join("\n").lines.count > 50 and dest[0]!='D'
+          dest = :on_thread
+          output.unshift('Since there are many lines returned the results are returned on a thread by default.')
+        end
+        output.each do |h|
+          msg = h.gsub(/^\s*command_id:\s+:\w+\s*$/,'')
+          unless msg.match?(/\A\s*\z/)
+            respond msg, dest, unfurl_links: false, unfurl_media: false
+          end
+        end
+    
       end
     end
   end

data/lib/slack/smart-bot/commands/on_master/admin/kill_bot_on_channel.rb

@@ -3,6 +3,7 @@ class SlackSmartBot
   # helpmaster: `kill bot on CHANNEL_NAME`
   # helpmaster:    kills the bot on the specified channel
   # helpmaster:    Only works if you are on Master channel and you created that bot or you are an admin user
+  # helpmaster:    <https://github.com/MarioRuiz/slack-smart-bot#bot-management|more info>
   # helpmaster:
   def kill_bot_on_channel(dest, from, channel)
     save_stats(__method__)
@@ -18,7 +19,8 @@ class SlackSmartBot
       if channel_id.nil?
         respond "There is no channel with that name: #{channel}, please be sure is written exactly the same", dest
       elsif @bots_created.keys.include?(channel_id)
-        if @bots_created[channel_id][:admins].split(",").include?(from)
+        @bots_created[channel_id] ||= {}
+        if @bots_created[channel_id][:admins].to_s.split(",").include?(from)
           if @bots_created[channel_id][:thread].kind_of?(Thread) and @bots_created[channel_id][:thread].alive?
             @bots_created[channel_id][:thread].kill
           end
@@ -26,6 +28,7 @@ class SlackSmartBot
           update_bots_file()
           respond "Bot on channel: #{channel}, has been killed and deleted.", dest
           send_msg_channel(channel, "Bot has been killed by #{from}")
+          save_status :off, :killed, "The admin killed SmartBot on *<##{channel_id}|#{@channels_name[channel_id]}>*"
         else
           respond "You need to be the creator or an admin of that bot channel", dest
         end

data/lib/slack/smart-bot/commands/on_master/admin_master/exit_bot.rb

@@ -6,21 +6,23 @@ class SlackSmartBot
   # helpadmin: `close bot`
   # helpadmin:    The bot stops running and also stops all the bots created from this master channel
   # helpadmin:    You can use this command only if you are an admin user and you are on the master channel
+  # helpadmin:    <https://github.com/MarioRuiz/slack-smart-bot#bot-management|more info>
   # helpadmin:
   def exit_bot(command, from, dest, display_name)
     save_stats(__method__)
     if config.on_master_bot
       if config.admins.include?(from) #admin user
-        unless @questions.keys.include?(from)
+        if answer.empty?
           ask("are you sure?", command, from, dest)
         else
-          case @questions[from]
+          case answer
           when /yes/i, /yep/i, /sure/i
             respond "Game over!", dest
             respond "Ciao #{display_name}!", dest
             @bots_created.each { |key, value|
               value[:thread] = ""
               send_msg_channel(key, "Bot has been closed by #{from}")
+              save_status :off, :exited, "The admin closed SmartBot on *<##{key}|#{value.channel_name}>*"
               sleep 0.5
             }
             update_bots_file()
@@ -33,7 +35,7 @@ class SlackSmartBot
               exit!
             end
           when /no/i, /nope/i, /cancel/i
-            @questions.delete(from)
+            answer_delete(from)
             respond "Thanks, I'm happy to be alive", dest
           else
             ask("I don't understand, are you sure do you want me to close? (yes or no)", command, from, dest)

data/lib/slack/smart-bot/commands/on_master/admin_master/notify_message.rb

@@ -7,6 +7,7 @@ class SlackSmartBot
   # helpmaster:    It will send a notification message to all channels the bot joined and private conversations with the bot
   # helpmaster:    It will send a notification message to the specified channel and to its extended channels
   # helpmaster:    Only works if you are on Master channel and you are a master admin user
+  # helpmaster:    <https://github.com/MarioRuiz/slack-smart-bot#sending-notifications|more info>
   # helpmaster:
   def notify_message(dest, from, where, message)
     save_stats(__method__)
@@ -18,7 +19,7 @@ class SlackSmartBot
           end
           respond "Bot channels have been notified", dest
         elsif where == "all" #all
-          myconv = client.web_client.users_conversations(exclude_archived: true, limit: 100, types: "im, public_channel,private_channel").channels
+          myconv = get_channels(bot_is_in: true)
           myconv.each do |c|
             respond message, c.id unless c.name == config.master_channel
           end

data/lib/slack/smart-bot/commands/on_master/admin_master/publish_announcements.rb

@@ -0,0 +1,32 @@
+class SlackSmartBot
+  # helpmaster: ----------------------------------------------
+  # helpmaster: `publish announcements`
+  # helpmaster:    It will publish on all channels the announcements added by using 'add announcement' command.
+  # helpmaster:    Only works if you are on Master channel and you are a master admin user
+  # helpmaster:    The messages stored on a DM won't be published.
+  # helpmaster:    This is very convenient to be called from a *Routine* for example every weekday at 09:00.
+  # helpmaster:    <https://github.com/MarioRuiz/slack-smart-bot#announcements|more info>
+  # helpmaster:
+  def publish_announcements(user)
+    save_stats(__method__)
+    if config.on_master_bot
+      if config.admins.include?(user.name) #admin user
+        channels = Dir.entries("#{config.path}/announcements/")
+        channels.select! {|i| i[/\.csv$/]}
+        channels.each do |channel|
+          channel.gsub!('.csv','')
+          unless channel[0]== 'D'
+            see_announcements(user, '', channel, true, true)
+            sleep 0.5 # to avoid reach ratelimit
+          end
+        end
+        react :heavy_check_mark
+
+      else
+        respond 'Only master admins on master channel can use this command.'
+      end
+    else
+      respond 'Only master admins on master channel can use this command.'
+    end
+  end
+end

data/lib/slack/smart-bot/commands/on_master/admin_master/set_general_message.rb

@@ -0,0 +1,38 @@
+class SlackSmartBot
+  # helpmaster: ----------------------------------------------
+  # helpmaster: `set general message MESSAGE`
+  # helpmaster: `set general message off`
+  # helpmaster:    The SmartBot will display the specified message after treating every command
+  # helpmaster:    Only works if you are on Master channel and you are a master admin user
+  # helpmaster:    You can add interpolation to the message you are adding
+  # helpmaster:    Examples:
+  # helpmaster:      _set general message We will be on maintenance at 12:00_
+  # helpmaster:      _set general message We will be on maintenance in #{((Time.new(2021,6,18,13,30,0)-Time.now)/60).to_i} minutes_
+  # helpmaster:      _set general message `We will be on *maintenance* at *12:00*`_
+  # helpmaster:      _set general message `:information_source: Pay attention: We will be on *maintenance* in *#{((Time.new(2021,6,18,13,30,0)-Time.now)/60).to_i} minutes*`_
+  # helpmaster:    <https://github.com/MarioRuiz/slack-smart-bot#bot-management|more info>
+  # helpmaster:
+  def set_general_message(from, status, message)
+    save_stats(__method__)
+    if config.on_master_bot
+      if config.admins.include?(from) #admin user
+        if status == 'on'
+          config.general_message = message
+          respond "General message has been set."
+        else
+          config.general_message = ''
+          respond "General message won't be displayed anymore."
+        end
+        
+        file = File.open("#{config.path}/config_tmp.status", "w")
+        file.write config.inspect
+        file.close
+    
+      else
+        respond 'Only master admins on master channel can use this command.'
+      end
+    else
+      respond 'Only master admins on master channel can use this command.'
+    end
+  end
+end

data/lib/slack/smart-bot/commands/on_master/admin_master/set_maintenance.rb

@@ -0,0 +1,49 @@
+class SlackSmartBot
+  # helpmaster: ----------------------------------------------
+  # helpmaster: `set maintenance on`
+  # helpmaster: `set maintenance on MESSAGE`
+  # helpmaster: `set maintenance off`
+  # helpmaster: `turn maintenance on`
+  # helpmaster: `turn maintenance on MESSAGE`
+  # helpmaster: `turn maintenance off`
+  # helpmaster:    The SmartBot will be on maintenance and responding with a generic message
+  # helpmaster:    Only works if you are on Master channel and you are a master admin user
+  # helpmaster:    You can add interpolation to the message you are adding
+  # helpmaster:    Examples:
+  # helpmaster:      _set maintenance on_
+  # helpmaster:      _set maintenance on We are on maintenance. We'll be available again in #{((Time.new(2021,6,18,13,30,0)-Time.now)/60).to_i} minutes_
+  # helpmaster:      _turn maintenance on `We are on *maintenance* until *12:00*`_
+  # helpmaster:    <https://github.com/MarioRuiz/slack-smart-bot#bot-management|more info>
+  # helpmaster:
+  def set_maintenance(from, status, message)
+    save_stats(__method__)
+    if config.on_master_bot
+      if config.admins.include?(from) #admin user
+        if message == ''
+          config.on_maintenance_message = "Sorry I'm on maintenance so I cannot attend your request."
+        else
+          config.on_maintenance_message = message
+        end
+
+        if status == 'on'
+          config.on_maintenance = true
+          respond "From now on I'll be on maintenance status so I won't be responding accordingly."
+          save_status :off, :maintenance_on, config.on_maintenance_message
+        else
+          config.on_maintenance = false
+          respond "From now on I won't be on maintenance. Everything is back to normal!"
+          save_status :on, :maintenance_off, config.on_maintenance_message
+        end
+        
+        file = File.open("#{config.path}/config_tmp.status", "w")
+        file.write config.inspect
+        file.close
+    
+      else
+        respond 'Only master admins on master channel can use this command.'
+      end
+    else
+      respond 'Only master admins on master channel can use this command.'
+    end
+  end
+end

data/lib/slack/smart-bot/commands/on_master/create_bot.rb

@@ -2,18 +2,20 @@ class SlackSmartBot
   # helpmaster: ----------------------------------------------
   # helpmaster: `create bot on CHANNEL_NAME`
   # helpmaster: `create cloud bot on CHANNEL_NAME`
-  # helpmaster:    creates a new bot on the channel specified
-  # helpmaster:    it will work only if you are on Master channel
-  # helpmaster:    the admins will be the master admins, the creator of the bot and the creator of the channel
-  # helpmaster:    follow the instructions in case creating cloud bots
+  # helpmaster: `create silent bot on CHANNEL_NAME`
+  # helpmaster:    Creates a new bot on the channel specified
+  # helpmaster:    It will work only if you are on Master channel
+  # helpmaster:    The admins will be the master admins, the creator of the bot and the creator of the channel
+  # helpmaster:    Follow the instructions in case creating cloud bots
+  # helpmaster:    In case 'silent' won't display the Bot initialization message on the CHANNEL_NAME
+  # helpmaster:    <https://github.com/MarioRuiz/slack-smart-bot#bot-management|more info>
   # helpmaster:
-  def create_bot(dest, user, cloud, channel)
+  def create_bot(dest, user, type, channel)
+    cloud = type.include?('cloud')
+    silent = type.include?('silent')
     save_stats(__method__)
     from = user.name
-    if config[:allow_access].key?(__method__) and !config[:allow_access][__method__].include?(user.name) and !config[:allow_access][__method__].include?(user.id) and 
-      (!user.key?(:enterprise_user) or ( user.key?(:enterprise_user) and !config[:allow_access][__method__].include?(user[:enterprise_user].id)))
-      respond "You don't have access to use this command, please contact an Admin to be able to use it: <@#{config.admins.join(">, <@")}>"
-    else
+    if has_access?(__method__, user)
       if config.on_master_bot
         get_channels_name_and_id() unless @channels_name.keys.include?(channel) or @channels_id.keys.include?(channel)
         channel_id = nil
@@ -24,13 +26,10 @@ class SlackSmartBot
           channel_id = @channels_id[channel]
         end
         #todo: add pagination for case more than 1000 channels on the workspace
-        channels = client.web_client.conversations_list(
-          types: "private_channel,public_channel",
-          limit: "1000",
-          exclude_archived: "true",
-        ).channels
+        channels = get_channels()
+        channel = @channels_name[channel] if @channels_name.key?(channel)
         channel_found = channels.detect { |c| c.name == channel }
-        members = client.web_client.conversations_members(channel: @channels_id[channel]).members unless channel_found.nil?
+        members = get_channel_members(@channels_id[channel]) unless channel_found.nil?
 
         if channel_id.nil?
           respond "There is no channel with that name: #{channel}, please be sure is written exactly the same", dest
@@ -39,37 +38,45 @@ class SlackSmartBot
         elsif @bots_created.keys.include?(channel_id)
           respond "There is already a bot in this channel: #{channel}, kill it before", dest
         elsif config[:nick_id] != channel_found.creator and !members.include?(config[:nick_id])
-          respond "You need to add first to the channel the smart bot user: #{config[:nick]}", dest
+          respond "You need to add first to the channel the smart bot user: <@#{config[:nick_id]}>", dest
         else
           if channel_id != config[:channel]
             begin
               rules_file = "slack-smart-bot_rules_#{channel_id}_#{from.gsub(" ", "_")}.rb"
-              if defined?(RULES_FOLDER)
+              if defined?(RULES_FOLDER) # consider removing RULES_FOLDER since we are not using it anywhere else
                 rules_file = RULES_FOLDER + rules_file
                 general_rules_file = RULES_FOLDER + 'general_rules.rb'
+                general_commands_file = RULES_FOLDER + 'general_commands.rb'
               else
                 Dir.mkdir("#{config.path}/rules") unless Dir.exist?("#{config.path}/rules")
                 Dir.mkdir("#{config.path}/rules/#{channel_id}") unless Dir.exist?("#{config.path}/rules/#{channel_id}")
                 rules_file = "/rules/#{channel_id}/" + rules_file
                 general_rules_file = "/rules/general_rules.rb"
+                general_commands_file = "/rules/general_commands.rb"
               end
               default_rules = (__FILE__).gsub(/slack\/smart-bot\/commands\/on_master\/create_bot\.rb$/, "slack-smart-bot_rules.rb")
               default_general_rules = (__FILE__).gsub(/slack\/smart-bot\/commands\/on_master\/create_bot\.rb$/, "slack-smart-bot_general_rules.rb")
+              default_general_commands = (__FILE__).gsub(/slack\/smart-bot\/commands\/on_master\/create_bot\.rb$/, "slack-smart-bot_general_commands.rb")
               
               File.delete(config.path + rules_file) if File.exist?(config.path + rules_file)
               FileUtils.copy_file(default_rules, config.path + rules_file) unless File.exist?(config.path + rules_file)
               FileUtils.copy_file(default_general_rules, config.path + general_rules_file) unless File.exist?(config.path + general_rules_file)
+              FileUtils.copy_file(default_general_commands, config.path + general_commands_file) unless File.exist?(config.path + general_commands_file)
               admin_users = Array.new()
-              creator_info = client.web_client.users_info(user: channel_found.creator)
-              admin_users = [from, creator_info.user.name] + config.masters
+              creator_info = @users.select{|u| u.id == channel_found.creator or (u.key?(:enterprise_user) and u.enterprise_user.id == channel_found.creator)}[-1]
+              if creator_info.nil? or creator_info.empty? or creator_info.user.nil?
+                admin_users = [from] + config.masters
+              else
+                admin_users = [from, creator_info.user.name] + config.masters
+              end
               admin_users.uniq!
-              @logger.info "ruby #{config.file_path} \"#{channel}\" \"#{admin_users.join(",")}\" \"#{rules_file}\" on"
+              @logger.info "BOT_SILENT=#{silent} ruby #{config.file_path} \"#{channel}\" \"#{admin_users.join(",")}\" \"#{rules_file}\" on"
           
               if cloud
                 respond "Copy the bot folder to your cloud location and run `ruby #{config.file} \"#{channel}\" \"#{admin_users.join(",")}\" \"#{rules_file}\" on&`", dest
               else
                 t = Thread.new do
-                  `BOT_SILENT=false ruby #{config.file_path} \"#{channel}\" \"#{admin_users.join(",")}\" \"#{rules_file}\" on`
+                  `BOT_SILENT=#{silent} ruby #{config.file_path} \"#{channel}\" \"#{admin_users.join(",")}\" \"#{rules_file}\" on`
                 end
               end
               @bots_created[channel_id] = {
@@ -84,6 +91,8 @@ class SlackSmartBot
                 cloud: cloud,
                 thread: t,
               }
+              @bots_created[channel_id].silent = true if silent
+
               respond "The bot has been created on channel: #{channel}. Rules file: #{File.basename rules_file}. Admins: #{admin_users.join(", ")}", dest
               update_bots_file()
             rescue Exception => stack