slack-smart-bot 1.10.0 → 1.11.0

data/lib/slack/smart-bot/process.rb

@@ -99,6 +99,8 @@ class SlackSmartBot
           /\Akill\s+bot\s+on\s+#(.+)\s*$/i, /\Akill\s+bot\s+on\s+(.+)\s*$/i
           channel = $1
           kill_bot_on_channel(dest, from, channel)
+        when /\A\s*(where\s+is|which\s+channels|where\s+is\s+a\s+member)\s+(#{@salutations.join("|")})\??\s*$/i
+          where_smartbot(user)
         when /\A\s*(add|create)\s+(silent\s+)?(bgroutine|routine)\s+([\w\.]+)\s+(every)\s+(\d+)\s*(days|hours|minutes|seconds|mins|min|secs|sec|d|h|m|s)\s*(\s#(\w+)\s*)(\s.+)?\s*\z/im,
           /\A\s*(add|create)\s+(silent\s+)?(bgroutine|routine)\s+([\w\.]+)\s+(every)\s+(\d+)\s*(days|hours|minutes|seconds|mins|min|secs|sec|d|h|m|s)\s*(\s<#(C\w+)\|.+>\s*)?(\s.+)?\s*\z/im,
           /\A\s*(add|create)\s+(silent\s+)?(bgroutine|routine)\s+([\w\.]+)\s+(every)\s+(\d+)\s*(days|hours|minutes|seconds|mins|min|secs|sec|d|h|m|s)\s*(\s<#(\w+)\|>\s*)?(\s.+)?\s*\z/im,
@@ -150,29 +152,42 @@ class SlackSmartBot
           see_routines(dest, from, user, all)
         when /\A\s*get\s+bot\s+logs?\s*$/i
           get_bot_logs(dest, from, typem)
-        when /\A\s*send\s+message\s+(on|to|in)\s*([^\s]+)\s+([^\s]+)\s*:\s*(.+)\s*$/i,
-          /\A\s*send\s+message\s+(on|to|in)\s*([^\s]+)\s*():\s*(.+)\s*$/i
-          to = $2
-          thread_ts = $3.to_s
-          message = $4
-          to_channel = to.scan(/<#([^>]+)\|.*>/).join 
-          to_channel = to.scan(/#([^\s]+)/).join if to_channel == ''
-          if to_channel == ''
-            to_user = to.scan(/<@(\w+)>/).join
-            if to_user == ''
-              # message_id
-            else
-              to = to_user
+        when /\A\s*send\s+message\s+(on|to|in)\s*(.+)\s*:\s*(.+)\s*$/im
+          opts = $2
+          message = $3
+          thread_ts = ''
+          to_channel = ''
+          to = []
+
+          opts.split(' ').each do |opt|
+            if opt.match?(/\Ahttps:/i)
+              to_channel, thread_ts = opt.scan(/\/archives\/(\w+)\/(\w\d+)/)[0]
+              to << to_channel
+            elsif opt.match(/<#([^>]+)\|.*>/) #channel
+              to << $1
+            elsif opt.match(/#([^\s]+)/) #channel
+              to << $1
+            elsif opt.match(/<@(\w+)>/)
+              to << $1
             end
-          else
-            to = to_channel
           end
+                    
+          thread_ts.gsub!('.','')
           send_message(dest, from, typem, to, thread_ts, message)
-        when /\A\s*react\s+(on|to|in)\s*([^\s]+)\s+([^\s]+)\s+(.+)\s*$/i
+        when /\A\s*delete\s+message\s+(.+)\s*$/i
+          url = $1
+          delete_message(from, typem, url)
+        when /\A\s*react\s+(on|to|in)\s*([^\s]+)\s+([p\d\.]+)\s+(.+)\s*$/i,
+          /\A\s*react\s+(on|to|in)\s*([^\s]+)\s+()(.+)\s*$/i
           to = $2
           thread_ts = $3.to_s
           emojis = $4
-          to_channel = to.scan(/<#([^>]+)\|.*>/).join
+
+          if to.match?(/\A<?https:/i)
+            to_channel, thread_ts = to.scan(/\/archives\/(\w+)\/(\w\d+)/)[0]
+          else
+            to_channel = to.scan(/<#([^>]+)\|.*>/).join
+          end
           if to_channel == ''
             to_channel = to.scan(/#([^\s]+)/).join
             to_channel = @channels_id[to_channel].to_s
@@ -251,6 +266,10 @@ class SlackSmartBot
 
         when /\A\s*bot\s+stats\s*(.*)\s*$/i
           opts = $1.to_s
+          exclude_members_channel = opts.scan(/exclude\s+members\s+<#(\w+)\|.*>/i).join #todo: add test
+          opts.gsub!(/exclude\s+members\s+<#\w+\|.*>/,'')
+          members_channel =  opts.scan(/members\s+<#(\w+)\|.*>/i).join #todo: add test
+          opts.gsub!(/members\s+<#\w+\|.*>/,'')
           all_opts = opts.downcase.split(' ')
           all_data = all_opts.include?('alldata')
           st_channel = opts.scan(/<#(\w+)\|.*>/).join
@@ -259,6 +278,7 @@ class SlackSmartBot
           st_to = opts.scan(/to\s+(\d\d\d\d[\/\-\.]\d\d[\/\-\.]\d\d)/).join
           st_to = st_to.gsub('.','-').gsub('/','-')
           st_user = opts.scan(/<@([^>]+)>/).join
+          st_user = opts.scan(/@([^\s]+)/).join if st_user == ''
           st_command = opts.scan(/\s+command\s+(\w+)/i).join.downcase
           st_command = opts.scan(/^command\s+(\w+)/i).join.downcase if st_command == ''
           exclude_masters = all_opts.include?('exclude') && all_opts.include?('masters')
@@ -284,7 +304,7 @@ class SlackSmartBot
           if (typem == :on_master or typem == :on_bot) and dest[0]!='D' #routine bot stats to be published on DM
             st_channel = dchannel
           end
-          bot_stats(dest, user, typem, st_channel, st_from, st_to, st_user, st_command, exclude_masters, exclude_routines, exclude_command, monthly, all_data)
+          bot_stats(dest, user, typem, st_channel, st_from, st_to, st_user, st_command, exclude_masters, exclude_routines, exclude_command, monthly, all_data, members_channel, exclude_members_channel)
         when /\A(set|turn)\s+maintenance\s+(on|off)\s*()\z/im, /\A(set|turn)\s+maintenance\s+(on)\s*(.+)\s*\z/im
           status = $2.downcase
           message = $3.to_s

data/lib/slack/smart-bot/process_first.rb

@@ -1,5 +1,5 @@
 class SlackSmartBot
-  def process_first(user, text, dest, dchannel, typem, files, ts, thread_ts, routine, routine_name, routine_type)
+  def process_first(user, text, dest, dchannel, typem, files, ts, thread_ts, routine, routine_name, routine_type, command_orig)
     nick = user.name
     rules_file = ""
     text.gsub!(/^!!/,'^') # to treat it just as ^
@@ -46,7 +46,6 @@ class SlackSmartBot
         rules_file = "/rules/general_rules.rb"
       end
     end
-
     if nick == config[:nick] #if message is coming from the bot
       begin
         case text
@@ -197,6 +196,7 @@ class SlackSmartBot
           Thread.current[:routine_name] = routine_name
           Thread.current[:routine_type] = routine_type
           Thread.current[:dchannel] = dchannel
+          Thread.current[:command_orig] = command_orig
           if thread_ts.to_s == ''
             Thread.current[:on_thread] = false
             Thread.current[:thread_ts] = Thread.current[:ts] # to create the thread if necessary

data/lib/slack/smart-bot/treat_message.rb

@@ -3,6 +3,7 @@ class SlackSmartBot
     @buffered = false if config[:testing]
     begin
       begin
+        command_orig = data.text
         unless data.text.to_s.match(/\A\s*\z/)
           #to remove italic, bold... from data.text since there is no method on slack api
           if remove_blocks and !data.blocks.nil? and data.blocks.size > 0
@@ -86,6 +87,7 @@ class SlackSmartBot
         end
       end
       if !dest.nil? and !data.text.nil? and !data.text.to_s.match?(/\A\s*\z/)
+        get_bots_created()
         if data.channel[0] == "D" and !data.text.to_s.match?(/^\s*<@#{config[:nick_id]}>\s+/) and 
           (data.text.to_s.match?(/^\s*(on)?\s*<#\w+\|[^>]*>/i) or data.text.to_s.match?(/^\s*(on)?\s*#\w+/i))
           data.text = "<@#{config[:nick_id]}> " + data.text.to_s
@@ -183,7 +185,8 @@ class SlackSmartBot
           end
         end
       end
-      load "#{config.path}/rules/general_commands.rb" if File.exists?("#{config.path}/rules/general_commands.rb") and @datetime_general_commands != File.mtime("#{config.path}/rules/general_commands.rb")
+      load "#{config.path}/rules/general_commands.rb" if File.exist?("#{config.path}/rules/general_commands.rb") and @datetime_general_commands != File.mtime("#{config.path}/rules/general_commands.rb")
+
       unless typem == :dont_treat or user_info.nil?
         if (Time.now - @last_activity_check) > 60 * 30 #every 30 minutes
           @last_activity_check = Time.now
@@ -241,7 +244,6 @@ class SlackSmartBot
             command += " ruby" if command != "ruby"
             command = "#{command} #{res.body.to_s.force_encoding("UTF-8")}"
           end
-
           if typem == :on_call
             command = "!" + command unless command[0] == "!" or command.match?(/^\s*$/) or command[0] == "^"
 
@@ -256,24 +258,24 @@ class SlackSmartBot
             elsif @status != :on
               respond "The bot in that channel is not :on", data.channel
             elsif data.user == channel_found.creator or members.include?(data.user)
-              process_first(user_info, command, dest, channel_rules, typem, data.files, data.ts, data.thread_ts, data.routine, data.routine_name, data.routine_type)
+              process_first(user_info, command, dest, channel_rules, typem, data.files, data.ts, data.thread_ts, data.routine, data.routine_name, data.routine_type, command_orig)
             else
               respond "You need to join the channel <##{channel_found.id}> to be able to use the rules.", data.channel
             end
           elsif config.on_master_bot and typem == :on_extended and
                 command.size > 0 and command[0] != "-"
             # to run ruby only from the master bot for the case more than one extended
-            process_first(user_info, command, dest, @channel_id, typem, data.files, data.ts, data.thread_ts, data.routine, data.routine_name, data.routine_type)
+            process_first(user_info, command, dest, @channel_id, typem, data.files, data.ts, data.thread_ts, data.routine, data.routine_name, data.routine_type, command_orig)
           elsif !config.on_master_bot and @bots_created[@channel_id].key?(:extended) and
                 @bots_created[@channel_id][:extended].include?(@channels_name[data.channel]) and
                 command.size > 0 and command[0] != "-"
-            process_first(user_info, command, dest, @channel_id, typem, data.files, data.ts, data.thread_ts, data.routine, data.routine_name, data.routine_type)
+            process_first(user_info, command, dest, @channel_id, typem, data.files, data.ts, data.thread_ts, data.routine, data.routine_name, data.routine_type, command_orig)
           elsif (dest[0] == "D" or @channel_id == data.channel or data.user == config[:nick_id]) and
                 command.size > 0 and command[0] != "-"
-            process_first(user_info, command, dest, data.channel, typem, data.files, data.ts, data.thread_ts, data.routine, data.routine_name, data.routine_type)
+            process_first(user_info, command, dest, data.channel, typem, data.files, data.ts, data.thread_ts, data.routine, data.routine_name, data.routine_type, command_orig)
             # if @botname on #channel_rules: do something
           elsif typem == :on_pub or typem == :on_pg
-            process_first(user_info, command, dest, channel_rules, typem, data.files, data.ts, data.thread_ts, data.routine, data.routine_name, data.routine_type)
+            process_first(user_info, command, dest, channel_rules, typem, data.files, data.ts, data.thread_ts, data.routine, data.routine_name, data.routine_type, command_orig)
           end
         rescue Exception => stack
           @logger.fatal stack
@@ -337,19 +339,13 @@ class SlackSmartBot
             get_bots_created()
           when /global shortcut added/
             sleep 2
-            if File.exist?("#{config.path}/shortcuts/shortcuts_global.rb")
-              file_sc = IO.readlines("#{config.path}/shortcuts/shortcuts_global.rb").join
-              unless file_sc.to_s() == ""
-                @shortcuts_global = eval(file_sc)
-              end
+            if File.exist?("#{config.path}/shortcuts/shortcuts_global.yaml")
+              @shortcuts_global = YAML.load(File.read("#{config.path}/shortcuts/shortcuts_global.yaml"))
             end
           when /global shortcut deleted/
             sleep 2
-            if File.exist?("#{config.path}/shortcuts/shortcuts_global.rb")
-              file_sc = IO.readlines("#{config.path}/shortcuts/shortcuts_global.rb").join
-              unless file_sc.to_s() == ""
-                @shortcuts_global = eval(file_sc)
-              end
+            if File.exist?("#{config.path}/shortcuts/shortcuts_global.yaml")
+              @shortcuts_global = YAML.load(File.read("#{config.path}/shortcuts/shortcuts_global.yaml"))
             end
           end
         end

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

@@ -9,8 +9,8 @@ class SlackSmartBot
     else
       return help_message
     end
-    files.each do |t|
 
+    files.each do |t|
       if Dir.exist?(t)
         res = build_help(t, expanded)
         help_message[:master][t.scan(/\/(\w+)$/).join.to_sym] = res[:master]

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

@@ -25,7 +25,7 @@ class SlackSmartBot
               (@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.exists?("#{config.path}/routines/#{@channel_id}/#{name}_output.txt")
+              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/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,16 +1,33 @@
 class SlackSmartBot
   def get_bots_created
-    if File.exist?(config.file_path.gsub(".rb", "_bots.rb"))
+    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(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)
+      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)
@@ -20,7 +37,7 @@ class SlackSmartBot
           end
           v[:rules_file] ||= ''
           v[:rules_file].gsub!(/^\./, '')
-        end            
+        end
       end
     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,14 +1,17 @@
 class SlackSmartBot
   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, :suggest_command, :bot_status, :use_rules, :stop_using_rules, :bot_stats, :leaderboard],
+      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, :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
@@ -66,9 +69,15 @@ class SlackSmartBot
     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.exists?(config.path + '/rules/general_commands.rb') and !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
@@ -101,36 +110,33 @@ class SlackSmartBot
         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"
-      txt +="
-      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"
     end
 
-    if help.key?(:general) and channel_type != :external and channel_type != :extended
+    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?(: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 even when the Smart Bot is not listening to you:*\n"
+          *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?(: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?(:on_bot) and channel_type != :external and channel_type != :extended
       if descriptions
         if channel_type == :direct
@@ -138,13 +144,23 @@ class SlackSmartBot
           *General commands on bot, DM or on external call on demand:*\n"
         else
           txt += "===================================
-          *General commands only when the Smart Bot is listening to you or on demand:*\n"
+          *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_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\n" if descriptions

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

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

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

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

@@ -0,0 +1,22 @@
+class SlackSmartBot
+  def get_teams
+    @teams ||= {}
+    teams_file = config.file_path.gsub(".rb", "_teams.yaml")
+    if File.exist?(teams_file)
+      if !defined?(@datetime_teams_file) or @datetime_teams_file != File.mtime(teams_file)
+        require 'yaml'
+        teams = @teams
+        10.times do
+          teams = YAML.load(File.read(teams_file))
+          if teams.is_a?(Hash)
+            break
+          else
+            sleep (0.1*(rand(2)+1))
+          end
+        end
+        @teams = teams unless teams.is_a?(FalseClass)
+        @datetime_teams_file = File.mtime(teams_file)
+      end
+    end
+  end
+end