slack-smart-bot 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1750567f74fe728f40a4c8ec8699d6a21844d72faf0299a841a5c161a4fa4616
-  data.tar.gz: 3fd9575a4e00fb2e7860ade60dc45d821c20450e470cb94caa66e655e2b262ec
+  metadata.gz: a068b59198e7c02bdf9c58f9b694699a550034540848de56e39e17cea9c7cf40
+  data.tar.gz: 12ac140c01e5f7cda57373b45960fa6fb1c9ebbbf7afdae96da3435b2f0c6277
 SHA512:
-  metadata.gz: a571a4d625efc505fe30e279308bf925f5050bb0f9dd691aff351ba83871272dea0564a334a98bb6e930db981a7fdaca4cd7edbd6cadf682ca04065af8ddbf3a
-  data.tar.gz: 1a5ff7c6f770696818646c4a148e3e036565376f5d27f0ffc9205df1c58b5273442f31a3da5adc4cc4546fa1cd81b28084db360cfb4da551492ddd38528b93cf
+  metadata.gz: f682eff80b6ee14339b44706708516b406a5a3ba23529be7e3174d15e96f36b9fc37cd926afff138d0927de6e9cd30fbd7d6c6086cd50ec624beb56dc98fb21d
+  data.tar.gz: c6123c515cabb71da6477526ba4cb312755d2057e29e679c751987fb586cddbd2a0a501e9bbd89c9e4bf4c514db9c8eb7c0e9f7e2536b7d3cba6b0b30314d75b

data/lib/slack-smart-bot.rb

@@ -202,7 +202,7 @@ class SlackSmartBot
       @logger.warn "!dest is nil. user: #{data.user}, channel: #{data.channel}, message: #{data.text}" if dest.nil?
       
       typem = :dont_treat
-      if !dest.nil?
+      if !dest.nil? and !data.text.nil? and !data.text.to_s.match?(/^\s*$/)
         if data.text.match(/^<@#{config[:nick_id]}>\s(on\s)?<#(\w+)\|(.+)>\s*:?\s*(.*)/im)
           channel_rules = $2
           channel_rules_name = $3
@@ -488,7 +488,7 @@ class SlackSmartBot
   #help:
   def process(user, command, dest, dchannel, rules_file, typem)
     from = user.name
-    firstname = from.split(/ /).first
+    display_name = user.profile.display_name
     processed = true
 
     if typem == :on_master or typem == :on_bot or typem ==:on_pg or typem == :on_dm
@@ -505,7 +505,7 @@ class SlackSmartBot
       when /^(Hello|Hallo|Hi|Hola|What's\sup|Hey|Hæ)\s(#{@salutations.join("|")})\s*$/i
         if @status == :on
           greetings = ["Hello", "Hallo", "Hi", "Hola", "What's up", "Hey", "Hæ"].sample
-          respond "#{greetings} #{firstname}", dest
+          respond "#{greetings} #{display_name}", 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" or dest[0] == "G")
@@ -524,7 +524,7 @@ class SlackSmartBot
       when /^(Bye|Bæ|Good\sBye|Adiós|Ciao|Bless|Bless\sBless|Adeu)\s(#{@salutations.join("|")})\s*$/i
         if @status == :on
           bye = ["Bye", "Bæ", "Good Bye", "Adiós", "Ciao", "Bless", "Bless bless", "Adeu"].sample
-          respond "#{bye} #{firstname}", dest
+          respond "#{bye} #{display_name}", dest
           @listening.delete(from)
         end
 
@@ -680,7 +680,7 @@ class SlackSmartBot
               case @questions[from]
               when /yes/i, /yep/i, /sure/i
                 respond "Game over!", dest
-                respond "Ciao #{firstname}!", dest
+                respond "Ciao #{display_name}!", dest
                 @bots_created.each { |key, value|
                   value[:thread] = ""
                   send_msg_channel(key, "Bot has been closed by #{from}")

data/lib/slack-smart-bot_rules.rb

@@ -44,6 +44,8 @@ end
 # help:
 def rules(user, command, processed, dest)
   from = user.name
+  display_name = user.profile.display_name
+
   if @testing
     puts "#{from}: #{command}"
     if @questions.keys.include?(from)
@@ -52,7 +54,6 @@ def rules(user, command, processed, dest)
       command = context
     end
   end
-  firstname = from.split(" ").first
   begin
     case command
 
@@ -98,12 +99,12 @@ def rules(user, command, processed, dest)
       stdout, stderr, status = Open3.capture3(process_to_run)
       if stderr == ""
         if stdout == ""
-          respond "#{user.name}: Nothing returned.", dest
+          respond "#{display_name}: Nothing returned.", dest
         else
-          respond "#{user.name}: #{stdout}", dest
+          respond "#{display_name}: #{stdout}", dest
         end
       else
-        respond "#{user.name}: #{stderr}", dest
+        respond "#{display_name}: #{stderr}", dest
       end
 
     # Examples sending a file to slack:
@@ -115,7 +116,7 @@ def rules(user, command, processed, dest)
       unless processed
         if @channel_id == dest or dest[0]=="D" or dest[0] == "G" #not on extended channels
           resp = %w{ what huh sorry }.sample
-          respond "#{firstname}: #{resp}?", dest
+          respond "#{display_name}: #{resp}?", dest
         end
       end
     end

metadata

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