slack-smart-bot 1.12.9 → 1.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 558fa51668313d856b46f1a46c79f033a6b8f65ad2da071e1825327a87770e87
-  data.tar.gz: 568303701c7ab27c8798b542c55b23ee7d8f762fe8e7346506ce05dfd7eb3e2d
+  metadata.gz: 19f7d9b931ce89bf4a626e953ffb63b1f98ee16e1b330c6fc3c1c24ff0899227
+  data.tar.gz: abe96da2c61b844398cfc0c7eb433094f826fa4fb659c0ef2f5c01effad21c23
 SHA512:
-  metadata.gz: f0ef8868f4f67c5da397f0652920a904d177bedcc78deee6889de146d598cbab6071509b1032294382148f614e69689f7fe7df59a1e40785529319b2200d1633
-  data.tar.gz: 07ec60ba6ee00a0be8065906c2402778f69294b4ebc7f25e4c8085af085fd425f6456640f88ef75b74449b88bf30c278c9f3045efd17b544633c4575f79a18cb
+  metadata.gz: 17e5a9feb8c2b3d6974bdfacb02640fcbd29a399def6fca52affd84c236b54d547ab4ebf85ca4f1d983e06afcc226f46c9b5d8e4b764998523b40c04cdd2f45e
+  data.tar.gz: 1cea00686dd66557aa71d9badee0ca9b734f4bdc26daef145554639417d137bc1c4cb212d6fcac4008bb7c026a48043245910a1001c4ee4a1a3dff05efc9f3d0

data/README.md

@@ -10,37 +10,40 @@ The main scope of this ruby gem is to be used internally in your company so team
 
 slack-smart-bot can create bots on demand, create shortcuts, run ruby code... just on a chat channel, you can access it just from your mobile phone if you want and run those tests you forgot to run, get the results, restart a server... no limits.
 
-![](slack.png)
+<img src="slack-smart-bot.png" width="150" height="150">![](slack.png)
 
 # Table of Contents
 
 - [Installation and configuration](#installation-and-configuration)
 - [Usage](#usage)
-  * [creating the MASTER BOT](#creating-the-master-bot)
+  * [creating the MASTER BOT](#creating-the-master-bot) (A)
   * [How to access the Smart Bot](#how-to-access-the-smart-bot)
   * [Bot Help](#bot-help)
-  * [Bot Management](#bot-management)
-    + [Cloud Bots](#cloud-bots)
-  * [Extending rules to other channels](#extending-rules-to-other-channels)
+  * [Bot Management](#bot-management) (A)
+    + [Cloud Bots](#cloud-bots) (A)
+  * [Extending rules to other channels](#extending-rules-to-other-channels) (A)
   * [Using rules from other channels](#using-rules-from-other-channels)
   * [Running Ruby code on a conversation](#running-ruby-code-on-a-conversation)
     + [REPL](#repl)
-  * [Sending notifications](#sending-notifications)
+  * [Sending notifications](#sending-notifications) (A)
   * [Shortcuts](#shortcuts)
   * [Announcements](#announcements)
   * [Share Messages](#share-messages)
   * [See Statuses](#see-statuses)
-  * [Routines](#routines)
-  * [Control who has access to a command](#control-who-has-access-to-a-command)
+  * [Routines](#routines) (A)
+  * [Loops](#loops)
+  * [Control who has access to a command](#control-who-has-access-to-a-command) (A)
   * [See favorite commands](#see-favorite-commands)
   * [Teams](#teams)
   * [Time off management](#time-off-management)
   * [Tips](#tips)
-    + [Send a file](#send-a-file)
-    + [Download a file](#download-a-file)
+    + [Send a file](#send-a-file) (A)
+    + [Download a file](#download-a-file) (A)
 - [Contributing](#contributing)
 - [License](#license)
 
+(A): Only for Admins
+
 ## Installation and configuration
 
     $ gem install slack-smart-bot
@@ -94,6 +97,8 @@ SmartBot will notify about SmartBot status changes or any SmartBot incident if d
 ## Usage
 
 ### creating the MASTER BOT
+> for admins
+
 Let's guess the file you created was called my_smart_bot.rb so, just run it:
 ```
 nohup ruby my_smart_bot.rb&
@@ -194,6 +199,8 @@ Also you can add general rules that will be available on all Smart Bot channels
 If you have commands that want to make them available everywhere the Smart Bot is a member then add those commands to `./rules/general_commands.rb`. 
 
 ### How to access the Smart Bot
+> for all users
+
 You can access the bot directly on the MASTER CHANNEL, on a secondary channel where the bot is running and directly by opening a private chat with the bot, in this case the conversation will be just between you and the bot.
 
 On a Smart Bot channel you will be able to run some of the commands just by writing a command, for example: **_`bot help`_**
@@ -258,6 +265,8 @@ Examples:
 >**_Smart-Bot>_** `You're very welcome`  
 
 ### Bot Help
+> for all users
+
 To get a full list of all commands and rules for a specific Smart Bot: **_`bot help`_**. It will show only the specific available commands for the user requesting. By default it will display only a short version of the bot help, call **_`bot help expanded`_** to get a expanded version of all commands.
 
 If you want to search just for a specific command: **_`bot help COMMAND`_** It will display expanded explanations for the command.
@@ -293,6 +302,8 @@ For the examples use _ and for the rules `. This is a good example of a Help sup
 To see what's new just call `What's new`
 
 ### Bot Management
+> for admins
+
 To create a new bot on a channel, run on MASTER CHANNEL: **_`create bot on CHANNEL`_**. The admins of this new bot on that channel will be the MASTER ADMINS, the creator of the bot and the creator of that channel. It will create a new rules file linked to this new bot.
 
 You can kill any bot running on any channel if you are an admin of that bot: **_`kill bot on CHANNEL`_**
@@ -316,11 +327,15 @@ You can add, remove and list admins of any channel by using: `add admin @user`,
 To see the full list of available command ids on any channel call: `see command ids`
 
 #### Cloud Bots
+> for admins
+
 If you want to create a bot that will be running on a different machine: **_`create cloud bot on CHANNEL`_**. Even though the cloud bots are running on different machines, the management can be done through the MASTER CHANNEL. The new cloud bot will be managed by your Master Bot like the others, closing, pausing...
 
 Cloud Bots are typically used to run commands on specific environments or even different OS or networks.
 
 ### Extending rules to other channels
+> for admins
+
 If you want to extend the use of your specific rules on a Bot Channel to a third channel you can use the command: **_`extend rules to CHANNEL`_**
 
 From that moment everybody part of that channel will be able to run the specific rules from the other channel but just on demand, for example: **_`!run something`_**
@@ -328,6 +343,8 @@ From that moment everybody part of that channel will be able to run the specific
 To stop allowing it: **_`stop using rules on CHANNEL`_**
 
 ### Using rules from other channels
+> for all users
+
 To be able to access the rules from other channel or from a direct conversation with the bot, first of all you need to be a member of that channel. Then on a direct conversation with the Smart Bot or from another bot channel: **_`use rules from CHANNEL`_**
 
 When you want to stop using those rules with the bot: **_`stop using rules from CHANNEL`_**
@@ -335,6 +352,8 @@ When you want to stop using those rules with the bot: **_`stop using rules from
 Also you can always call the Smart Bot from any channel, even from channels without a running Smart Bot. You can use the External Call on Demand: **_`@NAME_OF_BOT on #CHANNEL_NAME COMMAND`_**. In this case you will call the bot on #CHANNEL_NAME.
 
 ### Running Ruby code on a conversation
+> for all users
+
 You can run Ruby code by using the command: **_`ruby THE_CODE`_**. 
 
 Example:
@@ -344,6 +363,8 @@ Example:
 Also it is possible to attach a Ruby file and the Smart Bot will run and post the output. You need to select Ruby as file format. Or if you prefer it you can call the `ruby` command and on the same message supply a code block.
 
 #### REPL
+> for all users
+
 Easily starts a REPL session so you will be able to create a script directly from the slack conversation. You will be able to share the REPL so they can run it or see the content.
 
 It Will run all we write as a ruby command and will keep the session values until we finish the session sending `quit`, `exit` or `bye` 
@@ -400,9 +421,13 @@ You can run repls and supply parameters to the repl that will be executed on the
 Example:
 >**_Peter>_** ``run repl Create10RandomUsers `request = {path: '/api-dev/users/'}` ``  
 
+If you want to add a collaborator while you are on a repl call `add collaborator @USER`. From that moment that user will be able to interact with the repl. You can add all the collaborators you want. When any collaborator wants to jump off the repl, that user can use the `quit` command.  
+
 Other REPL commands: `see repls`, `run repl SESSION_NAME ENV_VAR=value`, `get repl SESSION_NAME`, `delete repl SESSION_NAME`, `kill repl RUN_REPL_ID`
 
 ### Sending notifications
+> for admins
+
 You can send notifications from MASTER CHANNEL by using **_`notify MESSAGE`_**. All Bot Channels will be notified.
 
 If you want to send a notification message to all channels the bot joined and direct conversations with the bot: **_`notify all MESSAGE`_**
@@ -410,6 +435,8 @@ If you want to send a notification message to all channels the bot joined and di
 And if you want to send a notification message to the specified channel and to its extended channels: **_`notify #CHANNEL MESSAGE`_**
 
 ### Shortcuts
+> for all users
+
 Sometimes your commands or rules are too long and you want to add a shortcut to be executed.
 
 If you have for example a rule like this: **_`run tests on customers android app`_** and you want to add a shortcut: **_`add shortcut run tca: run tests on customers android app`_**
@@ -439,6 +466,8 @@ Example:
 To see available shortcuts: **_`see shortcuts`_** and to delete a particular shortcut: **_`delete shortcut NAME`_**
 
 ### Announcements
+> for all users
+
 You can add any announcement on any channel where the SmartBot is a member by using **_`add COLOR announcement MESSAGE`_** or **_`add EMOJI announcement MESSAGE`_**.
 
 It will store the message on the announcement list labeled with the color/emoji specified, white by default. Possible colors white, green, yellow and red. Aliases for announcement: statement, declaration, message.
@@ -455,6 +484,8 @@ To see the announcements of the channel: **_`see announcements`_**, **_`see COLO
 If you are a master admin and you are on master channel then you can call **_`publish announcements`_** that will publish the announcements on all channels. The messages stored on a DM won't be published. This is very convenient to be called from a *Routine* for example every weekday at 09:00.
 
 ### Share messages
+> for all users
+
 You can automatically share any new message that is posted on the channel and meet the specified criteria by using **_`share messages /REGEXP/ on #CHANNEL`_** or **_`share messages "TEXT" on #CHANNEL`_**.
 
 This command is only available in public channels. The user adding the Share and the SmartBot need to be a member of both channels.
@@ -466,6 +497,8 @@ Examples:
 To see the shares of the channel: **_`see shares`_** and to delete a particular share: **_`delete share ID`_**
 
 ### See statuses
+> for all users
+
 To see a list of statuses of the members in the channel you can call `see statuses`, `who is on vacation?`, `who is not on vacation?`, `who is on EMOJI`, `who is on EMOJI #CHANNEL`
 
 You need to be a member of the channel to be able to get this info.
@@ -479,6 +512,8 @@ Examples:
 >**_Peter>_** `who is available?`
 
 ### Routines
+> for admins
+
 To add specific commands to be run automatically every certain amount of time or a specific time: **_`add routine NAME every NUMBER PERIOD COMMAND`_** or **_`add routine NAME at TIME COMMAND`_**. Also just before the command you can supply the channel where you want to publish the results, if not channel supplied then it would be the SmartBot Channel or on the DM if the command is run from there. Remember the SmartBot needs to have access to the channel where you want to publish.
 
 In case you create a *bgroutine* instead of a normal *routine* then the results of the run won't be published.
@@ -494,6 +529,7 @@ Examples:
 >**_`add routine clean_custdb on Mondays at 05:00 !clean customers db`_**  
 >**_`add routine clean_custdb on Tuesdays at 09:00 #SREChannel !clean customers db`_**  
 >**_`add silent routine suggestions on weekdays at 09:00 suggest command`_**
+>**_`add routine example on the 31st at 20:00 ^results sales monthly`_**  
 
 Also instead of adding a Command to be executed, you can attach a file, then the routine will be created and the attached file will be executed on the criteria specified. Also you can supply a script adding \`\`\`the code\`\`\` and specifying on the routine name the extension that will have. Only Master Admins are allowed to add files or scripts.
 
@@ -505,7 +541,24 @@ Other routine commands:
 * **_`see routines`_**
 * **_`see result routine NAME`_**
 
+### Loops
+> for all users
+
+You can run any command or rule on a loop by using:  
+**_`for NUMBER times every NUMBER minutes COMMAND`_**  
+**_`for NUMBER times every NUMBER seconds COMMAND`_**  
+Maximum number of times to be used: 24. Minimum every 10 seconds. Maximum every 60 minutes.  
+
+To stop the execution of a loop you can use: **_`quit loop LOOP_ID`_**  
+Examples:  
+>**_`for 5 times every 1 minute ^ruby puts Time.now`_**  
+>**_`10 times every 30s !ruby puts Time.now`_**  
+>**_`24 times every 60m !get sales today`_**  
+>**_`quit loop 1`_**  
+>**_`stop iterator 12`_**  
+
 ### Control who has access to a command
+> for admins
 
 You can add, remove and list admins of any channel by using: `add admin @user`, `remove admin @user` and `see admins`. You need to be the creator of the channel, a Master admin or an admin.
 
@@ -568,6 +621,7 @@ it will show the access rights for the specified command
 The authorization is controlled by `save_stats` so it will be check out when calling `save_stats` or by calling `has_access?(:your_command_id)`
 
 ### See favorite commands
+> for all users
 
 It will display the favorite commands in that channel. 
 
@@ -578,6 +632,7 @@ Examples:
 >**_`most used commands`_**  
 
 ### Teams
+> for all users
 
 You can add, update, see, ping and delete teams. When calling `see TEAM_NAME team` the availability of the members will be displayed.  
 `add team TEAM_NAME PROPERTIES` will add a team with the info supplied. In case it is supplied a channel with type 'members' the members of that channel would be considered members of the team.  
@@ -629,10 +684,13 @@ Examples:
 >**_`add jira to sales team : labels = SalesT AND status != Done`_**  
 >**_`add github to sales team : https://github.com/PeterBale/SalesBoom/issues?q=is%3Aissue+is%3Aopen+`_**  
 >**_`set :runner: on memo 7 team Sales`_**  
+>**_`see all memos from Sales team`_**  
+>**_`see bugs from Sales team dev`_**  
 
-Other team commands: **_`delete team TEAM_NAME`_**, **_`delete memo ID from team TEAM_NAME`_**, **_`set STATUS on memo ID TEAM_NAME team`_**  
+Other team commands: **_`delete team TEAM_NAME`_**, **_`delete memo ID from team TEAM_NAME`_**, **_`set STATUS on memo ID TEAM_NAME team`_**, **_`see MEMO_TYPE from TEAM_NAME team TOPIC`_**  
 
 ### Time off management
+> for all users
 
 You will be able to add or remove vacation and sick periods by using `add vacation/sick from YYYY/MM/DD to YYYY/MM/DD`. The SmartBot will automatically set the users status to 🌴 or 🤒 and the expiration date when the user is on vacation or sick. The SmartBot won't be allowed to change the status of workspace admins or owners.  
 
@@ -649,9 +707,24 @@ settings = {
 }
 ```
 
-Other 'time off' commands: **_`remove time off ID`_**, **_`see my time off`_**, **_`see vacations @USER`_**, **_`time off team NAME`_**  
+If you want to see the public holidays for a specific country or country/region you can use the command `public holidays COUNTRY/REGION`. Examples: `public holidays Iceland`, `public holidays Spain/Madrid`, `public holidays United States/California 2024`, `public holidays Spain/Catalonia 2024/04`.  
+You need to set up an account on https://www.calendarific.com  
+Add to your Smartbot configuration:
+```ruby
+settings = {
+  public_holidays: { 
+      api_key: API_KEY
+  }
+}
+```
+
+When calling `see my time off` on a DM will display a calendar of the year with the days off, including public holidays
+<img src="img/my_timeoff.png" width="650">
+
+Other 'time off' commands: **_`remove time off ID`_**, **_`see my time off`_**, **_`see vacations @USER`_**, **_`time off team NAME`_**, **_`set public holidays to COUNTRY/REGION`_**    
 
 ### Tips
+> for admins
 
 #### Send a file
 

data/lib/slack/smart-bot/comm/event_hello.rb

@@ -1,5 +1,6 @@
 class SlackSmartBot
   def event_hello()
+    @first_time_bot_started ||= true
     unless config.simulate
       m = "Successfully connected, welcome '#{client.self.name}' to the '#{client.team.name}' team at https://#{client.team.domain}.slack.com."
       puts m
@@ -18,7 +19,7 @@ class SlackSmartBot
       version_message = ". There is a new available version: #{version_remote}."
     end
     if (!config[:silent] or ENV['BOT_SILENT'].to_s == 'false') and !config.simulate
-      unless ENV['BOT_SILENT']=='true'
+      unless ENV['BOT_SILENT']=='true' or !@first_time_bot_started
         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
       ENV['BOT_SILENT'] = 'true' if config[:silent] and ENV['BOT_SILENT'].to_s != 'true'
@@ -30,5 +31,6 @@ class SlackSmartBot
         end
       end
     end
+    @first_time_bot_started = false
   end
 end

data/lib/slack/smart-bot/comm/respond.rb

@@ -58,6 +58,7 @@ class SlackSmartBot
               end
               txt += (m + "\n")
               txt[0] = '.' if txt.match?(/\A\s\s\s/) #first line of message in slack don't show spaces at the begining so we force it by changing first char
+              txt[0] = ".   " if txt.match?(/\A\t/)
             end
           end
           msgs << txt

data/lib/slack/smart-bot/comm/update.rb

@@ -0,0 +1,13 @@
+class SlackSmartBot
+  def update(channel, ts, text)
+    result = true
+    begin
+      resp = client.web_client.chat_update(channel: channel, as_user: true, ts: ts, text: text)
+      result = resp.ok.to_s == 'true'
+    rescue Exception => exc
+      result = false
+      @logger.fatal exc.inspect
+    end
+    return result
+  end
+end

data/lib/slack/smart-bot/comm.rb

@@ -16,3 +16,4 @@ require_relative 'comm/get_channels'
 require_relative 'comm/delete'
 require_relative 'comm/get_presence'
 require_relative 'comm/set_status'
+require_relative 'comm/update'

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

@@ -70,6 +70,7 @@ class SlackSmartBot
         team[:creator] = user.name
         team[:date] = Time.now.strftime("%Y-%m-%dT%H:%M:%S.000Z")[0..18]
         new_team = {}
+        team[:name] = name
         new_team[name.to_sym] = team
         update_teams(new_team)
         respond "The *#{name}* team has been added."

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

@@ -36,6 +36,11 @@ class SlackSmartBot
       else
         vacations = @vacations.deep_copy
         vacations[user.name] ||= { user_id: user.id, periods: [] }
+        if !vacations[user.name].key?(:periods)
+          vacations[user.name][:user_id] = user.id
+          vacations[user.name][:periods] = []
+        end
+
         if vacations[user.name].periods.empty?
           vacation_id = 1
         else

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

@@ -2,7 +2,7 @@ class SlackSmartBot
   def allow_access(user, command_id, opt)
     save_stats(__method__)
     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", "send_message", "kill_bot_on_channel", "exit_bot", "notify_message", "publish_announcements", "set_general_message",
+                   "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)
       respond "Only admins of this channel can use this command. Take a look who is an admin of this channel by calling `see admins`"

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

@@ -38,6 +38,7 @@ class SlackSmartBot
           when /yes/i, /yep/i, /sure/i
             answer_delete
             @teams.delete(team_name.to_sym)
+            File.delete(File.join(config.path, "teams", "t_#{team_name}.yaml"))
             update_teams()
             respond "The team #{team_name} has been deleted."
           when /no/i, /nope/i, /cancel/i

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

@@ -2,7 +2,7 @@ class SlackSmartBot
   def deny_access(user, command_id)
     save_stats(__method__)
     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", "send_message", "kill_bot_on_channel", "exit_bot", "notify_message", "publish_announcements", "set_general_message",
+                   "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)
       respond "Only admins of this channel can use this command. Take a look who is an admin of this channel by calling `see admins`"

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

@@ -0,0 +1,144 @@
+def public_holidays(country_name, location, year, month, day, add_stats: true, publish_results: true)
+  save_stats(__method__) if add_stats
+  if config[:public_holidays][:api_key].to_s == ""
+    respond "Sorry, I don't have the API key for the public holidays #{config[:public_holidays][:host]}. Set it up on your SmartBot config file."
+  else
+    begin
+      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
+      end
+      country = @countries_candelarific.find { |c| c.country_name.match?(/^\s*#{country_name}\s*$/i) }
+      if country.nil?
+        respond "Country #{country_name} not found"
+      else
+        country_original_name = country_name.downcase
+        country_region_id = country_name.downcase
+        country_region_id += "/#{location.downcase}" unless location.empty?
+        country_name = country["country_name"]
+        country_iso = country["iso-3166"]
+        states = []
+        if @public_holidays.key?(country_region_id) and @public_holidays[country_region_id].key?(year.to_s)
+          holidays = @public_holidays[country_region_id][year.to_s]
+        elsif File.exist?(File.join(config.path, "vacations", "#{year}_#{country_region_id.gsub("/", "_").gsub(" ", "_")}.json"))
+          holidays = (File.read(File.join(config.path, "vacations", "#{year}_#{country_region_id.gsub("/", "_").gsub(" ", "_")}.json"))).json()
+        elsif !location.empty? and File.exist?(File.join(config.path, "vacations", "#{year}_#{country_original_name.gsub("/", "_").gsub(" ", "_")}.json"))
+          holidays = (File.read(File.join(config.path, "vacations", "#{year}_#{country_original_name.gsub("/", "_").gsub(" ", "_")}.json"))).json()
+          holidays.each do |holiday|
+            if holiday.states.is_a?(Array)
+              states << holiday.states.name
+            else
+              states << holiday.states
+            end
+          end
+          holidays = holidays.select { |h| h.states.is_a?(String) and h.states == "All" or (h.states.is_a?(Array) and h.states.name.grep(/^\s*#{location}\s*$/i).length > 0) }
+          holidays_specific = holidays.select { |h| h.states.is_a?(Array) and h.states.name.grep(/^\s*#{location}\s*$/i).length > 0 }
+          found_location = false if holidays_specific.length == 0
+        else
+          response = http.get "/holidays?country=#{country_iso}&year=#{year}&day=#{day}&month=#{month}&api_key=#{config[:public_holidays][:api_key]}"
+          holidays = response.data.json(:holidays)
+          if location != ""
+            holidays.each do |holiday|
+              if holiday.states.is_a?(Array)
+                states << holiday.states.name
+              else
+                states << holiday.states
+              end
+            end
+            holidays = holidays.select { |h| h.states.is_a?(String) and h.states == "All" or (h.states.is_a?(Array) and h.states.name.grep(/^\s*#{location}\s*$/i).length > 0) }
+            holidays_specific = holidays.select { |h| h.states.is_a?(Array) and h.states.name.grep(/^\s*#{location}\s*$/i).length > 0 }
+            found_location = false if holidays_specific.length == 0
+          end
+          if day == "" and month == "" and holidays.is_a?(Array) and holidays.length > 0 and found_location
+            File.write(File.join(config.path, "vacations", "#{year}_#{country_region_id.gsub("/", "_").gsub(" ", "_")}.json"), holidays.to_json) if holidays.is_a?(Array)
+          end
+        end
+        if day == "" and month == ""
+          date = year
+        elsif day == ""
+          date = "#{year}-#{"%02d" % month}"
+        else
+          date = "#{year}-#{"%02d" % month}-#{"%02d" % day}"
+        end
+
+        if holidays.is_a?(Array) and holidays.length > 0 and found_location
+          date_holiday = ""
+          messages = ["*Holidays in #{country_name}#{" #{location.downcase.capitalize}" unless location.empty?} in #{date}*"]
+          num_holidays_to_show = 0
+          all_holidays = []
+          states = []
+          holidays_to_add = []
+          holidays.each do |holiday|
+            if holiday.type.join.match?(/holiday/i)
+              if location == "" or (location != "" and (holiday.states.is_a?(String) and holiday.states == "All") or (holiday.states.is_a?(Array) and holiday.states.name.grep(/#{location}/i).length > 0))
+                holiday_id = "#{holiday[:date][:datetime][:year]}-#{"%02d" % holiday[:date][:datetime][:month]}-#{"%02d" % holiday[:date][:datetime][:day]} #{holiday[:name]}"
+                unless all_holidays.include?(holiday_id) or
+                       (day != "" and holiday[:date][:datetime][:day] != day.to_i) or
+                       (month != "" and holiday[:date][:datetime][:month] != month.to_i)
+                  all_holidays << holiday_id
+                  if day == ""
+                    m = holiday[:date][:datetime][:month]
+                    d = holiday[:date][:datetime][:day]
+                    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}"
+                    end
+                  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
+          end
+          @public_holidays[country_region_id] = {} if !@public_holidays.key?(country_region_id)
+          @public_holidays[country_region_id][year.to_s] = holidays_to_add if !@public_holidays[country_region_id].key?(year.to_s)
+
+          if num_holidays_to_show > 30
+            messages = ["*Holidays in #{country_name}#{" #{location.downcase.capitalize}" unless location.empty?} in #{date}*"]
+            messages << "Too many holidays to show, please refine your search"
+          end
+        else
+          messages = ["*No holidays found in #{country_name}#{" #{location.downcase.capitalize}" unless location.empty?} in #{date}. Be sure the Country and State are written correctly. Try using just the Country, not all countries are supporting States.*"]
+        end
+        states.flatten!
+        states.uniq!
+        states.delete("All")
+        if states.length > 1 and (location == "" or !found_location)
+          messages << "*All States found in #{date} #{country_name}*: #{states.sort.join(", ")}"
+          respond messages[-1] if !publish_results
+        end
+        respond messages.join("\n") unless !publish_results
+      end
+    rescue Exception => stack
+      respond "Sorry, I can't get the public holidays for #{country_name} #{location} in #{date}. Error: #{stack.message}"
+      @logger.fatal stack
+    end
+    return (found_location==true and !country.nil?) if !publish_results
+  end
+end

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

@@ -74,9 +74,9 @@ class SlackSmartBot
                   user_created = user_info.profile.display_name unless user_info.nil?
                 end
                 if type == 'all' and channel_id[0]=='D'
-                  message << "\t#{m[:message_id]} #{emoji} *_#{m[:date]}_* #{m[:time]} *:* \t*private*"
+                  message << "\t#{emoji} *private* _(id:#{m[:message_id]} - #{m[:date]} #{m[:time]})_"
                 else
-                  message << "\t#{m[:message_id]} #{emoji} *_#{m[:date]}_* #{m[:time]} #{"#{user_created} " unless channel_id[0]=='D'}*:* \t#{m[:message]}"
+                  message << "\t#{emoji} #{m[:message]} _(id:#{m[:message_id]} - #{m[:date]} #{m[:time]} #{user_created})_"
                 end
               end
             end