slack-smart-bot 1.14.2 → 1.15.0

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

@@ -26,73 +26,74 @@ class SlackSmartBot
     save_stats(__method__)
     unless typem == :on_extended
       from = user.name
+      team_id_user = user.team_id + '_' + from
       if has_access?(__method__, user)
         shortcut_name.strip!
-        if global 
+        if global
           if !config.on_master_bot or typem != :on_master
             respond "It is only possible to add global shortcuts from Master channel"
           else
-            @shortcuts_global[from] = Hash.new() unless @shortcuts_global.keys.include?(from)
+            @shortcuts_global[team_id_user] = Hash.new() unless @shortcuts_global.keys.include?(team_id_user)
             found_other = false
             if for_all.to_s != ""
               @shortcuts_global.each { |sck, scv|
-                if sck != :all and sck != from and scv.key?(shortcut_name)
+                if sck != :all and sck != team_id_user and scv.key?(shortcut_name)
                   found_other = true
                 end
               }
             end
-            if @shortcuts_global[:all].include?(shortcut_name) or @shortcuts_global[from].include?(shortcut_name)
+            if @shortcuts_global[:all].include?(shortcut_name) or @shortcuts_global[team_id_user].include?(shortcut_name)
               respond "Global shortcut name already in use. Please use another shortcut name."
             elsif found_other
               respond "You cannot create a global shortcut for all with the same name than other user is using."
-            elsif !@shortcuts_global[from].include?(shortcut_name)
+            elsif !@shortcuts_global[team_id_user].include?(shortcut_name)
               #new shortcut
-              @shortcuts_global[from][shortcut_name] = command_to_run
+              @shortcuts_global[team_id_user][shortcut_name] = command_to_run
               @shortcuts_global[:all][shortcut_name] = command_to_run if for_all.to_s != ""
               update_shortcuts_file()
               respond "global shortcut added"
             else
               respond "Not possible to add the global shortcut" #todo: check if this is ever gonna be the case
-            end            
+            end
           end
         else
-          @shortcuts[from] = Hash.new() unless @shortcuts.keys.include?(from)
+          @shortcuts[team_id_user] = Hash.new() unless @shortcuts.keys.include?(team_id_user)
 
           found_other = false
           if for_all.to_s != ""
             @shortcuts.each { |sck, scv|
-              if sck != :all and sck != from and scv.key?(shortcut_name)
+              if sck != :all and sck != team_id_user and scv.key?(shortcut_name)
                 found_other = true
               end
             }
           end
-          if !is_admin?(from) and @shortcuts[:all].include?(shortcut_name) and !@shortcuts[from].include?(shortcut_name)
+          if !is_admin?(user) and @shortcuts[:all].include?(shortcut_name) and !@shortcuts[team_id_user].include?(shortcut_name)
             respond "Only the creator of the shortcut can modify it", dest
           elsif found_other
             respond "You cannot create a shortcut for all with the same name than other user is using", dest
-          elsif !@shortcuts[from].include?(shortcut_name)
+          elsif !@shortcuts[team_id_user].include?(shortcut_name)
             #new shortcut
-            @shortcuts[from][shortcut_name] = command_to_run
+            @shortcuts[team_id_user][shortcut_name] = command_to_run
             @shortcuts[:all][shortcut_name] = command_to_run if for_all.to_s != ""
             update_shortcuts_file()
             respond "shortcut added", dest
           else
             #are you sure? to avoid overwriting existing
             if answer.empty?
-              ask("The shortcut already exists, are you sure you want to overwrite it?", command, from, dest)
+              ask("The shortcut already exists, are you sure you want to overwrite it?", command, team_id_user, dest)
             else
               case answer
               when /^(yes|yep)/i
-                @shortcuts[from][shortcut_name] = command_to_run
+                @shortcuts[team_id_user][shortcut_name] = command_to_run
                 @shortcuts[:all][shortcut_name] = command_to_run if for_all.to_s != ""
                 update_shortcuts_file()
                 respond "shortcut added", dest
-                answer_delete(from)
+                answer_delete(team_id_user)
               when /^no/i
                 respond "ok, I won't add it", dest
-                answer_delete(from)
+                answer_delete(team_id_user)
               else
-                ask "I don't understand, yes or no?", command, from, dest
+                ask "I don't understand, yes or no?", command, team_id_user, dest
               end
             end
           end

data/lib/slack/smart-bot/commands/on_bot/admin/add_routine.rb

@@ -42,11 +42,12 @@ class SlackSmartBot
   # helpadmin:
   def add_routine(dest, from, user, name, type, number_time, period, command_to_run, files, silent, channel, routine_type)
     save_stats(__method__)
-    if files.nil? or files.size == 0 or (files.size > 0 and config.masters.include?(from))
+    if files.nil? or files.size == 0 or (files.size > 0 and config.team_id_masters.include?("#{user.team_id}_#{user.name}"))
       if is_admin?
         if @routines.key?(@channel_id) && @routines[@channel_id].key?(name)
           respond "I'm sorry but there is already a routine with that name.\nCall `see routines` to see added routines", dest
         else
+          react :running
           number_time += ":00" if number_time.split(":").size == 2
           if (type != "every") && !number_time.match?(/^[01][0-9]:[0-5][0-9]:[0-5][0-9]$/) &&
              !number_time.match?(/^2[0-3]:[0-5][0-9]:[0-5][0-9]$/)
@@ -91,14 +92,14 @@ class SlackSmartBot
                     next_time = Date.new(next_month.year, next_month.month, day)
                 end
                 days = (next_time - Date.today).to_i
-                every_in_seconds = days * 24 * 60 * 60 # one day       
-                                
+                every_in_seconds = days * 24 * 60 * 60 # one day
+
               elsif type != 'at' and type!='weekday' and type!='weekend'
                 dayweek = type.downcase
 
                 days = ['sunday','monday','tuesday','wednesday','thursday','friday','saturday']
                 incr = days.index(dayweek) - Time.now.wday
-                if incr < 0 
+                if incr < 0
                   incr = (7+incr)*24*60*60
                 else
                   incr = incr * 24 * 60 * 60
@@ -137,7 +138,7 @@ class SlackSmartBot
                 file_path += ".rb"
               end
               if files[0].key?(:content)
-                File.open(file_path, 'w') do |f| 
+                File.open(file_path, 'w') do |f|
                   f.write files[0].content
                 end
               else
@@ -154,18 +155,19 @@ class SlackSmartBot
             elsif @channels_id.key?(channel) #it is a channel name
               channel_id = @channels_id[channel]
             end
-    
+
             channel_id = dest if channel_id.to_s == ''
             @routines[@channel_id] = {} unless @routines.key?(@channel_id)
-            @routines[@channel_id][name] = { channel_name: config.channel, creator: from, creator_id: user.id, status: :on,
-                                             every: every, every_in_seconds: every_in_seconds, at: at, dayweek: dayweek, daymonth: daymonth, file_path: file_path, 
+            @routines[@channel_id][name] = { channel_name: config.channel, creator_team_id: user.team_id, creator: from, creator_id: user.id, status: :on,
+                                             every: every, every_in_seconds: every_in_seconds, at: at, dayweek: dayweek, daymonth: daymonth, file_path: file_path,
                                              command: command_to_run.to_s.strip, silent: silent,
-                                             next_run: next_run.to_s, dest: channel_id, last_run: "", last_elapsed: "", 
+                                             next_run: next_run.to_s, dest: channel_id, last_run: "", last_elapsed: "",
                                              running: false, routine_type: routine_type}
             update_routines()
             respond "Added routine *`#{name}`* to the channel", dest
             create_routine_thread(name, @routines[@channel_id][name])
           end
+          unreact :running
         end
       else
         respond "Only admin users can use this command", dest

data/lib/slack/smart-bot/commands/on_bot/admin/remove_routine.rb

@@ -16,10 +16,12 @@ class SlackSmartBot
     save_stats(__method__)
     if is_admin?
       if @routines.key?(@channel_id) and @routines[@channel_id].key?(name)
+        react :running
         @routines[@channel_id][name][:thread].exit
         @routines[@channel_id].delete(name)
         update_routines()
         respond "The routine *`#{name}`* has been removed.", dest
+        unreact :running
       else
         respond "There isn't a routine with that name: *`#{name}`*.\nCall `see routines` to see added routines", dest
       end

data/lib/slack/smart-bot/commands/on_bot/admin/run_routine.rb

@@ -42,6 +42,7 @@ class SlackSmartBot
           started = Time.now
           data = { channel: @routines[@channel_id][name][:dest],
             user: @routines[@channel_id][name][:creator_id],
+            team_id: @routines[@channel_id][name][:creator_team_id],
             text: @routines[@channel_id][name][:command],
             files: nil,
             routine_name: name, 

data/lib/slack/smart-bot/commands/on_bot/admin/see_routines.rb

@@ -14,6 +14,7 @@ class SlackSmartBot
   def see_routines(dest, from, user, all, header, regexp)
     save_stats(__method__)
     if is_admin?
+      react :running
       if all
         routines = {}
         if config.on_master_bot
@@ -28,8 +29,8 @@ class SlackSmartBot
           routines = @routines
         end
       else
-        if @rules_imported.key?(user.name) and @rules_imported[user.name].key?(user.name) and dest[0] == "D"
-          routines = YAML.load(File.read("#{config.path}/routines/routines_#{@rules_imported[user.name][user.name]}.yaml"))
+        if @rules_imported.key?("#{user.team_id}_#{user.name}") and @rules_imported["#{user.team_id}_#{user.name}"].key?(user.name) and dest[0] == "D"
+          routines = YAML.load(File.read("#{config.path}/routines/routines_#{@rules_imported["#{user.team_id}_#{user.name}"][user.name]}.yaml"))
           routines = {} if routines.is_a?(FalseClass)
         else
           routines = @routines
@@ -81,7 +82,7 @@ class SlackSmartBot
             msg << "\tStatus: #{v[:status]}"
             msg << "\tEvery: #{v[:every]}" unless v[:every] == ""
             msg << "\tAt: #{v[:at]}" unless v[:at] == ""
-            msg << "\tOn: #{v[:dayweek]}" unless !v.key?(:dayweek) or v[:dayweek].to_s == "" 
+            msg << "\tOn: #{v[:dayweek]}" unless !v.key?(:dayweek) or v[:dayweek].to_s == ""
             msg << "\tNext Run: #{v[:next_run]}"
             msg << "\tLast Run: #{v[:last_run]}"
             msg << "\tTime consumed on last run: #{v[:last_elapsed]}" unless v[:command] !=''
@@ -93,6 +94,7 @@ class SlackSmartBot
           end
         end
       end
+      unreact :running
     else
       respond "Only admin users can use this command", dest
     end

data/lib/slack/smart-bot/commands/on_bot/admin_master/delete_message.rb

@@ -6,10 +6,10 @@ class SlackSmartBot
     # helpadmin:    You can use this command only if you are a Master admin user and if you are in a private conversation with the bot
     # helpadmin: command_id: :delete_message
     # helpadmin:
-    def delete_message(from, typem, url)
+    def delete_message(user, typem, url)
       save_stats(__method__)
       channel, ts = url.scan(/\/archives\/(\w+)\/(\w\d+)/)[0]
-      if config.masters.include?(from) and typem==:on_dm and !channel.nil? #master admin user
+      if config.team_id_masters.include?("#{user.team_id}_#{user.name}") and typem==:on_dm and !channel.nil? #master admin user
         ts = "#{ts[0..-7]}.#{ts[-6..-1]}"
         succ = delete(channel, ts)
         if succ
@@ -22,4 +22,3 @@ class SlackSmartBot
       end
     end
 end
-  

data/lib/slack/smart-bot/commands/on_bot/admin_master/get_bot_logs.rb

@@ -6,9 +6,9 @@ class SlackSmartBot
     # helpadmin:    You can use this command only if you are a Master admin user and if you are in a private conversation with the bot
     # helpadmin: command_id: :get_bot_logs
     # helpadmin:
-    def get_bot_logs(dest, from, typem)
+    def get_bot_logs(dest, user, typem)
       save_stats(__method__)
-      if config.masters.include?(from) and typem==:on_dm #master admin user
+      if config.team_id_masters.include?("#{user.team_id}_#{user.name}") and typem==:on_dm #master admin user
         respond 'Remember this data is private'
         send_file(dest, "Logs for #{config.channel}", "#{config.path}/logs/#{config.log_file}", 'Remember this data is private', 'text/plain', "text")
       else
@@ -16,4 +16,3 @@ class SlackSmartBot
       end
     end
 end
-  

data/lib/slack/smart-bot/commands/on_bot/admin_master/react_to.rb

@@ -11,9 +11,9 @@ class SlackSmartBot
     # helpadmin:       _react to #sales p1622550707012100 :thumbsup: :heavy_check_mark: :bathtub:_
     # helpadmin: command_id: :react_to
     # helpadmin:
-    def react_to(dest, from, typem, to, thread_ts, emojis)
+    def react_to(dest, user, typem, to, thread_ts, emojis)
       save_stats(__method__)
-      if config.masters.include?(from) and typem==:on_dm #master admin user
+      if config.team_id_masters.include?("#{user.team_id}_#{user.name}") and typem==:on_dm #master admin user
         succs = []
         emojis.split(' ').each do |emoji|
           succs << (react emoji, thread_ts, to)
@@ -31,4 +31,3 @@ class SlackSmartBot
       end
     end
 end
-  

data/lib/slack/smart-bot/commands/on_bot/admin_master/send_message.rb

@@ -13,9 +13,9 @@ class SlackSmartBot
     # helpadmin:    In case from and to specified will send a DM to all users that have been using the SmartBot according to the SmartBot Stats. One message every 5sc. #CHANNEL and COMMAND_ID are optional filters.
     # helpadmin: command_id: :send_message
     # helpadmin:
-    def send_message(dest, from, typem, to, thread_ts, stats_from, stats_to, stats_channel_filter, stats_command_filter, message)
+    def send_message(dest, user, typem, to, thread_ts, stats_from, stats_to, stats_channel_filter, stats_command_filter, message)
       save_stats(__method__)
-      if config.masters.include?(from) and typem==:on_dm #master admin user
+      if config.team_id_masters.include?("#{user.team_id}_#{user.name}") and typem==:on_dm #master admin user
         react :runner
         unless Thread.current[:command_orig].to_s == ''
           message_orig = Thread.current[:command_orig].to_s.gsub("\u00A0", " ").scan(/[^:]+\s*:\s+(.+)/im).join
@@ -32,13 +32,13 @@ class SlackSmartBot
           Dir["#{config.stats_path}.*.log"].sort.each do |file|
             if file >= "#{config.stats_path}.#{stats_from[0..6]}.log" and file <= "#{config.stats_path}.#{stats_to[0..6]}.log"
               CSV.foreach(file, headers: true, header_converters: :symbol, converters: :numeric) do |row|
-                if row[:date] >= stats_from and row[:date] <= stats_to and !users.include?(row[:user_name]) 
+                if row[:date] >= stats_from and row[:date] <= stats_to and !users.include?(row[:user_name])
                   if (stats_channel_filter=='' and stats_command_filter=='') or
                     (stats_channel_filter!='' and stats_command_filter=='' and (row[:bot_channel_id]==stats_channel_filter or row[:dest_channel_id]==stats_channel_filter)) or
-                    (stats_command_filter!='' and stats_channel_filter=='' and row[:command]==stats_command_filter) or 
+                    (stats_command_filter!='' and stats_channel_filter=='' and row[:command]==stats_command_filter) or
                     (stats_channel_filter!='' and stats_command_filter!='' and ((row[:bot_channel_id]==stats_channel_filter or row[:dest_channel_id]==stats_channel_filter) and row[:command]==stats_command_filter))
 
-                    user_ids << row[:user_id] 
+                    user_ids << row[:user_id]
                     users << row[:user_name]
                   end
                 end
@@ -50,6 +50,7 @@ class SlackSmartBot
           users_failed = []
 
           user_ids.each do |u|
+            @buffered = false if config.testing
             succ = (respond message, u, thread_ts: thread_ts, web_client: true)
             if succ
               users_success << u
@@ -65,6 +66,7 @@ class SlackSmartBot
         else
           to.each do |t|
             unless t.match?(/^\s*$/)
+              @buffered = false if config.testing
               succ = (respond message, t, thread_ts: thread_ts, web_client: true) && succ
             end
           end
@@ -80,4 +82,3 @@ class SlackSmartBot
       end
     end
 end
-  

data/lib/slack/smart-bot/commands/on_bot/admin_master/update_message.rb

@@ -6,10 +6,10 @@ class SlackSmartBot
     # helpadmin:    You can use this command only if you are a Master admin user and if you are in a private conversation with the bot
     # helpadmin: command_id: :update_message
     # helpadmin:
-    def update_message(from, typem, url, text)
+    def update_message(user, typem, url, text)
       save_stats(__method__)
       channel, ts = url.scan(/\/archives\/(\w+)\/(\w\d+)/)[0]
-      if config.masters.include?(from) and typem==:on_dm and !channel.nil? #master admin user
+      if config.team_id_masters.include?("#{user.team_id}_#{user.name}") and typem==:on_dm and !channel.nil? #master admin user
         ts = "#{ts[0..-7]}.#{ts[-6..-1]}"
         succ = update(channel, ts, text)
         if succ
@@ -22,4 +22,3 @@ class SlackSmartBot
       end
     end
 end
-  

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

@@ -14,7 +14,7 @@ class SlackSmartBot
     if has_access?(__method__, user)
       if @repls.key?(session_name)
         Dir.mkdir("#{config.path}/repl") unless Dir.exist?("#{config.path}/repl")
-        if is_admin?(user.name) or @repls[session_name].creator_name == user.name
+        if is_admin?(user) or (@repls[session_name].creator_name == user.name and @repls[session_name].creator_team_id == user.team_id)
           @repls.delete(session_name)
           update_repls()
           File.rename("#{config.path}/repl/#{@channel_id}/#{session_name}.input", "#{config.path}/repl/#{@channel_id}/#{session_name}_#{Time.now.strftime("%Y%m%d%H%M%S%N")}.deleted")

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

@@ -13,26 +13,27 @@ class SlackSmartBot
     save_stats(__method__)
     unless typem == :on_extended
       from = user.name
+      team_id_user = user.team_id + '_' + from
       if has_access?(__method__, user)
-        deleted = false        
+        deleted = false
         shortcut.strip!
         if global
           if !config.on_master_bot or typem != :on_master
             respond "It is only possible to delete global shortcuts from Master channel"
           else
-            if !is_admin?(from) and @shortcuts_global[:all].include?(shortcut) and 
-              (!@shortcuts_global.key?(from) or !@shortcuts_global[from].include?(shortcut))
+            if !is_admin?(user) and @shortcuts_global[:all].include?(shortcut) and
+              (!@shortcuts_global.key?(team_id_user) or !@shortcuts_global[team_id_user].include?(shortcut))
               respond "Only the creator of the shortcut or an admin user can delete it"
-            elsif (@shortcuts_global.key?(from) and @shortcuts_global[from].keys.include?(shortcut)) or
-              (is_admin?(from) and @shortcuts_global[:all].include?(shortcut))
-              
+            elsif (@shortcuts_global.key?(team_id_user) and @shortcuts_global[team_id_user].keys.include?(shortcut)) or
+              (is_admin?(user) and @shortcuts_global[:all].include?(shortcut))
+
               respond "global shortcut deleted!", dest
-              if @shortcuts_global.key?(from) and @shortcuts_global[from].key?(shortcut)
-                respond("#{shortcut}: #{@shortcuts_global[from][shortcut]}", dest) 
+              if @shortcuts_global.key?(team_id_user) and @shortcuts_global[team_id_user].key?(shortcut)
+                respond("#{shortcut}: #{@shortcuts_global[team_id_user][shortcut]}", dest)
               elsif @shortcuts_global.key?(:all) and @shortcuts_global[:all].key?(shortcut)
                 respond("#{shortcut}: #{@shortcuts_global[:all][shortcut]}", dest)
               end
-              @shortcuts_global[from].delete(shortcut) if @shortcuts_global.key?(from) and @shortcuts_global[from].key?(shortcut)
+              @shortcuts_global[team_id_user].delete(shortcut) if @shortcuts_global.key?(team_id_user) and @shortcuts_global[team_id_user].key?(shortcut)
               @shortcuts_global[:all].delete(shortcut) if @shortcuts_global.key?(:all) and @shortcuts_global[:all].key?(shortcut)
               update_shortcuts_file()
             else
@@ -40,32 +41,32 @@ class SlackSmartBot
             end
           end
         else
-          if !is_admin?(from) and @shortcuts[:all].include?(shortcut) and 
-            (!@shortcuts.key?(from) or !@shortcuts[from].include?(shortcut))
+          if !is_admin?(user) and @shortcuts[:all].include?(shortcut) and
+            (!@shortcuts.key?(team_id_user) or !@shortcuts[team_id_user].include?(shortcut))
             respond "Only the creator of the shortcut or an admin user can delete it", dest
-          elsif (@shortcuts.keys.include?(from) and @shortcuts[from].keys.include?(shortcut)) or
-                (is_admin?(from) and @shortcuts[:all].include?(shortcut))
+          elsif (@shortcuts.keys.include?(team_id_user) and @shortcuts[team_id_user].keys.include?(shortcut)) or
+                (is_admin?(user) and @shortcuts[:all].include?(shortcut))
             #are you sure? to avoid deleting by mistake
             if answer.empty?
-              ask("are you sure you want to delete it?", command, from, dest)
+              ask("are you sure you want to delete it?", command, team_id_user, dest)
             else
               case answer
               when /^(yes|yep)/i
-                answer_delete(from)
+                answer_delete(team_id_user)
                 respond "shortcut deleted!", dest
-                if @shortcuts.key?(from) and @shortcuts[from].key?(shortcut)
-                  respond("#{shortcut}: #{@shortcuts[from][shortcut]}", dest) 
+                if @shortcuts.key?(team_id_user) and @shortcuts[team_id_user].key?(shortcut)
+                  respond("#{shortcut}: #{@shortcuts[team_id_user][shortcut]}", dest)
                 elsif @shortcuts.key?(:all) and @shortcuts[:all].key?(shortcut)
                   respond("#{shortcut}: #{@shortcuts[:all][shortcut]}", dest)
                 end
-                @shortcuts[from].delete(shortcut) if @shortcuts.key?(from) and @shortcuts[from].key?(shortcut)
+                @shortcuts[team_id_user].delete(shortcut) if @shortcuts.key?(team_id_user) and @shortcuts[team_id_user].key?(shortcut)
                 @shortcuts[:all].delete(shortcut) if @shortcuts.key?(:all) and @shortcuts[:all].key?(shortcut)
                 update_shortcuts_file()
               when /^no/i
-                answer_delete(from)
+                answer_delete(team_id_user)
                 respond "ok, I won't delete it", dest
               else
-                ask("I don't understand, are you sure you want to delete it? (yes or no)", command, from, dest)
+                ask("I don't understand, are you sure you want to delete it? (yes or no)", command, team_id_user, dest)
               end
             end
           else

data/lib/slack/smart-bot/commands/on_bot/general/bot_stats.rb

@@ -62,7 +62,7 @@ class SlackSmartBot
       user = "" # for the case we are on the stats channel
     end
     if (from_user.id != user and
-        (config.masters.include?(from_user.name) or master_admin_users_id.include?(from_user.id) or dest == @channels_id[config.stats_channel]) and 
+        (config.team_id_masters.include?("#{from_user.team_id}_#{from_user.name}") or master_admin_users_id.include?(from_user.id) or dest == @channels_id[config.stats_channel]) and
         (typem == :on_dm or dest[0] == "D" or dest == @channels_id[config.stats_channel]))
       on_dm_master = true #master admin user
     else
@@ -88,14 +88,14 @@ class SlackSmartBot
         wrong = true
       else
         tm.each do |m|
-          user_info = @users.select { |u| u.id == m or (u.key?(:enterprise_user) and u.enterprise_user.id == m) }[-1]
+          user_info = find_user(m)
           members_list << user_info.name unless user_info.is_app_user or user_info.is_bot
         end
       end
     end
 
     if header.size > 0
-      headers = ["date", "bot_channel", "bot_channel_id", "dest_channel", "dest_channel_id", "type_message", "user_name", "user_id", "text", "command", "files", "time_zone", "job_title"]
+      headers = ["date", "bot_channel", "bot_channel_id", "dest_channel", "dest_channel_id", "type_message", "user_name", "user_id", "text", "command", "files", "time_zone", "job_title", "team_id"]
       header.each do |h|
         if !headers.include?(h.downcase)
           message << ":exclamation: Wrong header #{h}. It should be one of the following: #{headers.join(", ")}"
@@ -117,6 +117,8 @@ class SlackSmartBot
     tzone_users = {}
     job_title_users = {}
     users_by_job_title = {}
+    users_by_team = {}
+    total_calls_by_team = {}
     unless wrong
       type_group = :monthly if only_graph and type_group == ""
       if on_dm_master or (from_user.id == user) # normal user can only see own stats
@@ -163,7 +165,7 @@ class SlackSmartBot
             end
             #end
             if user != ""
-              user_info = @users.select { |u| u.id == user or (u.key?(:enterprise_user) and u.enterprise_user.id == user) }[-1]
+              user_info = find_user(user)
               if user_info.nil? # for the case the user is populated from outside of slack
                 user_name = user
                 user_id = user
@@ -197,6 +199,7 @@ class SlackSmartBot
                     (exclude_channel_members and !members_list.include?(row[:user_name])) or
                     (!include_channel_members and !exclude_channel_members)
                     row[:date] = row[:date].to_s
+                    row[:team_id] = config.team_id if row[:team_id].to_s == ''
                     if row[:dest_channel_id].to_s[0] == "D"
                       row[:dest_channel] = "DM"
                     elsif row[:dest_channel].to_s == ""
@@ -217,7 +220,7 @@ class SlackSmartBot
                           header.each_with_index do |h, i|
                             if !row[h.downcase.to_sym].to_s.match?(/#{regexp[i]}/i)
                               add = false
-                              break 
+                              break
                             end
                           end
                         end
@@ -367,6 +370,35 @@ class SlackSmartBot
                 end
               end
 
+              team_ids = rows.team_id.uniq
+              client_web = Slack::Web::Client.new(token: config.token)
+              client_web.auth_test
+              team_ids.each do |team_id|
+                resp = client_web.team_info(team: team_id)
+                team_name = resp.team.name
+                users_by_team[team_name] ||= []
+                users_by_team[team_name] += rows.select { |h| h.team_id == team_id }.map { |h| h.user_id }.uniq
+                total_calls_by_team[team_name] ||= 0
+                total_calls_by_team[team_name] += rows.count { |h| h.team_id == team_id }
+              end
+              client_web = nil
+
+              #print users by team
+              if users_by_team.size > 0
+                message << "*Users by Space*"
+                users_by_team.each do |team_name, users|
+                  message << "\t#{team_name}: #{users.size} (#{(users.size.to_f * 100 / users_id_name.size).round(2)}%)"
+                end
+              end
+
+              #print total calls by user team
+              if total_calls_by_team.size > 0
+                message << "*Total calls by User Space*"
+                total_calls_by_team.each do |team_name, total_calls|
+                  message << "\t#{team_name}: #{total_calls} (#{(total_calls.to_f * 100 / total).round(2)}%)"
+                end
+              end
+
               if !only_graph
                 users_attachment = []
                 if user == ""
@@ -386,7 +418,7 @@ class SlackSmartBot
                           tzone_users[rows[i].values[11]] += 1
                         end
                       else
-                        user_info = @users.select { |u| u.id == usr or (u.key?(:enterprise_user) and u.enterprise_user.id == usr) }[-1]
+                        user_info = find_user(usr)
                         unless user_info.nil? or user_info.is_app_user or user_info.is_bot
                           tzone_users[user_info.tz_label] ||= 0
                           tzone_users[user_info.tz_label] += 1
@@ -422,7 +454,7 @@ class SlackSmartBot
                             users_by_job_title[job_title] << rows.user_name[i]
                           end
                         else
-                          user_info = @users.select { |u| u.id == usr or (u.key?(:enterprise_user) and u.enterprise_user.id == usr) }[-1]
+                          user_info = find_user(usr)
                           unless user_info.nil? or user_info.is_app_user or user_info.is_bot
                             if job_title_users.key?(user_info.profile.title)
                               job_title = user_info.profile.title
@@ -443,6 +475,7 @@ class SlackSmartBot
                   users_by_job_title.each do |job_title, users|
                     users.uniq!
                   end
+
                   if users.size > 10
                     message << "*Users* - #{users.size} (Top 10)"
                   else

data/lib/slack/smart-bot/commands/on_bot/general/bot_status.rb

@@ -20,8 +20,12 @@ class SlackSmartBot
       ip_address = Socket.ip_address_list.find { |ai| ai.ipv4? && !ai.ipv4_loopback? }.ip_address
       respond "*#{Socket.gethostname} (#{ip_address})*\n\tStatus: #{@status}.\n\tVersion: #{VERSION}.#{version_message}\n\tRules file: #{File.basename config.rules_file}\n\tExtended: #{@bots_created[@channel_id][:extended] unless config.on_master_bot}\n\tAdmins: #{config.admins}\n\tBot time: #{Time.now}", dest
       if @status == :on
-        respond "I'm listening to [#{@listening.keys.join(", ")}]", dest
-        if config.on_master_bot and config.admins.include?(user.name)
+        #@listening.keys delete :threads key
+        listening_keys = @listening.keys - [:threads]
+        #remove team id from keys, key is a symbol
+        listening_keys = listening_keys.map{|k| k.to_s.gsub(user.team_id+"_",'').to_sym}
+        respond "I'm listening to [#{listening_keys.join(", ")}]", dest
+        if config.on_master_bot and config.team_id_admins.include?("#{user.team_id}_#{user.name}")
           sleep 5
           @bots_created.each do |k, v|
             msg = []

data/lib/slack/smart-bot/commands/on_bot/general/stop_using_rules.rb

@@ -15,12 +15,13 @@ class SlackSmartBot
       channel_id = channel
     end
 
+    team_id_user = "#{user.team_id}_#{user.name}"
     if dest[0] == "C" or dest[0] == "G" #channel
-      if @rules_imported.key?(user.name) and @rules_imported[user.name].key?(dchannel)
-        if @rules_imported[user.name][dchannel] != channel_id
+      if @rules_imported.key?(team_id_user) and @rules_imported[team_id_user].key?(dchannel)
+        if @rules_imported[team_id_user][dchannel] != channel_id
           respond "You are not using those rules.", dest
         else
-          @rules_imported[user.name].delete(dchannel)
+          @rules_imported[team_id_user].delete(dchannel)
           sleep 0.5
           update_rules_imported()
           respond "You won't be using those rules from now on.", dest
@@ -32,11 +33,11 @@ class SlackSmartBot
         respond "You were not using those rules.", dest
       end
     else #direct message
-      if @rules_imported.key?(user.name) and @rules_imported[user.name].key?(user.name)
-        if @rules_imported[user.name][user.name] != channel_id
+      if @rules_imported.key?(team_id_user) and @rules_imported[team_id_user].key?(user.name)
+        if @rules_imported[team_id_user][user.name] != channel_id
           respond "You are not using those rules.", dest
         else
-          @rules_imported[user.name].delete(user.name)
+          @rules_imported[team_id_user].delete(user.name)
           sleep 0.5
           update_rules_imported()
           respond "You won't be using those rules from now on.", dest

data/lib/slack/smart-bot/commands/on_bot/general/suggest_command.rb

@@ -12,10 +12,10 @@ class SlackSmartBot
   # help:    if used 'command' it will show any kind of command or rule.
   # help: command_id: :suggest_command
   # help:
-  def suggest_command(from, dest, dchannel, specific, rules_file)
+  def suggest_command(user, dest, dchannel, specific, rules_file)
     save_stats(__method__)
     dont_suggest = []
-    help_message = get_help(rules_file, dest, from, specific, true, descriptions: false, only_normal_user: true)
+    help_message = get_help(rules_file, dest, user, specific, true, descriptions: false, only_normal_user: true)
     commands = help_message.gsub(/====+/,'-'*30).split(/^\s*-------*$/).flatten
     commands.reject!{|c| c.match?(/These are specific commands for this bot on this/i) || c.match?(/\A\s*\z/)}
     dont_suggest.each do |ds|
@@ -24,13 +24,14 @@ class SlackSmartBot
     @last_suggested_commands ||= []
     @last_suggested_commands.shift if @last_suggested_commands.size >=5
     command = ''
-    begin 
+    begin
       command = commands.sample
     end until !@last_suggested_commands.include?(command) or commands.size <= 5
     @last_suggested_commands << command
     command.gsub!(/^\s*command_id:\s+:\w+\s*$/,'')
+    command.gsub!(/^\s*>.+$/,'')
     message = "*Command suggestion*:\n#{command}"
     respond message, dest, unfurl_links: false, unfurl_media: false
   end
 
-end
+end