slack-smart-bot 1.14.2 → 1.15.1

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

@@ -3,18 +3,19 @@ class SlackSmartBot
     module General
       module Teams
         module Memos
-          def see_memos_team(user, type: "all", name: nil, topic: "", add_stats: true, team: nil, memo_id: nil)
+          def see_memos_team(user, type: "all", name: nil, topic: "", add_stats: true, team: nil, memo_id: nil, precise: true)
             save_stats(__method__) if add_stats
-
             get_teams()
             type = "all" if type.match?(/all\s+memo/i)
             message = []
             if @teams.size > 0
+              num_memos = 0
               if team.nil?
                 @teams.each do |team_name, teamv|
                   if (team_name.to_s == name.to_s) or (name.to_s.gsub("-", "").gsub("_", "") == team_name.to_s)
-                    if teamv.key?(:memos) and teamv[:memos].size > 0
-                      team = teamv.deep_copy
+                    team = teamv.deep_copy
+                    if team.key?(:memos) and team[:memos].size > 0
+                      num_memos = teamv[:memos].size
                     else
                       respond "There are no memos for the team #{name}." unless !add_stats
                     end
@@ -22,7 +23,8 @@ class SlackSmartBot
                   end
                 end
               end
-              if team
+              num_memos = team[:memos].size if team and num_memos == 0
+              if team and num_memos > 0
                 react :running unless !add_stats
                 all_memos = {}
                 assigned_members, unassigned_members, not_on_team_channel, channels_members, all_team_members = get_team_members(team)
@@ -37,12 +39,14 @@ class SlackSmartBot
                 end
                 team[:memos].each do |memo|
                   if memo_id.nil? or memo[:memo_id] == memo_id.to_i
-                    memos_filtered << memo
-                    all_topics << memo.topic
-                    if memo.key?(:search) and memo.key?(:issues) and memo.issues.size > 0
-                      num_issues += memo.issues.size
-                    else
-                      num_issues += 1
+                    if topic == "" or (memo.topic == topic and precise) or (memo.topic.to_s.downcase.include?(topic.to_s.downcase) and !precise)
+                      memos_filtered << memo
+                      all_topics << memo.topic
+                      if memo.key?(:search) and memo.key?(:issues) and memo.issues.size > 0
+                        num_issues += memo.issues.size
+                      else
+                        num_issues += 1
+                      end
                     end
                   end
                 end
@@ -57,22 +61,22 @@ class SlackSmartBot
                 elsif memos_filtered.size > 0
                   memos_filtered.each do |memo|
                     if memo.privacy.empty? or
-                       (memo.privacy == "private" and (all_team_members.include?(user.name) and (users_link or channels_members.include?(Thread.current[:dest])))) or
-                       (memo.privacy == "personal" and memo.user == user.name and users_link)
+                       (memo.privacy == "private" and (all_team_members.include?("#{user.team_id}_#{user.name}") and (users_link or channels_members.include?(Thread.current[:dest])))) or
+                       (memo.privacy == "personal" and memo.user == "#{user.team_id}_#{user.name}" and users_link)
                       if memo.type == "jira" and config.jira.host != ""
                         http = NiceHttp.new(config.jira.host)
                         http.headers.authorization = NiceHttpUtils.basic_authentication(user: config.jira.user, password: config.jira.password)
                         if memo.message.match?(/^\w+\-\d+$/) or (memo.key?(:search) and !memo.search)
                           resp = http.get("/rest/api/latest/issue/#{memo.message}")
-                          issues = [resp.data.json] if resp.code == 200
+                          issues = [resp.data.json] if resp.code.to_s == '200'
                           memo.search = false
                         else
                           resp = http.get("/rest/api/latest/search/?jql=#{memo.message}")
-                          issues = resp.data.json().issues if resp.code == 200
+                          issues = resp.data.json().issues if resp.code.to_s == '200'
                           memo.search = true
                         end
-                        if resp.code == 200
-                          unless issues.empty?
+                        if resp.code.to_s == '200'
+                          unless issues.nil? or issues.empty?
                             if memo.search
                               if memo.key?(:issues)
                                 orig_issues = memo.issues.deep_copy.sort
@@ -98,7 +102,8 @@ class SlackSmartBot
                               if memo.topic == :no_topic and !issue.fields.labels.empty?
                                 jira_memo.topic = issue.fields.labels.sort.join("_").split(" ").join("_")
                               end
-                              if topic == "" or (topic != "" and jira_memo.topic.to_s.downcase == topic.to_s.downcase)
+                              if topic == "" or (topic != "" and jira_memo.topic.to_s.downcase == topic.to_s.downcase and precise) or
+                                  (topic != "" and jira_memo.topic.to_s.downcase.include?(topic.to_s.downcase) and !precise)
                                 case issue.fields.issuetype.name
                                 when "Story"; jira_memo.type = ":abc:"; jira_memo.mtype = "memo"
                                 when "Bug"; jira_memo.type = ":bug:"; jira_memo.mtype = "bug"
@@ -148,7 +153,7 @@ class SlackSmartBot
                         resp = http.get("/repos/#{issue_url}")
                         issues = resp.data.json()
                         issues = [issues] unless issues.is_a?(Array)
-                        if resp.code == 200
+                        if resp.code.to_s == '200'
                           unless issues.empty?
                             if memo.search
                               if memo.key?(:issues)
@@ -179,7 +184,8 @@ class SlackSmartBot
                               if memo.topic == :no_topic and !issue.labels.empty?
                                 github_memo.topic = labels
                               end
-                              if topic == "" or (topic != "" and github_memo.topic.to_s.downcase == topic.to_s.downcase)
+                              if topic == "" or (topic != "" and github_memo.topic.to_s.downcase == topic.to_s.downcase and precise) or
+                                  (topic != "" and github_memo.topic.to_s.downcase.include?(topic.to_s.downcase) and !precise)
                                 case labels
                                 when /bug/i; github_memo.type = ":bug:"; github_memo.mtype = "bug"
                                 when /docum/i; github_memo.type = ":abc:"; github_memo.mtype = "note"
@@ -218,7 +224,8 @@ class SlackSmartBot
                         end
                         http.close
                       else
-                        if topic == "" or (topic != "" and memo.topic.to_s.downcase == topic.to_s.downcase)
+                        if topic == "" or (topic != "" and memo.topic.to_s.downcase == topic.to_s.downcase and precise) or
+                            (topic != "" and memo.topic.to_s.downcase.include?(topic.to_s.downcase) and !precise)
                           if (type == "all" or type.to_s == memo[:type].to_s or type == "")
                             memo.jira = false
                             memo.github = false
@@ -263,7 +270,8 @@ class SlackSmartBot
                         when "personal"; priv = " `personal`"
                         else priv = ""
                         end
-                        message << "        #{memo.type} #{memo.date.gsub("-", "/")[0..9]}:  #{memo.status} #{memo.message} (#{memo.user} #{memo.memo_id})#{priv}#{" :spiral_note_pad:" if memo.key?(:comments) and !memo.comments.empty?}#{" :mag:" if memo.key?(:search) and memo.search}"
+                        uname = memo.user.split("_")[1..-1].join("_")
+                        message << "        #{memo.type} #{memo.date.gsub("-", "/")[0..9]}:  #{memo.status} #{memo.message} (#{uname} #{memo.memo_id})#{priv}#{" :spiral_note_pad:" if memo.key?(:comments) and !memo.comments.empty?}#{" :mag:" if memo.key?(:search) and memo.search}"
                       end
                     end
                     all_memos[:no_topic] = []
@@ -276,7 +284,8 @@ class SlackSmartBot
                           when "personal"; priv = " `personal`"
                           else priv = ""
                           end
-                          message << "            #{memo.type} #{memo.date.gsub("-", "/")[0..9]}:  #{memo.status} #{memo.message} (#{memo.user} #{memo.memo_id})#{priv}#{" :spiral_note_pad:" if memo.key?(:comments) and !memo.comments.empty?}#{" :mag:" if memo.key?(:search) and memo.search}"
+                          uname = memo.user.split("_")[1..-1].join("_")
+                          message << "            #{memo.type} #{memo.date.gsub("-", "/")[0..9]}:  #{memo.status} #{memo.message} (#{uname} #{memo.memo_id})#{priv}#{" :spiral_note_pad:" if memo.key?(:comments) and !memo.comments.empty?}#{" :mag:" if memo.key?(:search) and memo.search}"
                         end
                       end
                     end
@@ -285,7 +294,7 @@ class SlackSmartBot
                   message << "There are no memos #{name} team #{type} #{topic}." unless !add_stats
                 end
                 unreact :running unless !add_stats
-              else
+              elsif team.nil?
                 respond "There is no team named #{name}." unless !add_stats
               end
               if add_stats

data/lib/slack/smart-bot/commands/general/teams/memos/set_memo_status.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
@@ -30,7 +30,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 set the status of a memo."
             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}"
@@ -39,7 +39,7 @@ class SlackSmartBot
               if memo_selected.type == "jira" or memo_selected.type == "github"
                 #todo: add tests for jira and github
                 respond "The memo specified is a #{memo_selected.type} and the status in those cases are linked to the specific issues in #{memo_selected.type}."
-              elsif memo_selected.privacy == "personal" and memo_selected.user != user.name
+              elsif memo_selected.privacy == "personal" and memo_selected.user != "#{user.team_id}_#{user.name}"
                 respond "Only the creator can set the status of a personal memo."
               else
                 answer_delete

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

@@ -22,7 +22,8 @@ class SlackSmartBot
               assigned_members = team.members.values.flatten
               assigned_members.uniq!
               assigned_members.dup.each do |m|
-                user_info = @users.select { |u| u.id == m or (u.key?(:enterprise_user) and u.enterprise_user.id == m) or u.name == m or (u.key?(:enterprise_user) and u.enterprise_user.name == m) }[-1]
+                # extract the team_id from the member name: team_id_user_name. so everything after the first _ is the user_name. user_name can include _.
+                user_info = find_user(m)
                 assigned_members.delete(m) if user_info.nil? or user_info.deleted
               end
               unassigned_members = []
@@ -34,19 +35,19 @@ 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.nil? or user_info.is_app_user or user_info.is_bot or user_info.deleted
+                    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 or user_info.deleted
                   end
                 end
                 team_members.flatten!
                 team_members.uniq!
                 unassigned_members = team_members - assigned_members
-                unassigned_members.delete(config.nick)
+                unassigned_members.delete("#{config.team_id}_#{config.nick}")
 
                 unless unassigned_members.empty?
                   um = unassigned_members.dup
                   um.each do |m|
-                    user_info = @users.select { |u| u.name == m or (u.key?(:enterprise_user) and u.enterprise_user.name == m) }[-1]
+                    user_info = find_user(m)
                     unless user_info.nil? or user_info.profile.title.to_s == "" or user_info.deleted
                       team.members[user_info.profile.title.to_snake_case] ||= []
                       team.members[user_info.profile.title.to_snake_case] << m
@@ -70,7 +71,7 @@ class SlackSmartBot
                 if type == :ping
                   active_members = []
                   members_list.each do |member|
-                    member_info = @users.select { |u| u.name == member }[-1]
+                    member_info = find_user(member)
                     unless member_info.nil? or member_info.deleted
                       active = (get_presence(member_info.id).presence.to_s == "active")
                       active_members << member if active
@@ -81,12 +82,13 @@ class SlackSmartBot
                   members = members_list
                 end
                 members.dup.each do |m|
-                  user_info = @users.select { |u| u.id == m or (u.key?(:enterprise_user) and u.enterprise_user.id == m) or u.name == m or (u.key?(:enterprise_user) and u.enterprise_user.name == m) }[-1]
+                  user_info = find_user(m)
                   members.delete(m) if user_info.nil? or user_info.deleted
                 end
 
                 if members.size > 0
-                  respond "#{icon} *#{type} #{team_name} team #{member_type}*\nfrom <@#{user.name}>\nto <@#{members[0..9].join(">, <@")}>#{", #{members[10..-1].join(", ")}" if members.size > 10} \n> #{message.split("\n").join("\n> ")}"
+                  members_names = members.map { |m| m.split("_")[1..-1].join("_") }
+                  respond "#{icon} *#{type} #{team_name} team #{member_type}*\nfrom <@#{user.name}>\nto <@#{members_names[0..29].join(">, <@")}>#{", #{members_names[30..-1].join(", ")}" if members.size > 30} \n> #{message.split("\n").join("\n> ")}"
                 elsif type == :ping
                   respond "It seems like there are no available #{member_type} members on #{team_name} team. Please call `see team #{team_name}`"
                 else

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

@@ -2,7 +2,7 @@ class SlackSmartBot
   module Commands
     module General
       module Teams
-        def see_teams(user, team_name, search = "", add_stats: true)
+        def see_teams(user, team_name, search = "", add_stats: true, ttype: '')
           save_stats(__method__) if add_stats
 
           get_teams()
@@ -14,6 +14,8 @@ class SlackSmartBot
           else
             users_link = (Thread.current[:dest][0] == "D")
             filter = (search != "")
+            members_displayed = []
+
             react :runner
             @users = get_users() if add_stats
 
@@ -25,8 +27,9 @@ class SlackSmartBot
               search.split(" ").each do |s|
                 if s.match(/<@(\w+)>/i)
                   m = $1
-                  user_info = @users.select { |u| u.id.downcase == m.downcase or (u.key?(:enterprise_user) and u.enterprise_user.id.downcase == m.downcase) }[-1]
-                  search_members << user_info.name unless user_info.nil?
+                  #upcase since from the smartbot command we get it in lowercase
+                  user_info = find_user(m.upcase)
+                  search_members << "#{user_info.team_id}_#{user_info.name}" unless user_info.nil?
                 elsif s.match(/<#(\w+)\|[^>]*>/i)
                   c = $1.upcase
                   search_channels << @channels_name[c] if @channels_name.key?(c)
@@ -46,7 +49,7 @@ class SlackSmartBot
               filter ? add = false : add = true
               if team_name.to_s == "" or (team_name.to_s == name.to_s) or (name.to_s.gsub("-", "").gsub("_", "") == team_name.to_s)
                 message = []
-                message << "*#{name.capitalize}*"
+                message << "*#{name.capitalize}#{" #{ttype}" unless ttype.empty?}*"
 
                 if filter and search_info.size > 0
                   all_info = true
@@ -70,7 +73,7 @@ class SlackSmartBot
                 unless unassigned_members.empty?
                   um = unassigned_members.dup
                   um.each do |m|
-                    user_info = @users.select { |u| u.name == m or (u.key?(:enterprise_user) and u.enterprise_user.name == m) }[-1]
+                    user_info = find_user(m)
                     unless user_info.nil? or user_info.profile.title.to_s == ""
                       team.members[user_info.profile.title.to_snake_case] ||= []
                       team.members[user_info.profile.title.to_snake_case] << m
@@ -107,69 +110,75 @@ class SlackSmartBot
                 if add
                   if team_name.to_s != ""
                     team.members.each do |type, members|
-                      message << "        _`#{type}`_:  "
-                      members.each do |member|
-                        types = [":palm_tree:", ":spiral_calendar_pad:", ":face_with_thermometer:", ":baby:"]
-                        member_info = @users.select { |u| u.name == member }[-1]
-                        if !member_info.nil? and !member_info.deleted
-                          member_id = member_info.id
-                          info = get_user_info(member_id)
-                          emoji = info.user.profile.status_emoji
-                          if types.include?(emoji)
-                            status = emoji
-                          else
-                            active = (get_presence(member_id).presence.to_s == "active")
-                            if active
-                              user_info = @users.select { |u| u.id == member_id or (u.key?(:enterprise_user) and u.enterprise_user.name == member_id) }[-1]
-                              if (user_info.tz_offset - user.tz_offset).abs <= (4 * 3600)
-                                status = ":large_green_circle:"
+                      if ttype.empty? or type.include?(ttype)
+                        message << "        _`#{type}`_:  "
+                        members.each do |member|
+                          types = [":palm_tree:", ":spiral_calendar_pad:", ":face_with_thermometer:", ":baby:"]
+                          member_info = find_user(member)
+                          if !member_info.nil? and !member_info.deleted
+                            member_id = member_info.id
+                            members_displayed << "#{member_info.team_id}_#{member_info.name}"
+                            info = get_user_info(member_id) #to get the status_emoji right now
+                            emoji = info.user.profile.status_emoji
+                            if types.include?(emoji)
+                              status = emoji
+                            else
+                              active = (get_presence(member_id).presence.to_s == "active")
+                              if active
+                                if member_info.key?(:tz_offset) and user.key?(:tz_offset) and (member_info.tz_offset - user.tz_offset).abs <= (4 * 3600)
+                                  status = ":large_green_circle:"
+                                else
+                                  status = ":large_yellow_circle:"
+                                end
                               else
-                                status = ":large_yellow_circle:"
+                                status = ":white_circle:"
                               end
-                            else
-                              status = ":white_circle:"
                             end
-                          end
-                        else
-                          status = ":exclamation:"
-                        end
-                        unless status == ":exclamation:"
-                          if users_link
-                            message[-1] += "  #{status}<@#{member}>, "
                           else
-                            user_info = @users.select { |u| u.name == member or (u.key?(:enterprise_user) and u.enterprise_user.name == member) }[-1]
-                            unless user_info.nil?
-                              if user_info.profile.display_name == ""
-                                name = user_info.name
-                              else
-                                name = user_info.profile.display_name
+                            status = ":exclamation:"
+                          end
+                          unless status == ":exclamation:"
+                            if users_link
+                              message[-1] += "  #{status}<@#{member_info.name}>, "
+                            else
+                              unless member_info.nil?
+                                if member_info.profile.display_name == ""
+                                  name = member_info.name
+                                else
+                                  name = member_info.profile.display_name
+                                end
+                                message[-1] += "  #{status} #{name}, "
                               end
-                              message[-1] += "  #{status} #{name}, "
                             end
                           end
                         end
+                        message[-1].chop!
+                        message[-1].chop!
                       end
-                      message[-1].chop!
-                      message[-1].chop!
                     end
                   else
                     team.members.each do |type, members|
-                      if users_link
-                        message << "        _`#{type}`_:  <@#{members.join(">,  <@")}>"
-                      else
-                        membersn = []
-                        members.each do |m|
-                          user_info = @users.select { |u| u.name == m or (u.key?(:enterprise_user) and u.enterprise_user.name == m) }[-1]
-                          unless user_info.nil? or user_info.deleted
-                            if user_info.profile.display_name == ""
-                              name = user_info.name
-                            else
-                              name = user_info.profile.display_name
+                      if ttype.empty? or type.include?(ttype)
+                        if users_link
+                          members_displayed += members
+                          members_names = members.map { |m| m.split("_")[1..-1].join("_") }
+                          message << "        _`#{type}`_:  <@#{members_names.join(">,  <@")}>"
+                        else
+                          membersn = []
+                          members.each do |m|
+                            user_info = find_user(m)
+                            unless user_info.nil? or user_info.deleted
+                              members_displayed << "#{user_info.team_id}_#{user_info.name}"
+                              if user_info.profile.display_name == ""
+                                name = user_info.name
+                              else
+                                name = user_info.profile.display_name
+                              end
+                              membersn << name
                             end
-                            membersn << name
                           end
+                          message << "        _`#{type}`_:  #{membersn.join("  /  ")}"
                         end
-                        message << "        _`#{type}`_:  #{membersn.join("  /  ")}"
                       end
                     end
                   end
@@ -178,18 +187,21 @@ class SlackSmartBot
                 if add
                   message << "   > *_channels_*"
                   team.channels.each do |type, channels|
-                    channel_ids = []
-                    channels.each do |ch|
-                      channel_info = @channels_list.select { |c| c.name.to_s.downcase == ch.to_s.downcase }[-1]
-                      if @channels_id.key?(ch) and (!channel_info.is_private or (channel_info.is_private and (team.members.values + [team.creator]).flatten.include?(user.name)))
-                        channel_ids << @channels_id[ch]
+                    if ttype.empty? or type.include?(ttype)
+                      channel_ids = []
+                      channels.each do |ch|
+                        channel_info = @channels_list.select { |c| c.name.to_s.downcase == ch.to_s.downcase }[-1]
+                        # remove team_id from team members values
+                        if @channels_id.key?(ch) and (!channel_info.is_private or (channel_info.is_private and (team.members.values + [team.creator]).flatten.include?("#{user.team_id}_#{user.name}")))
+                          channel_ids << @channels_id[ch]
+                        end
                       end
+                      message << "        _`#{type}`_:  <##{channel_ids.join("> <#")}>" unless channel_ids.empty?
                     end
-                    message << "        _`#{type}`_:  <##{channel_ids.join("> <#")}>" unless channel_ids.empty?
                   end
 
                   unless !team.key?(:memos) or team.memos.empty? or (team_name.to_s == "" and search.to_s == "")
-                    message += see_memos_team(user, type: "all", add_stats: false, team: team)
+                    message += see_memos_team(user, type: "all", add_stats: false, team: team, topic: ttype, precise: false)
                   end
 
                   unless team.info.empty?
@@ -225,7 +237,7 @@ class SlackSmartBot
                 respond msg, dest, unfurl_links: false, unfurl_media: false
               end
               unless team_name.to_s.empty?
-                see_vacations_team(user, team_name, Date.today.strftime("%Y/%m/%d"), add_stats: false)
+                see_vacations_team(user, team_name, Date.today.strftime("%Y/%m/%d"), add_stats: false, filter_members: members_displayed)
               end
             end
           end

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

@@ -2,7 +2,7 @@ class SlackSmartBot
   module Commands
     module General
       module Teams
-        def see_vacations_team(user, team_name, date, add_stats: true)
+        def see_vacations_team(user, team_name, date, add_stats: true, filter_members: [])
           save_stats(__method__) if add_stats
 
           get_teams()
@@ -20,15 +20,16 @@ class SlackSmartBot
             end
             date.gsub!("-", "/")
             get_vacations()
+            members_by_country_region = {}
             team = teams[team_name.to_sym]
             assigned_members = team.members.values.flatten
             assigned_members.uniq!
             assigned_members.dup.each do |m|
-              user_info = @users.select { |u| u.id == m or (u.key?(:enterprise_user) and u.enterprise_user.id == m) or u.name == m or (u.key?(:enterprise_user) and u.enterprise_user.name == m) }[-1]
+              user_info = find_user(m)
               assigned_members.delete(m) if user_info.nil? or user_info.deleted
             end
 
-            channels_members = []
+            channels_members = [] #todo: check if this is used in here. Remove.
             all_team_members = assigned_members.dup
             if team.channels.key?("members")
               team_members = []
@@ -40,8 +41,8 @@ class SlackSmartBot
                 else
                   channels_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
@@ -49,6 +50,10 @@ class SlackSmartBot
               all_team_members += team_members
               all_team_members.uniq!
             end
+            if filter_members.size > 0
+              all_team_members = all_team_members & filter_members
+            end
+
             unless all_team_members.empty?
               blocks_header =
                 {
@@ -69,8 +74,7 @@ class SlackSmartBot
                 defaulted_country_region = ""
               end
               all_team_members.each do |m|
-                @users = get_users() if @users.empty?
-                info = @users.select { |u| u.id == m or (u.key?(:enterprise_user) and u.enterprise_user.id == m) or u.name == m or (u.key?(:enterprise_user) and u.enterprise_user.name == m) }[-1]
+                info = find_user(m)
                 unless info.nil?
                   country_region = ""
                   if @vacations.key?(m) and @vacations[m][:public_holidays].to_s != ""
@@ -78,8 +82,8 @@ class SlackSmartBot
                   elsif config[:public_holidays].key?(:default_calendar) and country_region.empty?
                     country_region = defaulted_country_region
                   end
-
-                  info = get_user_info(info.id)
+                  members_by_country_region[country_region] ||= []
+                  members_by_country_region[country_region] << "#{info.team_id}_#{info.name}"
                   if @vacations.key?(m)
                     v = ""
                     (from..(from + 20)).each do |d|
@@ -148,8 +152,8 @@ class SlackSmartBot
                     elements: [
                       {
                         type: "image",
-                        image_url: info.user.profile.image_24,
-                        alt_text: info.user.name,
+                        image_url: info.profile.image_24,
+                        alt_text: info.name,
                       },
                       {
                             type: "plain_text",
@@ -171,8 +175,19 @@ class SlackSmartBot
               if !defaulted_country_region.empty?
                 message = "Defaulted public holidays calendar: #{defaulted_country_region}\n"
               end
-              message += "To change your public holidays calendar, use the command `set public holidays to COUNTRY/STATE`. "
-              message += "\nExamples: `set public holidays to Iceland`, `set public holidays to Spain/Madrid`"
+              if members_by_country_region.size > 0 and members_by_country_region.keys.size > 1
+                message_tmp = []
+                members_by_country_region.each do |region, members|
+                  #use only the user name on members
+                  members_names = members.map { |m| m.split("_")[1..-1].join("_") }
+                  message_tmp << "`#{region}`: <#{members_names.sort.join(", ")}>"
+                end
+                message += "Members by region:\n\t#{message_tmp.join(". ")}\n"
+              end
+              if all_team_members.include?(user.name)
+                message += "To change your public holidays calendar, use the command `set public holidays to COUNTRY/STATE`. "
+                message += "\nExamples: `set public holidays to Iceland`, `set public holidays to Spain/Madrid`"
+              end
               respond message
             end
           end

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

@@ -15,8 +15,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
@@ -27,7 +27,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 update this team."
           else
             wrong = false
@@ -49,14 +49,14 @@ class SlackSmartBot
                   last_type = opt
                 elsif opt.match(/<?@(\w+)>?/i) #accepts also @username for the case the user has been deactivated
                   member_id = $1
-                  member_info = @users.select { |u| u.id == member_id or u.name == member_id or (u.key?(:enterprise_user) and u.enterprise_user.id == member_id) }[-1]
+                  member_info = find_user(member_id)
                   if last_type.nil?
                     @teams[team_name.to_sym].members.each do |type, members|
-                      @teams[team_name.to_sym].members[type].delete(member_info.name)
+                      @teams[team_name.to_sym].members[type].delete("#{member_info.team_id}_#{member_info.name}")
                     end
                   else
                     @teams[team_name.to_sym].members[last_type] ||= []
-                    @teams[team_name.to_sym].members[last_type].delete(member_info.name)
+                    @teams[team_name.to_sym].members[last_type].delete("#{member_info.team_id}_#{member_info.name}")
                   end
                 elsif opt.match(/<#(\w+)\|[^>]*>/i)
                   channel_id = $1
@@ -94,9 +94,9 @@ class SlackSmartBot
                 elsif opt.match(/<@(\w+)>/i)
                   member_id = $1
                   last_type = "no_type" if last_type.nil?
-                  member_info = @users.select { |u| u.id == member_id or (u.key?(:enterprise_user) and u.enterprise_user.id == member_id) }[-1]
+                  member_info = find_user(member_id)
                   @teams[team_name.to_sym].members[last_type] ||= []
-                  @teams[team_name.to_sym].members[last_type] << member_info.name
+                  @teams[team_name.to_sym].members[last_type] << "#{member_info.team_id}_#{member_info.name}"
                   @teams[team_name.to_sym].members[last_type].uniq!
                 elsif opt.match(/<#(\w+)\|[^>]*>/i)
                   channel_id = $1
@@ -123,7 +123,7 @@ class SlackSmartBot
             unless wrong
               message ||= "The *#{team_name}* team has been updated."
               @teams[team_name.to_sym].status = :updated
-              @teams[team_name.to_sym].user = user.name
+              @teams[team_name.to_sym].user = "#{user.team_id}_#{user.name}"
               @teams[team_name.to_sym].date = Time.now.strftime("%Y-%m-%dT%H:%M:%S.000Z")[0..18]
               update_teams()
             end