slack-smart-bot 1.14.2 → 1.15.1

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

@@ -3,20 +3,37 @@ class SlackSmartBot
     save_stats(__method__) if add_stats
 
     get_vacations()
-    
+    team_id_user = "#{user.team_id}_#{user.name}"
+
     from_user_name = ''
-    year = Date.today.year if year.to_s == ''
 
     if from_user.empty?
-      from_user_name = user.name
+      from_user_name = team_id_user
     else
-      @users = get_users() if @users.empty?
-      user_info = @users.select{|u| u.id == from_user or (u.key?(:enterprise_user) and u.enterprise_user.id == from_user)}[-1]
-      from_user_name = user_info.name
+      user_info = find_user(from_user)
+      from_user_name = "#{user_info.team_id}_#{user_info.name}"
     end
-    from_user = '' if from_user_name == user.name
+
+    if @vacations.key?(from_user_name) and @vacations[from_user_name][:public_holidays].to_s != ""
+      country_region = @vacations[from_user_name][: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?
+      today = Date.today
+    else
+      today = local_day_time.to_date
+    end
+    year = today.year.to_s if year.to_s == ''
+
+    from_user = '' if from_user_name == team_id_user
     if !@vacations.key?(from_user_name) or !@vacations[from_user_name].key?(:periods) or @vacations[from_user_name].periods.empty?
       if from_user.empty?
+        display_calendar(from_user_name, year) if dest[0] == 'D'
         respond "You didn't add any time off yet. Use `add vacation from YYYY/MM/DD to YYYY/MM/DD`"
       else
         respond "No time off added yet for <@#{from_user}>"
@@ -24,27 +41,27 @@ class SlackSmartBot
     else
       messages = []
       messages << "*Time off <@#{from_user}> #{year}*" if !from_user.empty?
-      
-      display_calendar(from_user_name, year) if from_user_name == user.name and dest[0] == 'D'
 
-      today = Date.today.strftime("%Y/%m/%d")
+      display_calendar(from_user_name, year) if from_user_name == team_id_user and dest[0] == 'D'
+
+      today_txt = today.strftime("%Y/%m/%d")
       current_added = false
       past_added = false
       @vacations[from_user_name].periods.sort_by { |v| v[:from]}.reverse.each do |vac|
-        if !current_added and vac.to >= today 
-          messages << "*Current and future periods*" 
+        if !current_added and vac.to >= today_txt
+          messages << "*Current and future periods*"
           current_added = true
         end
-        if !past_added and vac.to < today and from_user.empty? and vac.to[0..3] == year
+        if !past_added and vac.to < today_txt and from_user.empty? and vac.to[0..3] == year
           if dest[0]=='D'
-            messages << "\n*Past periods #{year}*" 
+            messages << "\n*Past periods #{year}*"
             past_added = true
           else
             messages << "To see past periods call me from a DM"
             break
           end
         end
-        unless !from_user.empty? and vac.to < today
+        unless !from_user.empty? and vac.to < today_txt
           if vac.to[0..3] == year
             if !from_user.empty?
               icon = ":beach_with_umbrella:"
@@ -63,13 +80,13 @@ class SlackSmartBot
           end
         end
       end
-      if !past_added and !current_added and dest[0]=='D' 
+      if !past_added and !current_added and dest[0]=='D'
         if from_user.empty?
           messages << "No time off added yet for #{year}"
         else
           messages << "Not possible to see past periods for another user"
         end
-      elsif !past_added and dest[0]=='D' and !from_user.empty? and from_user_name != user.name
+      elsif !past_added and dest[0]=='D' and !from_user.empty? and from_user_name != team_id_user
         messages << "Not possible to see past periods for another user"
       end
       respond messages.join("\n")

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

@@ -4,6 +4,7 @@ class SlackSmartBot
 
     result = public_holidays(country, state, Date.today.year.to_s, '', '', add_stats: false, publish_results: false)
     if result == true
+        team_id_user = "#{user.team_id}_#{user.name}"
         if state == ""
             country_region = country
         else
@@ -15,9 +16,10 @@ class SlackSmartBot
           respond "Public holidays for *#{country_region}* set."
         end
         get_vacations()
-        @vacations[user.name] ||= {}
-        @vacations[user.name][:public_holidays] = country_region
+        @vacations[team_id_user] ||= {}
+        @vacations[team_id_user][:public_holidays] = country_region
         update_vacations()
+        check_vacations(date: nil, team_id: user.team_id, user: user.name, set_status: true, only_first_day: false)
     else
         respond "Be sure the country and state are correct. If not displayed available states, try with the country only."
     end

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

@@ -25,7 +25,7 @@ class SlackSmartBot
               type = :reaction
             end
             if File.exist?("#{config.path}/shares/#{from_channel}.csv")
-              t = CSV.table("#{config.path}/shares/#{from_channel}.csv", headers: ['share_id', 'user_deleted', 'user_created', 'date', 'time', 'type', 'to_channel', 'condition'])
+              t = CSV.table("#{config.path}/shares/#{from_channel}.csv", headers: ['share_id', 'user_team_id_deleted', 'user_deleted', 'user_team_id_created', 'user_created', 'date', 'time', 'type', 'to_channel', 'condition'])
               @shares[from_channel] = t
               if t.size>0
                 num = t[:share_id].max + 1
@@ -34,13 +34,13 @@ class SlackSmartBot
               end
             elsif !@shares.key?(from_channel)
               File.open("#{config.path}/shares/#{from_channel}.csv","w")
-              t = CSV.table("#{config.path}/shares/#{from_channel}.csv", headers: ['share_id', 'user_deleted', 'user_created', 'date', 'time', 'type', 'to_channel', 'condition'])
+              t = CSV.table("#{config.path}/shares/#{from_channel}.csv", headers: ['share_id', 'user_team_id_deleted', 'user_deleted', 'user_team_id_created', 'user_created', 'date', 'time', 'type', 'to_channel', 'condition'])
               num = 1
               @shares[from_channel] = t
             else
               num = @shares[from_channel][:share_id].max + 1
             end
-            values = [num, '', user.name, Time.now.strftime("%Y/%m/%d"), Time.now.strftime("%H:%M"), type.to_s, to_channel, condition]
+            values = [num, '', '', user.team_id, user.name, Time.now.strftime("%Y/%m/%d"), Time.now.strftime("%H:%M"), type.to_s, to_channel, condition]
             @shares[from_channel] << values
             CSV.open("#{config.path}/shares/#{from_channel}.csv", "a+") do |csv|
               csv << values

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

@@ -0,0 +1,191 @@
+class SlackSmartBot
+
+  #todo: add tests
+  def summarize(user, dest, channel, from, thread_ts)
+    save_stats(__method__)
+
+    ai_conn, message = SlackSmartBot::AI::OpenAI.connect({}, config, {}, service: :chat_gpt)
+    if message.empty?
+      ai_models_conn, message = SlackSmartBot::AI::OpenAI.connect({}, config, {}, service: :models)
+    end
+    if !message.empty? #error connecting
+      respond message
+    else
+      channels_bot_is_in = get_channels(bot_is_in: true)
+      if dest[0] == "D" and channel == dest
+        respond "Sorry, I can't summarize a direct message. Please use this command in a channel or supply the channel you want to summarize."
+      elsif !channels_bot_is_in.id.include?(channel) or !get_channel_members(channel).include?(config.nick_id_granular)
+        respond "Sorry, I can't summarize a channel where <@#{config.nick_id_granular}> and <@#{config.nick_id}> are not members. Please invite them to the channel."
+      elsif !get_channel_members(channel).include?(user.id)
+        respond "Sorry, I can't summarize a channel where you are not a member."
+      else
+        if (from == "" and channel == dest and Thread.current[:on_thread]) or thread_ts != ""
+          summarize_thread = true
+          if thread_ts == ""
+            thread_ts = Thread.current[:thread_ts]
+          else
+            if thread_ts.include?(".")
+              thread_ts = thread_ts
+            else
+              thread_ts = thread_ts.scan(/(\d+)/).join
+              thread_ts = "#{thread_ts[0..9]}.#{thread_ts[10..-1]}"
+            end
+          end
+        else
+          summarize_thread = false
+        end
+        from_time_off = false
+        if from == ""
+          from = (Time.now - (60 * 60) * 24 * 30).to_s
+          get_vacations()
+          if @vacations.key?(user.team_id_user) and @vacations[user.team_id_user].key?(:periods)
+            @vacations[user.team_id_user].periods.each do |p|
+              #get the last from date
+              if p.from > from[0..9].gsub("-", "/")
+                from = p.from
+                from_time_off = true
+              end
+            end
+            #from will be the day before the last time off
+            if from_time_off
+              from = (Time.strptime(from, "%Y/%m/%d") - (60 * 60) * 24).to_s
+            end
+          end
+        end
+
+        from.gsub!("-", "/")
+        if from.length == 10
+          from = from + " 00:00:00"
+        elsif from.length == 16
+          from = from + ":00"
+        end
+        from = Time.strptime(from, "%Y/%m/%d %H:%M:%S")
+        if summarize_thread
+          last_msg = respond("I'm going to summarize the thread messages", return_message: true)
+        elsif from_time_off
+          last_msg = respond("I'm going to summarize the messages since the day before your last time off #{from.strftime("%Y/%m/%d")} in <##{channel}>. This may take a while.", return_message: true)
+        else
+          last_msg = respond("I'm going to summarize the messages since #{from.strftime("%Y/%m/%d %H:%M:%S")} in <##{channel}>. This may take a while.", return_message: true)
+        end
+
+        @history_still_running ||= false
+        if @history_still_running
+          respond "Due to Slack API rate limit, `summarize` command is limited. Waiting for other `summarize` command to finish."
+          num_times = 0
+          while @history_still_running and num_times < 30
+            num_times += 1
+            sleep 1
+          end
+          if @history_still_running
+            respond "Sorry, Another `summarize` command is still running after 30 seconds. Please try again later."
+          end
+        end
+        unless @history_still_running
+          @history_still_running = true
+          react :running
+          if summarize_thread
+            hist = client_granular.conversations_history(channel: channel, oldest: thread_ts, inclusive: true, limit: 1)
+          else
+            hist = client_granular.conversations_history(channel: channel)
+          end
+          messages = {} # store the messages by year/month
+          act_users = {}
+          act_threads = {}
+          hist.messages.each do |message|
+            if Time.at(message.ts.to_f) >= from or summarize_thread
+              year_month = Time.at(message.ts.to_f).strftime("%Y/%m")
+              messages[year_month] ||= []
+              if message.key?("thread_ts")
+                thread_ts_message = message.thread_ts
+                replies = client_granular.conversations_replies(channel: channel, ts: thread_ts_message, latest: last_msg.ts)
+                sleep 0.5 #to avoid rate limit Tier 3 (50 requests per minute)
+                messages_replies = ["Thread Started about last message:"]
+                act_threads[message.ts] = replies.messages.size
+                replies.messages.each_with_index do |msgrepl, i|
+                  act_users[msgrepl.user] ||= 0
+                  act_users[msgrepl.user] += 1
+                  messages_replies << "<@#{msgrepl.user}> (#{Time.at(msgrepl.ts.to_f)}) wrote:> #{msgrepl.text}" if i > 0
+                end
+                messages_replies << "Thread ended."
+                messages[year_month] += messages_replies.reverse # the order on repls is from older to newer
+              end
+              act_users[message.user] ||= 0
+              act_users[message.user] += 1
+              url_to_message = "https://#{client.team.domain}.slack.com/archives/#{channel}/#{message.ts}"
+              messages[year_month] << "<@#{message.user}> (#{Time.at(message.ts.to_f)}) (link to the message: #{url_to_message}) wrote:> #{message.text}"
+            end
+          end
+          messages.each do |year_month, msgs|
+            messages[year_month] = msgs.reverse # the order on history is from newer to older
+          end
+          @history_still_running = false
+          unreact :running
+          if messages.empty?
+            respond "There are no Slack Messages since #{from}"
+          else
+            react :speech_balloon
+            chatgpt = ai_conn[user.team_id_user].chat_gpt
+            models = ai_models_conn[user.team_id_user].models
+
+            prompt_orig = "Could you please provide a summary of the given conversation, including all key points and supporting details? The summary should be comprehensive and accurately reflect the main message and arguments presented in the original text, while also being concise and easy to understand. To ensure accuracy, please read the text carefully and pay attention to any nuances or complexities in the language. Please also add the most important conversations in the summary. Additionally, the summary should avoid any personal biases or interpretations and remain objective and factual throughout.\n"
+            prompt_orig += "If you name an user remember to name it as <@user_id> so it is not replaced by the user name.\n"
+            prompt_orig += "Add the link to the message so it is easy to find it. The links added need to follow this <LINK|message>\n"
+            prompt_orig += "For example <https://#{client.team.domain}.slack.com/archives/C111JG4V4DZ/1610231016.950299|message>\n"
+            prompt_orig += "Add also the date of the message for relevant conversations.\n"
+            prompt_orig += "This is the conversation:\n"
+            #sort by year/month from older to newer
+            messages = messages.sort_by { |k, v| k }.to_h
+
+            @open_ai_model_info ||= {}
+            @open_ai_model_info[chatgpt.smartbot_model] ||= SlackSmartBot::AI::OpenAI.models(models.client, models, chatgpt.smartbot_model, return_response: true)
+            if @open_ai_model_info[chatgpt.smartbot_model].key?(:max_input_tokens)
+              max_num_tokens = @open_ai_model_info[chatgpt.smartbot_model][:max_input_tokens].to_i
+            elsif @open_ai_model_info[chatgpt.smartbot_model].key?(:max_tokens)
+              max_num_tokens = @open_ai_model_info[chatgpt.smartbot_model][:max_tokens].to_i
+            else
+              max_num_tokens = 8000
+            end
+            num_tokens = OpenAI.rough_token_count(prompt_orig + messages.values.flatten.join)
+            respond ":information_source: ChatGPT model: *#{chatgpt.smartbot_model}*. Max tokens: *#{max_num_tokens}*. Characters: #{messages.values.flatten.join.size}. Messages: #{messages.values.flatten.size}. Threads: #{act_threads.size}. Users: #{act_users.size}. Chatgpt tokens: *#{num_tokens}*"
+
+            prompts = []
+            i = 0
+            messages.each do |year_month, msgs|
+              msgs.each do |msg|
+                num_tokens = OpenAI.rough_token_count(prompts[i].to_s + msg)
+                i += 1 if num_tokens > max_num_tokens
+                prompts[i] ||= prompt_orig
+                prompts[i] += "#{msg}\n"
+              end
+            end
+            prompts.each_with_index do |prompt, i|
+              num_tokens = OpenAI.rough_token_count(prompt)
+              respond ":information_source: The total number of chatgpt tokens is more than the max allowed for this chatgpt model. *Part #{i + 1} of #{prompts.size}*.\n" if prompts.size > 1
+              success, res = SlackSmartBot::AI::OpenAI.send_gpt_chat(chatgpt.client, chatgpt.smartbot_model, prompt, chatgpt)
+              result_messages = []
+              if success
+                result_messages << "*ChatGPT:*\n#{res}"
+              else
+                result_messages << "*ChatGPT:*\nI'm sorry, I couldn't summarize the conversation. This is the issue: #{res}"
+              end
+              if i == prompts.size - 1
+                act_users.delete(config.nick_id_granular)
+                act_users.delete(config.nick_id)
+
+                act_users = act_users.sort_by { |k, v| v }.reverse
+
+                result_messages << "\n\t:runner: Most active users: #{act_users[0..2].map { |k, v| "<@#{k}> (#{v})" }.join(", ")}"
+                if act_threads.size > 0 and !summarize_thread
+                  act_threads = act_threads.sort_by { |k, v| v }.reverse
+                  result_messages << "\t:fire: Most active threads: #{act_threads[0..2].map { |k, v| "<https://#{client.team.domain}.slack.com/archives/#{channel}/#{k}|#{v - 1} replies>" }.join(", ")}"
+                end
+              end
+              respond result_messages.join("\n").gsub("**", "*")
+            end
+            unreact :speech_balloon
+          end
+        end
+      end
+    end
+  end
+end

data/lib/slack/smart-bot/commands/general/teams/add_team.rb

@@ -28,12 +28,8 @@ class SlackSmartBot
                   break
                 else
                   member_id = $1
-                  member_info = @users.select { |u| u.id == member_id or (u.key?(:enterprise_user) and u.enterprise_user.id == member_id) }[-1]
-                  if member_info.nil?
-                    @users = get_users()
-                    member_info = @users.select { |u| u.id == member_id or (u.key?(:enterprise_user) and u.enterprise_user.id == member_id) }[-1]
-                  end
-                  team[:members][last_type] << member_info.name
+                  member_info = find_user(member_id)
+                  team[:members][last_type] << "#{member_info.team_id}_#{member_info.name}"
                 end
               elsif opt.match(/<#(\w+)\|[^>]*>/i)
                 team[:channels][last_type] ||= []
@@ -69,8 +65,8 @@ class SlackSmartBot
               get_teams()
               team[:info] = info
               team[:status] = :added
-              team[:user] = user.name
-              team[:creator] = user.name
+              team[:user] = "#{user.team_id}_#{user.name}"
+              team[:creator] = "#{user.team_id}_#{user.name}"
               team[:date] = Time.now.strftime("%Y-%m-%dT%H:%M:%S.000Z")[0..18]
               new_team = {}
               team[:name] = name

data/lib/slack/smart-bot/commands/general/teams/delete_team.rb

@@ -19,8 +19,8 @@ class SlackSmartBot
                   get_channels_name_and_id() unless @channels_id.key?(ch)
                   tm = get_channel_members(@channels_id[ch])
                   tm.each do |m|
-                    user_info = @users.select { |u| u.id == m or (u.key?(:enterprise_user) and u.enterprise_user.id == m) }[-1]
-                    team_members << user_info.name unless user_info.is_app_user or user_info.is_bot
+                    user_info = find_user(m)
+                    team_members << "#{user_info.team_id}_#{user_info.name}" unless user_info.nil? or user_info.is_app_user or user_info.is_bot
                   end
                 end
               end
@@ -31,7 +31,7 @@ class SlackSmartBot
             end
             if !@teams.key?(team_name.to_sym)
               respond "It seems like the team *#{team_name}* doesn't exist.\nRelated commands `add team TEAM_NAME PROPERTIES`, `see team TEAM_NAME`, `see teams`"
-            elsif !(all_team_members + [@teams[team_name.to_sym].creator] + config.masters).flatten.include?(user.name)
+            elsif !(all_team_members + [@teams[team_name.to_sym].creator] + config.team_id_masters).flatten.include?("#{user.team_id}_#{user.name}")
               respond "You have to be a member of the team, the creator or a Master admin to be able to delete this team."
             else
               if answer.empty?

data/lib/slack/smart-bot/commands/general/teams/memos/add_memo_team.rb

@@ -17,8 +17,8 @@ class SlackSmartBot
                   get_channels_name_and_id() unless @channels_id.key?(ch)
                   tm = get_channel_members(@channels_id[ch])
                   tm.each do |m|
-                    user_info = @users.select { |u| u.id == m or (u.key?(:enterprise_user) and u.enterprise_user.id == m) }[-1]
-                    team_members << user_info.name unless user_info.is_app_user or user_info.is_bot
+                    user_info = find_user(m)
+                    team_members << "#{user_info.team_id}_#{user_info.name}" unless user_info.is_app_user or user_info.is_bot
                   end
                 end
               end
@@ -31,34 +31,39 @@ class SlackSmartBot
             if type == "jira"
               able_to_connect_jira = false
               begin
-                http = NiceHttp.new(config.jira.host)
-                http.headers.authorization = NiceHttpUtils.basic_authentication(user: config.jira.user, password: config.jira.password)
-                message.gsub!(/^\s*</, "")
-                message.gsub!(/\>$/, "")
-                message.gsub!(/\|.+$/, "")
-                message.gsub!(/^#{config.jira.host}/, "")
-                if message.include?("/browse/")
-                  message = message.scan(/\/browse\/(.+)/).join
-                  resp = http.get("/rest/api/latest/issue/#{message}")
-                else
-                  message.gsub!(/^\/issues\/\?jql=/, "")
-                  message.gsub!(" ", "%20")
-                  resp = http.get("/rest/api/latest/search/?jql=#{message}")
-                  search = true
-                end
-                if resp.code == 200
-                  able_to_connect_jira = true
+                if config.jira.host == "" or config.jira.user == "" or config.jira.password == ""
+                  respond "You need to supply the correct credentials for JIRA on the SmartBot settings: `jira: { host: HOST, user: USER, password: PASSWORD }`"
                 else
-                  error_code = resp.code
-                  if resp.code == 400
-                    error_message = resp.data.json(:errorMessages)[-1]
+                  http = NiceHttp.new(config.jira.host)
+                  http.headers.authorization = NiceHttpUtils.basic_authentication(user: config.jira.user, password: config.jira.password)
+                  message.gsub!(/^\s*</, "")
+                  message.gsub!(/\>$/, "")
+                  message.gsub!(/\|.+$/, "")
+                  message.gsub!(/^#{config.jira.host}/, "")
+                  if message.include?("/browse/")
+                    message = message.scan(/\/browse\/(.+)/).join
+                    resp = http.get("/rest/api/latest/issue/#{message}")
                   else
-                    error_message = ""
+                    message.gsub!(/^\/issues\/\?jql=/, "")
+                    message.gsub!(" ", "%20")
+                    resp = http.get("/rest/api/latest/search/?jql=#{message}")
+                    search = true
+                  end
+                  if resp.code.to_s == '200'
+                    able_to_connect_jira = true
+                  else
+                    error_code = resp.code.to_s
+                    if resp.code.to_s == '400'
+                      error_message = resp.data.json(:errorMessages)[-1]
+                    else
+                      error_message = ""
+                    end
                   end
+                  http.close
                 end
-                http.close
               rescue => exception
                 @logger.fatal exception
+                respond "There was an error trying to connect to JIRA. Please ask the admin to check the logs."
               end
             elsif type == "github"
               able_to_connect_github = false
@@ -73,11 +78,11 @@ class SlackSmartBot
                 message.gsub!("https://github.com", "")
                 message.slice!(0) if message[0] == "/"
                 resp = http.get("/repos/#{message}")
-                if resp.code == 200
+                if resp.code.to_s == '200'
                   able_to_connect_github = true
                 else
-                  error_code = resp.code
-                  if resp.code == 401
+                  error_code = resp.code.to_s
+                  if resp.code.to_s == '401'
                     error_message = resp.data.json(:message)[-1]
                   else
                     error_message = ""
@@ -91,7 +96,7 @@ class SlackSmartBot
 
             if !@teams.key?(team_name.to_sym)
               respond "It seems like the team *#{team_name}* doesn't exist\nRelated commands `add team TEAM_NAME PROPERTIES`, `see team TEAM_NAME`, `see teams`"
-            elsif !(all_team_members + config.masters).flatten.include?(user.name)
+            elsif !(all_team_members + config.team_id_masters).flatten.include?("#{user.team_id}_#{user.name}")
               respond "You have to be a member of the team or a Master admin to be able to add a memo to the team."
             elsif type == "jira" and !able_to_connect_jira
               if error_message == ""
@@ -117,7 +122,7 @@ class SlackSmartBot
                 topic: topic,
                 type: type,
                 privacy: privacy,
-                user: user.name,
+                user: "#{user.team_id}_#{user.name}",
                 date: Time.now.strftime("%Y-%m-%dT%H:%M:%S.000Z")[0..18],
                 message: message,
                 status: ":new: ",

data/lib/slack/smart-bot/commands/general/teams/memos/add_memo_team_comment.rb

@@ -13,7 +13,7 @@ class SlackSmartBot
                 memo = @teams[team_name].memos.select { |m| m.memo_id == memo_id.to_i }[-1]
                 if memo
                   memo.comments ||= []
-                  memo.comments << { user_name: user.name, user_id: user.id, message: message, time: Time.now.to_s }
+                  memo.comments << { user_name: "#{user.team_id}_#{user.name}", user_id: user.id, message: message, time: Time.now.to_s }
                   update_teams()
                   if config.simulate
                     respond "Comment added to memo #{memo_id} in team #{team_name}"

data/lib/slack/smart-bot/commands/general/teams/memos/delete_memo_team.rb

@@ -7,6 +7,8 @@ class SlackSmartBot
             save_stats(__method__) if answer.empty?
 
             get_teams()
+            team_id_user = "#{user.team_id}_#{user.name}"
+
             if @teams.key?(team_name.to_sym)
               assigned_members = @teams[team_name.to_sym].members.values.flatten
               assigned_members.uniq!
@@ -17,8 +19,8 @@ class SlackSmartBot
                   get_channels_name_and_id() unless @channels_id.key?(ch)
                   tm = get_channel_members(@channels_id[ch])
                   tm.each do |m|
-                    user_info = @users.select { |u| u.id == m or (u.key?(:enterprise_user) and u.enterprise_user.id == m) }[-1]
-                    team_members << user_info.name unless user_info.is_app_user or user_info.is_bot
+                    user_info = find_user(m)
+                    team_members << "#{user_info.team_id}_#{user_info.name}" unless user_info.is_app_user or user_info.is_bot
                   end
                 end
               end
@@ -30,13 +32,13 @@ class SlackSmartBot
 
             if !@teams.key?(team_name.to_sym)
               respond "It seems like the team *#{team_name}* doesn't exist.\nRelated commands `add team TEAM_NAME PROPERTIES`, `see team TEAM_NAME`, `see teams`"
-            elsif !(all_team_members + config.masters).flatten.include?(user.name)
+            elsif !(all_team_members + config.team_id_masters).flatten.include?(team_id_user)
               respond "You have to be a member of the team or a Master admin to be able to delete a memo of the team."
             elsif !@teams[team_name.to_sym].key?(:memos) or @teams[team_name.to_sym][:memos].empty? or !@teams[team_name.to_sym][:memos].memo_id.include?(memo_id.to_i)
               respond "It seems like there is no memo with id #{memo_id}"
             elsif @teams[team_name.to_sym][:memos].memo_id.include?(memo_id.to_i)
               memo_selected = @teams[team_name.to_sym][:memos].select { |m| m.memo_id == memo_id.to_i }[-1]
-              if memo_selected.privacy == "personal" and memo_selected.user != user.name
+              if memo_selected.privacy == "personal" and memo_selected.user != team_id_user
                 respond "Only the creator can delete a personal memo."
               else
                 if answer.empty?

data/lib/slack/smart-bot/commands/general/teams/memos/see_memo_team.rb

@@ -24,8 +24,9 @@ class SlackSmartBot
                 end
                 if memo
                   if memo_deleted
-                    messages = ["This memo was deleted from the team #{team_name}.\nOnly the creator (#{memo.user}) of the memo can get access to it."]
-                    if memo.user == user.name
+                    uname = memo.user.split("_")[1..-1].join("_")
+                    messages = ["This memo was deleted from the team #{team_name}.\nOnly the creator (#{uname}) of the memo can get access to it."]
+                    if memo.user == "#{user.team_id}_#{user.name}"
                       messages << "Memo #{memo.memo_id} (#{memo.type}): #{memo.message}"
                     end
                   else
@@ -39,24 +40,33 @@ class SlackSmartBot
                   else
                     if memo.type == "jira" and !memo_deleted
                       require "time"
-                      http = NiceHttp.new(config.jira.host)
-                      http.headers.authorization = NiceHttpUtils.basic_authentication(user: config.jira.user, password: config.jira.password)
-                      resp = http.get("/rest/api/2/issue/#{memo.message}/comment")
-                      if resp.code == 200
-                        jira_comments = resp.data.json.comments
-                        if !jira_comments.nil? and !jira_comments.empty?
-                          messages << "\n_*JIRA Comments:*_"
-                          jira_comments.each do |comment|
-                            messages << "  *#{comment.author.displayName}* > #{comment.body} _(#{Time.parse(comment.created).strftime("%Y/%m/%d %H:%M")})_"
+                      if config.jira.host == "" or config.jira.user == "" or config.jira.password == ""
+                        respond "You need to supply the correct credentials for JIRA on the SmartBot settings: `jira: { host: HOST, user: USER, password: PASSWORD }`"
+                      else
+                        begin
+                          http = NiceHttp.new(config.jira.host)
+                          http.headers.authorization = NiceHttpUtils.basic_authentication(user: config.jira.user, password: config.jira.password)
+                          resp = http.get("/rest/api/2/issue/#{memo.message}/comment")
+                          if resp.code.to_s == '200'
+                            jira_comments = resp.data.json.comments
+                            if !jira_comments.nil? and !jira_comments.empty?
+                              messages << "\n_*JIRA Comments:*_"
+                              jira_comments.each do |comment|
+                                messages << "  *#{comment.author.displayName}* > #{comment.body} _(#{Time.parse(comment.created).strftime("%Y/%m/%d %H:%M")})_"
+                              end
+                            end
                           end
+                          http.close
+                        rescue => exception
+                          @logger.fatal exception
+                          respond "There was an error trying to connect to JIRA. Please ask the admin to check the logs."
                         end
                       end
-                      http.close
                     elsif memo.type == "github" and !memo_deleted
                       http = NiceHttp.new(config.github.host)
                       http.headers.authorization = "token #{config.github.token}"
                       resp = http.get("/repos/#{memo.message}/comments")
-                      if resp.code == 200
+                      if resp.code.to_s == '200'
                         github_comments = resp.data.json
                         if !github_comments.nil? and !github_comments.empty?
                           messages << "\n_*GitHub Comments:*_"
@@ -67,10 +77,11 @@ class SlackSmartBot
                       end
                       http.close
                     end
-                    if memo.key?(:comments) and !memo.comments.empty? and (!memo_deleted or (memo_deleted and memo.user == user.name))
+                    if memo.key?(:comments) and !memo.comments.empty? and (!memo_deleted or (memo_deleted and memo.user == "#{user.team_id}_#{user.name}"))
                       messages << "\n_*Comments:*_"
                       memo.comments.each do |comment|
-                        messages << "  *#{comment[:user_name]}* > #{comment[:message]} _(#{comment[:time][0..15]})_"
+                        uname = comment[:user_name].split("_")[1..-1].join("_")
+                        messages << "  *#{uname}* > #{comment[:message]} _(#{comment[:time][0..15]})_"
                       end
                     end