slack-smart-bot 1.12.8 → 1.13.0

data/lib/slack/smart-bot/commands/general_bot_commands.rb

@@ -11,8 +11,6 @@ def general_bot_commands(user, command, dest, files = [])
       display_name = user.profile.display_name
     end
     case command
-
-
       # help: ----------------------------------------------
       # help: `bot help`
       # help: `bot help COMMAND`
@@ -29,6 +27,35 @@ def general_bot_commands(user, command, dest, files = [])
       # help: command_id: :bot_help
       # help:
 
+      # help: ----------------------------------------------
+      # help: `for NUMBER times every NUMBER minutes COMMAND`
+      # help: `for NUMBER times every NUMBER seconds COMMAND`
+      # help: `NUMBER times every NUMBER minutes COMMAND`
+      # help: `NUMBER times every NUMBER seconds COMMAND`
+      # help:    It will run the command every NUMBER minutes or seconds for NUMBER times.
+      # help:    max 24 times. min every 10 seconds. max every 60 minutes.
+      # help:    Call `quit loop LOOP_ID` to stop the loop.
+      # help:       aliases for minutes: m, minute, minutes
+      # help:       aliases for seconds: s, sc, second, seconds
+      # help:  Examples:
+      # help:       _for 5 times every 1 minute ^ruby puts Time.now_
+      # help:       _10 times every 30s !ruby puts Time.now_
+      # help:       _24 times every 60m !get sales today_
+      # help:    <https://github.com/MarioRuiz/slack-smart-bot#loops|more info>
+      # help: command_id: :create_loop
+      # help:
+
+      # help: ----------------------------------------------
+      # help: `quit loop LOOP_ID`
+      # help:    It will stop the loop with the id LOOP_ID.
+      # help:    Only the user who created the loop or an admin can stop it.
+      # help:       aliases for loop: iterator, iteration
+      # help:       aliases for quit: stop, exit, kill
+      # help:  Examples:
+      # help:       _quit loop 1_
+      # help:       _stop iterator 12_
+      # help:    <https://github.com/MarioRuiz/slack-smart-bot#loops|more info>
+      # help: command_id: :quit_loop
 
       # help: ----------------------------------------------
       # help: `Hi Bot`
@@ -575,6 +602,27 @@ def general_bot_commands(user, command, dest, files = [])
         name = $2.downcase
         delete_team(user, name)
 
+        # help: ----------------------------------------------
+        # help: `see MEMO_TYPE from TEAM_NAME team`
+        # help: `see MEMO_TYPE from TEAM_NAME team TOPIC`
+        # help: `see all memos from TEAM_NAME team`
+        # help: `see all memos from TEAM_NAME team TOPIC`
+        # help:     It will show the memos of the team.
+        # help:     If TOPIC is supplied it will show the memos of the topic.
+        # help:     MEMO_TYPE: memos, notes, issues, tasks, features, bugs, jira, github. In case of 'all memos' will display all of any type.
+        # help:  Examples:
+        # help:     _see memos from sales team_
+        # help:     _see bugs from sales team_
+        # help:     _see all memos from sales team webdev_
+        # help:    <https://github.com/MarioRuiz/slack-smart-bot#teams|more info>
+        # help: command_id: :see_memos_team
+        # help:
+      when /\A\s*see\s+(memo|note|issue|task|feature|bug|jira|github|all\s+memo)s?\s+(from\s+)?([\w\-]+)\s+team(.*)\s*\z/i,
+        /\A\s*see\s+(memo|note|issue|task|feature|bug|jira|github|all\s+memo)s?\s+(from\s+)?team\s+([\w\-]+)(.*)\s*\z/i
+        type = $1.downcase.to_sym
+        name = $3.downcase
+        topic = $4.strip
+        see_memos_team(user, type: type, name: name, topic: topic)
 
         # help: ----------------------------------------------
         # help: `add vacation from YYYY/MM/DD to YYYY/MM/DD`
@@ -631,16 +679,19 @@ def general_bot_commands(user, command, dest, files = [])
         # help: `see my vacations`
         # help: `see my time off`
         # help: `see vacations @USER`
+        # help: `see my vacations YEAR`
         # help:     It will display current and past time off.
+        # help:     If you call this command on a DM, it will show your vacations for the year on a calendar.
         # help:    <https://github.com/MarioRuiz/slack-smart-bot#time-off-management|more info>
         # help: command_id: :see_vacations
         # help: 
-      when /\A\s*see\s+my\s+vacations\s*()\z/i,
-        /\A\s*see\s+my\s+time\s+off\s*()\z/i,
-        /\A\s*see\s+time\s+off\s+<@(\w+)>\s*\z/i,
-        /\A\s*see\s+vacations\s+<@(\w+)>\s*\z/i
+      when /\A\s*see\s+my\s+vacations\s*()\s*(\d{4})?\s*\z/i,
+        /\A\s*see\s+my\s+time\s+off\s*()\s*(\d{4})?\s*\z/i,
+        /\A\s*see\s+time\s+off\s+<@(\w+)>\s*\s*(\d{4})?\s*\z/i,
+        /\A\s*see\s+vacations\s+<@(\w+)>\s*(\d{4})?\s*\z/i
         from_user = $1
-        see_vacations(user, from_user: from_user)
+        year = $2
+        see_vacations(user, dest, from_user: from_user, year: year)
 
         # help: ----------------------------------------------
         # help: `vacations team NAME`
@@ -659,7 +710,48 @@ def general_bot_commands(user, command, dest, files = [])
         date = $4.to_s
         date = Date.today.strftime("%Y/%m/%d") if date.empty?
         see_vacations_team(user, team_name, date)
-        
+
+
+        # help: ----------------------------------------------
+        # help: `public holidays COUNTRY`
+        # help: `public holidays COUNTRY/STATE DATE`
+        # help:     STATE: optional. If not specified, it will return all the holidays for the country.
+        # help:     DATE: optional. It can be supplied as YYYY or YYYY-MM or YYYY-MM-DD. If not specified, it will return all the holidays for current year.
+        # help: Examples:
+        # help:     _public holidays United States_
+        # help:     _public holidays United States/California_
+        # help:     _public holidays United States/California 2023_
+        # help:     _public holidays Iceland 2023-12_
+        # help:     _public holidays India 2023-12-25_
+        # help: command_id: :public_holidays
+        # help: 
+      when /\A\s*public\s+(holiday?|vacation)s?\s+(in\s+|on\s+)?([a-zA-Z\s]+)()()()()\s*\z/i,
+        /\A\s*public\s+(holiday?|vacation)s?\s+(in\s+|on\s+)?([a-zA-Z\s]+)\/([a-zA-Z\s]+)()()()\s*\z/i,
+        /\A\s*public\s+(holiday?|vacation)s?\s+(in\s+|on\s+)?([a-zA-Z\s]+)\/([a-zA-Z\s]+)\s+(\d{4})[\/\-]?(\d\d)?[\/\-]?(\d\d)?\s*\z/i,
+        /\A\s*public\s+(holiday?|vacation)s?\s+(in\s+|on\s+)?([a-zA-Z\s]+)()\s+(\d{4})[\/\-]?(\d\d)?[\/\-]?(\d\d)?\s*\z/i
+        country = $3
+        state = $4.to_s
+        year = $5.to_s
+        month = $6.to_s
+        day = $7.to_s
+        year = Date.today.year if year.to_s == ''
+        public_holidays(country, state, year, month, day)
+
+        # help: ----------------------------------------------
+        # help: `set public holidays to COUNTRY/STATE`
+        # help:     It will set the public holidays for the country and state specified.
+        # help:     If STATE is not specified, it will set the public holidays for the country.
+        # help: Examples:
+        # help:     _set public holidays to Iceland_
+        # help:     _set public holidays to United States/California_
+        # help: command_id: :set_public_holidays
+        # help:
+      when /\A\s*set\s+public\s+(holiday?|vacation)s?\s+to\s+([^\/]+)\/([^\/]+)\s*\z/i,
+        /\A\s*set\s+public\s+(holiday?|vacation)s?\s+to\s+([^\/]+)\s*\z/i
+        country = $2
+        state = $3.to_s
+        set_public_holidays(country, state, user)
+
     else
       return false
     end

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

@@ -11,6 +11,7 @@ class SlackSmartBot
   # helpadmin: `add routine NAME at TIME #CHANNEL COMMAND`
   # helpadmin: `add routine NAME on DAYWEEK at TIME COMMAND`
   # helpadmin: `add routine NAME on DAYWEEK at TIME #CHANNEL COMMAND`
+  # helpadmin: `add routine NAME on the DAY_OF_MONTH at TIME COMMAND`
   # helpadmin: `add routine NAME at TIME`
   # helpadmin: `add silent routine NAME at TIME`
   # helpadmin: `create routine NAME at TIME`
@@ -34,6 +35,7 @@ class SlackSmartBot
   # helpadmin:      _add bgroutine example on Mondays at 05:00 !run customer tests_
   # helpadmin:      _add routine example on Tuesdays at 09:00 #SREChannel !run db cleanup_
   # helpadmin:      _add routine example on weekdays at 22:00 suggest command_
+  # helpadmin:      _add routine example on the 5th at 22:00 suggest command_
   # helpadmin:    <https://github.com/MarioRuiz/slack-smart-bot#routines|more info>
   # helpadmin: command_id: :add_routine
   # helpadmin:
@@ -53,6 +55,7 @@ class SlackSmartBot
             every = ""
             at = ""
             dayweek = ''
+            daymonth = ''
             next_run = Time.now
             case period.downcase
             when "days", "d"
@@ -68,7 +71,28 @@ class SlackSmartBot
               every = "#{number_time} seconds"
               every_in_seconds = number_time.to_i
             else # time
-              if type != 'at' and type!='weekday' and type!='weekend'
+              if type != 'at' and type.match?(/^\d+$/) # day of month
+                day = type.to_i
+                daymonth = type
+                if day > 31
+                  respond "Wrong day of month specified: *#{day}*", dest
+                  return
+                end
+                if Date.today.day > day
+                    next_month = Date.new(Date.today.year, Date.today.month, 1) >> 1
+                else
+                    next_month = Date.new(Date.today.year, Date.today.month, 1)
+                end
+                next_month_last_day = Date.new(next_month.year, next_month.month, -1)
+                if day > next_month_last_day.day
+                    next_time = Date.new(next_month.year, next_month.month, next_month_last_day.day)
+                else
+                    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       
+                                
+              elsif type != 'at' and type!='weekday' and type!='weekend'
                 dayweek = type.downcase
 
                 days = ['sunday','monday','tuesday','wednesday','thursday','friday','saturday']
@@ -133,11 +157,11 @@ class SlackSmartBot
             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, file_path: file_path, 
+                                             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: "", 
                                              running: false, routine_type: routine_type}
-            update_routines
+            update_routines()
             respond "Added routine *`#{name}`* to the channel", dest
             create_routine_thread(name, @routines[@channel_id][name])
           end

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

@@ -38,15 +38,19 @@ class SlackSmartBot
             respond "routine *`#{name}`*: #{stdout} #{stderr}", @routines[@channel_id][name][:dest]
           end
         else #command
-          respond "routine *`#{name}`*: #{@routines[@channel_id][name][:command]}", @routines[@channel_id][name][:dest]
+          message = respond "routine *`#{name}`*: #{@routines[@channel_id][name][:command]}", @routines[@channel_id][name][:dest], return_message: true
           started = Time.now
-          treat_message({ channel: @routines[@channel_id][name][:dest],
-                         user: @routines[@channel_id][name][:creator_id],
-                         text: @routines[@channel_id][name][:command],
-                         files: nil,
-                         routine_name: name, 
-                         routine_type: @routines[@channel_id][name][:routine_type],
-                         routine: true })
+          data = { channel: @routines[@channel_id][name][:dest],
+            user: @routines[@channel_id][name][:creator_id],
+            text: @routines[@channel_id][name][:command],
+            files: nil,
+            routine_name: name, 
+            routine_type: @routines[@channel_id][name][:routine_type],
+            routine: true }
+          if @routines[@channel_id][name][:command].match?(/^!!/) or @routines[@channel_id][name][:command].match?(/^\^/)
+            data[:ts] = message.ts
+          end  
+          treat_message(data)
         end
         @routines[@channel_id][name][:last_elapsed] = (Time.now - started)
         @routines[@channel_id][name][:last_run] = started.to_s

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

@@ -1,14 +1,17 @@
 class SlackSmartBot
   # helpadmin: ----------------------------------------------
   # helpadmin: `see routines`
+  # helpadmin: `see routines HEADER /REGEXP/`
   # helpadmin: `see all routines`
+  # helpadmin: `see all routines HEADER /REGEXP/`
   # helpadmin:    It will show the routines of the channel
-  # helpadmin:    In case of `all` and on the master channel, it will show all the routines from all channels
+  # helpadmin:    In case of 'all' and on the master channel, it will show all the routines from all channels
+  # helpadmin:    If you use HEADER it will show only the routines that match the REGEXP on the header. Available headers: name, creator, status, next_run, last_run, command
   # helpadmin:    You can use this command only if you are an admin user
   # helpadmin:    <https://github.com/MarioRuiz/slack-smart-bot#routines|more info>
   # helpadmin: command_id: :see_routines
   # helpadmin:
-  def see_routines(dest, from, user, all)
+  def see_routines(dest, from, user, all, header, regexp)
     save_stats(__method__)
     if is_admin?
       if all
@@ -33,11 +36,37 @@ class SlackSmartBot
         end
       end
 
+      if header != ''
+        routines_filtered = {}
+
+        routines.each do |ch, rout_ch|
+          routines_filtered[ch] = rout_ch.dup
+          rout_ch.each do |k, v|
+            if header == 'name'
+              if k.match(/#{regexp}/i).nil?
+                routines_filtered[ch].delete(k)
+              end
+            elsif v[header.to_sym].to_s.match(/#{regexp}/i).nil?
+              routines_filtered[ch].delete(k)
+            end
+          end
+        end
+        routines = routines_filtered
+      end
+
       if routines.get_values(:channel_name).size == 0
-        respond "There are no routines added.", dest
+        if header != ''
+          respond "There are no routines added that match the header *#{header}* and the regexp *#{regexp}*.", dest
+        else
+          respond "There are no routines added.", dest
+        end
       else
         routines.each do |ch, rout_ch|
-          respond "Routines on channel *#{rout_ch.get_values(:channel_name).values.flatten.uniq[0]}*", dest
+          if header != ''
+            respond "Routines on channel *#{rout_ch.get_values(:channel_name).values.flatten.uniq[0]}* that match the header *#{header}* and the regexp *#{regexp}*", dest
+          else
+            respond "Routines on channel *#{rout_ch.get_values(:channel_name).values.flatten.uniq[0]}*", dest
+          end
           rout_ch.each do |k, v|
             msg = []
             if v[:dest][0] == 'D'

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

@@ -18,7 +18,28 @@ class SlackSmartBot
         respond "It's only possible to start routines from MASTER channel from a direct message with the bot.", dest
       elsif @routines.key?(@channel_id) and @routines[@channel_id].key?(name)
         @routines[@channel_id][name][:status] = :on
-        if @routines[@channel_id][name][:at]!=''
+        if @routines[@channel_id][name].key?(:daymonth) and @routines[@channel_id][name][:daymonth] != ''
+          started = Time.now
+          daymonth = @routines[@channel_id][name][:daymonth]
+          day = daymonth.to_i
+          nt = @routines[@channel_id][name][:at].split(":")
+          if Time.now > Time.new(Time.now.year, Time.now.month, day, nt[0], nt[1], nt[2])
+              next_month = Date.new(Date.today.year, Date.today.month, 1) >> 1
+          else
+              next_month = Date.new(Date.today.year, Date.today.month, 1)
+          end
+          next_month_last_day = Date.new(next_month.year, next_month.month, -1)
+          if day > next_month_last_day.day
+              next_time = Date.new(next_month.year, next_month.month, next_month_last_day.day)
+          else
+              next_time = Date.new(next_month.year, next_month.month, day)
+          end
+          days = (next_time - Date.today).to_i
+          next_run = started + (days * 24 * 60 * 60) # one more day/week
+          next_run = Time.new(next_run.year, next_run.month, next_run.day, nt[0], nt[1], nt[2])
+          @routines[@channel_id][name][:next_run] = next_run.to_s
+          @routines[@channel_id][name][:sleeping] = (next_run - started).ceil
+        elsif @routines[@channel_id][name][:at]!=''
           started = Time.now
           if started.strftime("%H:%M:%S") < @routines[@channel_id][name][:at]
             nt = @routines[@channel_id][name][:at].split(":")

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

@@ -7,23 +7,69 @@ class SlackSmartBot
     # helpadmin: `send message to URL : MESSAGE`
     # helpadmin: `send message to @USER1 @USER99 : MESSAGE`
     # helpadmin: `send message to #CHANNEL1 #CHANNEL99 : MESSAGE`
+    # helpadmin: `send message to users from YYYY/MM/DD to YYYY/MM/DD #CHANNEL COMMAND_ID: MESSAGE`
     # helpadmin:    It will send the specified message as SmartBot
     # 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:    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, message)
+    def send_message(dest, from, 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
+        react :runner
         unless Thread.current[:command_orig].to_s == ''
           message_orig = Thread.current[:command_orig].to_s.gsub("\u00A0", " ").scan(/[^:]+\s*:\s+(.+)/im).join
           message = message_orig unless message_orig == ''
         end
         succ = true
-        to.each do |t|
-          unless t.match?(/^\s*$/)
-            succ = (respond message, t, thread_ts: thread_ts, web_client: true) && succ
+        if stats_from!='' and stats_to!=''
+          users = []
+          user_ids = []
+          stats_from.gsub!('/', '-')
+          stats_to.gsub!('/', '-')
+          stats_from += " 00:00:00 +0000"
+          stats_to += " 23:59:59 +0000"
+          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 (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_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] 
+                    users << row[:user_name]
+                  end
+                end
+              end
+            end
+          end
+
+          users_success = []
+          users_failed = []
+
+          user_ids.each do |u|
+            succ = (respond message, u, thread_ts: thread_ts, web_client: true)
+            if succ
+              users_success << u
+            else
+              users_failed << u
+            end
+            sleep 5
+          end
+          respond "Users that received the message (#{users_success.size}): <@#{users_success.join('>, <@')}>", dest if users_success.size > 0
+          respond "Users that didn't receive the message (#{users_failed.size}): <@#{users_failed.join('>, <@')}>", dest if users_failed.size > 0
+          respond "No users selected to send the message.", dest if users_success.size == 0 and users_failed.size == 0
+          succ = false if users_failed.size > 0
+        else
+          to.each do |t|
+            unless t.match?(/^\s*$/)
+              succ = (respond message, t, thread_ts: thread_ts, web_client: true) && succ
+            end
           end
         end
+        unreact :runner
         if succ
           react :heavy_check_mark
         else

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

@@ -0,0 +1,25 @@
+class SlackSmartBot
+
+    # helpadmin: ----------------------------------------------
+    # helpadmin: `update message URL TEXT`
+    # helpadmin:    It will update the SmartBot message supplied
+    # 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)
+      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
+        ts = "#{ts[0..-7]}.#{ts[-6..-1]}"
+        succ = update(channel, ts, text)
+        if succ
+          react :heavy_check_mark
+        else
+          react :x
+        end
+      else
+        respond "Only master admin users on a private conversation with the SmartBot can update SmartBot messages"
+      end
+    end
+end
+  

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

@@ -39,7 +39,7 @@ class SlackSmartBot
   # help:      _bot stats #sales today_
   # help:      _bot stats #sales from 2020-01-01 monthly_
   # help:      _bot stats exclude routines masters from 2021/01/01 monthly_
-  # help:      _bot stats members #development from 2022/01/01 to 2022/01/31_\
+  # help:      _bot stats members #development from 2022/01/01 to 2022/01/31_
   # help:      _bot stats type_message /(on_pub|on_pg)/_
   # help:    <https://github.com/MarioRuiz/slack-smart-bot#bot-management|more info>
   # help: command_id: :bot_stats
@@ -60,7 +60,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 #Jal
+        (config.masters.include?(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
@@ -202,7 +202,7 @@ class SlackSmartBot
                       unless header.empty?
                         add = true
                         header.each_with_index do |h, i|
-                          if row[h.downcase.to_sym].to_s.match?(Regexp.new(regexp[i])) == false
+                          if !row[h.downcase.to_sym].to_s.match?(/#{regexp[i]}/i)
                             add = false
                             break 
                           end
@@ -297,10 +297,11 @@ class SlackSmartBot
                   message_new_users = "(#{new_users.size * 100 / users_month[k].uniq.size}%)"
                 end
                 all_users += users_month[k]
+                graph = ":large_yellow_square: " * (v.to_f * (10*rows_month.size) / total).round(2)
                 if on_dm_master
-                  message << "\t#{k}: #{v} (#{(v.to_f * 100 / total).round(2)}%) / #{commands_month[k].uniq.size} / #{users_month[k].uniq.size} #{message_new_users}"
+                  message << "\t#{k}: #{graph} #{v} (#{(v.to_f * 100 / total).round(2)}%) / #{commands_month[k].uniq.size} / #{users_month[k].uniq.size} #{message_new_users}"
                 else
-                  message << "\t#{k}: #{v} (#{(v.to_f * 100 / total).round(2)}%) / #{commands_month[k].uniq.size}"
+                  message << "\t#{k}: #{graph} #{v} (#{(v.to_f * 100 / total).round(2)}%) / #{commands_month[k].uniq.size}"
                 end
               end
             end
@@ -450,7 +451,8 @@ class SlackSmartBot
                 total_known = 0
                 tzone_users.each do |tzone, num|
                   unless tzone.to_s == ""
-                    message << "\t#{tzone}: #{num} (#{(num.to_f * 100 / total_without_routines).round(2)}%)"
+                    abb_tzone = tzone.split.map{|i| i[0,1].upcase}.join
+                    message << "\t#{abb_tzone} _#{tzone}_: #{num} (#{(num.to_f * 100 / total_without_routines).round(2)}%)"
                     total_known += num
                   end
                 end

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

@@ -24,6 +24,7 @@ class SlackSmartBot
   # help:     To pre-execute some ruby when starting the session add the code to .smart-bot-repl file on the project root folder defined on project_folder
   # help:     If you want to see the methods of a class or module you created use _ls TheModuleOrClass_
   # help:     You can supply the Environmental Variables you need for the Session
+  # help:     You can add collaborators by sending _add collaborator @USER_ to the session.
   # help:     Examples:
   # help:       _repl CreateCustomer LOCATION=spain HOST='https://10.30.40.50:8887'_
   # help:       _repl CreateCustomer: "It creates a random customer for testing" LOCATION=spain HOST='https://10.30.40.50:8887'_
@@ -61,7 +62,10 @@ class SlackSmartBot
           finished: Time.now,
           input: [],
           on_thread: Thread.current[:on_thread],
-          thread_ts: Thread.current[:thread_ts]
+          thread_ts: Thread.current[:thread_ts],
+          collaborators: [],
+          user_type: :creator,
+          user_creator: from
         }
 
         unless temp_repl
@@ -90,6 +94,7 @@ class SlackSmartBot
 
         message = "Session name: *#{session_name}*
         From now on I will execute all you write as a Ruby command and I will keep the session open until you send `quit` or `bye` or `exit`. 
+        In case you need someone to help you with the session you can add collaborators by sending `add collaborator @USER` to the session.
         I will respond with the result so it is not necessary you send `print`, `puts`, `p` or `pp` unless you want it as the output when calling `run repl`. 
         Use `p` to print a message raw, exacly like it is returned. 
         If you want to avoid a message to be treated by me, start the message with '-'. 
@@ -239,6 +244,9 @@ class SlackSmartBot
                   rescue
                   end
                 end
+                @repl_sessions[from][:collaborators].each do |collaborator|
+                  @repl_sessions.delete(collaborator)
+                end  
                 @repl_sessions.delete(from)
                 break
             end
@@ -280,24 +288,56 @@ class SlackSmartBot
           code.match?(/=?\s*(require|load)(\(|\s)/i)
 
           respond "Sorry I cannot run this due security reasons", dest
+        elsif code.match(/\A\s*add\s+collaborator\s+<@(\w+)>\s*\z/i)
+            collaborator = $1
+            user_info = @users.select{|u| u.id == collaborator or (u.key?(:enterprise_user) and u.enterprise_user.id == collaborator)}[-1]
+            collaborator_name = user_info.name
+            if @repl_sessions.key?(collaborator_name)
+              respond "Sorry, <@#{collaborator}> is already in a repl. Please ask her/him to quit it first.", dest
+            else
+              respond "Collaborator added. Now <@#{collaborator}> can interact with this repl.", dest
+              creator = @repl_sessions[from][:user_creator]
+              @repl_sessions[creator][:collaborators] << collaborator_name
+              @repl_sessions[collaborator_name] = {
+                name: @repl_sessions[from][:name],
+                dest: dest,
+                on_thread: Thread.current[:on_thread],
+                thread_ts: Thread.current[:thread_ts],
+                user_type: :collaborator,
+                user_creator: creator
+              }    
+            end
         else
-          @repl_sessions[from][:input]<<code
+          if @repl_sessions[from][:user_type] == :collaborator
+            @repl_sessions[@repl_sessions[from][:user_creator]][:input] << code
+          else
+            @repl_sessions[from][:input] << code
+          end
           case code
-          when /^\s*(quit|exit|bye|bye bot)\s*$/i
-            open("#{config.path}/repl/#{@channel_id}/#{@repl_sessions[from][:name]}.input", 'a+') {|f|
-              f.puts code
-            }
-            respond "REPL session finished: #{@repl_sessions[from][:name]}", dest
-            unreact :running, @ts_react[@repl_sessions[from].name]
-            pids = `pgrep -P #{@repl_sessions[from][:pid]}`.split("\n").map(&:to_i) #todo: it needs to be adapted for Windows
-            pids.each do |pid|
-              begin
-                Process.kill("KILL", pid)
-              rescue
+          when /^\s*(quit|exit|bye|bye\s+bot)\s*$/i
+            if @repl_sessions[from][:user_type] == :collaborator
+              respond "Collaborator <@#{user.id}> removed.", dest
+              @repl_sessions[@repl_sessions[from][:user_creator]][:collaborators].delete(from)
+              @repl_sessions.delete(from)
+            else
+              open("#{config.path}/repl/#{@channel_id}/#{@repl_sessions[from][:name]}.input", 'a+') {|f|
+                f.puts code
+              }
+              respond "REPL session finished: #{@repl_sessions[from][:name]}", dest
+              unreact :running, @ts_react[@repl_sessions[from].name]
+              pids = `pgrep -P #{@repl_sessions[from][:pid]}`.split("\n").map(&:to_i) #todo: it needs to be adapted for Windows
+              pids.each do |pid|
+                begin
+                  Process.kill("KILL", pid)
+                rescue
+                end
+              end
+              @repl_sessions[from][:collaborators].each do |collaborator|
+                @repl_sessions.delete(collaborator)
               end
+              @repl_sessions.delete(from)
             end
-            @repl_sessions.delete(from)
-          when /^\s*-/i
+          when /\A\s*-/i
             #ommit
           else
             if @ts_repl[@repl_sessions[from].name].to_s == ''

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

@@ -28,7 +28,8 @@ class SlackSmartBot
         respond "Running", dest if code.size > 200
 
         begin
-          code.gsub!(/^\W*$/, "") #to remove special chars from slack when copy/pasting
+          #todo: check. Commented next line because it was causing problems with the code, for the case the line was for example any of these chars: { } [ ] ( ) < > | & ; $ ` " ' \ * ? ~ # = ! ^ -
+          #code.gsub!(/^\W*$/, "") #to remove special chars from slack when copy/pasting
           code.gsub!('$','\$') #to take $ as literal, fex: puts '$lolo' => puts '\$lolo'
           ruby = "ruby -e \"#{code.gsub('"', '\"')}\""
           if defined?(project_folder) and project_folder.to_s != "" and Dir.exist?(project_folder)

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

@@ -36,6 +36,7 @@ require_relative "commands/on_extended/bot_rules"
 require_relative "commands/on_bot/admin_master/get_bot_logs"
 require_relative "commands/on_bot/admin_master/send_message"
 require_relative "commands/on_bot/admin_master/delete_message"
+require_relative "commands/on_bot/admin_master/update_message"
 require_relative "commands/on_bot/admin_master/react_to"
 require_relative "commands/on_bot/general/bot_stats"
 require_relative "commands/on_bot/general/leaderboard"
@@ -63,6 +64,7 @@ require_relative "commands/general/add_team"
 require_relative "commands/general/add_memo_team"
 require_relative "commands/general/set_memo_status"
 require_relative "commands/general/delete_memo_team"
+require_relative "commands/general/see_memos_team"
 require_relative "commands/general/see_teams"
 require_relative "commands/general/update_team"
 require_relative "commands/general/ping_team"
@@ -71,3 +73,5 @@ require_relative "commands/general/add_vacation"
 require_relative "commands/general/remove_vacation"
 require_relative "commands/general/see_vacations"
 require_relative "commands/general/see_vacations_team"
+require_relative "commands/general/public_holidays"
+require_relative "commands/general/set_public_holidays"

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

@@ -5,7 +5,7 @@ class SlackSmartBot
     @last_activity_check = Time.now
     get_bots_created()
     @buffer_complete = [] unless defined?(@buffer_complete)
-    b = File.read("#{config.path}/buffer_complete.log")
+    b = File.read("#{config.path}/buffer_complete.log", encoding: "UTF-8")
     result = b.scan(/^\|(\w+)\|(\w+)\|(\w+)\|([^~]+)~~~/m)
     result.delete(nil)
     new_messages = result[@buffer_complete.size..-1]