slack-smart-bot 0.5.1 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd812140a95cb9fc2621a610c3c380ae0501b11a1fdbb2f84d632c0b1aa071fc
-  data.tar.gz: f3a778525686d948b1316dd5c16f7ce6cbf6b1725c4e30909028e34f47024343
+  metadata.gz: 608a8f6f85dffb984e73c88319c4d1efda9dc7cdbbbfd31adf5207a1b9355a35
+  data.tar.gz: d44177e903e26b3e53ce3a3a80d65759c45efd1e80fde67405f854c488e6b111
 SHA512:
-  metadata.gz: e668e07bb746ad498b4e11bcc3fbd0d1cab5bd9d0f8fb8656f1e5618b0a7b9d4ebd67e27d365f7cfdb0e8eb8805fff5b19054987ec7aff3d3b149b2f7a7b3aa7
-  data.tar.gz: d003974b5a88a253e9d5021724b98495b3b548d3d76c565bc4e6698832b22aae9ba789a9fd55ba1f34d2cc5a10eb2a47472a9aed37ffb655be24be191e19a167
+  metadata.gz: ec02c8abcec55310d5b5088eeb3879b2310b5f04fe5318bf71869c1ff3249064f0c315dd5c08733ec9db31dd7110f79f7d584e7ef2187ef01e3c4804f090eb13
+  data.tar.gz: ca643989c2f909478f38662dd0bb24d2696e6a4ffbcd115ae4ecf607326eb5d1a0515df3215e0c9066161882f4e79b6f43b4fca6c2467d75b4545ee76c31c0cf

data/README.md

@@ -119,6 +119,8 @@ Some of the commands are available always even when the bot is not listening to
 
 >Bot starts listening to you
 
+>If you want to avoid a single message to be treated by the smart bot, start the message by -
+
 **_`Bye Bot`_**
 
 **_`Bye THE_NAME_OF_THE_BOT`_**
@@ -175,6 +177,17 @@ As soon as you save the file after editing it will become available on your chan
 
 >Only works if you are on Master channel and you created that bot or you are an admin user
 
+**_`notify MESSAGE`_**
+
+**_`notify all MESSAGE`_**
+
+>It will send a notificaiton message to all bot channels
+
+>It will send a notification message to all channels the bot joined and private conversations with the bot
+
+>Only works if you are on Master channel and you are an admin user
+
+
 ### Available commands only when listening to you or on demand or in a private conversation with the Smart Bot
 
 All the commands described on here or on your specific Rules file can be used when the bot is listening to you or on demand or in a private conversation with the Smart Bot.
@@ -248,6 +261,14 @@ Apart of the specific commands you define on the rules file of the channel, you
 
 >it will stop using the rules from the specified channel.
 
+### Available commands from channels without a Smart Bot
+**_`@BOT_NAME on #CHANNEL_NAME COMMAND`_**
+
+**_`@BOT_NAME #CHANNEL_NAME COMMAND`_**
+
+>It will run the supplied command using the rules on the channel supplied.
+
+>You need to join the specified channel to be able to use those rules.
 
 ## Contributing
 

data/lib/slack-smart-bot.rb

@@ -99,7 +99,13 @@ class SlackSmartBot
       m = "Successfully connected, welcome '#{client.self.name}' to the '#{client.team.name}' team at https://#{client.team.domain}.slack.com."
       puts m
       @logger.info m
-      respond "Smart Bot started v#{VERSION}\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."
+      gems_remote = `gem list slack-smart-bot --remote`
+      version_remote = gems_remote.to_s().scan(/slack-smart-bot \((\d+\.\d+\.\d+)/).join
+      version_message = ''
+      if version_remote != VERSION
+        version_message = ". There is a new available version: #{version_remote}."
+      end
+      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
 
     @status = STATUS_INIT
@@ -152,7 +158,6 @@ class SlackSmartBot
   #help: `@BOT_NAME #CHANNEL_NAME COMMAND`
   #help:    It will run the supplied command using the rules on the channel supplied.
   #help:    You need to join the specified channel to be able to use those rules.
-  #help:    The only 
   def listen
     @salutations = [config[:nick], config[:nick_id], "bot", "smart"]
     client.on :message do |data|
@@ -164,42 +169,52 @@ class SlackSmartBot
       #todo: sometimes data.user is nil, check the problem.
       @logger.warn "!dest is nil. user: #{data.user}, channel: #{data.channel}, message: #{data.text}" if dest.nil?
       # Direct messages are treated only on the master bot
-      @logger.info dest.inspect
-      @logger.info data.text
       if !dest.nil? and ((dest[0] == 'D' and ON_MASTER_BOT) or (dest[0] == 'C'))
+        begin
+        #todo: when changed @questions user_id then move user_info inside the ifs to avoid calling it when not necessary
         user_info = wclient.users_info(user: data.user)
         #todo: check to remove user_info.user.name == config[:nick] since I think we will never get messages from the bot on slack
         # if Direct message or we are in the channel of the bot
-        if dest[0]=='D' or @channels_id[CHANNEL] == data.channel or user_info.user.name == config[:nick]
+        if data.text.size >=2 and 
+          ((data.text[0]=='`' and data.text[-1]=='`') or (data.text[0]=='*' and data.text[-1]=='*') or (data.text[0]=='_' and data.text[-1]=='_'))
+          data.text = data.text[1..-2]
+        end
+        if (dest[0]=='D' or @channels_id[CHANNEL] == data.channel or data.user == config[:nick_id]) and 
+          data.text.size>0 and data.text[0]!="-"
+
           res = process_first(user_info.user, data.text, dest, data.channel)
-          next if res.to_s == "next"
         # if @botname on #channel_rules: do something
         elsif data.text.match(/^<@#{config[:nick_id]}>\s(on\s)?<#(\w+)\|(.+)>\s*:?\s*(.+)$/i)
           channel_rules = $2
           channel_rules_name = $3
           command = $4
           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
+
             channels = wclient.channels_list.channels
             channel_found = channels.detect { |c| c.name == channel_rules_name }
+            members = wclient.conversations_members(channel: @channels_id[channel_rules_name]).members unless channel_found.nil?
+
             if channel_found.nil?
               @logger.fatal "Not possible to find the channel #{channel_rules_name}"
             elsif channel_found.name == MASTER_CHANNEL
               respond "You cannot use the rules from Master Channel on any other channel.", dest
-            elsif user_info.user.id == channel_found.creator or channel_found.members.include?(user_info.user.id)
+            elsif data.user == channel_found.creator or members.include?(data.user)
               res = process_first(user_info.user, command, dest, channel_rules)
-              next if res.to_s == "next"
             else
               respond "You need to join the channel <##{channel_found.id}> to be able to use the rules.", dest
             end
           end
-        elsif @questions.keys.include?(user_info.user.name)
+        elsif @questions.keys.include?(user_info.user.name) 
+          #todo: @questions key should be the id not the name. change it everywhere
           dest = data.channel
           res = process_first(user_info.user, data.text, dest, @channels_id[CHANNEL])
-          next if res.to_s == "next"
         end
+      rescue Exception => stack
+        @logger.fatal stack
+      end
+
       end
     end
 
@@ -357,6 +372,7 @@ class SlackSmartBot
     #help: `Hello THE_NAME_OF_THE_BOT`
     #help:    Also apart of Hello you can use _Hallo, Hi, Hola, What's up, Hey, Hæ_
     #help:    Bot starts listening to you
+    #help:    If you want to avoid a single message to be treated by the smart bot, start the message by -
     #help:
     when /^(Hello|Hallo|Hi|Hola|What's\sup|Hey|Hæ)\s(#{@salutations.join("|")})\s*$/i
       if @status == :on
@@ -467,7 +483,13 @@ class SlackSmartBot
       #helpadmin:    If on master channel and admin user also it will display info about bots created
       #helpadmin:
     when /^bot\sstatus/i
-      respond "Status: #{@status}. Version: #{VERSION}. Rules file: #{File.basename RULES_FILE} ", dest
+      gems_remote = `gem list slack-smart-bot --remote`
+      version_remote = gems_remote.to_s().scan(/slack-smart-bot \((\d+\.\d+\.\d+)/).join
+      version_message = ''
+      if version_remote != VERSION
+        version_message = " There is a new available version: #{version_remote}."
+      end
+      respond "Status: #{@status}. Version: #{VERSION}.#{version_message} Rules file: #{File.basename RULES_FILE} ", dest
       if @status == :on
         respond "I'm listening to [#{@listening.join(", ")}]", dest
         if ON_MASTER_BOT and ADMIN_USERS.include?(from)
@@ -477,6 +499,33 @@ class SlackSmartBot
         end
       end
 
+      #helpmaster: ----------------------------------------------
+      #helpmaster: `notify MESSAGE`
+      #helpmaster: `notify all MESSAGE`
+      #helpmaster:    It will send a notificaiton message to all bot channels
+      #helpmaster:    It will send a notification message to all channels the bot joined and private conversations with the bot
+      #helpmaster:    Only works if you are on Master channel and you are an admin user
+      #helpmaster:
+    when /^notify\s+(all)?\s*(.+)\s*$/i
+      if ON_MASTER_BOT
+        if ADMIN_USERS.include?(from) #admin user
+          all = $1
+          message = $2
+          if all.nil?
+            @bots_created.each do |k,v|
+              respond message, k
+            end
+            respond "Bot channels have been notified", dest
+          else
+            myconv = wclient.users_conversations(exclude_archived: true, limit: 100, types: 'im, public_channel').channels
+            myconv.each do |c|
+              respond message, c.id unless c.name == MASTER_CHANNEL
+            end
+            respond "Channels and users have been notified", dest
+          end
+        end
+      end
+
       #helpmaster: ----------------------------------------------
       #helpmaster: `create bot on CHANNEL_NAME`
       #helpmaster:    creates a new bot on the channel specified

metadata

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