slack-smart-bot 0.6.8 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79e7f5fe180d59d53a3b04c4f5a6a71521f3153add97d4d2c7b467d0e14c7d70
-  data.tar.gz: 4c503562cc952a1c8bc892ee862bfc2d25de84e829a216b302dc6e771a2eb2db
+  metadata.gz: 6be5b7374264a38618fa3972485f361dc9d0a514c7c5734d62d3b8b5fd775ee7
+  data.tar.gz: 0de7f63e02d543f626e9ec0e06e4a017ac5a9afe0bad2efd51c46b8b53a699e8
 SHA512:
-  metadata.gz: f960f7c7d0fd5e6949ac4b942dac8715da5a5275d514aea9faac5febb0f58ca74dfaae0b5fd9f9f969f79284ec50d982bd17449950cb8cc297b335f12661c69e
-  data.tar.gz: 729157c3ed6944b91aaeca4748f6a179f89df8cb953dee392d949d512800c507620e8f588d8f5b62d02bb267a1ca5b917ea763b5eaf30af999fd7e76f75f65de
+  metadata.gz: a4cfad5cb2a8e3285c2fd2c77f5fc0111e926e97d7fa9ff2a451f737bd43f5974f84f6d0859406e6d0b06576dcb3ac4df884bc02108c1f774bb7166e9a846d2a
+  data.tar.gz: bbb6f59f47f16042744fd1e8c5852fcd1c09846c3b618a75f43cb1fe6fb082f201e37491f723512df483f5f753097d012db3add65d3291f41e3f095a0d81fbba

data/lib/slack-smart-bot.rb

@@ -122,7 +122,7 @@ class SlackSmartBot
       @logger.info m
       @logger.info _data
     end
-    
+
     client.on :closed do |_data|
       m = "Connection has been disconnected. #{Time.now}"
       @logger.info m
@@ -200,10 +200,10 @@ class SlackSmartBot
             channel_rules_name = $3
             command = $4
             if command.size >= 2 and
-              ((command[0] == "`" and command[-1] == "`") or (command[0] == "*" and command[-1] == "*") or (command[0] == "_" and command[-1] == "_"))
-             command = command[1..-2]
+               ((command[0] == "`" and command[-1] == "`") or (command[0] == "*" and command[-1] == "*") or (command[0] == "_" and command[-1] == "_"))
+              command = command[1..-2]
             end
- 
+
             command = "!" + command unless command[0] == "!"
             if @channels_id[CHANNEL] == channel_rules #to be treated only on the bot of the requested channel
               dest = data.channel
@@ -245,7 +245,7 @@ class SlackSmartBot
   def process_first(user, text, dest, dchannel)
     nick = user.name
     #todo: verify if on slack on anytime nick == config[:nick]
-    if nick == config[:nick] or nick == (config[:nick] + " · Bot") #if message is coming from the bot
+    if nick == config[:nick] #if message is coming from the bot
       begin
         case text
         when /^Bot has been killed by/
@@ -258,7 +258,7 @@ class SlackSmartBot
             @bots_created[@channels_id[channel_name]][:status] = status.to_sym
             update_bots_file()
             if CHANNEL == channel_name
-              @logger.info "#{nick}: #{text}" 
+              @logger.info "#{nick}: #{text}"
             else #on master bot
               @logger.info "Changed status on #{channel_name} to :#{status}"
             end
@@ -271,17 +271,24 @@ class SlackSmartBot
       end
     end
 
-    if text.match?(/^!?(shortcut|sc)\s(.+)/i)
-      shortcut = text.scan(/!?\w+\s*(.+)\s*/i).join.downcase
-      if text[0] == "!"
-        addexcl = true
-      else
-        addexcl = false
-      end
-      if @shortcuts.keys.include?(nick) and @shortcuts[nick].keys.include?(shortcut)
-        text = @shortcuts[nick][shortcut].dup
-      elsif @shortcuts.keys.include?(:all) and @shortcuts[:all].keys.include?(shortcut)
-        text = @shortcuts[:all][shortcut].dup
+    #only for shortcuts
+    if text.match(/^@?(#{config[:nick]}):*\s+(.+)\s*$/i) or
+       text.match(/^()!\s*(.+)\s*$/i) or
+       text.match(/^()<@#{config[:nick_id]}>\s+(.+)\s*$/i)
+      command = $2
+      addexcl = true
+    else
+      addexcl = false
+      command = text.downcase.lstrip.rstrip
+    end
+    if command.scan(/^(shortcut|sc)\s+(.+)/i).any? or
+       (@shortcuts.keys.include?(:all) and @shortcuts[:all].keys.include?(command)) or
+       (@shortcuts.keys.include?(nick) and @shortcuts[nick].keys.include?(command))
+      command = $2.downcase unless $2.nil?
+      if @shortcuts.keys.include?(nick) and @shortcuts[nick].keys.include?(command)
+        text = @shortcuts[nick][command].dup
+      elsif @shortcuts.keys.include?(:all) and @shortcuts[:all].keys.include?(command)
+        text = @shortcuts[:all][command].dup
       else
         respond "Shortcut not found", dest
         return :next
@@ -327,7 +334,7 @@ class SlackSmartBot
                   if @bots_created[@rules_imported[user.id][dchannel]][:status] == :on
                     rules_file = @bots_created[@rules_imported[user.id][dchannel]][:rules_file]
                   else
-                    respond 'The bot on that channel is not :on', dest
+                    respond "The bot on that channel is not :on", dest
                     done = true
                   end
                 end
@@ -697,7 +704,7 @@ class SlackSmartBot
         respond "The channel you are trying to use doesn't exist", dest
       elsif channel_found.name == MASTER_CHANNEL
         respond "You cannot use the rules from Master Channel on any other channel.", dest
-      elsif !@bots_created.key?(@channels_id[channel]) 
+      elsif !@bots_created.key?(@channels_id[channel])
         respond "There is no bot running on that channel.", dest
       elsif @bots_created.key?(@channels_id[channel]) and @bots_created[@channels_id[channel]][:status] != :on
         respond "The bot in that channel is not :on", dest
@@ -850,8 +857,9 @@ class SlackSmartBot
       #help:    Then to call this shortcut:
       #help:        _sc spanish account_
       #help:        _shortcut Spanish Account_
+      #help:        _Spanish Account_
       #help:
-      when /^(add\s)?shortcut\s(for\sall)?\s*(.+):\s(.+)/i, /^(add\s)sc\s(for\sall)?\s*(.+):\s(.+)/i
+      when /^(add\s)?shortcut\s(for\sall)?\s*(.+)\s*:\s*(.+)/i, /^(add\s)sc\s(for\sall)?\s*(.+)\s*:\s*(.+)/i
         for_all = $2
         shortcut_name = $3.to_s.downcase
         command_to_run = $4
@@ -892,7 +900,7 @@ class SlackSmartBot
         #help: `delete sc NAME`
         #help:    It will delete the shortcut with the supplied name
         #help:
-      when /^delete\sshortcut\s(.+)/i, /^delete\ssc\s(.+)/i
+      when /^delete\s+shortcut\s+(.+)/i, /^delete\s+sc\s+(.+)/i
         shortcut = $1.to_s.downcase
         deleted = false
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slack-smart-bot
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
 platform: ruby
 authors:
 - Mario Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-24 00:00:00.000000000 Z
+date: 2019-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-ruby-client