slack-smart-bot 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b75a6cea93322f420ba6e0bf6938609a600d889c4788f0e51e4929a075578d15
-  data.tar.gz: 8d3c0476510dd29d2dfac41eabfceb77f9d604100704815c775c3888002ef35c
+  metadata.gz: 184f25cc7baddfde9859cabae8a25e1204fca24b3c85b509d00c5579d86233ff
+  data.tar.gz: '08e6e6e647f2ab67f6a56f7022c56469d56f8c768b5dc7f12d3f6cd2338a2334'
 SHA512:
-  metadata.gz: 946fbf6bca9a5a704b0b7d1d46e12faeb25e6f7f44e99d867d5a28b07cc2441bac0d93e17d3cdae3f081b4acc8b59092b89b2903fcc9eec6282b84b383d6fb8f
-  data.tar.gz: c976933c3b0bbb67e9ba86778b2068ff75dd42a7470a1ba48bb08f49ae70415907f560a5454cb3835526732d6a8d3e47b80e68c404d017577428d6f6a791d4ff
+  metadata.gz: 320e5c00e0acf8e79414cfb582c3be1009bb790374833fe109009df53dbfbe63739b6148d2499eeb83a0d60c277f1cedad59f4375fff39395e7ce7985406eb79
+  data.tar.gz: f21210b0dc5504a700a1f6c9265f42ff4e62a4d7502e5e3da662df76452ce67f7ade3a4d837f1178881ed5511c5f6c96c122239e010fe5d62ff0385696322b93

data/README.md

@@ -151,7 +151,7 @@ def rules(user, command, processed, dest)
 
     else
       unless processed
-          dont_understand()
+        dont_understand()
       end
   end
 end

data/lib/slack-smart-bot.rb

@@ -161,13 +161,7 @@ class SlackSmartBot
       end
     end
 
-    # rules imported only for DM
-    if config.on_master_bot and File.exist?("#{config.path}/rules/rules_imported.rb")
-      file_conf = IO.readlines("#{config.path}/rules/rules_imported.rb").join
-      unless file_conf.to_s() == ""
-        @rules_imported = eval(file_conf)
-      end
-    end
+    get_rules_imported()
 
     begin
       user_info = client.web_client.users_info(user: "#{"@" if config[:nick][0] != "@"}#{config[:nick]}")

data/lib/slack-smart-bot_rules.rb

@@ -118,9 +118,7 @@ def rules(user, command, processed, dest, files = [], rules_file = "")
 
     else
       unless processed
-        if @channel_id == dest or dest[0] == "D" or dest[0] == "G" #not on extended channels
-          dont_understand()
-        end
+        dont_understand()
       end
     end
   rescue => exception

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

@@ -182,29 +182,25 @@ class SlackSmartBot
     )
   end
 
-  def dont_understand(rules_file = nil, command = nil, user = nil, dest = nil, answer = ["what?", "huh?", "sorry?", "what do you mean?", "I don't understand"])
-    if command.nil?
-      command = Thread.current[:command]
-    end
-    if user.nil?
-      user = Thread.current[:user]
-    end
-    if dest.nil?
-      dest = Thread.current[:dest]
-    end
-    if rules_file.nil?
-      rules_file = Thread.current[:rules_file]
+  def dont_understand(rules_file = nil, command = nil, user = nil, dest = nil, answer = ["what?", "huh?", "sorry?", "what do you mean?", "I don't understand"], channel_rules: config.channel, typem: nil)
+    command = Thread.current[:command] if command.nil?
+    user = Thread.current[:user] if user.nil?
+    dest = Thread.current[:dest] if dest.nil?
+    rules_file = Thread.current[:rules_file] if rules_file.nil?
+    typem = Thread.current[:typem] if typem.nil?
+    if typem==:on_extended
+      get_bots_created()
     end
 
-    if rules_file == ""
-      res_final = []
-    else
-      text = get_help(rules_file, dest, user.name)
+    if typem!=:on_extended or (typem==:on_extended and @extended_from[@channels_name[dest]][0]==@channel_id )
+      #only will be treated on the first extended channel in case more than one channel extended on DEST channel
+      text = get_help(rules_file, dest, user.name, typem==:on_extended)
 
       ff = text.scan(/\s*`\s*([^`]+)\s*`\s*/i).flatten
       ff.delete("!THE_COMMAND")
       ff.delete("@NAME_OF_BOT THE_COMMAND")
       ff.delete("NAME_OF_BOT THE_COMMAND")
+      ff.delete("@BOT_NAME on #CHANNEL_NAME COMMAND")
 
       ff2 = {}
       acommand = command.split(/\s+/)
@@ -228,12 +224,30 @@ class SlackSmartBot
         res_final << (ff2.select { |k, v| v == r }).keys
       end
       res_final.flatten!
-    end
-    if res_final.empty?
-      resp = answer.sample
-      respond "#{user.profile.display_name}, #{resp}", dest
-    else
-      respond "#{user.profile.display_name}, I don't understand. Maybe you are trying to say:\n`#{res_final[0..4].join("`\n`")}`", dest
+
+      if typem==:on_extended and @extended_from[@channels_name[dest]][0]==@channel_id 
+        if rules_file == config.rules_file
+          respond "#{user.profile.display_name}, I don't understand.", dest
+        end
+        if @extended_from[@channels_name[dest]].size > 1 and rules_file == config.rules_file
+          @extended_from[@channels_name[dest]][1..-1].each do |ch|
+            rf = @bots_created[ch].rules_file
+            dont_understand(rf, command, nil, dest, answer, channel_rules: @channels_name[ch], typem: typem)
+          end
+        end
+        unless res_final.empty?
+          respond "Similar rules on : *#{channel_rules}*\n`#{res_final[0..4].join("`\n`")}`", dest
+        end
+      elsif typem!=:on_extended
+        message = ''
+        message = "\nTake in consideration when on external calls, not all the commands are availalbe." if typem==:on_call
+        if res_final.empty?
+          resp = answer.sample
+          respond "#{user.profile.display_name}, #{resp}#{message}", dest
+        else
+          respond "#{user.profile.display_name}, I don't understand. Maybe you are trying to say:\n`#{res_final[0..4].join("`\n`")}`#{message}", dest
+        end
+      end
     end
   end
 end

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

@@ -26,12 +26,8 @@ class SlackSmartBot
         end
       end
     else
-      if (dest[0] == "C") || (dest[0] == "G") and @rules_imported.key?(user.id) &&
-                                                  @rules_imported[user.id].key?(dchannel) && @bots_created.key?(@rules_imported[user.id][dchannel])
-        message = "*You are using rules from another channel: <##{@rules_imported[user.id][dchannel]}>. These are the specific commands for that channel:*"
-      elsif dest[0] == "D" && @rules_imported.key?(user.id) && @rules_imported[user.id].key?(user.id) and
-            @bots_created.key?(@rules_imported[user.id][user.id])
-        message = "*You are using rules from another channel: <##{@rules_imported[user.id][user.id]}>. These are the specific commands for that channel:*"
+      if Thread.current[:using_channel]!=''
+        message = "*You are using rules from another channel: <##{Thread.current[:using_channel]}>. These are the specific commands for that channel:*"
       end
       respond message, dest
     end

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

@@ -13,10 +13,8 @@ class SlackSmartBot
     if @status == :on
       greetings = ["Hello", "Hallo", "Hi", "Hola", "What's up", "Hey", "Hæ"].sample
       respond "#{greetings} #{display_name}", dest
-      if @rules_imported.key?(user.id) and @rules_imported[user.id].key?(user.id) and dest[0] == "D"
-        respond "You are using specific rules for channel: <##{@rules_imported[user.id][user.id]}>", dest
-      elsif @rules_imported.key?(user.id) and @rules_imported[user.id].key?(dchannel) and (dest[0] == "C" or dest[0] == "G")
-        respond "You are using specific rules for channel: <##{@rules_imported[user.id][dchannel]}>", dest
+      if Thread.current[:using_channel]!=''
+        respond "You are using specific rules for channel: <##{Thread.current[:using_channel]}>", dest
       end
       @listening << from unless @listening.include?(from)
     end

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

@@ -9,13 +9,14 @@ class SlackSmartBot
     else
       channel_id = channel
     end
+
     if dest[0] == "C" or dest[0] == "G" #channel
       if @rules_imported.key?(user.id) and @rules_imported[user.id].key?(dchannel)
         if @rules_imported[user.id][dchannel] != channel_id
           respond "You are not using those rules.", dest
         else
           @rules_imported[user.id].delete(dchannel)
-          update_rules_imported() if config.on_master_bot
+          update_rules_imported()
           respond "You won't be using those rules from now on.", dest
 
           def git_project() "" end
@@ -30,7 +31,7 @@ class SlackSmartBot
           respond "You are not using those rules.", dest
         else
           @rules_imported[user.id].delete(user.id)
-          update_rules_imported() if config.on_master_bot
+          update_rules_imported()
           respond "You won't be using those rules from now on.", dest
 
           def git_project() "" end

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

@@ -35,7 +35,7 @@ class SlackSmartBot
         else
           @rules_imported[user.id][user.id] = channel_found.id
         end
-        update_rules_imported() if config.on_master_bot
+        update_rules_imported()
         respond "I'm using now the rules from <##{channel_found.id}>", dest
 
         def git_project() "" end

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

@@ -39,7 +39,6 @@ class SlackSmartBot
         update_shortcuts_file()
         respond "shortcut added", dest
       else
-
         #are you sure? to avoid overwriting existing
         unless @questions.keys.include?(from)
           ask("The shortcut already exists, are you sure you want to overwrite it?", command, from, dest)

data/lib/slack/smart-bot/commands/on_bot/admin/extend_rules.rb

@@ -29,10 +29,9 @@ class SlackSmartBot
             channels_in_use << v[:channel_name]
           end
         end
-
         if channel_found.nil?
-          respond "The channel you specified doesn't exist", dest
-        elsif @bots_created.key?(@channels_id[channel])
+          respond "The channel you specified doesn't exist or I don't have access to it. Be sure I was invited to that channel.", dest
+        elsif @bots_created.key?(@channels_id[channel]) or channel == config.master_channel
           respond "There is a bot already running on that channel.", dest
         elsif @bots_created[@channel_id][:extended].include?(channel)
           respond "The rules are already extended to that channel.", dest

data/lib/slack/smart-bot/commands/on_bot/admin/remove_routine.rb

@@ -15,6 +15,7 @@ class SlackSmartBot
       if !config.on_master_bot and dest[0] == "D"
         respond "It's only possible to remove routines from MASTER channel from a direct message with the bot.", dest
       elsif @routines.key?(@channel_id) and @routines[@channel_id].key?(name)
+        @routines[@channel_id][name][:thread].exit
         @routines[@channel_id].delete(name)
         update_routines()
         respond "The routine *`#{name}`* has been removed.", dest

data/lib/slack/smart-bot/commands/on_bot/admin/see_routines.rb

@@ -19,14 +19,14 @@ class SlackSmartBot
           end
         else
           respond "To see all routines on all channels you need to run the command on the master channel.\nI'll display only the routines on this channel.", dest
-          routines = @routines.deep_copy
+          routines = @routines.dup
         end
       else
         if @rules_imported.key?(user.id) and @rules_imported[user.id].key?(user.id) and dest[0] == "D"
           file_conf = IO.readlines("#{config.path}/routines/routines_#{@rules_imported[user.id][user.id]}.rb").join
           routines = eval(file_conf)
         else
-          routines = @routines.deep_copy
+          routines = @routines.dup
         end
       end
 

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

@@ -7,11 +7,11 @@ class SlackSmartBot
         help_found = false
         help_filtered.split(/^\s*-------*$/).each do |h|
           if h.match?(/[`_]#{help_command}/i)
-            respond h, dest
+            respond "*#{config.channel}*:#{h}", dest
             help_found = true
           end
         end
-        respond("I didn't find any command starting by `#{help_command}`", dest) unless help_found
+        respond("*#{config.channel}*: I didn't find any command starting by `#{help_command}`", dest) unless help_found
       else
         message = "-\n\n\n===================================\n*Rules from channel #{config.channel}*\n"
         if typem == :on_extended

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

@@ -135,8 +135,8 @@ class SlackSmartBot
         shortcut_name = $3.to_s.downcase
         command_to_run = $4
         add_shortcut(dest, from, typem, for_all, shortcut_name, command, command_to_run)
-      when /^\s*delete\s+shortcut\s+(.+)/i, /^delete\s+sc\s+(.+)/i
-        shortcut = $1.to_s.downcase
+      when /^\s*(delete|remove)\s+shortcut\s+(.+)/i, /^(delete|remove)\s+sc\s+(.+)/i
+        shortcut = $2.to_s.downcase
         delete_shortcut(dest, from, shortcut, typem, command)
       when /^\s*see\sshortcuts/i, /^see\ssc/i
         see_shortcuts(dest, from, typem)

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

@@ -109,6 +109,17 @@ class SlackSmartBot
           Thread.current[:user] = user
           Thread.current[:command] = command
           Thread.current[:rules_file] = rules_file
+          Thread.current[:typem] = typem
+          if (dest[0] == "C") || (dest[0] == "G") and @rules_imported.key?(user.id) &&
+            @rules_imported[user.id].key?(dchannel) && @bots_created.key?(@rules_imported[user.id][dchannel])
+              Thread.current[:using_channel] = @rules_imported[user.id][dchannel]
+          elsif dest[0] == "D" && @rules_imported.key?(user.id) && @rules_imported[user.id].key?(user.id) and
+            @bots_created.key?(@rules_imported[user.id][user.id])
+              Thread.current[:using_channel] = @rules_imported[user.id][user.id]
+          else
+              Thread.current[:using_channel] = ''
+          end
+
           processed = process(user, command, dest, dchannel, rules_file, typem, files)
           @logger.info "command: #{nick}> #{command}" if processed
           on_demand = false
@@ -192,7 +203,7 @@ class SlackSmartBot
                 respond "No rules running. You can use the command `use rules from CHANNEL` to specify the rules you want to use on this private conversation.\n`bot help` to see available commands.", dest
               end
               unless processed
-                dont_understand(__FILE__, command, user, dest)
+                dont_understand('')
               end
             end
           end

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

@@ -1,6 +1,10 @@
 class SlackSmartBot
   def treat_message(data)
-    data.text = CGI.unescapeHTML(data.text)
+    begin
+      data.text = CGI.unescapeHTML(data.text) unless data.text.to_s.match(/\A\s*\z/)
+    rescue
+      @logger.warn "Impossible to unescape the data.text:#{data.text}"
+    end
     if config[:testing] and config.on_master_bot
       open("#{config.path}/buffer.log", "a") { |f|
         f.puts "|#{data.channel}|#{data.user}|#{data.text}"
@@ -30,7 +34,7 @@ class SlackSmartBot
           typem = :on_call
         end
       elsif dest == @master_bot_id
-        if config.on_master_bot #only to be treated on master mot channel
+        if config.on_master_bot #only to be treated on master bot channel
           typem = :on_master
         end
       elsif @bots_created.key?(dest)
@@ -38,7 +42,15 @@ class SlackSmartBot
           typem = :on_bot
         end
       elsif dest[0] == "D" #Direct message
-        if config.on_master_bot #only to be treated by master bot
+        get_rules_imported()
+        if @rules_imported.key?(data.user) && @rules_imported[data.user].key?(data.user) and
+          @bots_created.key?(@rules_imported[data.user][data.user])
+          if @channel_id == @rules_imported[data.user][data.user]
+            #only to be treated by the channel we are 'using'
+            typem = :on_dm
+          end
+        elsif config.on_master_bot
+          #only to be treated by master bot
           typem = :on_dm
         end
       elsif dest[0] == "C" or dest[0] == "G"

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

@@ -19,8 +19,13 @@ class SlackSmartBot
           @bots_created = eval(file_conf)
         end
         @datetime_bots_created = File.mtime(config.file_path.gsub(".rb", "_bots.rb"))
+        @extended_from = {}
         @bots_created.each do |k, v|
           v[:extended] = [] unless v.key?(:extended)
+          v[:extended].each do |ch|
+            @extended_from[ch] = [] unless @extended_from.key?(ch)
+            @extended_from[ch] << k
+          end
           v[:rules_file].gsub!(/^\./, '')
         end
       end
@@ -33,6 +38,18 @@ class SlackSmartBot
     file.close
   end
 
+  def get_rules_imported
+    if File.exist?("#{config.path}/rules/rules_imported.rb")
+      if !defined?(@datetime_rules_imported) or @datetime_rules_imported != File.mtime("#{config.path}/rules/rules_imported.rb")        
+        @datetime_rules_imported = File.mtime("#{config.path}/rules/rules_imported.rb")
+        file_conf = IO.readlines("#{config.path}/rules/rules_imported.rb").join
+        unless file_conf.to_s() == ""
+          @rules_imported = eval(file_conf)
+        end
+      end
+    end
+  end
+  
   def update_rules_imported
     file = File.open("#{config.path}/rules/rules_imported.rb", "w")
     file.write @rules_imported.inspect
@@ -67,14 +84,23 @@ class SlackSmartBot
   end
 
   def update_routines(channel = @channel_id)
+    routines = {}
     file = File.open("#{config.path}/routines/routines_#{channel}.rb", "w")
-    file.write (@routines.inspect)
+    @routines.each do |k,v|
+      routines[k]={}
+      v.each do |kk,vv|
+        routines[k][kk] = vv.dup
+        routines[k][kk][:thread]=""
+      end
+    end
+    file.write (routines.inspect)
     file.close
   end
 
   def create_routine_thread(name)
     t = Thread.new do
       while @routines.key?(@channel_id) and @routines[@channel_id].key?(name)
+        @routines[@channel_id][name][:thread] = Thread.current
         started = Time.now
         if @status == :on and @routines[@channel_id][name][:status] == :on
           @logger.info "Routine: #{@routines[@channel_id][name].inspect}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slack-smart-bot
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Mario Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-05 00:00:00.000000000 Z
+date: 2019-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-ruby-client