slack-smart-bot 1.9.1 → 1.11.0

data/lib/slack/smart-bot/utils/create_routine_thread.rb

@@ -1,11 +1,15 @@
 class SlackSmartBot
 
-  def create_routine_thread(name)
+  def create_routine_thread(name, hroutine)
     t = Thread.new do
       while @routines.key?(@channel_id) and @routines[@channel_id].key?(name)
         @routines[@channel_id][name][:thread] = Thread.current
         started = Time.now
         if @status == :on and @routines[@channel_id][name][:status] == :on
+          if !@routines[@channel_id][name].key?(:creator_id) or @routines[@channel_id][name][:creator_id].to_s == ''
+            user_info = @users.select{|u| u.name == @routines[@channel_id][name][:creator]}[-1]
+            @routines[@channel_id][name][:creator_id] = user_info.id unless user_info.nil? or user_info.empty?
+          end
           @logger.info "Routine: #{@routines[@channel_id][name].inspect}"
           if @routines[@channel_id][name][:file_path].match?(/\.rb$/i)
             ruby = "ruby "
@@ -16,63 +20,84 @@ class SlackSmartBot
           if @routines[@channel_id][name][:at] == "" or
              (@routines[@channel_id][name][:at] != "" and @routines[@channel_id][name][:running] and
               @routines[@channel_id][name][:next_run] != "" and Time.now.to_s >= @routines[@channel_id][name][:next_run])
-            if @routines[@channel_id][name][:file_path] != ""
-              process_to_run = "#{ruby}#{Dir.pwd}#{@routines[@channel_id][name][:file_path][1..-1]}"
-              process_to_run = ("cd #{project_folder} &&" + process_to_run) if defined?(project_folder)
-              data = {
-                dest: @routines[@channel_id][name][:dest],
-                typem: 'routine_file',
-                user: {id: @routines[@channel_id][name][:creator_id], name: @routines[@channel_id][name][:creator]},
-                files: false,
-                command: @routines[@channel_id][name][:file_path],
-                routine: true
-              }            
-              save_stats(name, data: data)
-              stdout, stderr, status = Open3.capture3(process_to_run)
-              if !@routines[@channel_id][name][:silent] or (@routines[@channel_id][name][:silent] and 
-                (!stderr.match?(/\A\s*\z/) or !stdout.match?(/\A\s*\z/)))
-                if @routines[@channel_id][name][:dest]!=@channel_id
-                  respond "routine from <##{@channel_id}> *`#{name}`*: #{@routines[@channel_id][name][:file_path]}", @routines[@channel_id][name][:dest]
+              
+            if !@routines[@channel_id][name].key?(:dayweek) or 
+              (@routines[@channel_id][name].key?(:dayweek) and @routines[@channel_id][name][:dayweek].to_s!='weekday' and @routines[@channel_id][name][:dayweek].to_s!='weekend') or
+              (@routines[@channel_id][name].key?(:dayweek) and @routines[@channel_id][name][:dayweek].to_s=='weekday' and Date.today.wday>=1 and Date.today.wday<=5) or
+              (@routines[@channel_id][name].key?(:dayweek) and @routines[@channel_id][name][:dayweek].to_s=='weekend' and (Date.today.wday==6 or Date.today.wday==0)) 
+              File.delete "#{config.path}/routines/#{@channel_id}/#{name}_output.txt" if File.exist?("#{config.path}/routines/#{@channel_id}/#{name}_output.txt")
+              if @routines[@channel_id][name][:file_path] != ""
+                process_to_run = "#{ruby}#{Dir.pwd}#{@routines[@channel_id][name][:file_path][1..-1]}"
+                process_to_run = ("cd #{project_folder} &&" + process_to_run) if defined?(project_folder)
+                data = {
+                  dest: @routines[@channel_id][name][:dest],
+                  typem: 'routine_file',
+                  user: {id: @routines[@channel_id][name][:creator_id], name: @routines[@channel_id][name][:creator]},
+                  files: false,
+                  command: @routines[@channel_id][name][:file_path],
+                  routine: true,
+                  routine_name: name,
+                  routine_type: hroutine[:routine_type]
+                }
+                save_stats(name, data: data)
+                stdout, stderr, status = Open3.capture3(process_to_run)
+                if !@routines[@channel_id][name][:silent]
+                  unless config.on_maintenance
+                    if @routines[@channel_id][name][:dest]!=@channel_id
+                      respond "routine from <##{@channel_id}> *`#{name}`*: #{@routines[@channel_id][name][:file_path]}", @routines[@channel_id][name][:dest]
+                    else
+                      respond "routine *`#{name}`*: #{@routines[@channel_id][name][:file_path]}", @routines[@channel_id][name][:dest]
+                    end
+                  end
+                end
+                if hroutine[:routine_type].to_s!='bgroutine'
+                  if stderr == ""
+                    unless stdout.match?(/\A\s*\z/)
+                      respond stdout, @routines[@channel_id][name][:dest]
+                    end
+                  else
+                    respond "#{stdout} #{stderr}", @routines[@channel_id][name][:dest]
+                  end
                 else
-                  respond "routine *`#{name}`*: #{@routines[@channel_id][name][:file_path]}", @routines[@channel_id][name][:dest]
+                  File.write("#{config.path}/routines/#{@channel_id}/#{name}_output.txt", stdout.to_s+stderr.to_s, mode: "a+")
                 end
-              end
-              if stderr == ""
-                unless stdout.match?(/\A\s*\z/)
-                  respond stdout, @routines[@channel_id][name][:dest]
+              else #command
+                if !@routines[@channel_id][name][:silent] and !config.on_maintenance
+                  if @routines[@channel_id][name][:dest]!=@channel_id
+                    respond "routine from <##{@channel_id}> *`#{name}`*: #{@routines[@channel_id][name][:command]}", @routines[@channel_id][name][:dest]
+                  else
+                    respond "routine *`#{name}`*: #{@routines[@channel_id][name][:command]}", @routines[@channel_id][name][:dest]
+                  end
                 end
-              else
-                respond "#{stdout} #{stderr}", @routines[@channel_id][name][:dest]
+                started = Time.now
+                data = { channel: @channel_id,
+                  dest: @routines[@channel_id][name][:dest],
+                  user: @routines[@channel_id][name][:creator_id],
+                  text: @routines[@channel_id][name][:command],
+                  files: nil,
+                  routine: true,
+                  routine_name: name,
+                  routine_type: hroutine[:routine_type] }
+                treat_message(data)
               end
-            else #command
-              if !@routines[@channel_id][name][:silent]
-                if @routines[@channel_id][name][:dest]!=@channel_id
-                  respond "routine from <##{@channel_id}> *`#{name}`*: #{@routines[@channel_id][name][:command]}", @routines[@channel_id][name][:dest]
-                else
-                  respond "routine *`#{name}`*: #{@routines[@channel_id][name][:command]}", @routines[@channel_id][name][:dest]
-                end
+              # in case the routine was deleted while running the process
+              if !@routines.key?(@channel_id) or !@routines[@channel_id].key?(name)
+                Thread.exit
               end
-              started = Time.now
-              data = { channel: @channel_id,
-                dest: @routines[@channel_id][name][:dest],
-                user: @routines[@channel_id][name][:creator_id],
-                text: @routines[@channel_id][name][:command],
-                files: nil,
-                routine: true }
-              treat_message(data)
+              @routines[@channel_id][name][:last_run] = started.to_s
+            elsif (@routines[@channel_id][name].key?(:dayweek) and @routines[@channel_id][name][:dayweek].to_s=='weekday' and (Date.today.wday==6 or Date.today.wday==0)) or
+              (@routines[@channel_id][name].key?(:dayweek) and @routines[@channel_id][name][:dayweek].to_s=='weekend' and Date.today.wday>=1 and Date.today.wday<=5) 
+              @routines[@channel_id][name][:last_run] = started.to_s
             end
-            # in case the routine was deleted while running the process
-            if !@routines.key?(@channel_id) or !@routines[@channel_id].key?(name)
-              Thread.exit
-            end
-            @routines[@channel_id][name][:last_run] = started.to_s
           end
           if @routines[@channel_id][name][:last_run] == "" and @routines[@channel_id][name][:next_run] != "" #for the first create_routine of one routine with at
             elapsed = 0
             require "time"
             every_in_seconds = Time.parse(@routines[@channel_id][name][:next_run]) - Time.now
           elsif @routines[@channel_id][name][:at] != "" #coming from start after pause for 'at'
-            if @routines[@channel_id][name].key?(:dayweek) and @routines[@channel_id][name][:dayweek].to_s!=''
+            if @routines[@channel_id][name].key?(:dayweek) and @routines[@channel_id][name][:dayweek].to_s!=''and 
+              @routines[@channel_id][name][:dayweek].to_s!='weekend' and @routines[@channel_id][name][:dayweek].to_s!='weekday'
+              
               day = @routines[@channel_id][name][:dayweek]
               days = ['sunday','monday','tuesday','wednesday','thursday','friday','saturday']
               incr = days.index(day) - Time.now.wday
@@ -83,6 +108,16 @@ class SlackSmartBot
               end
               days = incr/(24*60*60)
               weekly = true
+            elsif @routines[@channel_id][name].key?(:dayweek) and @routines[@channel_id][name][:dayweek].to_s!='' and 
+              @routines[@channel_id][name][:dayweek].to_s=='weekend'
+              
+              weekly = false
+              days = 0
+            elsif @routines[@channel_id][name].key?(:dayweek) and @routines[@channel_id][name][:dayweek].to_s!='' and 
+              @routines[@channel_id][name][:dayweek].to_s=='weekday'
+              
+              weekly = false
+              days = 0
             else
               days = 0
               weekly = false

data/lib/slack/smart-bot/utils/get_access_channels.rb

@@ -0,0 +1,13 @@
+class SlackSmartBot
+
+  def get_access_channels()
+    if File.exist?("#{config.path}/rules/#{@channel_id}/access_channels.rb")
+      file_conf = IO.readlines("#{config.path}/rules/#{@channel_id}/access_channels.rb").join
+      unless file_conf.to_s() == ""
+        @access_channels = eval(file_conf)
+      end
+    else
+      @access_channels = {}
+    end
+  end
+end

data/lib/slack/smart-bot/utils/get_admins_channels.rb

@@ -0,0 +1,13 @@
+class SlackSmartBot
+
+  def get_admins_channels()
+    if File.exist?("#{config.path}/rules/#{@channel_id}/admins_channels.rb")
+      file_conf = IO.readlines("#{config.path}/rules/#{@channel_id}/admins_channels.rb").join
+      unless file_conf.to_s() == ""
+        @admins_channels = eval(file_conf)
+      end
+    else
+      @admins_channels = {}
+    end
+  end
+end

data/lib/slack/smart-bot/utils/get_bots_created.rb

@@ -1,14 +1,33 @@
 class SlackSmartBot
   def get_bots_created
-    if File.exist?(config.file_path.gsub(".rb", "_bots.rb"))
-      if !defined?(@datetime_bots_created) or @datetime_bots_created != File.mtime(config.file_path.gsub(".rb", "_bots.rb"))
-        file_conf = IO.readlines(config.file_path.gsub(".rb", "_bots.rb")).join
-        if file_conf.to_s() == ""
-          @bots_created = {}
-        else
-          @bots_created = eval(file_conf)
+    require 'yaml'
+    bots_file = config.file_path.gsub(".rb", "_bots.yaml")
+
+    if File.exist?(config.file_path.gsub(".rb", "_bots.rb")) #backwards compatible
+      file_conf = IO.readlines(config.file_path.gsub(".rb", "_bots.rb")).join
+      if file_conf.to_s() == ""
+        @bots_created = {}
+      else
+        @bots_created = eval(file_conf)
+      end
+      File.open(bots_file, 'w') {|file| file.write(@bots_created.to_yaml) }
+      File.delete(config.file_path.gsub(".rb", "_bots.rb"))
+    end
+
+    if File.exist?(bots_file)
+      
+      if !defined?(@datetime_bots_created) or @datetime_bots_created != File.mtime(bots_file)
+        bots_created = @bots_created
+        10.times do
+          bots_created = YAML.load(File.read(bots_file))
+          if bots_created.is_a?(Hash)
+            break
+          else
+            sleep (0.1*(rand(2)+1))
+          end
         end
-        @datetime_bots_created = File.mtime(config.file_path.gsub(".rb", "_bots.rb"))
+        @bots_created = bots_created unless bots_created.is_a?(FalseClass)
+        @datetime_bots_created = File.mtime(bots_file)
         @extended_from = {}
         @bots_created.each do |k, v|
           v[:extended] = [] unless v.key?(:extended)
@@ -16,6 +35,7 @@ class SlackSmartBot
             @extended_from[ch] = [] unless @extended_from.key?(ch)
             @extended_from[ch] << k
           end
+          v[:rules_file] ||= ''
           v[:rules_file].gsub!(/^\./, '')
         end
       end

data/lib/slack/smart-bot/utils/get_channels_name_and_id.rb

@@ -1,13 +1,18 @@
 class SlackSmartBot
 
   def get_channels_name_and_id
-    channels = get_channels()
+    @channels_list = get_channels()
     @channels_id = Hash.new()
     @channels_name = Hash.new()
-    channels.each do |ch|
+    @channels_creator = Hash.new()
+    @users = get_users() if @users.empty?
+    @channels_list.each do |ch|
       unless ch.is_archived
         @channels_id[ch.name] = ch.id
         @channels_name[ch.id] = ch.name
+        user_info = @users.select{|u| u.id == ch.creator or (u.key?(:enterprise_user) and u.enterprise_user.id == ch.creator)}[-1]
+        @channels_creator[ch.id] = user_info.name unless user_info.nil?
+        @channels_creator[ch.name] = user_info.name unless user_info.nil?
       end
     end
   end

data/lib/slack/smart-bot/utils/get_command_ids.rb

@@ -0,0 +1,84 @@
+class SlackSmartBot
+  def get_command_ids
+    commands = {
+      general: [],
+      on_bot_general: [],
+      on_bot_on_demand: [],
+      on_bot_admin: [],
+      on_bot_master_admin: [],
+      on_extended: [],
+      on_master: [],
+      on_master_admin: [],
+      on_master_master_admin: [],
+      general_commands: [],
+      general_rules: [],
+      rules: []
+    }
+    typem = Thread.current[:typem]
+    user = Thread.current[:user]
+    # :on_call, :on_bot, :on_extended, :on_dm, :on_master, :on_pg, :on_pub
+    admin = is_admin?(user.name)
+
+    commands[:general] = (Dir.entries("#{__dir__}/../commands/general/").select { |e| e.match?(/\.rb/) }).sort.join('|').gsub('.rb','').split('|')
+    general = File.read("#{__dir__}/../commands/general_bot_commands.rb")
+    commands[:general] += general.scan(/^\s*#\s*help\w*:\s+command_id:\s+:(\w+)\s*$/i).flatten
+    commands[:general].uniq!
+    
+    if typem == :on_bot or typem == :on_master
+      commands[:on_bot_general] = (Dir.entries("#{__dir__}/../commands/on_bot/general/").select { |e| e.match?(/\.rb/) }).sort.join('|').gsub('.rb','').split('|')
+    end
+
+    if typem == :on_bot or typem == :on_master
+      commands[:on_bot_on_demand] = (Dir.entries("#{__dir__}/../commands/on_bot/").select { |e| e.match?(/\.rb/) }).sort.join('|').gsub('.rb','').split('|')
+    end
+
+    if (typem == :on_bot or typem == :on_master) and admin
+      commands[:on_bot_admin] = (Dir.entries("#{__dir__}/../commands/on_bot/admin/").select { |e| e.match?(/\.rb/) }).sort.join('|').gsub('.rb','').split('|')
+    end
+
+    if (typem == :on_bot or typem == :on_master) and config.masters.include?(user.name)
+      commands[:on_bot_master_admin] = (Dir.entries("#{__dir__}/../commands/on_bot/admin_master/").select { |e| e.match?(/\.rb/) }).sort.join('|').gsub('.rb','').split('|')
+    end
+
+    if typem == :on_extended
+      commands[:on_extended] = (Dir.entries("#{__dir__}/../commands/on_extended/").select { |e| e.match?(/\.rb/) }).sort.join('|').gsub('.rb','').split('|')
+      commands[:on_extended]+= ['repl', 'see_repls', 'get_repl', 'run_repl', 'delete_repl', 'ruby_code']
+    end
+
+    if typem == :on_master
+      commands[:on_master] = (Dir.entries("#{__dir__}/../commands/on_master/").select { |e| e.match?(/\.rb/) }).sort.join('|').gsub('.rb','').split('|')
+    end
+
+    if typem == :on_master and admin
+      commands[:on_master_admin] = (Dir.entries("#{__dir__}/../commands/on_master/admin/").select { |e| e.match?(/\.rb/) }).sort.join('|').gsub('.rb','').split('|')
+    end
+
+    if typem == :on_master and config.masters.include?(user.name)
+      commands[:on_master_master_admin] = (Dir.entries("#{__dir__}/../commands/on_master/admin_master/").select { |e| e.match?(/\.rb/) }).sort.join('|').gsub('.rb','').split('|')
+    end
+
+    if File.exist?("#{config.path}/rules/general_commands.rb")
+      general_commands = File.read("#{config.path}/rules/general_commands.rb")
+      commands[:general_commands] = general_commands.scan(/^\s*#\s*help\w*:\s+command_id:\s+:(\w+)\s*$/i).flatten
+      commands[:general_commands]+= general_commands.scan(/^\s*save_stats\(?\s*:(\w+)\s*,?/i).flatten
+      commands[:general_commands].uniq!
+    end
+
+    if typem == :on_extended or typem ==:on_call or typem == :on_bot or typem == :on_master or (typem == :on_dm and Thread.current[:using_channel].to_s != '')
+      if Thread.current.key?(:rules_file) and File.exist?(config.path + Thread.current[:rules_file])
+        rules = File.read(config.path + Thread.current[:rules_file])
+        commands[:rules] = rules.scan(/^\s*#\s*help\w*:\s+command_id:\s+:(\w+)\s*$/i).flatten
+        commands[:rules]+= rules.scan(/^\s*save_stats\(?\s*:(\w+)\s*,?/i).flatten
+        commands[:rules].uniq!
+
+        if File.exist?("#{config.path}/rules/general_rules.rb")
+          general_rules = File.read("#{config.path}/rules/general_rules.rb")
+          commands[:general_rules] = general_rules.scan(/^\s*#\s*help\w*:\s+command_id:\s+:(\w+)\s*$/i).flatten
+          commands[:general_rules]+= general_rules.scan(/^\s*save_stats\(?\s*:(\w+)\s*,?/i).flatten
+          commands[:general_rules].uniq!  
+        end
+      end
+    end
+    return commands
+  end
+end

data/lib/slack/smart-bot/utils/get_help.rb

@@ -1,18 +1,22 @@
 class SlackSmartBot
-  def get_help(rules_file, dest, from, only_rules, expanded)
+  def get_help(rules_file, dest, from, only_rules, expanded, descriptions: true, only_normal_user: false)
     order = {
-      general: [:whats_new, :hi_bot, :bye_bot, :bot_help, :bot_status, :use_rules, :stop_using_rules, :bot_stats],
+      general: [:bot_help, :hi_bot, :bye_bot, :add_admin, :remove_admin, :see_admins, :poster, :add_announcement, :delete_announcement, 
+                :see_announcements, :see_command_ids, :share_messages, :see_shares, :delete_share, :see_favorite_commands, :see_statuses, 
+                :allow_access, :see_access, :deny_access, :add_team, :see_teams, :update_team, :ping_team, :delete_team],
+      on_bot_general: [:whats_new, :suggest_command, :bot_status, :use_rules, :stop_using_rules, :bot_stats, :leaderboard],
       on_bot: [:ruby_code, :repl, :get_repl, :run_repl, :delete_repl, :see_repls, :add_shortcut, :delete_shortcut, :see_shortcuts],
       on_bot_admin: [:extend_rules, :stop_using_rules_on, :start_bot, :pause_bot, :add_routine,
-        :see_routines, :start_routine, :pause_routine, :remove_routine, :run_routine]
+        :see_routines, :start_routine, :pause_routine, :remove_routine, :see_result_routine, :run_routine]
     }
     if config.masters.include?(from)
       user_type = :master # master admin
-    elsif config.admins.include?(from)
+    elsif is_admin?(from)
       user_type = :admin
     else
       user_type = :normal #normal user
     end
+    
     # channel_type: :bot, :master_bot, :direct, :extended, :external
     if dest[0] == "D"
       channel_type = :direct
@@ -24,6 +28,15 @@ class SlackSmartBot
       channel_type = :bot
     end
 
+    if Thread.current[:typem] == :on_pg or Thread.current[:typem] == :on_pub
+      channel_type = :external
+    end
+
+    if only_normal_user
+      user_type = :normal 
+      channel_type = :bot
+    end
+
     @help_messages_expanded ||= build_help("#{__dir__}/../commands", true)
     @help_messages_not_expanded ||= build_help("#{__dir__}/../commands", false)
     if only_rules
@@ -33,7 +46,6 @@ class SlackSmartBot
     else
       help = @help_messages_not_expanded.deep_copy[user_type]
     end
-
     if rules_file != ""
       help[:rules_file] = build_help(config.path+rules_file, expanded)[user_type].values.join("\n") + "\n"
      
@@ -55,6 +67,17 @@ class SlackSmartBot
         help[:rules_file] += rhelp[user_type].values.join("\n") + "\n"
       end
     end
+
+    help[:general_commands_file] = build_help("#{__dir__}/../commands/general_bot_commands.rb", expanded)[user_type].values.join("\n") + "\n" unless only_rules
+    if File.exist?(config.path + '/rules/general_commands.rb') and !only_rules
+      help[:general_commands_file] += build_help(config.path+'/rules/general_commands.rb', expanded)[user_type].values.join("\n") + "\n"
+    end
+    if help.key?(:on_bot)
+      commands_on_extended_from_on_bot = [:repl, :see_repls, :get_repl, :run_repl, :delete_repl, :ruby_code]
+      commands_on_extended_from_on_bot.each do |cm|
+        help[:on_extended][cm] = help[:on_bot][cm] if help[:on_bot].key?(cm)
+      end      
+    end
     help = remove_hash_keys(help, :admin_master) unless user_type == :master
     help = remove_hash_keys(help, :admin) unless user_type == :admin or user_type == :master
     help = remove_hash_keys(help, :on_master) unless channel_type == :master_bot
@@ -62,7 +85,7 @@ class SlackSmartBot
     help = remove_hash_keys(help, :on_dm) unless channel_type == :direct
     txt = ""
 
-    if (channel_type == :bot or channel_type == :master_bot) and expanded
+    if (channel_type == :bot or channel_type == :master_bot) and expanded and descriptions
       txt += "===================================
       For the Smart Bot start listening to you say *hi bot*
       To run a command on demand even when the Smart Bot is not listening to you:
@@ -73,11 +96,11 @@ class SlackSmartBot
             *^THE_COMMAND*
             *!!THE_COMMAND*\n"
     end
-    if channel_type == :direct and expanded
+    if channel_type == :direct and expanded and descriptions
       txt += "===================================
       When on a private conversation with the Smart Bot, I'm always listening to you.\n"
     end
-    unless channel_type == :master_bot or channel_type == :extended or !expanded
+    unless channel_type == :master_bot or channel_type == :extended or !expanded or !descriptions
       txt += "===================================
       *Commands from Channels without a bot:*
       ----------------------------------------------
@@ -86,38 +109,61 @@ class SlackSmartBot
         It will run the supplied command using the rules on the channel supplied.
         You need to join the specified channel to be able to use those rules.
         Also you can use this command to call another bot from a channel with a running bot.
+      \n"
+    end
 
-      The commands you will be able to use from a channel without a bot: 
-      *bot rules*, *ruby CODE*, *add shortcut NAME: COMMAND*, *delete shortcut NAME*, *see shortcuts*, *shortcut NAME*
-      *And all the specific rules of the Channel*\n"
+    if help.key?(:general_commands_file)
+      txt += "===================================
+        *General commands on any channel where the Smart Bot is a member:*\n" if descriptions
+      txt += help.general_commands_file
     end
 
-    if help.key?(:general)
-      unless channel_type == :direct
-        txt += "===================================
-        *General commands even when the Smart Bot is not listening to you:*\n"
+    if help.key?(:on_bot) and help.on_bot.key?(:general) and channel_type != :external and channel_type != :extended
+      if descriptions
+        if channel_type == :direct
+          txt += "===================================
+          *General commands:*\n"
+        else
+          txt += "===================================
+          *General commands on Bot channel even when the Smart Bot is not listening to you:*\n"
+        end
       end
-      order.general.each do |o|
-        txt += help.general[o]
+      order.on_bot_general.each do |o|
+        txt += help.on_bot.general[o]
       end
       if channel_type == :master_bot
         txt += help.on_master.create_bot
+        txt += help.on_master.where_smartbot
       end
     end
 
-    if help.key?(:on_bot)
-      unless channel_type == :direct
-        txt += "===================================
-        *General commands only when the Smart Bot is listening to you or on demand:*\n"
+    if help.key?(:on_bot) and channel_type != :external and channel_type != :extended
+      if descriptions
+        if channel_type == :direct
+          txt += "===================================
+          *General commands on bot, DM or on external call on demand:*\n"
+        else
+          txt += "===================================
+          *General commands on Bot channel only when the Smart Bot is listening to you or on demand:*\n"
+        end
       end
       order.on_bot.each do |o|
         txt += help.on_bot[o]
       end
     end
-    if help.key?(:on_bot) and help.on_bot.key?(:admin)
+    if help.key?(:on_extended) and channel_type == :extended and help[:on_extended].keys.size > 0
+      if descriptions
+        txt += "===================================
+        *General commands on Extended channel only on demand:*\n"
+      end
+      commands_on_extended_from_on_bot.each do |o|
+        txt += help.on_extended[o]
+      end
+    end
+
+    if help.key?(:on_bot) and help.on_bot.key?(:admin) and channel_type != :external and channel_type != :extended
       txt += "===================================
-        *Admin commands:*\n"
-      txt += "\n\n"
+        *Admin commands:*\n\n" if descriptions
       order.on_bot_admin.each do |o|
         txt += help.on_bot.admin[o]
       end
@@ -128,76 +174,36 @@ class SlackSmartBot
       end
     end
 
-    if help.key?(:on_bot) and help.on_bot.key?(:admin_master) and help.on_bot.admin_master.size > 0
+    if help.key?(:on_bot) and help.on_bot.key?(:admin_master) and help.on_bot.admin_master.size > 0 and channel_type != :external and channel_type != :extended
       txt += "===================================
-      *Master Admin commands:*\n"
+        *Master Admin commands:*\n" if descriptions
       help.on_bot.admin_master.each do |k, v|
         txt += v if v.is_a?(String)
       end
     end
 
-    if help.key?(:on_master) and help.on_master.key?(:admin_master) and help.on_master.admin_master.size > 0
+    if help.key?(:on_master) and help.on_master.key?(:admin_master) and help.on_master.admin_master.size > 0 and channel_type != :external and channel_type != :extended
       txt += "===================================
-      *Master Admin commands:*\n" unless txt.include?('*Master Admin commands*')
+        *Master Admin commands:*\n" unless txt.include?('*Master Admin commands*') or !descriptions
       help.on_master.admin_master.each do |k, v|
         txt += v if v.is_a?(String)
       end
     end
 
-    if help.key?(:rules_file)
+    if help.key?(:rules_file) and channel_type != :external
       @logger.info channel_type if config.testing
       if channel_type == :extended or channel_type == :direct
         @logger.info help.rules_file if config.testing
         help.rules_file = help.rules_file.gsub(/^\s*\*These are specific commands.+NAME_OF_BOT THE_COMMAND`\s*$/im, "")
       end
 
-      unless expanded
-        resf = ''
-        help.rules_file.split(/^\s*\-+\s*$/).each do |rule|
-          command_done = false
-          explanation_done = false
-          example_done = false
-          if rule.match?(/These are specific commands for this/i)
-            resf += rule
-            resf += "-"*50
-            resf += "\n"
-          elsif rule.match?(/To run a command on demand and add the respond on a thread/i)
-            resf += rule
-            resf += "-"*50
-            resf += "\n"
-          else
-            rule.split("\n").each do |line|
-              if line.match?(/^\s*\-+\s*/i)
-                resf += line
-              elsif !command_done and line.match?(/^\s*`.+`\s*/i)
-                resf += "\n#{line}"
-                command_done = true
-              elsif !explanation_done and line.match?(/^\s+[^`].+\s*/i)
-                resf += "\n#{line}"
-                explanation_done = true
-              elsif !example_done and line.match?(/^\s*_.+_\s*/i)
-                resf += "\n     Example: #{line}"
-                example_done = true
-              end
-            end
-            resf += "\n\n"
-          end
-        end
-        unless resf.match?(/These are specific commands for this bot on this Channel/i)
-          if resf.match?(/\A\s*[=\-]+$/)
-            pre = ''
-            post = ''
-          else
-            pre = ('='*50) + "\n"
-            post = ('-'*50) + "\n"
-          end
-          resf = "#{pre}*These are specific commands for this bot on this Channel:*\n#{post}" + resf
-        end
-        help.rules_file = resf
+      if !help.rules_file.to_s.include?('These are specific commands') and help.rules_file!=''
+        txt += "===================================
+         *Specific commands on this Channel, call them !THE_COMMAND or !!THE_COMMAND:*\n" if descriptions
       end
+  
       txt += help.rules_file
     end
-
     return txt
   end
 end

data/lib/slack/smart-bot/utils/get_repls.rb

@@ -1,11 +1,31 @@
 class SlackSmartBot
 
   def get_repls(channel = @channel_id)
-    if File.exist?("#{config.path}/repl/repls_#{channel}.rb")
+    require 'yaml'
+    repl_file = "#{config.path}/repl/repls_#{channel}.yaml"
+
+    if File.exist?("#{config.path}/repl/repls_#{channel}.rb") #backwards compatible
       file_conf = IO.readlines("#{config.path}/repl/repls_#{channel}.rb").join
-      unless file_conf.to_s() == ""
+      if file_conf.to_s() == ""
+        @repls = {}
+      else
         @repls = eval(file_conf)
       end
+      File.open(repl_file, 'w') {|file| file.write(@repls.to_yaml) }
+      File.delete("#{config.path}/repl/repls_#{channel}.rb")
+    end
+
+    if File.exist?(repl_file)      
+      repls = @repls
+      10.times do
+        repls = YAML.load(File.read(repl_file))
+        if repls.is_a?(Hash)
+          break
+        else
+          sleep (0.1*(rand(2)+1))
+        end
+      end
+      @repls = repls unless repls.is_a?(FalseClass)
     end
   end
 end