slack-smart-bot 1.14.2 → 1.15.1

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

@@ -21,8 +21,8 @@ class SlackSmartBot
                           elsif el.type == 'user'
                             data_text += "<@#{el.user_id}>"
                           elsif el.type == 'channel'
-                            tch = data.text.scan(/(<##{el.channel_id}\|[^\>]*>)/).join
-                            data_text += tch
+                            tch = data.text.scan(/(<##{el.channel_id}\|[^\>]*>)/).flatten.first
+                            data_text += tch.to_s
                           else
                             data_text += el.url
                           end
@@ -41,22 +41,22 @@ class SlackSmartBot
         end
         data.text.gsub!('‘', "'")
         data.text.gsub!('’', "'")
-        data.text.gsub!('“', '"') 
+        data.text.gsub!('“', '"')
         data.text.gsub!('”', '"')
       rescue Exception => exc
         @logger.warn "Impossible to unescape or clean format for data.text:#{data.text}"
         @logger.warn exc.inspect
       end
-      
+
       unless data.key?(:routine)
-        data.routine = false 
+        data.routine = false
         data.routine_name = ''
         data.routine_type = ''
       end
       if config[:testing] and config.on_master_bot and !@buffered
         @buffered = true
         open("#{config.path}/buffer.log", "a") { |f|
-          f.puts "|#{data.channel}|#{data.user}|#{data.user_name}|#{data.text}"
+          f.puts "|#{data.channel}|#{data.thread_ts}|#{data.user}|#{data.user_name}|#{data.text}"
         }
       end
       if data.key?(:dest) and data.dest.to_s!='' # for run routines and publish on different channels
@@ -80,38 +80,51 @@ class SlackSmartBot
           end
         end
       end
-      
       if !dest.nil? and config.on_master_bot and !data.text.nil? and data.text.match(/^ping from (.+)\s*$/) and data.user == config[:nick_id]
         @pings << $1
       end
-      if config.on_master_bot and @vacations_check != Date.today
-        @vacations_check = Date.today
+      if config.on_master_bot and @vacations_check != Time.now.strftime("%Y%m%d%H") #every hour since depends on user's time zone
+        @vacations_check = Time.now.strftime("%Y%m%d%H")
         t = Thread.new do
-          check_vacations(only_first_day: true)
+          check_vacations(date: nil, only_first_day: true)
         end
       end
       typem = :dont_treat
+
+      @users = get_users() if @users.empty?
+      if data.key?(:bot_id) and data.bot_id.to_s!=''
+        if @slack_bots.key?(data.bot_id) #bot or workflow
+          data.user = @slack_bots[data.bot_id]
+        else
+          bot_info = get_user_info(data.bot_id, is_bot: true)
+          unless bot_info.nil? or bot_info.empty?
+              @slack_bots[data.bot_id] = bot_info.user.id
+              data.user = bot_info.user.id
+              @users << bot_info.user unless bot_info.nil? or bot_info.empty?
+          end
+        end
+      end
       if data.nil? or data.user.nil? or data.user.to_s==''
         user_info = nil
-        @users = get_users() if @users.empty?
       else
-        #todo: when changed @questions user_id then move user_info inside the ifs to avoid calling it when not necessary
-        user_info = @users.select{|u| u.id == data.user or (u.key?(:enterprise_user) and u.enterprise_user.id == data.user)}[-1]
-        if user_info.nil? or user_info.empty?
-          @users = get_users() 
-          user_info = @users.select{|u| u.id == data.user or (u.key?(:enterprise_user) and u.enterprise_user.id == data.user)}[-1]
+        user_info = find_user(data.user, get_sso_user_name: true)
+        if user_info.nil?
+          @logger.warn "User not found on users with id #{data.user} and user_team #{data.user_team}"
+        elsif !user_info.key?(:team_id) or user_info.team_id.to_s.empty?
+          @logger.warn "User with id #{data.user} and user_team #{data.user_team} has no team_id. User_info: #{user_info.inspect}"
         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 
+        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
         end
         #todo: we need to add mixed channels: @smart-bot on private1 #bot1cm <#CXDDFRDDF|bot2cu>: echo A
         if data.text.match(/\A\^\^+/) # to open a thread it will be only when starting by single ^
           typem = :dont_treat
-        elsif data.text.match(/^\s*<@#{config[:nick_id]}>\s+(on\s+)?((<#\w+\|[^>]*>\s*)+)\s*:?\s*(.*)/im) or 
+        elsif data.text.match(/^\s*<@#{config[:nick_id]}>\s+(on\s+)?((<#\w+\|[^>]*>\s*)+)\s*:?\s*(.*)/im) or
           data.text.match(/^\s*<@#{config[:nick_id]}>\s+(on\s+)?((#[a-zA-Z0-9\-\_]+\s*)+)\s*:?\s*(.*)/im) or
           data.text.match(/^\s*<@#{config[:nick_id]}>\s+(on\s+)?(([a-zA-Z0-9\-\_]+\s*)+)\s*:\s*(.*)/im)
           channels_rules = $2 #multiple channels @smart-bot on #channel1 #channel2 echo AAA
@@ -132,10 +145,10 @@ class SlackSmartBot
           else
             channels_arr.each do |row|
               row[0] = @channels_id[row[1]] if row[0] == ''
-              row[1] = @channels_name[row[0]] if row[1] == ''              
+              row[1] = @channels_name[row[0]] if row[1] == ''
             end
           end
-          
+
           # to be treated only on the bots of the requested channels
           channels_arr.each do |tcid, tcname|
             if @channel_id == tcid
@@ -163,9 +176,9 @@ class SlackSmartBot
           end
         elsif data.channel[0] == "D" #Direct message
           get_rules_imported()
-          if @rules_imported.key?(user_info.name) && @rules_imported[user_info.name].key?(user_info.name) and
-            @bots_created.key?(@rules_imported[user_info.name][user_info.name])
-            if @channel_id == @rules_imported[user_info.name][user_info.name]
+          if @rules_imported.key?("#{user_info.team_id}_#{user_info.name}") && @rules_imported["#{user_info.team_id}_#{user_info.name}"].key?(user_info.name) and
+            @bots_created.key?(@rules_imported["#{user_info.team_id}_#{user_info.name}"][user_info.name])
+            if @channel_id == @rules_imported["#{user_info.team_id}_#{user_info.name}"][user_info.name]
               #only to be treated by the channel we are 'using'
               typem = :on_dm
             end
@@ -204,46 +217,61 @@ class SlackSmartBot
       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")
       eval(File.new(config.path + config.rules_file).read) if !defined?(rules) and File.exist?(config.path+config.rules_file) and !config.rules_file.empty?
       unless typem == :dont_treat or user_info.nil?
-        if (Time.now - @last_activity_check) > 60 * 30 #every 30 minutes
+        if (Time.now - @last_activity_check) > TIMEOUT_LISTENING #every 30 minutes
           @last_activity_check = Time.now
           @listening.each do |k,v|
-            v.each do |kk, vv|
-              @listening[k].delete(kk) if (Time.now - vv) > 60 * 30
+            unless k == :threads
+              v.each do |kk, vv|
+                if (Time.now - vv) > TIMEOUT_LISTENING
+                  if @listening[:threads].key?(kk) && @active_chat_gpt_sessions.key?(k) &&
+                    @active_chat_gpt_sessions[k].key?(kk)
+                    unreact :running, kk, channel: @listening[:threads][kk]
+                    session_name = @active_chat_gpt_sessions[k][kk]
+                    chatgpt_message = "ChatGPT session has been terminated due to inactivity."
+                    if !session_name.to_s.empty?
+                      chatgpt_message += "\n\nIf you want to start it again on this thread call `chatgpt #{session_name}`"
+                    end
+                    respond chatgpt_message, @listening[:threads][kk], thread_ts: kk
+                    @listening[:threads].delete(kk)
+                  end
+                  @listening[k].delete(kk)
+                end
+              end
+              @listening.delete(k) if @listening[k].empty?
             end
-            @listening.delete(k) if @listening[k].empty?
           end
         end
         begin
           #user_info.id = data.user #todo: remove this line when slack issue with Wxxxx Uxxxx fixed
           data.user = user_info.id  #todo: remove this line when slack issue with Wxxxx Uxxxx fixed
-          if data.thread_ts.nil?
+          team_id_user = "#{user_info.team_id}_#{user_info.name}"
+          if data.thread_ts.to_s.empty?
             qdest = dest
           else
             qdest = data.thread_ts
           end
-          if !answer(user_info.name, qdest).empty?
+          if !answer(user_info, qdest).empty?
             if data.text.match?(/\A\s*(Bye|Bæ|Good\sBye|Adiós|Ciao|Bless|Bless\sBless|Adeu)\s(#{@salutations.join("|")})\s*$/i)
-              answer_delete(user_info.name, qdest)
+              answer_delete(user_info, qdest)
               command = data.text
             else
-              command = answer(user_info.name, qdest)
-              @answer[user_info.name][qdest] = data.text
-              @questions[user_info.name] = data.text # to be backwards compatible #todo remove it when 2.0
+              command = answer(user_info, qdest)
+              @answer[team_id_user][qdest] = data.text
+              @questions[team_id_user] = data.text # to be backwards compatible #todo remove it when 2.0
             end
-          elsif @repl_sessions.key?(user_info.name) and data.channel==@repl_sessions[user_info.name][:dest] and 
-            ((@repl_sessions[user_info.name][:on_thread] and data.thread_ts == @repl_sessions[user_info.name][:thread_ts]) or
-            (!@repl_sessions[user_info.name][:on_thread] and data.thread_ts.to_s == '' ))
-            
+          elsif @repl_sessions.key?(team_id_user) and data.channel==@repl_sessions[team_id_user][:dest] and
+            ((@repl_sessions[team_id_user][:on_thread] and data.thread_ts == @repl_sessions[team_id_user][:thread_ts]) or
+            (!@repl_sessions[team_id_user][:on_thread] and data.thread_ts.to_s == '' ))
+
             if data.text.match(/^\s*```(.*)```\s*$/im)
-                @repl_sessions[user_info.name][:command] = $1
-            else   
-              @repl_sessions[user_info.name][:command] = data.text
+                @repl_sessions[team_id_user][:command] = $1
+            else
+              @repl_sessions[team_id_user][:command] = data.text
             end
             command = 'repl'
           else
             command = data.text
           end
-
           #when added special characters on the message
           if command.match(/\A\s*```(.*)```\s*\z/im)
             command = $1
@@ -291,16 +319,16 @@ class SlackSmartBot
                 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, command_orig)
             # if @botname on #channel_rules: do something
-          elsif typem == :on_pub or typem == :on_pg
+          elsif (typem == :on_pub or typem == :on_pg) and command.size > 0 and command[0] != "-"
             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
         end
-
       else
-        @logger.warn "Pay attention there is no user on users with id #{data.user}" if user_info.nil? and data.user.to_s!=''
+        if user_info.nil? and data.user.to_s!=''
+          @logger.warn "Pay attention there is no user on users with id #{data.user}"
+        end
         if !config.on_master_bot and !dest.nil? and (data.channel == @master_bot_id or dest[0] == "D") and
           data.text.match?(/^\s*(!|!!|\^)?\s*bot\s+status\s*$/i) and @admin_users_id.include?(data.user)
           respond "ping from #{config.channel}", dest
@@ -342,7 +370,7 @@ class SlackSmartBot
                 end
               end
             end
-            
+
           when /^Bot has been (closed|killed) by/i
             sleep 2
             get_bots_created()
@@ -379,6 +407,10 @@ class SlackSmartBot
               end
             end
             if @status == :exit
+              @listening[:threads].each do |thread_ts, channel_thread|
+                unreact :running, thread_ts, channel: channel_thread
+                respond "ChatGPT session closed since SmartBot is going to be closed", channel_thread, thread_ts: thread_ts
+              end
               @logger.info 'Game over!'
               sleep 3
               exit!
@@ -388,7 +420,7 @@ class SlackSmartBot
       end
       unless data.nil? or data.channel.nil? or data.channel.empty?
         @announcements_activity_after[data.channel] ||= 0
-        @announcements_activity_after[data.channel] += 1 
+        @announcements_activity_after[data.channel] += 1
       end
     rescue Exception => stack
       @logger.fatal stack

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

@@ -1,5 +1,14 @@
 class SlackSmartBot
-    def answer(from = Thread.current[:user].name, dest = Thread.current[:dest])
+    def answer(user = Thread.current[:user], dest = Thread.current[:dest])
+        if user.is_a?(String)
+            if user.match?(/^[A-Z0-9]{7,11}_/)
+                from = user
+            else
+                from = "#{config.team_id}_#{user}"
+            end
+        else
+            from = "#{user.team_id}_#{user.name}"
+        end
         if @answer.key?(from)
             if Thread.current[:on_thread]
                 dest = Thread.current[:thread_ts]
@@ -13,6 +22,5 @@ class SlackSmartBot
             return ''
         end
     end
-  
+
   end
-  

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

@@ -1,5 +1,14 @@
 class SlackSmartBot
-    def answer_delete(from = Thread.current[:user].name, dest = Thread.current[:dest])
+    def answer_delete(user = Thread.current[:user], dest = Thread.current[:dest])
+        if user.is_a?(String)
+            if user.match?(/^[A-Z0-9]{7,11}_/)
+                from = user
+            else
+                from = "#{config.team_id}_#{user}"
+            end
+        else
+            from = "#{user.team_id}_#{user.name}"
+        end
         if @answer.key?(from)
             if Thread.current[:on_thread]
                 dest = Thread.current[:thread_ts]
@@ -10,6 +19,5 @@ class SlackSmartBot
             @questions.delete(from) # to be backwards compatible #todo: remove when 2.0
         end
     end
-  
+
   end
-  

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

@@ -1,15 +1,33 @@
 class SlackSmartBot
-  def check_vacations(date: Date.today, user: nil, set_status: true, only_first_day: true)
+  def check_vacations(date: Date.today, team_id: nil, user: nil, set_status: true, only_first_day: true)
     get_vacations()
     if user.nil?
       users = @vacations.keys
     else
-      users = [user]
+      users = ["#{team_id}_#{user}"]
     end
-    on_vacation = []
+    on_vacation = []    
+    
     users.each do |user|
       type = nil
       expiration = nil
+
+      if date.nil?
+        if @vacations.key?(user) and @vacations[user][:public_holidays].to_s != ""
+          country_region = @vacations[user][:public_holidays].downcase
+        elsif config[:public_holidays].key?(:default_calendar)
+          country_region = config[:public_holidays][:default_calendar].downcase
+        else
+          country_region = ''
+        end
+    
+        local_day_time = local_time(country_region)
+        if local_day_time.nil?
+          date = Date.today
+        else
+          date = local_day_time.to_date
+        end
+      end
       @vacations[user].periods ||= []
       @vacations[user].periods.each do |p|
         if only_first_day and p.from == date.strftime("%Y/%m/%d")

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

@@ -7,7 +7,7 @@ class SlackSmartBot
         started = Time.now
         if @status == :on and @routines[@channel_id][name][:status] == :on
           if !@routines[@channel_id][name].key?(:creator_id) or @routines[@channel_id][name][:creator_id].to_s == ''
-            user_info = @users.select{|u| u.name == @routines[@channel_id][name][:creator]}[-1]
+            user_info = find_user(@routines[@channel_id][name][:creator])
             @routines[@channel_id][name][:creator_id] = user_info.id unless user_info.nil? or user_info.empty?
           end
           @logger.info "Routine #{name}: #{@routines[@channel_id][name].inspect}"
@@ -20,11 +20,11 @@ class SlackSmartBot
           if @routines[@channel_id][name][:at] == "" or
              (@routines[@channel_id][name][:at] != "" and @routines[@channel_id][name][:running] and
               @routines[@channel_id][name][:next_run] != "" and Time.now.to_s >= @routines[@channel_id][name][:next_run])
-              
-            if !@routines[@channel_id][name].key?(:dayweek) or 
+
+            if !@routines[@channel_id][name].key?(:dayweek) or
               (@routines[@channel_id][name].key?(:dayweek) and @routines[@channel_id][name][:dayweek].to_s!='weekday' and @routines[@channel_id][name][:dayweek].to_s!='weekend') or
               (@routines[@channel_id][name].key?(:dayweek) and @routines[@channel_id][name][:dayweek].to_s=='weekday' and Date.today.wday>=1 and Date.today.wday<=5) or
-              (@routines[@channel_id][name].key?(:dayweek) and @routines[@channel_id][name][:dayweek].to_s=='weekend' and (Date.today.wday==6 or Date.today.wday==0)) 
+              (@routines[@channel_id][name].key?(:dayweek) and @routines[@channel_id][name][:dayweek].to_s=='weekend' and (Date.today.wday==6 or Date.today.wday==0))
               File.delete "#{config.path}/routines/#{@channel_id}/#{name}_output.txt" if File.exist?("#{config.path}/routines/#{@channel_id}/#{name}_output.txt")
               if @routines[@channel_id][name][:file_path] != ""
                 process_to_run = "#{ruby}#{Dir.pwd}#{@routines[@channel_id][name][:file_path][1..-1]}"
@@ -90,7 +90,7 @@ class SlackSmartBot
               end
               @routines[@channel_id][name][:last_run] = started.to_s
             elsif (@routines[@channel_id][name].key?(:dayweek) and @routines[@channel_id][name][:dayweek].to_s=='weekday' and (Date.today.wday==6 or Date.today.wday==0)) or
-              (@routines[@channel_id][name].key?(:dayweek) and @routines[@channel_id][name][:dayweek].to_s=='weekend' and Date.today.wday>=1 and Date.today.wday<=5) 
+              (@routines[@channel_id][name].key?(:dayweek) and @routines[@channel_id][name][:dayweek].to_s=='weekend' and Date.today.wday>=1 and Date.today.wday<=5)
               @routines[@channel_id][name][:last_run] = started.to_s
             end
           end
@@ -116,27 +116,27 @@ class SlackSmartBot
               end
               days = (next_time - Date.today).to_i
               every_in_seconds = Time.parse(@routines[@channel_id][name][:next_run]) - Time.now
-            elsif @routines[@channel_id][name].key?(:dayweek) and @routines[@channel_id][name][:dayweek].to_s!='' and 
+            elsif @routines[@channel_id][name].key?(:dayweek) and @routines[@channel_id][name][:dayweek].to_s!='' and
               @routines[@channel_id][name][:dayweek].to_s!='weekend' and @routines[@channel_id][name][:dayweek].to_s!='weekday'
-              
+
               day = @routines[@channel_id][name][:dayweek]
               days = ['sunday','monday','tuesday','wednesday','thursday','friday','saturday']
               incr = days.index(day) - Time.now.wday
-              if incr < 0 
+              if incr < 0
                 incr = (7+incr)*24*60*60
               else
                 incr = incr * 24 * 60 * 60
               end
               days = incr/(24*60*60)
               weekly = true
-            elsif @routines[@channel_id][name].key?(:dayweek) and @routines[@channel_id][name][:dayweek].to_s!='' and 
+            elsif @routines[@channel_id][name].key?(:dayweek) and @routines[@channel_id][name][:dayweek].to_s!='' and
               @routines[@channel_id][name][:dayweek].to_s=='weekend'
-              
+
               weekly = false
               days = 0
-            elsif @routines[@channel_id][name].key?(:dayweek) and @routines[@channel_id][name][:dayweek].to_s!='' and 
+            elsif @routines[@channel_id][name].key?(:dayweek) and @routines[@channel_id][name][:dayweek].to_s!='' and
               @routines[@channel_id][name][:dayweek].to_s=='weekday'
-              
+
               weekly = false
               days = 0
             else
@@ -147,7 +147,7 @@ class SlackSmartBot
             if started.strftime("%H:%M:%S") < @routines[@channel_id][name][:at] and days == 0
               nt = @routines[@channel_id][name][:at].split(":")
               next_run = Time.new(started.year, started.month, started.day, nt[0], nt[1], nt[2])
-            else 
+            else
               if days == 0 and started.strftime("%H:%M:%S") >= @routines[@channel_id][name][:at]
                 if weekly
                     days = 7

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

@@ -5,8 +5,13 @@ class SlackSmartBot
     elsif config[:public_holidays].key?(:default_calendar) and country_region.empty?
       country_region = config[:public_holidays][:default_calendar].downcase
     end
-
     country, location = country_region.split("/")
+    local_day_time = local_time(country_region)
+    if local_day_time.nil?
+      today = Date.today
+    else
+      today = local_day_time.to_date
+    end
     public_holidays(country.to_s, location.to_s, year, "", "", add_stats: false, publish_results: false)
     if from_user_name.empty?
       messages = ["*Calendar #{year} #{country_region}*"]
@@ -39,7 +44,11 @@ class SlackSmartBot
             vacations_set = false
             public_holiday_set = false
             if phd.include?(date_text)
-              month_line += ":large_red_square: "
+              if date == today
+                month_line += ":large_red_circle: "
+              else
+                month_line += ":large_red_square: "
+              end
               public_holiday_set = true
             end
             if !public_holiday_set
@@ -47,11 +56,23 @@ class SlackSmartBot
                 @vacations[from_user_name][:periods].each do |period|
                   if date >= Date.parse(period[:from]) and date <= Date.parse(period[:to])
                     if period[:type] == "sick"
-                      month_line += ":face_with_thermometer: "
+                      if date == today
+                        month_line += ":thermometer: "
+                      else
+                        month_line += ":face_with_thermometer: "
+                      end
                     elsif period[:type] == "sick child"
-                      month_line += ":baby: "
+                      if date == today
+                        month_line += ":baby_bottle: "
+                      else
+                        month_line += ":baby: "
+                      end
                     elsif period[:type] == "vacation"
-                      month_line += ":palm_tree: "
+                      if date == today
+                        month_line += ":evergreen_tree: "
+                      else
+                        month_line += ":palm_tree: "
+                      end
                       if wday <= 5
                         days_of_vacations += 1
                       end
@@ -63,9 +84,17 @@ class SlackSmartBot
               end
               if !vacations_set
                 if wday == 6 || wday == 7
-                  month_line += ":large_yellow_square: "
+                  if date == today
+                    month_line += ":large_yellow_circle: "
+                  else
+                    month_line += ":large_yellow_square: "
+                  end
                 else
-                  month_line += ":white_square: "
+                  if date == today
+                    month_line += ":white_circle: "
+                  else
+                    month_line += ":white_square: "
+                  end
                 end
               end
             end
@@ -80,7 +109,12 @@ class SlackSmartBot
     if !from_user_name.empty?
       messages << "\n\n:large_yellow_square: weekend / :white_square: weekday / :white_small_square: not in month / :large_red_square: Public Holiday / :palm_tree: Vacation / :face_with_thermometer: Sick / :baby: Sick child"
       if country_region != ""
-        messages << "Your public holidays are set for #{country_region.downcase}. Call `set public holidays to COUNTRY/REGION` if you want to change it.\n"
+        if local_day_time.nil?
+          local_str = "local time not found"
+        else
+          local_str = local_day_time.strftime("%Y-%m-%d %H:%M")
+        end
+        messages << "Your public holidays are set for #{country_region.downcase} (#{local_str}). Call `set public holidays to COUNTRY/REGION` if you want to change it.\n"
       else
         messages << "Your public holidays are not set. Call `set public holidays to COUNTRY/REGION` to set it.\n"
       end

data/lib/slack/smart-bot/utils/encryption/decrypt.rb

@@ -2,17 +2,24 @@ class SlackSmartBot
   module Utils
     module Encryption
       def self.decrypt(data, config)
-        if config.encrypt
+        if config.encrypt or (config.key?(:recover_encrypted) and config[:recover_encrypted])
           require "openssl"
           require "base64"
-
-          key, iv = Utils::Encryption.encryption_get_key_iv(config)
-          encrypted = Base64.decode64(data)
-          cipher = OpenSSL::Cipher.new("AES-256-CBC")
-          cipher.decrypt
-          cipher.key = key
-          cipher.iv = iv
-          plain = cipher.update(encrypted) + cipher.final
+          if data == ''
+            plain = ''
+          else
+            begin
+              key, iv = Utils::Encryption.encryption_get_key_iv(config)
+              encrypted = Base64.decode64(data)
+              cipher = OpenSSL::Cipher.new("AES-256-CBC")
+              cipher.decrypt
+              cipher.key = key
+              cipher.iv = iv
+              plain = cipher.update(encrypted) + cipher.final
+            rescue Exception => stack
+              return data
+            end
+          end            
           return plain
         else
           return data

data/lib/slack/smart-bot/utils/encryption/encrypt.rb

@@ -5,17 +5,20 @@ class SlackSmartBot
         if config.encrypt
           require "openssl"
           require "base64"
-
-          key, iv = Utils::Encryption.encryption_get_key_iv(config)
-          cipher = OpenSSL::Cipher::Cipher.new "AES-256-CBC"
-          cipher.encrypt
-          cipher.key = key
-          cipher.iv = iv
-          encrypted = cipher.update(data) + cipher.final
-          encrypted = Base64.encode64(encrypted)
-          if defined?(Thread.current)
-            Thread.current[:encrypted] ||= []
-            Thread.current[:encrypted] << data
+          if data == ''
+            encrypted = ''
+          else
+            key, iv = Utils::Encryption.encryption_get_key_iv(config)
+            cipher = OpenSSL::Cipher::Cipher.new "AES-256-CBC"
+            cipher.encrypt
+            cipher.key = key
+            cipher.iv = iv
+            encrypted = cipher.update(data) + cipher.final
+            encrypted = Base64.encode64(encrypted)
+            if defined?(Thread.current)
+              Thread.current[:encrypted] ||= []
+              Thread.current[:encrypted] << data
+            end
           end
           return encrypted
         else

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

@@ -0,0 +1,71 @@
+class SlackSmartBot
+  def find_user(user, get_sso_user_name: false)
+    @users = get_users() if @users.empty?
+    userh = { id: "", name: "" }
+    user_info = nil
+    if user.to_s.length > 0 and user != "@"
+      if user[0] == "@" #name
+        user = user[1..-1]
+        is_name = true
+      else
+        is_name = false
+      end
+      if user.match?(/^[A-Z0-9]{7,11}_/) #team_id_user_name
+        team_id = user.split("_")[0]
+        user = user.split("_")[1..-1].join("_")
+        is_name = true
+      else
+        team_id = config.team_id
+        is_name = false
+      end
+
+      if is_name
+        userh[:name] = user
+      elsif user.match?(/[a-z]/)
+        # if not is name and user contains any downcase letter, then we guess it is a name
+        userh[:name] = user
+      else
+        userh[:id] = user
+      end
+      user_info = @users.select { |u|
+        # for user id we don't check team_id as for the moment according to Slack API, user id is unique
+        ((userh[:id].to_s != "" and u.id == userh[:id]) or (u.key?(:enterprise_user) and u.enterprise_user.id == userh[:id])) or
+        ((userh[:name].to_s != "" and u.name == userh[:name] and u.team_id == team_id) or (u.key?(:enterprise_user) and u.enterprise_user.name == userh[:name] and u.enterprise_user.enterprise_id == team_id))
+      }[-1]
+
+      if user_info.nil? #other workspace
+        user_info = get_user_info(user)
+        unless user_info.nil? or user_info.empty?
+          @users << user_info.user
+          user_info = @users.select { |u|
+            # for user id we don't check team_id as for the moment according to Slack API, user id is unique
+            ((userh[:id].to_s != "" and u.id == userh[:id]) or (u.key?(:enterprise_user) and u.enterprise_user.id == userh[:id])) or
+            ((userh[:name].to_s != "" and u.name == userh[:name] and u.team_id == team_id) or (u.key?(:enterprise_user) and u.enterprise_user.name == userh[:name] and u.enterprise_user.enterprise_id == team_id))
+          }[-1]
+        end
+      end
+    end
+    if get_sso_user_name and defined?(@ldap) and !@ldap.nil? and !user_info.nil? and user_info[:sso_user_name].to_s.empty? and !user_info[:profile].email.to_s.empty?
+      begin
+        if @ldap.bind
+          email = user_info[:profile].email
+          filter1 = Net::LDAP::Filter.eq("mail", email)
+          filter2 = Net::LDAP::Filter.eq("mailAlternateAddress", email)
+          filter3 = Net::LDAP::Filter.eq("mail", email.gsub(/@.+$/, ""))
+          filter4 = Net::LDAP::Filter.eq("mailAlternateAddress", email.gsub(/@.+$/, ""))
+          filter = filter1 | filter2 | filter3 | filter4
+          @ldap.search(:base => config.ldap.treebase, :filter => filter) do |entry|
+            user_info[:sso_user_name] = entry.uid[0]
+          end
+        end
+      rescue => exception
+        if defined?(@logger)
+          @logger.fatal exception
+        else
+          puts exception
+        end
+      end
+    end
+    return user_info
+  end
+end