slack-smart-bot 1.15.0 → 1.15.25

data/lib/slack/smart-bot/commands/on_extended/bot_rules.rb

@@ -1,11 +1,11 @@
 class SlackSmartBot
-  def bot_rules(dest, help_command, typem, rules_file, user, send_to_file: false)
-    save_stats(__method__)
+  def bot_rules(dest, help_command, typem, rules_file, user, send_to_file: false, savestats: true, return_output: false)
+    save_stats(__method__) if savestats
     if has_access?(__method__, user)
       if typem == :on_extended or typem == :on_call #for the other cases above.
         output = []
-        if help_command.to_s != ''
-          help_command = '' if help_command.to_s.match?(/^\s*expanded\s*$/i) or help_command.to_s.match?(/^\s*extended\s*$/i)
+        if help_command.to_s != ""
+          help_command = "" if help_command.to_s.match?(/^\s*expanded\s*$/i) or help_command.to_s.match?(/^\s*extended\s*$/i)
           expanded = true
         else
           expanded = false
@@ -25,7 +25,7 @@ class SlackSmartBot
               commands << h
             elsif !h.match?(/\A\s*\*/) and !h.match?(/\A\s*=+/) #to avoid general messages for bot help *General rules...*
               all_found = true
-              help_command.to_s.split(' ') do |hc|
+              help_command.to_s.split(" ") do |hc|
                 unless hc.match?(/^\s*\z/)
                   if !h.match?(/#{hc}/i)
                     all_found = false
@@ -35,9 +35,9 @@ class SlackSmartBot
               commands_search << h if all_found
             end
           end
-          if commands.size < 10 and help_command.to_s!='' and commands_search.size > 0
+          if commands.size < 10 and help_command.to_s != "" and commands_search.size > 0
             commands_search.shuffle!
-            (10-commands.size).times do |n|
+            (10 - commands.size).times do |n|
               unless commands_search[n].nil?
                 output << commands_search[n]
                 help_found = true
@@ -47,7 +47,6 @@ class SlackSmartBot
           unless help_found
             output << "*#{config.channel}*: I didn't find any command with `#{help_command}`"
           end
-
         else
           message = "-\n\n\n===================================\n*Rules from channel #{config.channel}*\n"
           if typem == :on_extended
@@ -59,7 +58,7 @@ class SlackSmartBot
 
         unless rules_file.empty?
           begin
-            eval(File.new(config.path+rules_file).read) if File.exist?(config.path+rules_file)
+            eval(File.new(config.path + rules_file).read) if File.exist?(config.path + rules_file)
           end
         end
         if defined?(git_project) and git_project.to_s != "" and help_command.to_s == ""
@@ -73,28 +72,33 @@ class SlackSmartBot
           message_not_expanded += "Also to get specific *expanded* help for a specific command or rule call *`bot rules COMMAND`*\n"
           output << message_not_expanded
         end
-        if output.join("\n").lines.count > 50 and dest[0]!='D'
+        if output.join("\n").lines.count > 50 and dest[0] != "D"
           dest = :on_thread
-          output.unshift('Since there are many lines returned the results are returned on a thread by default.')
+          output.unshift("Since there are many lines returned the results are returned on a thread by default.")
         end
         if send_to_file
           content = output.join("\n\n")
           content.gsub!(/\*<([^>]*)\|([^>]*)>\*/, '## [\2](\1)')
           content.gsub!(/^\s*(\*.+\*)\s*$/, '# \1')
-          content.gsub!(/command_id:\s+:/, '### :')
-          content = content.gsub("\n", "  \n").gsub(/\|[\w\s]*>/i,">").gsub(/^\s*\-\-\-\-\-\-/, "\n------")
+          content.gsub!(/command_id:\s+:/, "### :")
+          content = content.gsub("\n", "  \n").gsub(/\|[\w\s]*>/i, ">").gsub(/^\s*\-\-\-\-\-\-/, "\n------")
           dest == :on_thread ? dest_file = dchannel : dest_file = dest
-          send_file(dest_file, "SmartBot Rules", "", 'smartbot_rules.md', "text/markdown", "markdown", content: content)
+          send_file(dest_file, "SmartBot Rules", "", "smartbot_rules.md", "text/markdown", "markdown", content: content)
+        elsif return_output
+          output.each do |h|
+            h.gsub!(/^\s*command_id:\s+:\w+\s*$/, "")
+            h.gsub!(/^\s*>.+$/, "") if help_command.to_s != ""
+          end
+          return output
         else
           output.each do |h|
-            msg = h.gsub(/^\s*command_id:\s+:\w+\s*$/,'')
-            msg.gsub!(/^\s*>.+$/,'') if help_command.to_s != ''
+            msg = h.gsub(/^\s*command_id:\s+:\w+\s*$/, "")
+            msg.gsub!(/^\s*>.+$/, "") if help_command.to_s != ""
             unless msg.match?(/\A\s*\z/)
               respond msg, dest, unfurl_links: false, unfurl_media: false
             end
           end
         end
-
       end
     end
   end

data/lib/slack/smart-bot/commands/on_master/admin_master/exit_bot.rb

@@ -37,7 +37,7 @@ class SlackSmartBot
             respond "Game over!", dest
             @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
+              respond "ChatGPT session closed since SmartBot is going to be closed.\nCheck <##{@channels_id[config.status_channel]}>", channel_thread, thread_ts: thread_ts
             end
             if config.simulate
               sleep 2
@@ -45,7 +45,7 @@ class SlackSmartBot
               config.simulate = false
               Thread.exit
             else
-              respond 'Ok, It will take around 40s to close all the bots, all routines and the master bot.'
+              respond "Ok, It will take around 40s to close all the bots, all routines and the master bot."
               sleep 35
               respond "Ciao #{display_name}!", dest
               unreact :runner

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

@@ -79,25 +79,25 @@ require_relative "commands/general/set_public_holidays"
 require_relative "commands/general/personal_settings"
 require_relative "commands/general/teams/memos/add_memo_team_comment"
 require_relative "commands/general/teams/memos/see_memo_team"
-require_relative 'commands/general/ai/open_ai/open_ai_chat'
-require_relative 'commands/general/ai/open_ai/open_ai_chat_get_prompts'
-require_relative 'commands/general/ai/open_ai/open_ai_chat_delete_session'
-require_relative 'commands/general/ai/open_ai/open_ai_chat_share_session'
-require_relative 'commands/general/ai/open_ai/open_ai_chat_list_sessions'
-require_relative 'commands/general/ai/open_ai/open_ai_chat_add_collaborator'
-require_relative 'commands/general/ai/open_ai/open_ai_chat_use_model'
-require_relative 'commands/general/ai/open_ai/open_ai_chat_copy_session'
-require_relative 'commands/general/ai/open_ai/open_ai_generate_image'
-require_relative 'commands/general/ai/open_ai/open_ai_variations_image'
-require_relative 'commands/general/ai/open_ai/open_ai_edit_image'
-require_relative 'commands/general/ai/open_ai/open_ai_models'
-require_relative 'commands/general/ai/open_ai/open_ai_whisper'
-require_relative 'commands/general/recap'
-require_relative 'commands/general/summarize'
-require_relative 'commands/general/get_smartbot_readme'
+require_relative "commands/general/ai/open_ai/open_ai_chat"
+require_relative "commands/general/ai/open_ai/open_ai_chat_get_prompts"
+require_relative "commands/general/ai/open_ai/open_ai_chat_delete_session"
+require_relative "commands/general/ai/open_ai/open_ai_chat_share_session"
+require_relative "commands/general/ai/open_ai/open_ai_chat_list_sessions"
+require_relative "commands/general/ai/open_ai/open_ai_chat_add_collaborator"
+require_relative "commands/general/ai/open_ai/open_ai_chat_use_model"
+require_relative "commands/general/ai/open_ai/open_ai_chat_copy_session"
+require_relative "commands/general/ai/open_ai/open_ai_generate_image"
+require_relative "commands/general/ai/open_ai/open_ai_variations_image"
+require_relative "commands/general/ai/open_ai/open_ai_edit_image"
+require_relative "commands/general/ai/open_ai/open_ai_models"
+require_relative "commands/general/ai/open_ai/open_ai_whisper"
+require_relative "commands/general/recap"
+require_relative "commands/general/summarize"
+require_relative "commands/general/get_smartbot_readme"
 
 class SlackSmartBot
-    include SlackSmartBot::Commands::General::AI::OpenAI
-    include SlackSmartBot::Commands::General::Teams
-    include SlackSmartBot::Commands::General::Teams::Memos
+  include SlackSmartBot::Commands::General::AI::OpenAI
+  include SlackSmartBot::Commands::General::Teams
+  include SlackSmartBot::Commands::General::Teams::Memos
 end

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

@@ -7,12 +7,12 @@ class SlackSmartBot
     Thread.current[:user] = user
     Thread.current[:team_id_user] = team_id_user
     if text.match(/\A\s*(stop|quit|exit|kill)\s+(iterator|iteration|loop)\s+(\d+)\s*\z/i)
-      save_stats :quit_loop, forced: true, data: {dest: dest, typem: typem, user: user, files: false, command: text, routine: routine}
+      save_stats :quit_loop, forced: true, data: { dest: dest, typem: typem, user: user, files: false, command: text, routine: routine }
       num_iteration = $3.to_i
       if config.team_id_admins.include?(team_id_user) or @loops.key?(team_id_user)
         if config.team_id_admins.include?(team_id_user)
-          name_loop = ''
-          @loops.each do |k,v|
+          name_loop = ""
+          @loops.each do |k, v|
             if v.include?(num_iteration)
               name_loop = k
               break
@@ -37,20 +37,20 @@ class SlackSmartBot
           text.gsub!(encdata, "********")
         end
         text = "********" if !found
-        text+= " (encrypted #{Thread.current[:command_id]})"
+        text += " (encrypted #{Thread.current[:command_id]})"
       end
       @logger.info "command: #{user.team_id}/#{nick}> #{text}"
       return :next #jal
     end
     if text.match(/\A\s*!*^?\s*(for\s*)?(\d+)\s+times\s+every\s+(\d+)\s*(m|minute|minutes|s|sc|second|seconds)\s+(.+)\s*\z/i)
-      save_stats :create_loop, forced: true, data: {dest: dest, typem: typem, user: user, files: false, command: text, routine: routine}
+      save_stats :create_loop, forced: true, data: { dest: dest, typem: typem, user: user, files: false, command: text, routine: routine }
       # min every 10s, max every 60m, max times 24
       command_every = text.dup
       text = $5
       num_times = $2.to_i
       type_every = $4.downcase
       every_seconds = $3.to_i
-      command_every.gsub!(/^\s*!*^?\s*/, '')
+      command_every.gsub!(/^\s*!*^?\s*/, "")
       every_seconds = (every_seconds * 60) if type_every[0] == "m"
       if num_times > 24 or every_seconds < 10 or every_seconds > 3600
         respond "You can't do that. Maximum times is 24, minimum every is 10 seconds, maximum every is 60 minutes.", dest, thread_ts: thread_ts
@@ -61,10 +61,10 @@ class SlackSmartBot
       @num_loops += 1
       loop_id = @num_loops
       @loops[team_id_user] << loop_id
-      respond "Loop #{loop_id} started. To stop the loop use: `#{['stop','quit','exit', 'kill'].sample} #{['iteration','iterator','loop'].sample} #{loop_id}`", dest, thread_ts: thread_ts
+      respond "Loop #{loop_id} started. To stop the loop use: `#{["stop", "quit", "exit", "kill"].sample} #{["iteration", "iterator", "loop"].sample} #{loop_id}`", dest, thread_ts: thread_ts
       #todo: command_orig should be reasigned maybe to remove for N times every X seconds. Check.
     else
-      command_every = ''
+      command_every = ""
       num_times = 1
       every_seconds = 0
     end
@@ -119,6 +119,10 @@ class SlackSmartBot
         when /^Bot has been (closed|killed) by/i
           if config.channel == @channels_name[dchannel]
             @logger.info "#{nick}: #{text}"
+            @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.\nCheck <##{@channels_id[config.status_channel]}>", channel_thread, thread_ts: thread_ts
+            end
             if config.simulate
               @status = :off
               config.simulate = false
@@ -151,7 +155,7 @@ class SlackSmartBot
           from_name = $1
           to_name = $2
           if config.on_master_bot and @bots_created.key?(@channels_id[from_name]) and
-            @bots_created[@channels_id[from_name]][:cloud]
+             @bots_created[@channels_id[from_name]][:cloud]
             @bots_created[@channels_id[from_name]][:extended].delete(to_name)
             update_bots_file()
           end
@@ -252,15 +256,15 @@ class SlackSmartBot
         t = Thread.new do
           begin
             sleep every_seconds * i if every_seconds > 0
-            Thread.exit if command_every!='' and @loops.key?(team_id_user) and !@loops[team_id_user].include?(loop_id)
-            @logger.info "i: #{i}, num_times: #{num_times}, every_seconds: #{every_seconds}, command: #{command_thread}" if command_every!=''
+            Thread.exit if command_every != "" and @loops.key?(team_id_user) and !@loops[team_id_user].include?(loop_id)
+            @logger.info "i: #{i}, num_times: #{num_times}, every_seconds: #{every_seconds}, command: #{command_thread}" if command_every != ""
             processed = false
             processed_rules = false
 
             if command_thread.match?(/\A.+\s+\?\?\s+.+\z/im) and !command_thread.match?(/\A\s*(add|create)\s+(silent\s+)?(bgroutine|routine)\s+([\w\.]+)/im)
               pos = command_thread.index("??")
-              Thread.current[:prompt] = command_thread[pos+2..-1].strip
-              command_thread = command_thread[0..pos-1].strip
+              Thread.current[:prompt] = command_thread[pos + 2..-1].strip
+              command_thread = command_thread[0..pos - 1].strip
               Thread.current[:stdout] = ""
             else
               Thread.current[:prompt] = ""
@@ -318,17 +322,16 @@ class SlackSmartBot
             end
 
             if !config.on_maintenance and @listening.key?(team_id_user) and @listening[team_id_user].key?(Thread.current[:thread_ts]) and !Thread.current[:thread_ts].empty? and
-              ((@active_chat_gpt_sessions.key?(team_id_user) and @active_chat_gpt_sessions[team_id_user].key?(Thread.current[:thread_ts])) or
-              (@chat_gpt_collaborating.key?(team_id_user) and @chat_gpt_collaborating[team_id_user].key?(Thread.current[:thread_ts])))
+               ((@active_chat_gpt_sessions.key?(team_id_user) and @active_chat_gpt_sessions[team_id_user].key?(Thread.current[:thread_ts])) or
+                (@chat_gpt_collaborating.key?(team_id_user) and @chat_gpt_collaborating[team_id_user].key?(Thread.current[:thread_ts])))
               @listening[team_id_user][Thread.current[:thread_ts]] = Time.now
               command_thread = "? #{command_thread}" #chatgpt
             end
 
-
             unless config.on_maintenance or @status != :on
               if typem == :on_pub or typem == :on_pg or typem == :on_extended
                 if command_thread.match(/\A(<)?\s*(#{@salutations.join("|")})\s+(rules|help)\s*(.+)?$/i) or command_thread.match(/\A(<)?\s*(#{@salutations.join("|")}),? what can I do/i)
-                  $1.to_s=='' ? send_to_file = false : send_to_file = true
+                  $1.to_s == "" ? send_to_file = false : send_to_file = true
                   $3.to_s.match?(/rules/i) ? specific = true : specific = false
                   help_command = $4
                   react :runner
@@ -343,6 +346,7 @@ class SlackSmartBot
               end
               processed = (processed || general_bot_commands(user, command_thread, dest, files))
               processed = (processed || general_commands(user, command_thread, dest, files)) if defined?(general_commands)
+
               if processed
                 text_to_log = command_thread.dup
 
@@ -353,7 +357,7 @@ class SlackSmartBot
                     text_to_log.gsub!(encdata, "********")
                   end
                   text_to_log = "********" if !found
-                  text_to_log+= " (encrypted #{Thread.current[:command_id]})"
+                  text_to_log += " (encrypted #{Thread.current[:command_id]})"
                 end
                 @logger.info "command: #{user.team_id}/#{nick}> #{text_to_log}" unless user.id == config.nick_id_granular
               end
@@ -369,19 +373,19 @@ class SlackSmartBot
                    ((@listening[team_id_user].key?(dest) and !Thread.current[:on_thread]) or
                     (@listening[team_id_user].key?(thread_ts) and Thread.current[:on_thread]))) or
                   dest[0] == "D" or on_demand)
-                  unless processed
-                    text_to_log = command_thread.dup
-                    found = false
-                    if Thread.current.key?(:encrypted) and Thread.current[:encrypted].size > 0
-                      Thread.current[:encrypted].each do |encdata|
-                        found = true if !found and text_to_log.include?(encdata)
-                        text_to_log.gsub!(encdata, "********")
-                      end
-                      text_to_log = "********" if !found
-                      text_to_log+= " (encrypted #{Thread.current[:command_id]})"
+                unless processed
+                  text_to_log = command_thread.dup
+                  found = false
+                  if Thread.current.key?(:encrypted) and Thread.current[:encrypted].size > 0
+                    Thread.current[:encrypted].each do |encdata|
+                      found = true if !found and text_to_log.include?(encdata)
+                      text_to_log.gsub!(encdata, "********")
                     end
-                    @logger.info "command: #{user.team_id}/#{nick}> #{text_to_log}" unless user.id == config.nick_id_granular
+                    text_to_log = "********" if !found
+                    text_to_log += " (encrypted #{Thread.current[:command_id]})"
                   end
+                  @logger.info "command: #{user.team_id}/#{nick}> #{text_to_log}" unless user.id == config.nick_id_granular
+                end
                 #todo: verify this
 
                 if dest[0] == "C" or dest[0] == "G" or (dest[0] == "D" and typem == :on_call)
@@ -493,10 +497,10 @@ class SlackSmartBot
               end
             end
 
-            if Thread.current[:prompt].to_s != ''
+            if Thread.current[:prompt].to_s != ""
               prompt = "#{Thread.current[:command]}\n\n#{Thread.current[:prompt]}\n\n#{Thread.current[:stdout]}\n\n"
-              Thread.current[:prompt] = ''
-              Thread.current[:stdout] = ''
+              Thread.current[:prompt] = ""
+              Thread.current[:stdout] = ""
               if processed
                 if @active_chat_gpt_sessions.key?(team_id_user) and @active_chat_gpt_sessions[team_id_user].key?(Thread.current[:thread_ts])
                   open_ai_chat(prompt, false, :temporary)
@@ -508,9 +512,8 @@ class SlackSmartBot
             if processed and config.general_message != "" and !routine
               respond eval("\"" + config.general_message + "\"")
             end
-            respond "_*Loop #{loop_id}* (#{i+1}/#{num_times}) <@#{user.name}>: #{command_every}_" if command_every!='' and processed
-            @loops[team_id_user].delete(loop_id) if command_every!='' and !processed and @loops.key?(team_id_user) and @loops[team_id_user].include?(loop_id)
-
+            respond "_*Loop #{loop_id}* (#{i + 1}/#{num_times}) <@#{user.name}>: #{command_every}_" if command_every != "" and processed
+            @loops[team_id_user].delete(loop_id) if command_every != "" and !processed and @loops.key?(team_id_user) and @loops[team_id_user].include?(loop_id)
           rescue Exception => stack
             @logger.fatal stack
           end