slack-smart-bot 1.14.2 → 1.15.0

data/lib/slack/smart-bot/commands/general/bye_bot.rb

@@ -1,18 +1,22 @@
 class SlackSmartBot
 
-  def bye_bot(dest, from, display_name)
+  def bye_bot(dest, user, display_name)
+    user_name = user.name
+    team_id = user.team_id 
+    team_id_user = team_id + "_" + user_name
+
     if @status == :on
       save_stats(__method__)
       bye = ["Bye", "Bæ", "Good Bye", "Adiós", "Ciao", "Bless", "Bless bless", "Adeu"].sample
       respond "#{bye} #{display_name}", dest
 
-      if @listening.key?(from)
+      if @listening.key?(team_id_user)
         if Thread.current[:on_thread]
-          @listening[from].delete(Thread.current[:thread_ts])
+          @listening[team_id_user].delete(Thread.current[:thread_ts])
         else
-          @listening[from].delete(dest)
+          @listening[team_id_user].delete(dest)
         end
-        @listening.delete(from) if @listening[from].empty?
+        @listening.delete(team_id_user) if @listening[team_id_user].empty?
       end
     end
   end

data/lib/slack/smart-bot/commands/general/delete_announcement.rb

@@ -9,7 +9,7 @@ class SlackSmartBot
         channel = Thread.current[:dest]
       end
       if File.exist?("#{config.path}/announcements/#{channel}.csv") and !@announcements.key?(channel)
-        t = CSV.table("#{config.path}/announcements/#{channel}.csv", headers: ['message_id', 'user_deleted', 'user_created', 'date', 'time', 'type', 'message'])
+        t = CSV.table("#{config.path}/announcements/#{channel}.csv", headers: ['message_id', 'user_team_id_deleted', 'user_deleted', 'user_team_id_created', 'user_created', 'date', 'time', 'type', 'message'])
         @announcements[channel] = t
       end
       found = false
@@ -19,6 +19,7 @@ class SlackSmartBot
           @announcements[channel].each do |row|
             if row[:message_id].to_i == message_id.to_i
               message = row[:message]
+              row[:user_team_id_deleted] = user.team_id
               row[:user_deleted] = user.name
             end    
             csv << row

data/lib/slack/smart-bot/commands/general/delete_share.rb

@@ -9,7 +9,7 @@ class SlackSmartBot
         channel = Thread.current[:dest]
       end
       if File.exist?("#{config.path}/shares/#{@channels_name[channel]}.csv") and !@shares.key?(@channels_name[channel])
-        t = CSV.table("#{config.path}/shares/#{@channels_name[channel]}.csv", headers: ['share_id', 'user_deleted', 'user_created', 'date', 'time', 'type', 'to_channel', 'condition'])
+        t = CSV.table("#{config.path}/shares/#{@channels_name[channel]}.csv", headers: ['share_id', 'user_team_id_deleted', 'user_deleted', 'user_team_id_created', 'user_created', 'date', 'time', 'type', 'to_channel', 'condition'])
         @shares[@channels_name[channel]] = t
       end
       found = false
@@ -19,6 +19,7 @@ class SlackSmartBot
           @shares[@channels_name[channel]].each do |row|
             if row[:share_id].to_i == share_id.to_i
               message = row[:condition]
+              row[:user_team_id_deleted] = user.team_id
               row[:user_deleted] = user.name
             end    
             csv << row

data/lib/slack/smart-bot/commands/general/deny_access.rb

@@ -4,7 +4,7 @@ class SlackSmartBot
     not_allowed = ['hi_bot', 'bye_bot', "allow_access", "deny_access", "get_bot_logs", "add_routine", "pause_bot", "pause_routine", "remove_routine", "run_routine", "start_bot",
                    "start_routine", "delete_message", "update_message", "send_message", "kill_bot_on_channel", "exit_bot", "notify_message", "publish_announcements", "set_general_message",
                    "set_maintenance", 'bot_help', 'bot_rules']
-    if !is_admin?(user.name)
+    if !is_admin?(user)
       respond "Only admins of this channel can use this command. Take a look who is an admin of this channel by calling `see admins`"
     elsif Thread.current[:dest][0] == "D"
       respond "This command cannot be called from a DM"

data/lib/slack/smart-bot/commands/general/get_smartbot_readme.rb

@@ -0,0 +1,15 @@
+class SlackSmartBot
+  #todo: Add tests
+  def get_smartbot_readme(dest)
+    save_stats(__method__)
+    dir = Gem::Specification.latest_spec_for('slack-smart-bot').gem_dir
+    file_name = "README.md"
+    content = File.read("#{dir}/#{file_name}")
+    content.gsub!('"img/', '"https://raw.githubusercontent.com/MarioRuiz/slack-smart-bot/master/img/')
+    if File.exist?("#{dir}/#{file_name}")
+      send_file(dest, "SmartBot README", "", file_name, "text/markdown", "markdown", content: content)
+    else
+      respond "There is no README.md"
+    end
+  end
+end

data/lib/slack/smart-bot/commands/general/hi_bot.rb

@@ -3,6 +3,10 @@ class SlackSmartBot
   def hi_bot(user, dest, from, display_name)
     if @status == :on
       save_stats(__method__)
+      user_name = user.name
+      team_id = user.team_id
+      team_id_user = team_id + "_" + user_name
+
       greetings = ["Hello", "Hallo", "Hi", "Hola", "What's up", "Hey", "Hæ"].sample
       respond "#{greetings} #{display_name}", dest
       if Thread.current[:typem] == :on_pub or Thread.current[:typem] == :on_pg
@@ -12,7 +16,9 @@ class SlackSmartBot
         message << "Call `bot help` to see the commands you can use."
         respond message.join("\n")
       elsif Thread.current[:typem] == :on_dm and Thread.current[:using_channel] == ''
-        respond "To start using the rules from a Bot channel call `use #CHANNEL`.\nAvailable SmartBots: <##{@bots_created.keys.join('>, <#')}>\nIf you want to call just one command from a specific channel: `#CHANNEL COMMAND`"
+        unless @bots_created.empty?
+          respond "To start using the rules from a Bot channel call `use #CHANNEL`.\nAvailable SmartBots: <##{@bots_created.keys.join('>, <#')}>\nIf you want to call just one command from a specific channel: `#CHANNEL COMMAND`"
+        end
       else
         respond "You are on <##{@channel_id}> SmartBot channel. Call `bot help` to see all commands you can use or `bot rules` just to see the specific commands for this Bot channel."
       end
@@ -22,11 +28,11 @@ class SlackSmartBot
         message << "You can call a command from any other channel by calling `#CHANNEL COMMAND`" if Thread.current[:typem] == :on_dm
         respond message.join("\n")
       end
-      @listening[from] = {} unless @listening.key?(from)
+      @listening[team_id_user] = {} unless @listening.key?(team_id_user)
       if Thread.current[:on_thread]
-        @listening[from][Thread.current[:thread_ts]] = Time.now
+        @listening[team_id_user][Thread.current[:thread_ts]] = Time.now
       else
-        @listening[from][dest] = Time.now
+        @listening[team_id_user][dest] = Time.now
       end
     end
   end

data/lib/slack/smart-bot/commands/general/personal_settings.rb

@@ -2,32 +2,50 @@ class SlackSmartBot
   def personal_settings(user, type, settings_id, settings_value)
     save_stats "#{type}_personal_settings"
     if Thread.current[:typem] == :on_dm
+      user_name = user.name
+      team_id = user.team_id
+      team_id_user = team_id + "_" + user_name
       get_personal_settings()
-      @personal_settings[user.name] ||= {}
+      @personal_settings[team_id_user] ||= {}
       if type == :get
         if settings_id.to_s == ''
           personal_settings_txt = ""
-          @personal_settings[user.name].each do |key, value|
+          @personal_settings[team_id_user].each do |key, value|
             personal_settings_txt << "`#{key}`:  #{value}\n"
           end
+          if personal_settings_txt == ""
+            personal_settings_txt = "No personal settings found.\nYou can set personal settings with `set personal settings SETTINGS_ID VALUE`"
+          end
           respond "Personal settings for *#{user.name}* are:\n#{personal_settings_txt}"
         else
-          if @personal_settings[user.name].key?(settings_id)
-            respond "Personal settings for *#{settings_id}* is: *#{@personal_settings[user.name][settings_id]}*."
+          if @personal_settings[team_id_user].key?(settings_id)
+            respond "Personal settings for *#{settings_id}* is: *#{@personal_settings[team_id_user][settings_id]}*."
           else
             respond "Personal settings for *#{settings_id}* not found."
           end
         end
       elsif type == :delete
-        if @personal_settings[user.name].key?(settings_id)
-          @personal_settings[user.name].delete(settings_id)
+        if @personal_settings[team_id_user].key?(settings_id)
+          @personal_settings[team_id_user].delete(settings_id)
           update_personal_settings()
           respond "Personal settings deleted for *#{settings_id}*."
         else
-          respond "Personal settings for *#{settings_id}* not found."
+          settings_id_deleted = []
+          @personal_settings[team_id_user].each do |key, value|
+            if key.match?(/^#{settings_id}\./i)
+              @personal_settings[team_id_user].delete(key)
+              settings_id_deleted << key
+            end
+          end
+          if settings_id_deleted.empty?
+            respond "Personal settings for *#{settings_id}* not found."
+          else
+            update_personal_settings()
+            respond "Personal settings deleted for *#{settings_id}*:\n`#{settings_id_deleted.join("`, `")}`"
+          end
         end
       else #set
-        @personal_settings[user.name][settings_id] = settings_value
+        @personal_settings[team_id_user][settings_id] = settings_value
         update_personal_settings()
         respond "Personal settings set for *#{settings_id}*."
       end

data/lib/slack/smart-bot/commands/general/poster.rb

@@ -28,6 +28,30 @@ class SlackSmartBot
               y: ["00000", "10001", "01010", "00100", "00100", "00100", "00000"],
               z: ["00000", "11111", "00010", "00100", "01000", "11111", "00000"],
               '!': ["0", "1", "1", "1", "0", "1", "0"],
+              "'": ["0", "1", "0", "0", "0", "0", "0"],
+              ".": ["0", "0", "0", "0", "0", "1", "0"],
+              "|": ["0", "1", "1", "1", "1", "1", "0"],
+              "%": ["1001", "1001", "0010", "0100", "1001", "1001", "0000"],
+              "$": ["0110", "1001", "0110", "0010", "1001", "0110", "0000"],
+              "*": ["000", "010", "111", "010", "000", "000", "000"],
+              "/": ["000000", "000010", "000100", "001000", "010000", "100000", "000000"],
+              "(": ["000", "001", "010", "010", "010", "001", "000"],
+              ")": ["000", "100", "010", "010", "010", "100", "000"],
+              "<": ["000", "001", "010", "100", "010", "001", "000"],
+              ">": ["000", "100", "010", "001", "010", "100", "000"],
+              "[": ["00", "11", "10", "10", "10", "11", "00"],
+              "]": ["00", "11", "01", "01", "01", "11", "00"],
+              "{": ["00", "01", "10", "01", "10", "01", "00"],
+              "}": ["00", "10", "01", "10", "01", "10", "00"],
+              "_": ["000", "000", "000", "000", "000", "000", "111"],
+              "°": ["0110", "1001", "1001", "0110", "0000", "0000", "0000"],
+              "º": ["0110", "1001", "1001", "0110", "0000", "0000", "0000"],
+              "ª": ["0110", "1001", "0110", "0000", "0000", "0000", "0000"],
+              "&": ["0000", "0110", "1000", "0101", "1010", "0101", "0000"],
+              "#": ["00000", "01010", "11111", "01010", "11111", "01010", "00000"],
+              "@": ["01110", "10001", "10101", "10111", "10000", "01110", "00000"],
+              '^': ["00100", "01010", "10001", "00000", "00000", "00000", "00000"],
+              '"': ["000", "101", "101", "000", "000", "000", "000"],
               '+': ["000", "000", "010", "111", "010", "000", "000"],
               '-': ["000", "000", "000", "111", "000", "000", "000"],
               '=': ["000", "000", "111", "000", "111", "000", "000"],
@@ -44,7 +68,7 @@ class SlackSmartBot
               '9': ["000", "111", "101", "111", "001", "111", "000"],
               ' ': ["0", "0", "0", "0", "0", "0", "0"] }
 
-    emoticon_bg = ":white_square:" if emoticon_bg.to_s == ""
+    emoticon_bg = ":transparent_square:" if emoticon_bg.to_s == ""
     emoticon_text = ":black_square:" if emoticon_text.to_s == ""
     string.downcase!
     messages = []
@@ -116,4 +140,4 @@ class SlackSmartBot
       react :heavy_minus_sign
     end
   end
-end
+end

data/lib/slack/smart-bot/commands/general/public_holidays.rb

@@ -9,18 +9,7 @@ class SlackSmartBot
         found_location = true
         http = NiceHttp.new("#{config[:public_holidays][:host]}/api/v2")
         if !defined?(@countries_candelarific)
-          if File.exist?("#{config.path}/vacations/countries_candelarific.json")
-            @countries_candelarific = JSON.parse(File.read("#{config.path}/vacations/countries_candelarific.json"))
-          else
-            response = http.get "/countries?api_key=#{config[:public_holidays][:api_key]}"
-            countries_candelarific = response.data.json(:countries)
-            if countries_candelarific.is_a?(Array)
-              File.write("#{config.path}/vacations/countries_candelarific.json", countries_candelarific.to_json)
-              @countries_candelarific = JSON.parse(countries_candelarific.to_json)
-            else
-              @countries_candelarific = []
-            end
-          end
+          get_countries_candelarific()
         end
         country = @countries_candelarific.find { |c| c.country_name.match?(/^\s*#{country_name}\s*$/i) }
         if country.nil?
@@ -95,24 +84,25 @@ class SlackSmartBot
                       date_holiday = " #{holiday[:date][:datetime][:year]}-#{"%02d" % m}-#{"%02d" % d} "
                     end
                     num_holidays_to_show += 1
-                    break if num_holidays_to_show > 30 and publish_results
-                    week_day = Date.new(holiday[:date][:datetime][:year], holiday[:date][:datetime][:month], holiday[:date][:datetime][:day]).strftime("%A")
-                    messages << "\t:spiral_calendar_pad:#{date_holiday}*#{holiday[:name]}* _(#{holiday[:type].join(", ")}) (#{week_day})_"
-                    messages << "\t#{holiday[:description]}"
-                    if location == ""
-                      if holiday.states.is_a?(Array)
-                        messages << "\tLocations: #{holiday.states.name.sort.join(", ")}"
-                      else
-                        messages << "\tLocations: #{holiday.states}"
+                    unless num_holidays_to_show > 30 and publish_results
+                        week_day = Date.new(holiday[:date][:datetime][:year], holiday[:date][:datetime][:month], holiday[:date][:datetime][:day]).strftime("%A")
+                        messages << "\t:spiral_calendar_pad:#{date_holiday}*#{holiday[:name]}* _(#{holiday[:type].join(", ")}) (#{week_day})_"
+                        messages << "\t#{holiday[:description]}"
+                        if location == ""
+                        if holiday.states.is_a?(Array)
+                          messages << "\tLocations: #{holiday.states.name.sort.join(", ")}"
+                        else
+                          messages << "\tLocations: #{holiday.states}"
+                        end
                       end
+                      messages << "\n"
+                      holidays_to_add << holiday
                     end
                     if holiday.states.is_a?(Array)
                       states << holiday.states.name
                     else
                       states << holiday.states
                     end
-                    messages << "\n"
-                    holidays_to_add << holiday
                   end
                 end
               end
@@ -143,4 +133,4 @@ class SlackSmartBot
       return (found_location==true and !country.nil?) if !publish_results
     end
   end
-end
+end