immosquare-slack 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64ce7966173035e0831abfb2254abecba89bc821a58fba28441390409dcfae78
-  data.tar.gz: 20d86d9420346ec337e7fd626f9fdd88d8035c3c9dd9d88f8a0378e7fe2e7900
+  metadata.gz: aa3bbd3b3a57145bcf994af26d5aecc034321ad8c65f5d10ef70011b25dc1399
+  data.tar.gz: 2f90ddfa14097c4b9bb06de7c17456d36d8e66cd8121d65a7f1932bcfacf572f
 SHA512:
-  metadata.gz: b39052b2c44e3a0cdb3ee5ad1b1d07f2971440886257f2e15f5d3c412c1c7884bd6d54f50a4d4f93f015681911248a01b68d62587a3304c679ada15367da1555
-  data.tar.gz: 6f2f4256398427a964302992b6222e2e542d414ccce9a5dde98ebc8b2e2dee7123f7340cf5e334075edeb29eb98b9aa6933440cb822268f3dab43d8aeccf256d
+  metadata.gz: 555770a445c82bee6d56e3ff877889a9ff24884f977e7c99495d5b9883c319557c9af0957fdf2b20d32884bc91bb40596c8f054243d99173bdc49d1eb3342ef5
+  data.tar.gz: 7f8b11fa4d086bb0b29f3d82c6830a2fd24730a0daad4badd4a83f078dc0939f18d5731d75ce917e3d0c7e98412293c2787bc7d85823357335fe3693b349f4c9

data/lib/immosquare-slack/channel.rb

@@ -17,14 +17,17 @@ module ImmosquareSlack
         channel_id = get_channel_id_by_name(channel_name)
         raise("Channel not found") if channel_id.nil?
 
-        url  = "https://slack.com/api/chat.postMessage"
-        text = "#{build_notification_text(channel_id, notify, notify_text) if notify.present?}#{text}"
+        url               = "https://slack.com/api/chat.postMessage"
+        notification_text = notify ? build_notification_text(channel_id, notify, notify_text) : nil
+        text              = "#{notification_text}#{text}"
 
         body = {
-          :channel  => channel_id,
-          :text     => text,
-          :username => bot_name.presence
+          :channel => channel_id,
+          :text    => text
         }
+
+        body[:username] = bot_name if bot_name
+
         make_slack_api_call(url, :method => :post, :body => body)
       end
 
@@ -51,25 +54,29 @@ module ImmosquareSlack
       ##============================================================##
       ## Méthode récupérant les membres d'un channel et les notifier
       ## sur le message
+      ## on ne peut pas utilser in? si on veut que la gem soit
+      ## compatible avec ruby (sans rails)
+      ## pareil pour present?
       ##============================================================##
       def build_notification_text(channel_id, notify, text = "Hello")
-        final = if notify.is_a?(Array)
-                  members = ImmosquareSlack::User.list_users
-                  members = members.select {|m| m["profile"]["email"].in?(notify) }
-                  members.map {|m| "<@#{m["id"]}>" }.join(", ")
-                elsif notify.to_sym == :all
-                  members = get_channel_members(channel_id)
-                  members.map {|m| "<@#{m}>" }.join(", ")
-                elsif notify.to_sym == :channel
-                  "<!channel>"
-                elsif notify.to_sym == :here
-                  "<!here>"
-                elsif notify.to_sym == :everyone
-                  "<!everyone>"
-                end
+        final =
+          if notify.is_a?(Array)
+            members = ImmosquareSlack::User.list_users
+            members = members.select {|m| notify.include?(m["profile"]["email"]) }
+            members.map {|m| "<@#{m["id"]}>" }.join(", ")
+          elsif notify.to_sym == :all
+            members = get_channel_members(channel_id)
+            members.map {|m| "<@#{m}>" }.join(", ")
+          elsif notify.to_sym == :channel
+            "<!channel>"
+          elsif notify.to_sym == :here
+            "<!here>"
+          elsif notify.to_sym == :everyone
+            "<!everyone>"
+          end
 
 
-        "#{text} #{final}\n" if final.present?
+        "#{text} #{final}\n" if !final.to_s.empty?
       end
 
     end

data/lib/immosquare-slack/shared_methods.rb

@@ -1,3 +1,6 @@
+require "json"
+require "httparty"
+
 module ImmosquareSlack
   module SharedMethods
     private

data/lib/immosquare-slack/version.rb

@@ -1,3 +1,3 @@
 module ImmosquareSlack
-  VERSION = "0.1.2".freeze
+  VERSION = "0.1.3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: immosquare-slack
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - IMMO SQUARE
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-11 00:00:00.000000000 Z
+date: 2023-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty