slack-smart-bot 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de2e23162b674076d5e475671a8736db3fe3f0ebc50db8284bfda453008413e1
-  data.tar.gz: 8b47643c8cd75d7efc36b5b6b13db45af782dd41cb6093b100116fba5b516eb8
+  metadata.gz: 9dd7ec5a931f45aeef862b601c89dd869edfb317e5e05f47fd997f3c48af0b0f
+  data.tar.gz: b6c6171727919ba7f8200d9ff14f299e19a1d0b07c62263759758ed88ba4f14e
 SHA512:
-  metadata.gz: 8a3152be4feb408f72442952a144055032a07df4a5d6de0e5ac4adf74728eacc12e8ae60514d408bddc09a58613270e4ac2000c59a52862a492e9f465f37a6a4
-  data.tar.gz: 336750bcac43c800c7b2cc1edeae4f8d43026126e3e10e6f159ad5f7c47662ed7a6c747fba6136779d06625e1edab0fd6430875316a3d271617375899ac96964
+  metadata.gz: 82fded753140cd4b5f1635ed3a22f6f5c156b57e7d93d9b45a1f8f643d8ed92acb5a6c83aabfb005feb753cc73c05e9d6de1c481532f26a851e21ccdb22aa30f
+  data.tar.gz: b81648ea8b9ff046d0a379941acbc6db78823bb1d5c2b3d95a57ed11b77c8a5ada4f398c443cefcf7251dc0ba348c1eebddcab784dddceb74f70b105300641cb

data/lib/slack-smart-bot.rb

@@ -79,7 +79,7 @@ class SlackSmartBot
       end
     end
 
-    # rules imported only for private channels
+    # rules imported only for DM
     if ON_MASTER_BOT and File.exist?("./rules/rules_imported.rb")
       file_conf = IO.readlines("./rules/rules_imported.rb").join
       unless file_conf.to_s() == ""
@@ -176,7 +176,7 @@ class SlackSmartBot
   def listen
     @salutations = [config[:nick], config[:nick_id], "bot", "smart"]
     client.on :message do |data|
-      if data.channel[0] == "D" or data.channel[0] == "C" #Direct message or Channel
+      if data.channel[0] == "D" or data.channel[0] == "C" or data.channel[0] == "G" #Direct message or Channel or Private Channel
         dest = data.channel
       else # not treated
         dest = nil
@@ -184,7 +184,7 @@ 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
-      if !dest.nil? and ((dest[0] == "D" and ON_MASTER_BOT) or (dest[0] == "C")) and data.user.to_s != ""
+      if !dest.nil? and ((dest[0] == "D" and ON_MASTER_BOT) or (dest[0] == "C" or dest[0] == "G")) and data.user.to_s != ""
         begin
           #todo: when changed @questions user_id then move user_info inside the ifs to avoid calling it when not necessary
           user_info = client.web_client.users_info(user: data.user)
@@ -253,7 +253,7 @@ class SlackSmartBot
     nick = user.name
     rules_file = ''
 
-    if dest[0] == "C" # on a channel
+    if dest[0] == "C" or dest[0] == "G" # on a channel or private channel
       rules_file = RULES_FILE
 
       if @rules_imported.key?(user.id) and @rules_imported[user.id].key?(dchannel)
@@ -279,7 +279,6 @@ class SlackSmartBot
       end
     end
 
-    #todo: verify if on slack on anytime nick == config[:nick]
     if nick == config[:nick] #if message is coming from the bot
       begin
         case text
@@ -357,7 +356,7 @@ class SlackSmartBot
             #todo: verify this
 
 
-            if dest[0] == "C" #only for channels, not for DM
+            if dest[0] == "C" or dest[0] == "G" #only for channels, not for DM
               if @rules_imported.key?(user.id) and @rules_imported[user.id].key?(dchannel)
                 if @bots_created.key?(@rules_imported[user.id][dchannel])
                   if @bots_created[@rules_imported[user.id][dchannel]][:status] != :on
@@ -447,7 +446,7 @@ class SlackSmartBot
         respond "#{greetings} #{firstname}", dest
         if @rules_imported.key?(user.id) and @rules_imported[user.id].key?(user.id) and dest[0] == "D"
           respond "You are using specific rules for channel: <##{@rules_imported[user.id][user.id]}>", dest
-        elsif @rules_imported.key?(user.id) and @rules_imported[user.id].key?(dchannel) and dest[0] == "C"
+        elsif @rules_imported.key?(user.id) and @rules_imported[user.id].key?(dchannel) and (dest[0] == "C" or dest[0] == "G")
           respond "You are using specific rules for channel: <##{@rules_imported[user.id][dchannel]}>", dest
         end
         @listening << from unless @listening.include?(from)
@@ -730,7 +729,7 @@ class SlackSmartBot
       else
         if user.id == channel_found.creator or members.include?(user.id)
           @rules_imported[user.id] = {} unless @rules_imported.key?(user.id)
-          if dest[0] == "C" #todo: take in consideration bots that are not master
+          if dest[0] == "C" or dest[0] == "G" #todo: take in consideration bots that are not master
             @rules_imported[user.id][dchannel] = channel_found.id
           else
             @rules_imported[user.id][user.id] = channel_found.id
@@ -754,7 +753,7 @@ class SlackSmartBot
       else
         channel_id = channel
       end
-      if dest[0] == "C" #channel
+      if dest[0] == "C" or dest[0] == "G" #channel
         if @rules_imported.key?(user.id) and @rules_imported[user.id].key?(dchannel)
           if @rules_imported[user.id][dchannel] != channel_id
             respond "You are not using those rules.", dest
@@ -797,12 +796,12 @@ class SlackSmartBot
         if ADMIN_USERS.include?(from) #admin user
           respond "*Commands for administrators:*\n#{help_message.scan(/#\s*help\s*admin:(.*)/).join("\n")}", dest
         end
-        if ON_MASTER_BOT and dest[0] == "C"
+        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
         end
         respond help_message.scan(/#\s*help\s*:(.*)/).join("\n"), dest
       end
-      if dest[0] == "C" # on a channel
+      if dest[0] == "C" or dest[0] == "G" # on a channel
         if @rules_imported.key?(user.id) and @rules_imported[user.id].key?(dchannel)
           if @bots_created.key?(@rules_imported[user.id][dchannel])
             respond "*You are using rules from another channel: <##{@rules_imported[user.id][dchannel]}>. These are the specific commands for that channel:*", dest
@@ -1008,6 +1007,8 @@ class SlackSmartBot
             end
           end
           
+          respond "Running", dest if code.size > 100
+
           begin
             ruby = "ruby -e \"#{code.gsub('"', '\"')}\""
             ruby = ("cd #{project_folder} &&" + ruby) if defined?(project_folder)
@@ -1039,7 +1040,7 @@ class SlackSmartBot
   def respond(msg, dest = nil)
     if dest.nil?
       client.message(channel: @channels_id[CHANNEL], text: msg, as_user: true)
-    elsif dest[0] == "C" # channel
+    elsif dest[0] == "C" or dest[0] == "G" # channel
       client.message(channel: dest, text: msg, as_user: true)
     elsif dest[0] == "D" # Direct message
       send_msg_user(dest, msg)
@@ -1053,7 +1054,7 @@ class SlackSmartBot
   def ask(question, context, to, dest = nil)
     if dest.nil?
       client.message(channel: @channels_id[CHANNEL], text: "#{to}: #{question}", as_user: true)
-    elsif dest[0] == "C" # channel
+    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
       send_msg_user(dest, "#{to}: #{question}")

metadata

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