slack-smart-bot 1.5.1 → 1.6.0

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

@@ -188,8 +188,13 @@ class SlackSmartBot
             on_demand = true
           end
           if @status == :on and
-             (@questions.keys.include?(nick) or
-              (@listening.include?(nick) and typem != :on_extended) or
+             (@questions.key?(nick) or
+             (@repl_sessions.key?(nick) and dest==@repl_sessions[nick][:dest] and 
+               ((@repl_sessions[nick][:on_thread] and thread_ts == @repl_sessions[nick][:thread_ts]) or
+                (!@repl_sessions[nick][:on_thread] and !Thread.current[:on_thread] ))) or 
+             (@listening.key?(nick) and typem != :on_extended and 
+               ((@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}" unless processed
             #todo: verify this
@@ -228,7 +233,7 @@ class SlackSmartBot
               if @bots_created.key?(@rules_imported[user.id][user.id])
                 if @bots_created[@rules_imported[user.id][user.id]][:status] == :on
                   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) and !['.','..'].include?(config.path + rules_file)
                   rescue Exception => stack
                     @logger.fatal "ERROR ON imported RULES FILE: #{rules_file}"
                     @logger.fatal stack
@@ -263,6 +268,15 @@ class SlackSmartBot
                 dont_understand('')
               end
             end
+
+            if processed and @listening.key?(nick)
+              if Thread.current[:on_thread] and @listening[nick].key?(Thread.current[:thread_ts])
+                @listening[nick][Thread.current[:thread_ts]] = Time.now
+              elsif !Thread.current[:on_thread] and @listening[nick].key?(dest)
+                @listening[nick][dest] = Time.now
+              end
+            end
+
           end
         rescue Exception => stack
           @logger.fatal stack

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

@@ -1,5 +1,6 @@
 class SlackSmartBot
   def treat_message(data, remove_blocks = true)
+
     begin
       unless data.text.to_s.match(/\A\s*\z/)
         #to remove italic, bold... from data.text since there is no method on slack api
@@ -10,8 +11,15 @@ class SlackSmartBot
               if b.elements.size > 0
                 b.elements.each do |e|
                   if e.type == 'rich_text_section'
-                    if e.elements.size > 0 and e.elements.type.uniq == ['text']
-                      data.text = e.elements.text.join
+                    if e.elements.size > 0 and (e.elements.type.uniq - ['link', 'text']) == []
+                      data.text = ''
+                      e.elements.each do |el|
+                        if el.type == 'text'
+                          data.text += el.text
+                        else
+                          data.text += el.url
+                        end
+                      end
                     end
                     break
                   end
@@ -95,10 +103,18 @@ class SlackSmartBot
       end
     end
     unless typem == :dont_treat
+      if (Time.now - @last_activity_check) > 60 * 30 #every 30 minutes
+        @last_activity_check = Time.now
+        @listening.each do |k,v|
+          v.each do |kk, vv|
+            @listening[k].delete(kk) if (Time.now - vv) > 60 * 30
+          end
+          @listening.delete(k) if @listening[k].empty?
+        end
+      end
       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)
-
         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)
@@ -107,6 +123,11 @@ class SlackSmartBot
             command = @questions[user_info.user.name]
             @questions[user_info.user.name] = data.text
           end
+        elsif @repl_sessions.key?(user_info.user.name) and dest==@repl_sessions[user_info.user.name][:dest] and 
+          ((@repl_sessions[user_info.user.name][:on_thread] and data.thread_ts == @repl_sessions[user_info.user.name][:thread_ts]) or
+           (!@repl_sessions[user_info.user.name][:on_thread] and data.thread_ts.to_s == '' ))
+          @repl_sessions[user_info.user.name][:command] = data.text
+          command = 'repl'
         else
           command = data.text
         end

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

@@ -11,3 +11,6 @@ require_relative 'utils/update_routines'
 require_relative 'utils/update_rules_imported'
 require_relative 'utils/update_shortcuts_file'
 require_relative 'utils/save_stats'
+require_relative 'utils/get_repls'
+require_relative 'utils/update_repls'
+

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

@@ -2,7 +2,7 @@ class SlackSmartBot
   def get_help(rules_file, dest, from, only_rules = false)
     order = {
       general: [:hi_bot, :bye_bot, :bot_help, :bot_status, :use_rules, :stop_using_rules],
-      on_bot: [:ruby_code, :add_shortcut, :delete_shortcut, :see_shortcuts],
+      on_bot: [:ruby_code, :repl, :get_repl, :run_repl, :delete_repl, :see_repls, :add_shortcut, :delete_shortcut, :see_shortcuts],
       on_bot_admin: [:extend_rules, :stop_using_rules_on, :start_bot, :pause_bot, :add_routine,
         :see_routines, :start_routine, :pause_routine, :remove_routine, :run_routine]
     }

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

@@ -0,0 +1,11 @@
+class SlackSmartBot
+
+  def get_repls(channel = @channel_id)
+    if File.exist?("#{config.path}/repl/repls_#{channel}.rb")
+      file_conf = IO.readlines("#{config.path}/repl/repls_#{channel}.rb").join
+      unless file_conf.to_s() == ""
+        @repls = eval(file_conf)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,8 @@
+class SlackSmartBot
+
+  def update_repls(channel = @channel_id)
+    file = File.open("#{config.path}/repl/repls_#{channel}.rb", "w")
+    file.write (@repls.inspect)
+    file.close
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slack-smart-bot
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Mario Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-12 00:00:00.000000000 Z
+date: 2020-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-ruby-client
@@ -36,20 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.24
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.24
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: nice_hash
   requirement: !ruby/object:Gem::Requirement
@@ -79,25 +73,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.8.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.8.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.9'
 description: "Create a Slack bot that is smart and so easy to expand, create new bots
   on demand, run ruby code on chat, create shortcuts... \n  The main scope of this
   gem is to be used internally in the company so teams can create team channels with
@@ -147,8 +149,13 @@ files:
 - lib/slack/smart-bot/commands/on_bot/admin/stop_using_rules_on.rb
 - lib/slack/smart-bot/commands/on_bot/admin_master/bot_stats.rb
 - lib/slack/smart-bot/commands/on_bot/admin_master/get_bot_logs.rb
+- lib/slack/smart-bot/commands/on_bot/delete_repl.rb
 - lib/slack/smart-bot/commands/on_bot/delete_shortcut.rb
+- lib/slack/smart-bot/commands/on_bot/get_repl.rb
+- lib/slack/smart-bot/commands/on_bot/repl.rb
 - lib/slack/smart-bot/commands/on_bot/ruby_code.rb
+- lib/slack/smart-bot/commands/on_bot/run_repl.rb
+- lib/slack/smart-bot/commands/on_bot/see_repls.rb
 - lib/slack/smart-bot/commands/on_bot/see_shortcuts.rb
 - lib/slack/smart-bot/commands/on_extended/bot_rules.rb
 - lib/slack/smart-bot/commands/on_master/admin/kill_bot_on_channel.rb
@@ -165,11 +172,13 @@ files:
 - lib/slack/smart-bot/utils/get_bots_created.rb
 - lib/slack/smart-bot/utils/get_channels_name_and_id.rb
 - lib/slack/smart-bot/utils/get_help.rb
+- lib/slack/smart-bot/utils/get_repls.rb
 - lib/slack/smart-bot/utils/get_routines.rb
 - lib/slack/smart-bot/utils/get_rules_imported.rb
 - lib/slack/smart-bot/utils/remove_hash_keys.rb
 - lib/slack/smart-bot/utils/save_stats.rb
 - lib/slack/smart-bot/utils/update_bots_file.rb
+- lib/slack/smart-bot/utils/update_repls.rb
 - lib/slack/smart-bot/utils/update_routines.rb
 - lib/slack/smart-bot/utils/update_rules_imported.rb
 - lib/slack/smart-bot/utils/update_shortcuts_file.rb
@@ -185,7 +194,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="