slack-smart-bot 1.10.0 → 1.12.0

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

@@ -9,15 +9,16 @@ class SlackSmartBot
   # helpadmin:    Examples:
   # helpadmin:      _run routine example_
   # helpadmin:    <https://github.com/MarioRuiz/slack-smart-bot#routines|more info>
+  # helpadmin: command_id: :run_routine
   # helpadmin:
 
   def run_routine(dest, from, name)
     save_stats(__method__)
-    if config.admins.include?(from) #admin user
+    if is_admin?
       if !config.on_master_bot and dest[0] == "D"
         respond "It's only possible to run routines from MASTER channel from a direct message with the bot.", dest
       elsif @routines.key?(@channel_id) and @routines[@channel_id].key?(name)
-        File.delete "#{config.path}/routines/#{@channel_id}/#{name}_output.txt" if File.exists?("#{config.path}/routines/#{@channel_id}/#{name}_output.txt")
+        File.delete "#{config.path}/routines/#{@channel_id}/#{name}_output.txt" if File.exist?("#{config.path}/routines/#{@channel_id}/#{name}_output.txt")
         if @routines[@channel_id][name][:file_path] != ""
           if @routines[@channel_id][name][:file_path].match?(/\.rb$/i)
             ruby = "ruby "

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

@@ -10,10 +10,11 @@ class SlackSmartBot
   # helpadmin:    Examples:
   # helpadmin:      _see routine result example_
   # helpadmin:    <https://github.com/MarioRuiz/slack-smart-bot#routines|more info>
+  # helpadmin: command_id: :see_result_routine
   # helpadmin:
   def see_result_routine(dest, from, name)
     save_stats(__method__)
-    if config.admins.include?(from) #admin user
+    if is_admin?
       if @routines.key?(@channel_id) and @routines[@channel_id].key?(name)
         if File.exist?("#{config.path}/routines/#{@channel_id}/#{name}_output.txt")
           msg = "*Results from routine run #{File.mtime("#{config.path}/routines/#{@channel_id}/#{name}_output.txt")}*\n"

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

@@ -6,29 +6,30 @@ class SlackSmartBot
   # helpadmin:    In case of `all` and on the master channel, it will show all the routines from all channels
   # helpadmin:    You can use this command only if you are an admin user
   # helpadmin:    <https://github.com/MarioRuiz/slack-smart-bot#routines|more info>
+  # helpadmin: command_id: :see_routines
   # helpadmin:
   def see_routines(dest, from, user, all)
     save_stats(__method__)
-    if config.admins.include?(from) #admin user
+    if is_admin?
       if all
         routines = {}
         if config.on_master_bot
-          Dir["#{config.path}/routines/routines_*.rb"].each do |rout|
-            file_conf = IO.readlines(rout).join
-            unless file_conf.to_s() == ""
-              routines.merge!(eval(file_conf))
+          Dir["#{config.path}/routines/routines_*.yaml"].each do |rout|
+            routine = YAML.load(File.read(rout))
+            unless routine.is_a?(FalseClass)
+              routines.merge!(routine)
             end
           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.dup
+          routines = @routines
         end
       else
         if @rules_imported.key?(user.name) and @rules_imported[user.name].key?(user.name) and dest[0] == "D"
-          file_conf = IO.readlines("#{config.path}/routines/routines_#{@rules_imported[user.name][user.name]}.rb").join
-          routines = eval(file_conf)
+          routines = YAML.load(File.read("#{config.path}/routines/routines_#{@rules_imported[user.name][user.name]}.yaml"))
+          routines = {} if routines.is_a?(FalseClass)
         else
-          routines = @routines.dup
+          routines = @routines
         end
       end
 

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

@@ -6,10 +6,11 @@ class SlackSmartBot
   # helpadmin:    the bot will start to listen
   # helpadmin:    You can use this command only if you are an admin user
   # helpadmin:    <https://github.com/MarioRuiz/slack-smart-bot#bot-management|more info>
+  # helpadmin: command_id: :start_bot
   # helpadmin:
   def start_bot(dest, from)
     save_stats(__method__)
-    if config.admins.include?(from) #admin user
+    if is_admin?
       respond "This bot is running and listening from now on. You can pause again: pause this bot", dest
       @status = :on
       unless config.on_master_bot

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

@@ -8,11 +8,12 @@ class SlackSmartBot
   # helpadmin:    Examples:
   # helpadmin:      _start routine example_
   # helpadmin:    <https://github.com/MarioRuiz/slack-smart-bot#routines|more info>
+  # helpadmin: command_id: :start_routine
   # helpadmin:
 
   def start_routine(dest, from, name)
     save_stats(__method__)
-    if config.admins.include?(from) #admin user
+    if is_admin?
       if !config.on_master_bot and dest[0] == "D"
         respond "It's only possible to start routines from MASTER channel from a direct message with the bot.", dest
       elsif @routines.key?(@channel_id) and @routines[@channel_id].key?(name)

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

@@ -4,12 +4,13 @@ class SlackSmartBot
   # helpadmin: `stop using rules on CHANNEL_NAME`
   # helpadmin:    it will stop using the extended rules on the specified channel.
   # helpadmin:    <https://github.com/MarioRuiz/slack-smart-bot#extending-rules-to-other-channels|more info>
+  # helpadmin: command_id: :stop_using_rules_on
   # helpadmin:
 
   def stop_using_rules_on(dest, user, from, channel, typem)
     save_stats(__method__)
     unless typem == :on_extended
-      if !config.admins.include?(from) #not admin
+      if !is_admin?
         respond "Only admins can extend or stop using the rules. Admins on this channel: #{config.admins}", dest
       else
         get_bots_created()

data/lib/slack/smart-bot/commands/on_bot/admin_master/delete_message.rb

@@ -0,0 +1,25 @@
+class SlackSmartBot
+
+    # helpadmin: ----------------------------------------------
+    # helpadmin: `delete message URL`
+    # helpadmin:    It will delete the SmartBot message supplied
+    # helpadmin:    You can use this command only if you are a Master admin user and if you are in a private conversation with the bot
+    # helpadmin: command_id: :delete_message
+    # helpadmin:
+    def delete_message(from, typem, url)
+      save_stats(__method__)
+      channel, ts = url.scan(/\/archives\/(\w+)\/(\w\d+)/)[0]
+      if config.masters.include?(from) and typem==:on_dm and !channel.nil? #master admin user
+        ts = "#{ts[0..-7]}.#{ts[-6..-1]}"
+        succ = delete(channel, ts)
+        if succ
+          react :heavy_check_mark
+        else
+          react :x
+        end
+      else
+        respond "Only master admin users on a private conversation with the SmartBot can delete SmartBot messages"
+      end
+    end
+end
+  

data/lib/slack/smart-bot/commands/on_bot/admin_master/get_bot_logs.rb

@@ -4,6 +4,7 @@ class SlackSmartBot
     # helpadmin: `get bot logs`
     # helpadmin:    To see the bot logs
     # helpadmin:    You can use this command only if you are a Master admin user and if you are in a private conversation with the bot
+    # helpadmin: command_id: :get_bot_logs
     # helpadmin:
     def get_bot_logs(dest, from, typem)
       save_stats(__method__)

data/lib/slack/smart-bot/commands/on_bot/admin_master/react_to.rb

@@ -2,12 +2,14 @@ class SlackSmartBot
 
     # helpadmin: ----------------------------------------------
     # helpadmin: `react to #CHANNEL_NAME THREAD_ID EMOJIS`
+    # helpadmin: `react to URL EMOJIS`
     # helpadmin:    It will send the specified reactions as SmartBot
     # helpadmin:    You can use this command only if you are a Master admin user and if you are in a private conversation with the bot
     # helpadmin:     Examples:
     # helpadmin:       _react to #sales 1622550707.012100 :thumbsup:_
     # helpadmin:       _react to #sales p1622550707012100 :thumbsup:_
     # helpadmin:       _react to #sales p1622550707012100 :thumbsup: :heavy_check_mark: :bathtub:_
+    # helpadmin: command_id: :react_to
     # helpadmin:
     def react_to(dest, from, typem, to, thread_ts, emojis)
       save_stats(__method__)
@@ -25,7 +27,7 @@ class SlackSmartBot
           react :x
         end
       else
-        respond "Only master admin users on a `pr`ivate conversation with the SmartBot can send reactions as SmartBot.", dest
+        respond "Only master admin users on a private conversation with the SmartBot can send reactions as SmartBot.", dest
       end
     end
 end

data/lib/slack/smart-bot/commands/on_bot/admin_master/send_message.rb

@@ -3,14 +3,27 @@ class SlackSmartBot
     # helpadmin: ----------------------------------------------
     # helpadmin: `send message to @USER_NAME : MESSAGE`
     # helpadmin: `send message to #CHANNEL_NAME : MESSAGE`
-    # helpadmin: `send message to #CHANNEL_NAME THREAD_ID : MESSAGE`
+    # helpadmin: `send message to THREAD_ID : MESSAGE`
+    # helpadmin: `send message to URL : MESSAGE`
+    # helpadmin: `send message to @USER1 @USER99 : MESSAGE`
+    # helpadmin: `send message to #CHANNEL1 #CHANNEL99 : MESSAGE`
     # helpadmin:    It will send the specified message as SmartBot
     # helpadmin:    You can use this command only if you are a Master admin user and if you are in a private conversation with the bot
+    # helpadmin: command_id: :send_message
     # helpadmin:
     def send_message(dest, from, typem, to, thread_ts, message)
       save_stats(__method__)
       if config.masters.include?(from) and typem==:on_dm #master admin user
-        succ = (respond message, to, thread_ts: thread_ts, web_client: true)
+        unless Thread.current[:command_orig].to_s == ''
+          message_orig = Thread.current[:command_orig].to_s.gsub("\u00A0", " ").scan(/[^:]+\s*:\s+(.+)/im).join
+          message = message_orig unless message_orig == ''
+        end
+        succ = true
+        to.each do |t|
+          unless t.match?(/^\s*$/)
+            succ = (respond message, t, thread_ts: thread_ts, web_client: true) && succ
+          end
+        end
         if succ
           react :heavy_check_mark
         else

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

@@ -6,6 +6,7 @@ class SlackSmartBot
   # help:     Will delete the specified REPL
   # help:     Only the creator of the REPL or an admin can delete REPLs
   # help:     <https://github.com/MarioRuiz/slack-smart-bot#repl|more info>
+  # help: command_id: :delete_repl
   # help:
   def delete_repl(dest, user, session_name)
     #todo: add tests
@@ -13,7 +14,7 @@ class SlackSmartBot
     if has_access?(__method__, user)
       if @repls.key?(session_name)
         Dir.mkdir("#{config.path}/repl") unless Dir.exist?("#{config.path}/repl")
-        if config.admins.include?(user.name) or @repls[session_name].creator_name == user.name
+        if is_admin?(user.name) or @repls[session_name].creator_name == user.name
           @repls.delete(session_name)
           update_repls()
           File.rename("#{config.path}/repl/#{@channel_id}/#{session_name}.input", "#{config.path}/repl/#{@channel_id}/#{session_name}_#{Time.now.strftime("%Y%m%d%H%M%S%N")}.deleted")

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

@@ -6,6 +6,7 @@ class SlackSmartBot
   # help:    It will delete the shortcut with the supplied name
   # help:    'global' or 'generic' can only be used on Master channel.
   # help:    <https://github.com/MarioRuiz/slack-smart-bot#shortcuts|more info>
+  # help: command_id: :delete_shortcut
   # help:
 
   def delete_shortcut(dest, user, shortcut, typem, command, global)
@@ -19,11 +20,11 @@ class SlackSmartBot
           if !config.on_master_bot or typem != :on_master
             respond "It is only possible to delete global shortcuts from Master channel"
           else
-            if !config.admins.include?(from) and @shortcuts_global[:all].include?(shortcut) and 
+            if !is_admin?(from) and @shortcuts_global[:all].include?(shortcut) and 
               (!@shortcuts_global.key?(from) or !@shortcuts_global[from].include?(shortcut))
               respond "Only the creator of the shortcut or an admin user can delete it"
             elsif (@shortcuts_global.key?(from) and @shortcuts_global[from].keys.include?(shortcut)) or
-              (config.admins.include?(from) and @shortcuts_global[:all].include?(shortcut))
+              (is_admin?(from) and @shortcuts_global[:all].include?(shortcut))
               
               respond "global shortcut deleted!", dest
               if @shortcuts_global.key?(from) and @shortcuts_global[from].key?(shortcut)
@@ -39,11 +40,11 @@ class SlackSmartBot
             end
           end
         else
-          if !config.admins.include?(from) and @shortcuts[:all].include?(shortcut) and 
+          if !is_admin?(from) and @shortcuts[:all].include?(shortcut) and 
             (!@shortcuts.key?(from) or !@shortcuts[from].include?(shortcut))
             respond "Only the creator of the shortcut or an admin user can delete it", dest
           elsif (@shortcuts.keys.include?(from) and @shortcuts[from].keys.include?(shortcut)) or
-                (config.admins.include?(from) and @shortcuts[:all].include?(shortcut))
+                (is_admin?(from) and @shortcuts[:all].include?(shortcut))
             #are you sure? to avoid deleting by mistake
             if answer.empty?
               ask("are you sure you want to delete it?", command, from, dest)