slack-smart-bot 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 335286b4f30e6956f97a8e79b6093851a2d048da064ba2efd7c302c01e7c19ec
-  data.tar.gz: 89b301b09b8b60e7e19dfa35ee332a5666b3ba9c2c3a6bad2a9bd79ea0c583b8
+  metadata.gz: 4f525626c08342efb47771ac63104863aee616dfe45b428f09c48be94d855cd0
+  data.tar.gz: 8cf17f028da036a7b15c418b13a5e7f8011bb3359b15b8a1d02c88e6962cb379
 SHA512:
-  metadata.gz: 56b297b67275669063426154d0450e40930217b4de92651fbc61f9aea93b8fe7b547d1c5a491f3265a98b8ec7755b0d47b8c300edc486b95199dc363dd42e84b
-  data.tar.gz: 898432dc2811c1e02bafb27ff44bb514f985e6c4ab554fd2ddbdf32852f2f99dc3237ac9510c884dc6e89fca6c5af34e81b80ea61351a5932b2c1c3eaa6da114
+  metadata.gz: 4f6b5afdcfc4cfc199e272a4f0723865d4e68dd9e4242d73d88a3f8d4051575aca028bf53215b0261243743b00f7f467842f484f423daa2a0407cb69ccde59ed
+  data.tar.gz: c652cdad1b97ab090131f9baf3a9f5f4f6796a8a751052285f38329a390fc8d601dc4170acaefc18479593e8359724212d17cc2b589e1fcabe68103b15d87e81

data/lib/slack-smart-bot.rb

@@ -372,7 +372,25 @@ class SlackSmartBot
               @logger.info "Changed status on #{channel_name} to :#{status}"
             end
           end
+        when /extended the rules from (.+) to be used on (.+)\.$/i
+          from_name = $1
+          to_name = $2
+          if ON_MASTER_BOT and @bots_created[@channels_id[from_name]][:cloud]
+            @bots_created[@channels_id[from_name]][:extended] << to_name
+            @bots_created[@channels_id[from_name]][:extended].uniq!
+            update_bots_file()
+          end
+
+        when /removed the access to the rules of (.+) from (.+)\.$/i
+          from_name = $1
+          to_name = $2
+          if ON_MASTER_BOT and @bots_created[@channels_id[from_name]][:cloud]
+            @bots_created[@channels_id[from_name]][:extended].delete(to_name)
+            update_bots_file()
+          end
+          
         end
+
         return :next #don't continue analyzing
       rescue Exception => stack
         @logger.fatal stack
@@ -560,7 +578,7 @@ class SlackSmartBot
             respond "*Commands for administrators:*\n#{help_message.scan(/#\s*help\s*admin:(.*)/).join("\n")}", dest
           end
           if ON_MASTER_BOT and (dest[0] == "C" or dest[0] == "G")
-            respond "*Commands only on Master Channel <##{@channels_id[MASTER_CHANNEL]}>:*\n#{help_message.scan(/#\s*help\s*master:(.*)/).join("\n")}", dest
+            respond "*Commands only on Master Channel <##{@master_bot_id}>:*\n#{help_message.scan(/#\s*help\s*master:(.*)/).join("\n")}", dest
           end
           respond help_message.scan(/#\s*help\s*:(.*)/).join("\n"), dest
         end
@@ -645,7 +663,7 @@ class SlackSmartBot
         #help: `stop using rules from CHANNEL`
         #help:    it will stop using the rules from the specified channel.
         #help:
-      when /^stop using rules (from\s+)<#C\w+\|(.+)>/i, /^stop using rules (from\s+)(.+)/i
+      when /^stop using rules (from\s+)<#\w+\|(.+)>/i, /^stop using rules (from\s+)(.+)/i
         channel = $2
         if @channels_id.key?(channel)
           channel_id = @channels_id[channel]
@@ -719,7 +737,7 @@ class SlackSmartBot
             respond "Only admin users can kill me", dest
           end
         else
-          respond "To do this you need to be an admin user in the master channel: <##{@channels_id[MASTER_CHANNEL]}>", dest
+          respond "To do this you need to be an admin user in the master channel: <##{@master_bot_id}>", dest
         end
 
         #helpadmin: ----------------------------------------------
@@ -770,7 +788,9 @@ class SlackSmartBot
         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
+        require 'socket'
+        ip_address = Socket.ip_address_list.find { |ai| ai.ipv4? && !ai.ipv4_loopback? }.ip_address
+        respond "*#{Socket.gethostname} (#{ip_address})*\n\tStatus: #{@status}.\n\tVersion: #{VERSION}.#{version_message}\n\tRules 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)
@@ -909,7 +929,7 @@ class SlackSmartBot
         else
           @logger.info MASTER_CHANNEL
           @logger.info @channel_id.inspect
-          respond "Sorry I cannot create bots from this channel, please visit the master channel: <##{@channels_id[MASTER_CHANNEL]}>", dest
+          respond "Sorry I cannot create bots from this channel, please visit the master channel: <##{@master_bot_id}>", dest
         end
 
         #helpmaster: ----------------------------------------------
@@ -947,7 +967,7 @@ class SlackSmartBot
             respond "There is no bot in this channel: #{channel}", dest
           end
         else
-          respond "Sorry I cannot kill bots from this channel, please visit the master channel: <##{@channels_id[MASTER_CHANNEL]}>", dest
+          respond "Sorry I cannot kill bots from this channel, please visit the master channel: <##{@master_bot_id}>", dest
         end
 
 
@@ -986,7 +1006,7 @@ class SlackSmartBot
       when /^bot\s+rules$/i
         if typem == :on_extended or typem == :on_call #for the other cases above.
           help_message_rules = ''
-          message = "-\n\n\n===================================\n*Rules from channel <##{@channels_id[CHANNEL]}>*\n"
+          message = "-\n\n\n===================================\n*Rules from channel #{CHANNEL}*\n"
           if typem == :on_extended
             message += "To run the commands on this extended channel, add `!` before the command.\n"
           end
@@ -1042,7 +1062,7 @@ class SlackSmartBot
               respond "The channel you specified doesn't exist", dest
             elsif @bots_created.key?(@channels_id[channel])
               respond "There is a bot already running on that channel.", dest
-            elsif @bots_created[@channels_id[CHANNEL]][:extended].include?(channel)
+            elsif @bots_created[@channel_id][:extended].include?(channel)
               respond "The rules are already extended to that channel.", dest
             elsif !members.include?(config[:nick_id])
               respond "You need to add first to the channel the smart bot user: #{config[:nick]}", dest
@@ -1052,11 +1072,12 @@ class SlackSmartBot
               channels_in_use.each do |channel_in_use|
                 respond "The rules from channel <##{@channels_id[channel_in_use]}> are already in use on that channel", dest
               end
-              @bots_created[@channels_id[CHANNEL]][:extended] = [] unless @bots_created[@channels_id[CHANNEL]].key?(:extended)
-              @bots_created[@channels_id[CHANNEL]][:extended] << channel
+              @bots_created[@channel_id][:extended] = [] unless @bots_created[@channel_id].key?(:extended)
+              @bots_created[@channel_id][:extended] << channel
               update_bots_file()
-              respond "Now the rules from <##{@channels_id[CHANNEL]}> are available on <##{@channels_id[channel]}>", dest
-              respond "<@#{user.id}> extended the rules from <##{@channels_id[CHANNEL]}> to this channel so now you can talk to the Smart Bot on demand using those rules.", @channels_id[channel]
+              respond "<@#{user.id}> extended the rules from #{CHANNEL} to be used on #{channel}.", @master_bot_id
+              respond "Now the rules from <##{@channel_id}> are available on <##{@channels_id[channel]}>", dest
+              respond "<@#{user.id}> extended the rules from <##{@channel_id}> to this channel so now you can talk to the Smart Bot on demand using those rules.", @channels_id[channel]
               respond "Use `!` before the command you want to run", @channels_id[channel]
               respond "To see the specific rules for this bot on this channel: `!bot rules`", @channels_id[channel]
             end
@@ -1067,20 +1088,21 @@ class SlackSmartBot
         #helpadmin: `stop using rules on CHANNEL_NAME`
         #helpadmin:    it will stop using the extended rules on the specified channel.
         #helpadmin:
-      when /^stop using rules (on\s+)<#C\w+\|(.+)>/i, /^stop using rules (on\s+)(.+)/i
+      when /^stop using rules (on\s+)<#\w+\|(.+)>/i, /^stop using rules (on\s+)(.+)/i
         unless typem == :on_extended
           if !ADMIN_USERS.include?(from) #not admin 
             respond "Only admins can extend or stop using the rules. Admins on this channel: #{ADMIN_USERS}", dest
           else
             channel = $2
             get_bots_created()
-            if @bots_created[@channels_id[CHANNEL]][:extended].include?(channel)
-              @bots_created[@channels_id[CHANNEL]][:extended].delete(channel)
+            if @bots_created[@channel_id][:extended].include?(channel)
+              @bots_created[@channel_id][:extended].delete(channel)
               update_bots_file()
-              respond "The rules won't be accessible from <##{@channels_id[CHANNEL]}> from now on.", dest
-              respond "<@#{user.id}> removed the access to the rules of <##{@channels_id[CHANNEL]}> from this channel.", @channels_id[channel]
+              respond "<@#{user.id}> removed the access to the rules of #{CHANNEL} from #{channel}.", @master_bot_id
+              respond "The rules won't be accessible from <##{@channels_id[channel]}> from now on.", dest
+              respond "<@#{user.id}> removed the access to the rules of <##{@channel_id}> from this channel.", @channels_id[channel]
             else
-              respond "The rules were not accessible from <##{@channels_id[channel]}>", dest
+              respond "The rules were not accessible from #{@channels_id[channel]}", dest
             end
           end
         end
@@ -1284,7 +1306,7 @@ class SlackSmartBot
 
   def respond(msg, dest = nil)
     if dest.nil?
-      client.message(channel: @channels_id[CHANNEL], text: msg, as_user: true)
+      client.message(channel: @channel_id, text: msg, as_user: true)
     elsif dest[0] == "C" or dest[0] == "G" # channel
       client.message(channel: dest, text: msg, as_user: true)
     elsif dest[0] == "D" # Direct message
@@ -1298,7 +1320,7 @@ class SlackSmartBot
   #to: user that should answer
   def ask(question, context, to, dest = nil)
     if dest.nil?
-      client.message(channel: @channels_id[CHANNEL], text: "#{to}: #{question}", as_user: true)
+      client.message(channel: @channel_id, text: "#{to}: #{question}", as_user: true)
     elsif dest[0] == "C" or dest[0] == "G" # channel
       client.message(channel: dest, text: "#{to}: #{question}", as_user: true)
     elsif dest[0] == "D" #private message

metadata

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