slack-smart-bot 1.9.1 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0566062f8e9af6bc724b505bc1ee0821027e93bf5302a36781a0506e66d2cdf7
-  data.tar.gz: 3d10378e17c6dc94f70784c5a68854fbdac9c4d6e752f5616728f27b7c4ab706
+  metadata.gz: 974b9b2da39dd58e4e404572932ace72c5b9d1136956543ac890cf7bc91ab61e
+  data.tar.gz: a304bbeeecc5177c5014c86902c20d9682e6addfc00ab3f5ee33aeca4dba2215
 SHA512:
-  metadata.gz: 4cc5736de96995f20e0530a54c2f0ddf5fdc8dee3288e6f04bc938ef446b869508fc003f58b8ed030b89bdab37959aff6ca1e0d59e556df581ca0c5a2abc5b01
-  data.tar.gz: 929465da66b5ca3660b1bad1b360d7badc391d43596fcbe834a8e69f0aca3decd0b970b67dfbb063df8d77cb0c50b47d4b2b4ed84b99663719532406958b6b34
+  metadata.gz: 85e6d1e343b0523b25c5c630d37fcda402a8529d2ae8a1f5473694a65e9311293b4d628bc0e9a18e3910bd68123276b30039e1a50115c97bd029db19a2a9738a
+  data.tar.gz: 90c2441764b9faceeb74d1281c19fccc84c960d4344f5822c5d50293d1de55d300d10373a60e0cf876270aced23f20686844e2cb0503dfb0a30004adeec8e27c

data/lib/slack-smart-bot.rb

@@ -61,6 +61,7 @@ class SlackSmartBot
     Dir.mkdir("#{config.path}/logs") unless Dir.exist?("#{config.path}/logs")
     Dir.mkdir("#{config.path}/shortcuts") unless Dir.exist?("#{config.path}/shortcuts")
     Dir.mkdir("#{config.path}/routines") unless Dir.exist?("#{config.path}/routines")
+    File.delete("#{config.path}/config_tmp.status") if File.exist?("#{config.path}/config_tmp.status")
 
     config.masters = MASTER_USERS if config.masters.to_s=='' and defined?(MASTER_USERS)
     config.master_channel = MASTER_CHANNEL if config.master_channel.to_s=='' and defined?(MASTER_CHANNEL)

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

@@ -16,7 +16,7 @@ class SlackSmartBot
       version_message = ". There is a new available version: #{version_remote}."
     end
     if (!config[:silent] or ENV['BOT_SILENT'].to_s == 'false') and !config.simulate
-      ENV['BOT_SILENT'] = 'true' if config[:silent] == 'true' and ENV['BOT_SILENT'].to_s != 'true'
+      ENV['BOT_SILENT'] = 'true' if config[:silent] and ENV['BOT_SILENT'].to_s != 'true'
       respond "Smart Bot started v#{VERSION}#{version_message}\nIf you want to know what I can do for you: `bot help`.\n`bot rules` if you want to display just the specific rules of this channel.\nYou can talk to me privately if you prefer it."
     end
     @routines.each do |ch, rout|

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

@@ -6,8 +6,11 @@ class SlackSmartBot
     dest = @channels_id[dest] if @channels_id.key?(dest) #it is a name of channel
     if !config.simulate #https://api.slack.com/docs/rate-limits
       msg.to_s.size > 500 ? wait = 0.5 : wait = 0.1
-      sleep wait if Time.now <= (@last_respond+wait) 
+      sleep wait if Time.now <= (@last_respond+wait)
+    else
+      wait = 0
     end
+    msgs = msg.chars.each_slice(4000).map(&:join) # max of 4000 characters per message
     if dest.nil?
       if config[:simulate]
         open("#{config.path}/buffer_complete.log", "a") { |f|
@@ -15,9 +18,15 @@ class SlackSmartBot
         }
       else  
         if Thread.current[:on_thread]
-          client.message(channel: @channel_id, text: msg, as_user: true, thread_ts: Thread.current[:thread_ts])
+          msgs.each do |msg|
+            client.message(channel: @channel_id, text: msg, as_user: true, thread_ts: Thread.current[:thread_ts])
+            sleep wait
+          end
         else
-          client.message(channel: @channel_id, text: msg, as_user: true)
+          msgs.each do |msg|
+            client.message(channel: @channel_id, text: msg, as_user: true)
+            sleep wait
+          end
         end
       end
       if config[:testing] and config.on_master_bot
@@ -32,9 +41,15 @@ class SlackSmartBot
       }
       else  
         if Thread.current[:on_thread]
-          client.message(channel: dest, text: msg, as_user: true, thread_ts: Thread.current[:thread_ts])
+          msgs.each do |msg|
+            client.message(channel: dest, text: msg, as_user: true, thread_ts: Thread.current[:thread_ts])
+            sleep wait
+          end
         else
-          client.message(channel: dest, text: msg, as_user: true)
+          msgs.each do |msg|
+            client.message(channel: dest, text: msg, as_user: true)
+            sleep wait
+          end
         end
       end
       if config[:testing] and config.on_master_bot
@@ -43,11 +58,17 @@ class SlackSmartBot
         }
       end
     elsif dest[0] == "D" or dest[0] == "U"  or dest[0] == "W" # Direct message
-      send_msg_user(dest, msg)
+      msgs.each do |msg|
+        send_msg_user(dest, msg)
+        sleep wait
+      end
     elsif dest[0] == "@"
       begin
         user_info = get_user_info(dest)
-        send_msg_user(user_info.user.id, msg)
+        msgs.each do |msg|
+          send_msg_user(user_info.user.id, msg)
+          sleep wait
+        end
       rescue Exception => stack
         @logger.warn("user #{dest} not found.")
         @logger.warn stack

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

@@ -16,12 +16,13 @@ class SlackSmartBot
     else
       #todo: add pagination for case more than 1000 channels on the workspace
       channels = get_channels()
-
+      channel.gsub!('#','') # for the case the channel name is in plain text including #
       channel_found = channels.detect { |c| c.name == channel }
-      members = get_channel_members(@channels_id[channel]) unless channel_found.nil?
+      get_channels_name_and_id() unless @channels_id.key?(channel)
+      members = get_channel_members(@channels_id[channel]) unless channel_found.nil? or !@channels_id.key?(channel)
 
-      if channel_found.nil?
-        respond "The channel you are trying to use doesn't exist", dest
+      if channel_found.nil? or !@channels_id.key?(channel)
+        respond "The channel you are trying to use doesn't exist or cannot be found.", dest
       elsif channel_found.name == config.master_channel
         respond "You cannot use the rules from Master Channel on any other channel.", dest
       elsif !@bots_created.key?(@channels_id[channel])

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

@@ -99,12 +99,21 @@ class SlackSmartBot
               http.get(files[0].url_private_download, save_data: file_path)
               system("chmod +x #{file_path}")
             end
-            channel = dest if channel.to_s == ''
+            get_channels_name_and_id() unless @channels_name.keys.include?(channel) or @channels_id.keys.include?(channel)
+            channel_id = nil
+            if @channels_name.key?(channel) #it is an id
+              channel_id = channel
+              channel = @channels_name[channel_id]
+            elsif @channels_id.key?(channel) #it is a channel name
+              channel_id = @channels_id[channel]
+            end
+    
+            channel_id = dest if channel_id.to_s == ''
             @routines[@channel_id] = {} unless @routines.key?(@channel_id)
             @routines[@channel_id][name] = { channel_name: config.channel, creator: from, creator_id: user.id, status: :on,
                                              every: every, every_in_seconds: every_in_seconds, at: at, dayweek: dayweek, file_path: file_path, 
                                              command: command_to_run.to_s.strip, silent: silent,
-                                             next_run: next_run.to_s, dest: channel, last_run: "", last_elapsed: "", 
+                                             next_run: next_run.to_s, dest: channel_id, last_run: "", last_elapsed: "", 
                                              running: false }
             update_routines
             respond "Added routine *`#{name}`* to the channel", dest

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

@@ -27,7 +27,7 @@ class SlackSmartBot
         command = command2
         on_demand = true
     end
-    if (on_demand or 
+    if (on_demand or typem == :on_dm or
       (@listening.key?(from) and (@listening[from].key?(dest) or @listening[from].key?(Thread.current[:thread_ts])) )) and 
       config.on_maintenance and !command.match?(/\A(set|turn)\s+maintenance\s+off\s*\z/)
       respond config.on_maintenance_message, dest
@@ -83,8 +83,11 @@ class SlackSmartBot
         when /^\s*kill\s+bot\s+on\s+<#C\w+\|(.+)>\s*$/i, /^kill\s+bot\s+on\s+(.+)\s*$/i
           channel = $1
           kill_bot_on_channel(dest, from, channel)
-        when /^\s*(add|create)\s+(silent\s+)?routine\s+(\w+)\s+(every)\s+(\d+)\s*(days|hours|minutes|seconds|mins|min|secs|sec|d|h|m|s)\s*(\s<#(C\w+)\|.+>\s*)?(\s.+)?\s*$/i,
+        when /^\s*(add|create)\s+(silent\s+)?routine\s+(\w+)\s+(every)\s+(\d+)\s*(days|hours|minutes|seconds|mins|min|secs|sec|d|h|m|s)\s*(\s#(\w+)\s*)(\s.+)?\s*$/i,
+          /^\s*(add|create)\s+(silent\s+)?routine\s+(\w+)\s+(every)\s+(\d+)\s*(days|hours|minutes|seconds|mins|min|secs|sec|d|h|m|s)\s*(\s<#(C\w+)\|.+>\s*)?(\s.+)?\s*$/i,
+          /^\s*(add|create)\s+(silent\s+)?routine\s+(\w+)\s+on\s+(monday|tuesday|wednesday|thursday|friday|saturday|sunday)s?\s+at\s+(\d+:\d+:?\d+?)\s*()(\s#(\w+)\s*)(\s.+)?\s*$/i,
           /^\s*(add|create)\s+(silent\s+)?routine\s+(\w+)\s+on\s+(monday|tuesday|wednesday|thursday|friday|saturday|sunday)s?\s+at\s+(\d+:\d+:?\d+?)\s*()(\s<#(C\w+)\|.+>\s*)?(\s.+)?\s*$/i,
+          /^\s*(add|create)\s+(silent\s+)?routine\s+(\w+)\s+(at)\s+(\d+:\d+:?\d+?)\s*()(\s#(\w+)\s*)(\s.+)?\s*$/i,
           /^\s*(add|create)\s+(silent\s+)?routine\s+(\w+)\s+(at)\s+(\d+:\d+:?\d+?)\s*()(\s<#(C\w+)\|.+>\s*)?(\s.+)?\s*$/i
           silent = $2.to_s!=''
           name = $3.downcase

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

@@ -69,14 +69,24 @@ class SlackSmartBot
     end
     typem = :dont_treat
     if !dest.nil? and !data.text.nil? and !data.text.to_s.match?(/\A\s*\z/)
-      #if data.text.match(/^\s*<@#{config[:nick_id]}>\s+(on\s+)?<#(\w+)\|([^>]+)>\s*:?\s*(.*)/im)
-      if data.text.match(/^\s*<@#{config[:nick_id]}>\s+(on\s+)?((<#\w+\|[^>]+>\s*)+)\s*:?\s*(.*)/im)
+      #todo: we need to add mixed channels: @smart-bot on private1 #bot1cm <#CXDDFRDDF|bot2cu>: echo A
+      if data.text.match(/^\s*<@#{config[:nick_id]}>\s+(on\s+)?((<#\w+\|[^>]+>\s*)+)\s*:?\s*(.*)/im) or 
+        data.text.match(/^\s*<@#{config[:nick_id]}>\s+(on\s+)?((#[a-zA-Z0-9]+\s*)+)\s*:?\s*(.*)/im) or
+        data.text.match(/^\s*<@#{config[:nick_id]}>\s+(on\s+)?(([a-zA-Z0-9]+\s*)+)\s*:\s*(.*)/im)
         channels_rules = $2 #multiple channels @smart-bot on #channel1 #channel2 echo AAA
         data_text = $4
         channel_rules_name = ''
         channel_rules = ''
+        channels_arr = channels_rules.scan(/<#(\w+)\|([^>]+)>/)
+        if channels_arr.size == 0
+          channels_arr = []
+          channels_rules.scan(/([^\s]+)/).each do |cn|
+            cna = cn.join.gsub('#','')
+            channels_arr << [@channels_id[cna], cna]
+          end
+        end
         # to be treated only on the bots of the requested channels
-        channels_rules.scan(/<#(\w+)\|([^>]+)>/).each do |tcid, tcname|
+        channels_arr.each do |tcid, tcname|
           if @channel_id == tcid
             data.text = data_text
             typem = :on_call
@@ -234,6 +244,7 @@ class SlackSmartBot
               file_cts = eval(file_cts)
               if file_cts.is_a?(Hash) and file_cts.key?(:on_maintenance)
                 config.on_maintenance = file_cts.on_maintenance
+                config.on_maintenance_message = file_cts.on_maintenance_message
               end
             end
           end
@@ -245,6 +256,7 @@ class SlackSmartBot
               file_cts = eval(file_cts)
               if file_cts.is_a?(Hash) and file_cts.key?(:on_maintenance)
                 config.on_maintenance = file_cts.on_maintenance
+                config.on_maintenance_message = file_cts.on_maintenance_message
               end
             end
           end

data/whats_new.txt

@@ -1,4 +1,10 @@
-*Version 1.9.1* Released 2021-Mar-18
+*Version 1.9.2* Released 2021-Apr-27
+
+- Bugfixing and small improvements
+
+------------------------------
+
+*Version 1.9.0* Released 2021-Mar-18
 
 *For General users*
 - Added command `what's new` that will show this.

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: slack-smart-bot
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.9.2
 platform: ruby
 authors:
 - Mario Ruiz
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-18 00:00:00.000000000 Z
+date: 2021-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-ruby-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.17'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.17.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.17'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.17.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: nice_http
   requirement: !ruby/object:Gem::Requirement
@@ -218,8 +218,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.0.3
+signing_key: 
 specification_version: 4
 summary: Create a Slack bot that is smart and so easy to expand, create new bots on
   demand, run ruby code on chat, create shortcuts...