slack-smart-bot 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b15c46b5b101a0a31487508457982e8f5d6b81ad41f54338407ecdb2aa9974f3
-  data.tar.gz: d32bfceda9068f5f11d1002f255b77a280f3a7b7068f40a632c03b7cb6378127
+  metadata.gz: 19ab121009af799ef4d1338e6b274c3212aa3fb9eed9098ab32b4d445e620a14
+  data.tar.gz: d9d16f6eb8de9fe372865e56f4f4e22ae2b10acdd55918f2d17a38a25f7111d7
 SHA512:
-  metadata.gz: 61c6e4060d928a1562176a0596ac968c7d007998c268816af489a0d36624a768ba1eadd3b6d27be7d19d37984b335d70215f718189165c1a9ac0a3a18130c5a0
-  data.tar.gz: 48995f9d416dd8906353508ac9bf86219cd92b2ede2f0043c3752dcc4db95564161ad64f41d86fd9f821fa1dc6d9d5bba3ef5519be037214e0003c3423b595c9
+  metadata.gz: d94f2a3b0f5f26c1ece8f9d9241b89e26714e6565104a1591c2f0ab0bac0bb9273d2e64e5a988fde4c18cdea0e89a8bcb98d5ee1f36ab22756b30d2b3cf61fff
+  data.tar.gz: 2dadb23423038f6141e0f8fdf540b15ec5da160058eb7d286e7fee9b6b7672c58d348f33221848b472997a42818283ea76cb67748ad1d2437784ac0a61f41b3d

data/lib/slack-smart-bot.rb

@@ -177,10 +177,20 @@ class SlackSmartBot
     get_rules_imported()
 
     begin
+      #todo: take in consideration the case that the value supplied on config.masters and config.admins are the ids and not the user names
       @admin_users_id = []
+      @master_admin_users_id = []
       config.admins.each do |au|
         user_info = client.web_client.users_info(user: "@#{au}")
         @admin_users_id << user_info.user.id
+        if config.masters.include?(au)
+          @master_admin_users_id << user_info.user.id
+        end
+        sleep 1
+      end
+      (config.masters-config.admins).each do |au|
+        user_info = client.web_client.users_info(user: "@#{au}")
+        @master_admin_users_id << user_info.user.id
         sleep 1
       end
     rescue Slack::Web::Api::Errors::TooManyRequestsError

data/lib/slack/smart-bot/comm/react.rb

@@ -2,7 +2,7 @@ class SlackSmartBot
   # list of available emojis: https://www.webfx.com/tools/emoji-cheat-sheet/
   # react(:thumbsup)
   def react(emoji, parent=false)
-    if parent
+    if parent or Thread.current[:ts].to_s == ''
       ts = Thread.current[:thread_ts]
     else
       ts = Thread.current[:ts]

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

@@ -32,14 +32,10 @@ class SlackSmartBot
             message = ["You need to set stats to true to generate the stats when running the bot instance."]
         end
         save_stats(__method__)
-        if config.masters.include?(from_user) and typem==:on_dm #master admin user
+        if (config.masters.include?(from_user) or @master_admin_users_id.include?(from_user)) and typem==:on_dm #master admin user
             if !File.exist?("#{config.stats_path}.#{Time.now.strftime("%Y-%m")}.log")
                 message<<'No stats'
             else
-                if user!=''
-                    user_info = client.web_client.users_info(user: user)
-                    user_name = user_info.user.name
-                end
                 from = "#{Time.now.strftime("%Y-%m")}-01" if from == ''
                 to = "#{Time.now.strftime("%Y-%m-%d")}" if to == ''
                 from_short = from
@@ -52,13 +48,56 @@ class SlackSmartBot
                 rows_month = {}
                 users_month = {}
                 commands_month = {}
-
+                users_id_name = {}
+                users_name_id = {}
+    
+                # to translate global and enterprise users since sometimes was returning different names/ids
+                Dir["#{config.stats_path}.*.log"].sort.each do |file|
+                    if file >= "#{config.stats_path}.#{from_file}.log" or file <= "#{config.stats_path}.#{to_file}.log"
+                        CSV.foreach(file, headers: true, header_converters: :symbol, converters: :numeric) do |row|
+                            unless users_id_name.key?(row[:user_id])
+                                users_id_name[row[:user_id]] = row[:user_name]
+                            end
+                            unless users_name_id.key?(row[:user_name])
+                                users_name_id[row[:user_name]] = row[:user_id]
+                            end
+    
+                        end
+                    end
+                end
+    
+                if user!=''
+                    user_info = client.web_client.users_info(user: user)
+                    if users_id_name.key?(user_info.user.id)
+                        user_name = users_id_name[user_info.user.id]
+                    else
+                        user_name = user_info.user.name
+                    end
+                    if users_name_id.key?(user_info.user.name)
+                        user_id = users_name_id[user_info.user.name]
+                    else
+                        user_id = user_info.user.id
+                    end
+                end
+                master_admins = config.masters.dup
+                config.masters.each do |u|
+                    if users_id_name.key?(u)
+                        master_admins << users_id_name[u]
+                    elsif users_name_id.key?(u)
+                        master_admins << users_name_id[u]
+                    end
+                end
+    
                 Dir["#{config.stats_path}.*.log"].sort.each do |file|
                     if file >= "#{config.stats_path}.#{from_file}.log" or file <= "#{config.stats_path}.#{to_file}.log"
                         CSV.foreach(file, headers: true, header_converters: :symbol, converters: :numeric) do |row|
                             row[:date] = row[:date].to_s
-                            if !exclude_masters or (exclude_masters and !config.masters.include?(row[:user_name]))
-                                if user=='' or (user!='' and row[:user_name] == user_name)
+                            row[:user_name] = users_id_name[row[:user_id]]
+                            row[:user_id] = users_name_id[row[:user_name]]
+                            if !exclude_masters or (exclude_masters and !master_admins.include?(row[:user_name]) and 
+                                                    !master_admins.include?(row[:user_id]) and
+                                                    !@master_admin_users_id.include?(row[:user_id]))
+                                if user=='' or (user!='' and row[:user_name] == user_name) or (user!='' and row[:user_id] == user_id)
                                     if exclude_command == '' or (exclude_command!='' and row[:command]!=exclude_command)
                                         if row[:bot_channel_id] == channel_id or channel_id == ''
                                             if row[:date] >= from and row[:date] <= to
@@ -68,7 +107,7 @@ class SlackSmartBot
                                                     users_month[row[:date][0..6]] = [] unless users_month.key?(row[:date][0..6])
                                                     commands_month[row[:date][0..6]] = [] unless commands_month.key?(row[:date][0..6])
                                                     rows_month[row[:date][0..6]] += 1
-                                                    users_month[row[:date][0..6]] << row[:user_name]
+                                                    users_month[row[:date][0..6]] << row[:user_id]
                                                     commands_month[row[:date][0..6]] << row[:command]
                                                 end
                                             end
@@ -79,7 +118,6 @@ class SlackSmartBot
                         end
                     end
                 end
-
                 total = rows.size
                 if exclude_masters
                     message << 'Excluding master admins'
@@ -111,7 +149,7 @@ class SlackSmartBot
                             message << "\t#{k}: #{v} (#{(v.to_f*100/total).round(2)}%) / #{commands_month[k].uniq.size} / #{users_month[k].uniq.size} #{message_new_users}"
                         end
                     end
-
+    
                     if channel_id == ''
                         message << "*Channels*"
                         channels = rows.bot_channel.uniq.sort
@@ -121,21 +159,25 @@ class SlackSmartBot
                         end
                     end
                     if user==''
-                        users = rows.user_name.uniq.sort
+                        users = rows.user_id.uniq.sort
                         message << "*Users* - #{users.size}"
+                        count_user = {}
                         users.each do |user|
-                            count = rows.count {|h| h.user_name==user}
-                            message << "\t#{user}: #{count} (#{(count.to_f*100/total).round(2)}%)"
+                            count = rows.count {|h| h.user_id==user}
+                            count_user[user] = count
+                        end
+                        count_user.sort_by {|k,v| -v}.each do |user, count|
+                           message << "\t#{users_id_name[user]}: #{count} (#{(count.to_f*100/total).round(2)}%)"
                         end
                     end
-
+    
                     commands = rows.command.uniq.sort
                     message << "*Commands* - #{commands.size}"
                     commands.each do |command|
                         count = rows.count {|h| h.command==command}
                         message << "\t#{command}: #{count} (#{(count.to_f*100/total).round(2)}%)"
                     end
-
+    
                     message << "*Message type*"
                     types = rows.type_message.uniq.sort
                     types.each do |type|
@@ -144,7 +186,6 @@ class SlackSmartBot
                     end
                     message << "*Last activity*: #{rows[-1].date} #{rows[-1].bot_channel} #{rows[-1].type_message} #{rows[-1].user_name} #{rows[-1].command}"
                 end
-                
             end
         else
             message<<"Only Master admin users on a private conversation with the bot can see the bot stats."

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

@@ -117,7 +117,8 @@ class SlackSmartBot
       begin
         #todo: when changed @questions user_id then move user_info inside the ifs to avoid calling it when not necessary
         user_info = client.web_client.users_info(user: data.user)
-        user_info.user.id = data.user #todo: remove this line when slack issue with Wxxxx Uxxxx fixed
+        #user_info.user.id = data.user #todo: remove this line when slack issue with Wxxxx Uxxxx fixed
+        data.user = user_info.user.id  #todo: remove this line when slack issue with Wxxxx Uxxxx fixed
         if @questions.key?(user_info.user.name)
           if data.text.match?(/^\s*(Bye|Bæ|Good\sBye|Adiós|Ciao|Bless|Bless\sBless|Adeu)\s(#{@salutations.join("|")})\s*$/i)
             @questions.delete(user_info.user.name)

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: slack-smart-bot
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Mario Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-27 00:00:00.000000000 Z
+date: 2020-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-ruby-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.15.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.15'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.15.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.15.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.15'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.15.1
 - !ruby/object:Gem::Dependency
   name: nice_http
   requirement: !ruby/object:Gem::Requirement