slack-smart-bot 1.12.0 → 1.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b862b6537e267ad0582f3ca4e60eefa63ef9513a6e2b4d0bf0dd05ac5689ef4
-  data.tar.gz: 1f08183c3eb4e33f63f1b1b4a1fc1e078ceb4835655d03435eca27aa2491f749
+  metadata.gz: 2ca72cea646786ecef45351b9572383eaf24ac21c0536d69f589ec05975a8bc0
+  data.tar.gz: 0a67ca50fe73a664368912ed37f8a0edf30744ae1d30e981873de68599ad7e2d
 SHA512:
-  metadata.gz: 286cc08cac4c0f4cc7dbb32583a2d1f27d7b41bfa2e53330a407850ed80ce993ec63c036c0b1c88a6113b4261701315bd8b2a34eac91e1a9d156eadd029e50de
-  data.tar.gz: a7b84c3d33cb1eda1a59d2d677b091f3b7aab488824d7ee7ba62af1eaa71a2311bb9decd3f7844baedf2fc569bc9f72b9baad023d50393627d70e40c8ba7be6e
+  metadata.gz: ca0195b49029b878b1d91b2ee361af405e862ef7f93e8a7fed3e982b61c6ce46946f882b22798d190c8a36241b772301c62ad85cffba2773a7705e7a8147537e
+  data.tar.gz: e34528eb142a56fae2d4a61bbc9455ac8aa3f72185085ea8eadb61468756365e29ae1689067a3b59478805d066ec7916db351e337010707130fa75772193c5b7

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

@@ -10,7 +10,6 @@ def general_bot_commands(user, command, dest, files = [])
       end
       display_name = user.profile.display_name
     end
-
     case command
 
 
@@ -557,9 +556,9 @@ def general_bot_commands(user, command, dest, files = [])
         type = $1.downcase.to_sym
         name = $2.downcase
         member_type = $3.downcase
-        message = Thread.current[:command_orig].to_s.gsub("\u00A0", " ").scan(/\A\s*[^\s]+\s*\w+\s+team\s+[\w\-]+\s+[\w\-]+\s+(.+)\s*\z/im).join
+        message = Thread.current[:command_orig].to_s.gsub("\u00A0", " ").scan(/\A\s*[\w]+\s+\w+\s+team\s+[\w\-]+\s+(.+)\s*\z/im).join
         if message == ''
-          message = Thread.current[:command_orig].to_s.gsub("\u00A0", " ").scan(/\A\s*[^\s]+\s*\w+\s+[\w\-]+\s+team\s+[\w\-]+\s+(.+)\s*\z/im).join
+          message = Thread.current[:command_orig].to_s.gsub("\u00A0", " ").scan(/\A\s*[\w]+\s+team\s+\w+\s+[\w\-]+\s+(.+)\s*\z/im).join
         end
         ping_team(user, type, name, member_type, message)
 

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

@@ -75,6 +75,7 @@ class SlackSmartBot
             end
         end
         tzone_users = {}
+        job_title_users = {}
 
         unless wrong
             if on_dm_master or (from_user.id == user) # normal user can only see own stats 
@@ -318,6 +319,30 @@ class SlackSmartBot
                                     end
                                 end
                             end
+                            if rows[0].key?(:job_title) #then save_stats is saving the job title already
+                                rows.job_title.each do |job_title|
+                                    unless job_title == ''
+                                        job_title_users[job_title] ||= 0
+                                        job_title_users[job_title] += 1
+                                    end
+                                end
+                            else
+                                rows.user_id.each_with_index do |usr, i|
+                                    if rows[i].values.size >= 13 #then save_stats is saving the job_title already but not all the data
+                                        unless rows[i].values[12] == ''
+                                            job_title_users[rows[i].values[12]] ||= 0
+                                            job_title_users[rows[i].values[12]] += 1    
+                                        end
+                                    else
+                                        user_info = @users.select { |u| u.id == usr or (u.key?(:enterprise_user) and u.enterprise_user.id == usr) }[-1]
+                                        unless user_info.nil? or user_info.is_app_user or user_info.is_bot
+                                            job_title_users[user_info.profile.title] ||= 0
+                                            job_title_users[user_info.profile.title] += 1
+                                        end
+                                    end
+                                end
+                            end
+
                             if users.size > 10
                                 message << "*Users* - #{users.size} (Top 10)"
                             else
@@ -357,6 +382,17 @@ class SlackSmartBot
                                 message << "\tUnknown: #{total_unknown} (#{(total_unknown.to_f*100/total_without_routines).round(2)}%)" if total_unknown > 0
                             end
 
+                            if job_title_users.size > 0
+                                message << "*Job Titles*"
+                                total_known = 0
+                                job_title_users.each do |jtitle, num|
+                                    message << "\t#{jtitle}: #{num} (#{(num.to_f*100/total_without_routines).round(2)}%)"
+                                    total_known+=num
+                                end
+                                total_unknown = total_without_routines - total_known
+                                message << "\tUnknown: #{total_unknown} (#{(total_unknown.to_f*100/total_without_routines).round(2)}%)" if total_unknown > 0
+                            end
+
                         end
                         commands_attachment = []
 

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

@@ -6,7 +6,7 @@ class SlackSmartBot
           require "csv"
           if !File.exist?("#{config.stats_path}.#{Time.now.strftime("%Y-%m")}.log")
             CSV.open("#{config.stats_path}.#{Time.now.strftime("%Y-%m")}.log", "wb") do |csv|
-              csv << ["date", "bot_channel", "bot_channel_id", "dest_channel", "dest_channel_id", "type_message", "user_name", "user_id", "text", "command", "files", "time_zone"]
+              csv << ["date", "bot_channel", "bot_channel_id", "dest_channel", "dest_channel_id", "type_message", "user_name", "user_id", "text", "command", "files", "time_zone", "job_title"]
             end
           end
           if data.empty?
@@ -37,12 +37,14 @@ class SlackSmartBot
           user_info = @users.select { |u| u.id == user_id or (u.key?(:enterprise_user) and u.enterprise_user.id == user_id) }[-1]
           if user_info.nil? or user_info.is_app_user or user_info.is_bot
             time_zone = ''
+            job_title = ''
           else
             time_zone = user_info.tz_label
+            job_title = user_info.profile.title
           end
 
           CSV.open("#{config.stats_path}.#{Time.now.strftime("%Y-%m")}.log", "a+") do |csv|
-            csv << [Time.now, config.channel, @channel_id, @channels_name[data.dest], data.dest, data.typem, user_name, user_id, command_txt, method, data.files, time_zone]
+            csv << [Time.now, config.channel, @channel_id, @channels_name[data.dest], data.dest, data.typem, user_name, user_id, command_txt, method, data.files, time_zone, job_title]
           end
         rescue Exception => exception
           @logger.fatal "There was a problem on the stats"

data/whats_new.txt

@@ -1,4 +1,4 @@
-*Version 1.12.0* Released 2022-Sep-28
+*Version 1.12.2* Released 2022-Nov-01
 
 *For General users*
 - `run repl` accepts local parameters and precode to be supplied (<https://github.com/MarioRuiz/slack-smart-bot/issues/60|#60>).
@@ -12,7 +12,8 @@
 
 *For Admin users*
 - Bot Stats is now saving the time_zone of the user (<https://github.com/MarioRuiz/slack-smart-bot/issues/66|#66>)
-- Announcements won't be published if no activity on channel. (<https://github.com/MarioRuiz/slack-smart-bot/issues/74|#74)
+- Announcements won't be published if no activity on channel. (<https://github.com/MarioRuiz/slack-smart-bot/issues/74|#74>)
+- Bot Stats is now saving the job title of the user (<https://github.com/MarioRuiz/slack-smart-bot/issues/77|#77>)
 ------------------------------
 
 *Previous*: <https://github.com/MarioRuiz/slack-smart-bot/blob/b1a368c3342094e886f53d96dc4d12ecd81ab04b/whats_new.txt|1.11.0>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slack-smart-bot
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.12.2
 platform: ruby
 authors:
 - Mario Ruiz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-29 00:00:00.000000000 Z
+date: 2022-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-ruby-client