slack-smart-bot 1.13.2 → 1.14.0

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

@@ -23,6 +23,8 @@ class SlackSmartBot
   # help:     By default it will be automatically loaded the gems: string_pattern, nice_hash and nice_http
   # help:     To pre-execute some ruby when starting the session add the code to .smart-bot-repl file on the project root folder defined on project_folder
   # help:     If you want to see the methods of a class or module you created use _ls TheModuleOrClass_
+  # help:     To see the code of a method: _code TheModuleOrClass.my_method_
+  # help:     To see the documentation of a method: _doc TheModuleOrClass.my_method_
   # help:     You can supply the Environmental Variables you need for the Session
   # help:     You can add collaborators by sending _add collaborator @USER_ to the session.
   # help:     Examples:
@@ -91,118 +93,14 @@ class SlackSmartBot
         end
         @ts_repl ||= {}
         @ts_repl[session_name] = ""
+        process_to_run = repl_client(from, session_name, type, serialt, env_vars)
 
-        message = "Session name: *#{session_name}*
-        From now on I will execute all you write as a Ruby command and I will keep the session open until you send `quit` or `bye` or `exit`. 
-        In case you need someone to help you with the session you can add collaborators by sending `add collaborator @USER` to the session.
-        I will respond with the result so it is not necessary you send `print`, `puts`, `p` or `pp` unless you want it as the output when calling `run repl`. 
-        Use `p` to print a message raw, exacly like it is returned. 
-        If you want to avoid a message to be treated by me, start the message with '-'. 
-        After 30 minutes of no communication with the Smart Bot the session will be dismissed.
-        If you want to see the methods of a class or module you created use _ls TheModuleOrClass_
-        You can supply the Environmental Variables you need for the Session
-        Example:
-          _repl CreateCustomer LOCATION=spain HOST='https://10.30.40.50:8887'_
-        "
-        respond message, dest
-
-        File.write("#{config.path}/repl/#{@channel_id}/#{@repl_sessions[from][:name]}.input", "", mode: "a+")
-        File.write("#{config.path}/repl/#{@channel_id}/#{@repl_sessions[from][:name]}.output", "", mode: "a+")
-        File.write("#{config.path}/repl/#{@channel_id}/#{@repl_sessions[from][:name]}.run", "", mode: "a+")
-
-        if type != :private_clean and type != :public_clean
-          pre_execute = '
-            if File.exist?(\"./.smart-bot-repl\")
-              begin
-                eval(File.read(\"./.smart-bot-repl\"), bindme' + serialt + ")
-              rescue Exception => resp_repl
-              end
-            end
-          "
-        else
-          pre_execute = ""
-        end
-
-        process_to_run = "
-            " + env_vars.join("\n") + '
-            require \"amazing_print\"
-            require \"stringio\"
-            bindme' + serialt + ' = binding
-            eval(\"require \'nice_http\'\" , bindme' + serialt + ')
-            def ls(obj)
-              (obj.methods - Object.methods)
-            end
-            file_run_path = \"' + +File.expand_path(config.path) + "/repl/" + @channel_id + "/" + session_name + '.rb\"
-            file_input_repl = File.open(\"' + File.expand_path(config.path) + "/repl/" + @channel_id + "/" + session_name + '.input\", \"r\")
-            ' + pre_execute + '
-            while true do 
-              sleep 0.2 
-              code_to_run_repl = file_input_repl.read
-              if code_to_run_repl.to_s!=\"\"
-                add_to_run_repl = true
-                if code_to_run_repl.to_s.match?(/^quit$/i) or 
-                  code_to_run_repl.to_s.match?(/^exit$/i) or 
-                  code_to_run_repl.to_s.match?(/^bye bot$/i) or
-                  code_to_run_repl.to_s.match?(/^bye$/i)
-                  exit
-                else
-                  if code_to_run_repl.match?(/^\s*ls\s+(.+)/)
-                    add_to_run_repl = false
-                  end
-                  error = false
-                  begin
-                    begin
-                      original_stdout = $stdout
-                      $stdout = StringIO.new 
-                      resp_repl = eval(code_to_run_repl, bindme' + serialt + ')
-                      stdout_repl = $stdout.string
-                    ensure 
-                      $stdout = original_stdout
-                    end
-                  rescue Exception => resp_repl
-                    error = true
-                  end
-                  if error
-                    open(\"' + File.expand_path(config.path) + "/repl/" + @channel_id + "/" + session_name + '.output\", \"a+\") {|f|
-                      f.puts \"\`\`\`\n#{resp_repl.to_s.gsub(/^.+' + session_name + '\.rb:\d+:/,\"\")}\`\`\`\"
-                    }
-                  else
-                    if code_to_run_repl.match?(/^\s*p\s+/i)
-                      resp_repl = stdout_repl unless stdout_repl.to_s == \'\'
-                      if stdout_repl.to_s == \'\'
-                        resp_repl = resp_repl.inspect
-                      else
-                        resp_repl = stdout_repl 
-                      end
-                      open(\"' + File.expand_path(config.path) + "/repl/" + @channel_id + "/" + session_name + '.output\", \"a+\") {|f|
-                        f.puts \"\`\`\`\n#{resp_repl}\`\`\`\"
-                      }
-                    else
-                      if stdout_repl.to_s == \'\'
-                        resp_repl = resp_repl.ai
-                      else
-                        resp_repl = stdout_repl 
-                      end
-                      open(\"' + File.expand_path(config.path) + "/repl/" + @channel_id + "/" + session_name + '.output\", \"a+\") {|f|
-                        f.puts \"\`\`\`\n#{resp_repl}\`\`\`\"
-                      }
-                    end
-                    unless !add_to_run_repl
-                      open(\"' + File.expand_path(config.path) + "/repl/" + @channel_id + "/" + session_name + '.run\", \"a+\") {|f|
-                        f.puts code_to_run_repl
-                      }
-                    end
-                  end
-                end
-              end
-            end
-        '
         unless rules_file.empty? # to get the project_folder
           begin
             eval(File.new(config.path + rules_file).read) if File.exist?(config.path + rules_file)
           end
         end
-        process_to_run.gsub!('\"', '"')
+
         file_run_path = "./tmp/repl/#{@channel_id}/#{session_name}.rb"
         if defined?(project_folder)
           Dir.mkdir("#{project_folder}/tmp/") unless Dir.exist?("#{project_folder}/tmp/")
@@ -257,7 +155,8 @@ class SlackSmartBot
                 unreact(:running, @ts_repl[@repl_sessions[from].name])
                 @ts_repl[@repl_sessions[from].name] = ""
               end
-              if resp_repl.to_s.lines.count < 60 and resp_repl.to_s.size < 3500
+              if (resp_repl.to_s.lines.count < 60 and resp_repl.to_s.size < 3500) or 
+                resp_repl.match?(/^\s*[_\*]*`\w+`/im)
                 respond resp_repl, dest
               else
                 resp_repl.gsub!(/^\s*```/, "")

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

@@ -0,0 +1,233 @@
+class SlackSmartBot
+  def repl_client(from, session_name, type, serialt, env_vars)
+    message = "Session name: *#{session_name}*
+        From now on I will execute all you write as a Ruby command and I will keep the session open until you send `quit` or `bye` or `exit`. 
+        In case you need someone to help you with the session you can add collaborators by sending `add collaborator @USER` to the session.
+        I will respond with the result so it is not necessary you send `print`, `puts`, `p` or `pp` unless you want it as the output when calling `run repl`. 
+        Use `p` to print a message raw, exacly like it is returned. 
+        If you want to avoid a message to be treated by me, start the message with '-'. 
+        After 30 minutes of no communication with the Smart Bot the session will be dismissed.
+        If you want to see the methods of a class or module you created use _ls TheModuleOrClass_
+        To see the code of a method: _code TheModuleOrClass.my_method_. To see the documentation of a method: _doc TheModuleOrClass.my_method_
+        You can supply the Environmental Variables you need for the Session
+        Example:
+          _repl CreateCustomer LOCATION=spain HOST='https://10.30.40.50:8887'_
+        "
+    respond message
+
+    File.write("#{config.path}/repl/#{@channel_id}/#{@repl_sessions[from][:name]}.input", "", mode: "a+")
+    File.write("#{config.path}/repl/#{@channel_id}/#{@repl_sessions[from][:name]}.output", "", mode: "a+")
+    File.write("#{config.path}/repl/#{@channel_id}/#{@repl_sessions[from][:name]}.run", "", mode: "a+")
+
+    if type != :private_clean and type != :public_clean
+      pre_execute = '
+            if File.exist?(\"./.smart-bot-repl\")
+              begin
+                eval(File.read(\"./.smart-bot-repl\"), bindme' + serialt + ")
+              rescue Exception => resp_repl
+              end
+            end
+          "
+    else
+      pre_execute = ""
+    end
+
+    process_to_run = "
+            " + env_vars.join("\n") + '
+            require \"amazing_print\"
+            require \"stringio\"
+            require \"method_source\"
+            bindme' + serialt + ' = binding
+            eval(\"require \'nice_http\'\" , bindme' + serialt + ')
+            def get_met_params(obj, m=nil)
+              result = ""
+              if m.nil?
+                met = obj
+              else
+                met = obj.method(m) 
+              end
+              met.source.split("\n").each { |line|
+                line.gsub!("def", "")
+                line.gsub!("self.", "")
+                line.strip!
+                line.gsub!(/\A(\w+)\(/, \'*`\1`* (\')
+                line.gsub!(/\A(\w+)$/, \'*`\1`*\')
+                if line.strip[-1] == ")" or (result.empty? and !line.include?("("))
+                  line.gsub!(/\A(\w+)\s/, \'*`\1`* \') if !line.include?("(")
+                  result << "#{line}"
+                  result << " ..." if !line.include?("(") and !line.include?(")")
+                  result << "\n"
+                  break 
+                else
+                  result << "#{line}\n"
+                end
+              }
+              result
+            end
+            def ls(obj)
+              result = ""
+              (obj.methods - Object.methods).sort.each do |m|
+                result << get_met_params(obj, m)
+                result << "\n"
+              end
+              puts result
+            end
+            def get_object(obj_txt)
+              met = obj_txt.scan(/\.(\w+)/).flatten.last
+            
+              if met.nil? and obj_txt[0].match(/[A-Z]/) 
+                obj = Object
+                obj_txt.split("::").each do |cl|
+                  if obj.const_defined?(cl.to_sym)
+                    obj = obj.const_get(cl)
+                  else
+                    obj = nil
+                    break
+                  end
+                end
+              elsif met.nil? and obj_txt[0].match(/[a-z]/)
+                begin
+                  obj = self.method(obj_txt)
+                rescue
+                  obj = nil
+                end     
+              else
+                cl = obj_txt.scan(/([\w\:]+)\./).flatten.first
+                obj = Object
+                cl.split("::").each do |cl|
+                  if obj.const_defined?(cl.to_sym)
+                    obj = obj.const_get(cl)
+                  else
+                    obj = nil
+                    break
+                  end
+                end
+                unless obj.nil?
+                  if obj.respond_to?(met)
+                    obj = obj.method(met)
+                  elsif obj.instance_method(met)
+                    obj = obj.instance_method(met)        
+                  else
+                    obj = nil
+                  end
+                end
+            
+              end    
+            end
+            
+            def doc(obj_txt)
+              obj = get_object(obj_txt)
+              if !obj.nil? and obj.respond_to?(:source_location) and obj.respond_to?(:comment) and
+                !obj.source_location.nil? and !obj.comment.nil?
+                result = "_*#{obj.source_location.join(":").gsub(Dir.pwd,"").gsub(Dir.home,"")}*_\n\n"
+                comment = obj.comment.gsub(/^\s*\#/, "")
+                comment.gsub!(/^\s*#+\s*(\R|$)/, "")
+                comment.gsub!(/^\s(\w)([\w\s\-]*):/i, \'*\1\2*:\')
+                comment.gsub!(/^(\s+)(\w[\w\s\-]*):/i, \'\1*`\2`*:\')
+                result << "#{comment}"
+                result << "\n\n"
+                result << get_met_params(obj)
+              else
+                result = "No documentation found for #{obj_txt}. The object doesn\'t exist or it is not accessible."
+              end
+              puts result
+            end
+            
+            def source(obj_txt)
+              obj = get_object(obj_txt)
+              if !obj.nil? and obj.respond_to?(:source_location) and obj.respond_to?(:comment) and
+                !obj.source_location.nil? and !obj.comment.nil?
+                result = "# #{obj.source_location.join(":").gsub(Dir.pwd,"").gsub(Dir.home,"")}\n\n"
+                result << "#{obj.source}"
+              else
+                result = "No source code found for #{obj_txt}. The object doesn\'t exist or it is not accessible."
+              end
+              puts result
+            end
+                        
+            def code(obj_txt)
+              source(obj_txt)
+            end            
+
+            file_run_path = \"' + +File.expand_path(config.path) + "/repl/" + @channel_id + "/" + session_name + '.rb\"
+            file_input_repl = File.open(\"' + File.expand_path(config.path) + "/repl/" + @channel_id + "/" + session_name + '.input\", \"r\")
+            ' + pre_execute + '
+            while true do 
+              sleep 0.2 
+              code_to_run_repl = file_input_repl.read
+              if code_to_run_repl.to_s!=\"\"
+                add_to_run_repl = true
+                if code_to_run_repl.to_s.match?(/^quit$/i) or 
+                  code_to_run_repl.to_s.match?(/^exit$/i) or 
+                  code_to_run_repl.to_s.match?(/^bye bot$/i) or
+                  code_to_run_repl.to_s.match?(/^bye$/i)
+                  exit
+                else
+                  error = false
+                  as_it_is = false
+                  begin
+                      if code_to_run_repl.match?(/^\s*ls\s+(.+)/)
+                        add_to_run_repl = false
+                        as_it_is = true
+                      elsif code_to_run_repl.match(/^\s*doc\s+(.+)/)
+                        add_to_run_repl = false
+                        code_to_run_repl = \"doc \\\"#{$1}\\\"\"
+                        as_it_is = true
+                      elsif code_to_run_repl.match(/^\s*(code|source|src)\s+(.+)/)
+                        add_to_run_repl = false
+                        code_to_run_repl = \"source \\\"#{$2}\\\"\"
+                      end
+                    begin
+                      original_stdout = $stdout
+                      $stdout = StringIO.new 
+                      resp_repl = eval(code_to_run_repl, bindme' + serialt + ')
+                      stdout_repl = $stdout.string
+                    ensure 
+                      $stdout = original_stdout
+                    end
+                  rescue Exception => resp_repl
+                    error = true
+                  end
+                  if error
+                    open(\"' + File.expand_path(config.path) + "/repl/" + @channel_id + "/" + session_name + '.output\", \"a+\") {|f|
+                      f.puts \"\`\`\`\n#{resp_repl.to_s.gsub(/^.+' + session_name + '\.rb:\d+:/,\"\")}\`\`\`\"
+                    }
+                  else
+                    if code_to_run_repl.match?(/^\s*p\s+/i)
+                      resp_repl = stdout_repl unless stdout_repl.to_s == \'\'
+                      if stdout_repl.to_s == \'\'
+                        resp_repl = resp_repl.inspect
+                      else
+                        resp_repl = stdout_repl 
+                      end
+                      open(\"' + File.expand_path(config.path) + "/repl/" + @channel_id + "/" + session_name + '.output\", \"a+\") {|f|
+                        f.puts \"\`\`\`\n#{resp_repl}\`\`\`\"
+                      }
+                    else
+                      if stdout_repl.to_s == \'\'
+                        resp_repl = resp_repl.ai
+                      else
+                        resp_repl = stdout_repl 
+                      end
+                      open(\"' + File.expand_path(config.path) + "/repl/" + @channel_id + "/" + session_name + '.output\", \"a+\") {|f|
+                        if as_it_is
+                          f.puts resp_repl
+                        else
+                          f.puts \"\`\`\`\n#{resp_repl}\`\`\`\"
+                        end
+                      }
+                    end
+                    unless !add_to_run_repl
+                      open(\"' + File.expand_path(config.path) + "/repl/" + @channel_id + "/" + session_name + '.run\", \"a+\") {|f|
+                        f.puts code_to_run_repl
+                      }
+                    end
+                  end
+                end
+              end
+            end
+        '
+    process_to_run.gsub!('\"', '"')
+    return process_to_run
+  end
+end

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

@@ -4,12 +4,13 @@ class SlackSmartBot
   # helpadmin: `exit bot`
   # helpadmin: `quit bot`
   # helpadmin: `close bot`
+  # helpadmin: `exit bot silent`
   # helpadmin:    The bot stops running and also stops all the bots created from this master channel
   # helpadmin:    You can use this command only if you are an admin user and you are on the master channel
   # helpadmin:    <https://github.com/MarioRuiz/slack-smart-bot#bot-management|more info>
   # helpadmin: command_id: :exit_bot
   # helpadmin:
-  def exit_bot(command, from, dest, display_name)
+  def exit_bot(command, from, dest, display_name, silent: false)
     save_stats(__method__)
     if config.on_master_bot
       if config.masters.include?(from) #admin user
@@ -18,21 +19,33 @@ class SlackSmartBot
         else
           case answer
           when /yes/i, /yep/i, /sure/i
-            respond "Game over!", dest
-            respond "Ciao #{display_name}!", dest
+            react :runner
             @bots_created.each { |key, value|
               value[:thread] = ""
-              send_msg_channel(key, "Bot has been closed by #{from}")
+              send_msg_channel(key, "Bot has been closed by #{from}") unless silent
               save_status :off, :exited, "The admin closed SmartBot on *##{value.channel_name}*"
               sleep 0.5
             }
             update_bots_file()
             sleep 0.5
+            file = File.open("#{config.path}/config_tmp.status", "w")
+            config.exit_bot = true
+            file.write config.inspect
+            file.close
+            @status = :exit
+            respond "Game over!", dest
             if config.simulate
+              sleep 2
               @status = :off
               config.simulate = false
               Thread.exit
             else
+              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
+              react :beach_with_umbrella
+              sleep 1
               exit!
             end
           when /no/i, /nope/i, /cancel/i

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

@@ -4,6 +4,7 @@ require_relative "commands/general/bot_help"
 require_relative "commands/on_bot/general/suggest_command"
 require_relative "commands/on_bot/ruby_code"
 require_relative "commands/on_bot/repl"
+require_relative "commands/on_bot/repl_client"
 require_relative "commands/on_bot/get_repl"
 require_relative "commands/on_bot/run_repl"
 require_relative "commands/on_bot/kill_repl"
@@ -60,18 +61,33 @@ require_relative "commands/general/poster"
 require_relative "commands/general/see_access"
 require_relative "commands/general/allow_access"
 require_relative "commands/general/deny_access"
-require_relative "commands/general/add_team"
-require_relative "commands/general/add_memo_team"
-require_relative "commands/general/set_memo_status"
-require_relative "commands/general/delete_memo_team"
-require_relative "commands/general/see_memos_team"
-require_relative "commands/general/see_teams"
-require_relative "commands/general/update_team"
-require_relative "commands/general/ping_team"
-require_relative "commands/general/delete_team"
+require_relative "commands/general/teams/add_team"
+require_relative "commands/general/teams/memos/add_memo_team"
+require_relative "commands/general/teams/memos/set_memo_status"
+require_relative "commands/general/teams/memos/delete_memo_team"
+require_relative "commands/general/teams/memos/see_memos_team"
+require_relative "commands/general/teams/see_teams"
+require_relative "commands/general/teams/update_team"
+require_relative "commands/general/teams/ping_team"
+require_relative "commands/general/teams/delete_team"
 require_relative "commands/general/add_vacation"
 require_relative "commands/general/remove_vacation"
 require_relative "commands/general/see_vacations"
-require_relative "commands/general/see_vacations_team"
+require_relative "commands/general/teams/see_vacations_team"
 require_relative "commands/general/public_holidays"
 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_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'
+
+class SlackSmartBot
+    include SlackSmartBot::Commands::General::AI::OpenAI
+    include SlackSmartBot::Commands::General::Teams
+    include SlackSmartBot::Commands::General::Teams::Memos
+end

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

@@ -74,8 +74,9 @@ class SlackSmartBot
             /\A\s*use\s+rules\s+(on\s+)(.+)/i
           channel = $2
           extend_rules(dest, user, from, channel, typem)
-        when /\A\s*exit\s+bot\s*$/i, /\A\s*quit\s+bot\s*$/i, /\A\s*close\s+bot\s*$/i
-          exit_bot(command, from, dest, display_name)
+        when /\A\s*exit\s+bot(\s+silent)?\s*$/i, /\A\s*quit\s+bot(\s+silent)?\s*$/i, /\A\s*close\s+bot(\s+silent)?\s*$/i
+          silent = $1.to_s != ''
+          exit_bot(command, from, dest, display_name, silent: silent)
         when /\A\s*start\s+(this\s+)?bot$/i
           start_bot(dest, from)
         when /\A\s*pause\s+(this\s+)?bot$/i
@@ -327,13 +328,23 @@ class SlackSmartBot
             opts.gsub!(/\s+routines$/,'')
             opts.gsub!(/\s+routines\s+/,'')
           end
+          only_graph = all_opts.include?('graph')
+
           monthly = false
+          type_group = ''
           if all_opts.include?('today')
             st_from = st_to = "#{Time.now.strftime("%Y-%m-%d")}"
           elsif all_opts.include?('yesterday')
             st_from = st_to = "#{(Time.now-86400).strftime("%Y-%m-%d")}"
           elsif all_opts.include?('monthly')
             monthly = true
+            type_group = :monthly
+          elsif all_opts.include?('weekly')
+            type_group = :weekly
+          elsif all_opts.include?('daily')
+            type_group = :daily
+          elsif all_opts.include?('yearly')
+            type_group = :yearly
           end
           if this_month
             st_from = "#{Date.today.strftime("%Y-%m-01")}"
@@ -379,7 +390,7 @@ class SlackSmartBot
             header << r[0]
             regexp << r[1]
           end
-          bot_stats(dest, user, typem, st_channel, st_from, st_to, st_user, st_command, exclude_masters, exclude_routines, exclude_command, monthly, all_data, members_channel, exclude_members_channel, header, regexp)
+          bot_stats(dest, user, typem, st_channel, st_from, st_to, st_user, st_command, exclude_masters, exclude_routines, exclude_command, monthly, all_data, members_channel, exclude_members_channel, header, regexp, type_group: type_group, only_graph: only_graph)
         when /\A(set|turn)\s+maintenance\s+(on|off)\s*()\z/im, /\A(set|turn)\s+maintenance\s+(on)\s*(.+)\s*\z/im
           status = $2.downcase
           message = $3.to_s

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

@@ -26,6 +26,15 @@ class SlackSmartBot
       else
         respond "Only the creator of the loop or an admin can stop the loop.", dest, thread_ts: thread_ts
       end
+      if Thread.current.key?(:encrypted) and Thread.current[:encrypted].size > 0
+        found = false
+        Thread.current[:encrypted].each do |encdata|
+          found = true if !found and text.include?(encdata)
+          text.gsub!(encdata, "********")
+        end
+        text = "********" if !found
+        text+= " (encrypted #{Thread.current[:command_id]})"
+      end
       @logger.info "command: #{nick}> #{text}"
       return :next #jal
     end
@@ -306,7 +315,20 @@ 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)
-              @logger.info "command: #{nick}> #{command_thread}" if processed
+              if processed
+                text_to_log = command_thread.dup
+                
+                if Thread.current.key?(:encrypted) and Thread.current[:encrypted].size > 0
+                  found = false
+                  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]})"
+                end
+                @logger.info "command: #{nick}> #{text_to_log}"
+              end
             end
 
             if !config.on_maintenance and !processed and typem != :on_pub and typem != :on_pg
@@ -319,7 +341,19 @@ class SlackSmartBot
                    ((@listening[nick].key?(dest) and !Thread.current[:on_thread]) or
                     (@listening[nick].key?(thread_ts) and Thread.current[:on_thread]))) or
                   dest[0] == "D" or on_demand)
-                @logger.info "command: #{nick}> #{command_thread}" unless processed
+                  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]})"
+                    end
+                    @logger.info "command: #{nick}> #{text_to_log}"
+                  end
                 #todo: verify this
 
                 if dest[0] == "C" or dest[0] == "G" or (dest[0] == "D" and typem == :on_call)

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

@@ -71,6 +71,16 @@ class SlackSmartBot
       if !data.files.nil? and data.files.size == 1 and data.text.to_s == "" and data.files[0].filetype == "ruby"
         data.text = "ruby"
       end
+
+      #open ai chat gpt and shared messages as an input
+      if data.text.match?(/\A\s*(^|!!|!)?\s*(\?|\?\?)\s*/im) and !data.attachments.nil? and data.attachments.size > 0 and !data.attachments[0].text.nil? and data.attachments[0].text != ''
+        data.attachments.each_with_index do |att, i|
+          if !att.text.nil? and att.text != ''
+            data.text += "\n#{att.text}"
+          end
+        end
+      end
+      
       if !dest.nil? and config.on_master_bot and !data.text.nil? and data.text.match(/^ping from (.+)\s*$/) and data.user == config[:nick_id]
         @pings << $1
       end
@@ -355,6 +365,24 @@ class SlackSmartBot
             if File.exist?("#{config.path}/shortcuts/shortcuts_global.yaml")
               @shortcuts_global = YAML.load(File.read("#{config.path}/shortcuts/shortcuts_global.yaml"))
             end
+          when /\AGame\s+over!\z/i
+            sleep 2
+            get_bots_created()
+            if File.exist?("#{config.path}/config_tmp.status")
+              file_cts = IO.readlines("#{config.path}/config_tmp.status").join
+              unless file_cts.to_s() == ""
+                file_cts = eval(file_cts)
+                if file_cts.is_a?(Hash) and file_cts.key?(:exit_bot)
+                  config.exit_bot = file_cts.exit_bot
+                end
+                @status = :exit if config.exit_bot
+              end
+            end
+            if @status == :exit
+              @logger.info 'Game over!'
+              sleep 3
+              exit!
+            end
           end
         end
       end

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

@@ -10,6 +10,7 @@ class SlackSmartBot
     users.each do |user|
       type = nil
       expiration = nil
+      @vacations[user].periods ||= []
       @vacations[user].periods.each do |p|
         if only_first_day and p.from == date.strftime("%Y/%m/%d")
           type = p.type

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

@@ -2,7 +2,7 @@ class SlackSmartBot
 
   def create_routine_thread(name, hroutine)
     t = Thread.new do
-      while @routines.key?(@channel_id) and @routines[@channel_id].key?(name)
+      while @routines.key?(@channel_id) and @routines[@channel_id].key?(name) and @status != :exit
         @routines[@channel_id][name][:thread] = Thread.current
         started = Time.now
         if @status == :on and @routines[@channel_id][name][:status] == :on