immosquare-slack 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4eec84f4f9ca3ea1bb5fdbe1f5534fcc1b78ac8d0ba359079615fbbca500ae0
-  data.tar.gz: 20e5313fa30c0ec42c2cbed9d40b0a96d674986d324096a4e8b92f8aed7cb0f3
+  metadata.gz: 8f225c081bd5414be15eb18de6283012de0a0763266aa7ad69df66bb42a09104
+  data.tar.gz: 576e4573f9cd77b62ee364231f21e1ba38e00367d7f2bd4da567fa36b1ffb4f2
 SHA512:
-  metadata.gz: 703bd12a7ec32728c1dee2e67361925931d15826c0e560546b8006e8f3cd54c1fbd776f3350c3c2c59acadccd2bf880f3279c78ebad0a77df860813b1a1ae5d9
-  data.tar.gz: 380f30822739cc1147d845be7795ea6596d6e53deec54c6dc7f88c64a5ff000296b7fd4c6a83c8c1eeaa650fe62cf166a7d961ceb63217913e8153f56f8f7858
+  metadata.gz: 180c9241ecb12c5784a9d287087f37ef22fc58f1126e48107d51dcbeb92dc17efe769fdab3d1fae19f083d1c6e88bc26bab4712d09e3650543933eb14adf0714
+  data.tar.gz: 6b3cbd7e068f7d0cc3575c3403104c739e18a167d02549be2c11c2f0a9daa770a4df218671b3f0edb527237ee49d2faee46cfd7892536ad42257fd90269743a9

data/lib/immosquare-slack/channel.rb

@@ -7,15 +7,27 @@ module ImmosquareSlack
       ## Pour récupérer la liste des channels
       ##============================================================##
       def list_channels
-        fetch_paginated_data("https://slack.com/api/conversations.list", "channels")
+        @list_channels ||= begin
+          extra_params = {
+            :types            => ["public_channel", "private_channel"].join(","),
+            :exclude_archived => false
+          }
+          fetch_paginated_data("https://slack.com/api/conversations.list", "channels", extra_params)
+        end
       end
 
       ##============================================================##
       ## Pour poster un message dans un channel
       ##============================================================##
-      def post_message(channel_name, text, notify: nil, notify_text: nil, bot_name: nil)
+      def post_message(channel_name, text, notify: nil, notify_text: nil, bot_name: nil, notify_general_if_invalid_channel: true)
         channel_id = get_channel_id_by_name(channel_name)
-        raise("Channel #{channel_name} not found on slack") if channel_id.nil?
+
+        if channel_id.nil?
+          text = "immosquare-slack missing channel *#{channel_name}*\nmessage:\n#{text}"
+          return post_message("general", text, :notify => :channel, :notify_text => "", :bot_name => bot_name, :notify_general_if_invalid_channel => false) if channel_name != "general" && notify_general_if_invalid_channel
+
+          raise("channel '#{channel_name}' not found on slack")
+        end
 
         url               = "https://slack.com/api/chat.postMessage"
         notification_text = notify ? build_notification_text(channel_id, notify, *notify_text) : nil
@@ -40,8 +52,8 @@ module ImmosquareSlack
       ##============================================================##
       def get_channel_id_by_name(channel_name)
         channels = list_channels
-        channel = channels.find {|c| c["name"] == channel_name }
-        channel ? channel["id"] : nil
+        channel  = channels.find {|c| channel_name == "general" ? c["is_general"] == true : (c["name"] == channel_name && c["is_archived"] == false) }
+        channel.present? ? channel["id"] : nil
       end
 
       ##============================================================##

data/lib/immosquare-slack/configuration.rb

@@ -1,7 +1,7 @@
 module ImmosquareSlack
   class Configuration
 
-    attr_accessor :slack_api_token_bot, :openai_model
+    attr_accessor :slack_api_token_bot
 
     def initialize
       @slack_api_token_bot = nil

data/lib/immosquare-slack/shared_methods.rb

@@ -13,12 +13,11 @@ module ImmosquareSlack
       cursor = nil
 
       loop do
-        query = cursor ? {:cursor => cursor}.merge(extra_query) : extra_query
+        query    = cursor ? {:cursor => cursor}.merge(extra_query) : extra_query
         response = make_slack_api_call(url, :query => query)
-
+        cursor   = response.dig("response_metadata", "next_cursor")
 
         items.concat(response[data_key])
-        cursor = response.dig("response_metadata", "next_cursor")
         break if cursor.nil? || cursor.empty?
       end
       items
@@ -40,7 +39,7 @@ module ImmosquareSlack
       ##============================================================##
       ## On crée les options en fonction du cas de figure
       ##============================================================##
-      options[:query] = query if query.any?
+      options[:query] = query        if query.any?
       options[:body]  = body.to_json if body
 
       ##============================================================##
@@ -48,7 +47,7 @@ module ImmosquareSlack
       ##============================================================##
       response        = HTTParty.send(method, url, options)
       parsed_response = JSON.parse(response.body)
-      raise(parsed_response.to_json) unless parsed_response["ok"]
+      raise(parsed_response.to_json) if !parsed_response["ok"]
 
       parsed_response
     rescue JSON::ParserError

data/lib/immosquare-slack/version.rb

@@ -1,3 +1,3 @@
 module ImmosquareSlack
-  VERSION = "0.1.5".freeze
+  VERSION = "0.1.6".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: immosquare-slack
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - immosquare