slack_bot-events 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 653594899c76b05d93054ceb20520d84a487a38451ecee7d561ab5b9e6590bf7
-  data.tar.gz: 3f722375d06dce4ca2a3f4151ed221948b9e1d5e6d87842cf966ff067c54c31b
+  metadata.gz: 26e9e0a0edd93455cbc0cff5043f9a5e9a93a1bdb1a6ace9107df71cabd01856
+  data.tar.gz: 4eb9d15cc14f868f8e1f8bab0ccaaca876e256899a84d2b53cf5939df2496205
 SHA512:
-  metadata.gz: eb0fb66fded40a580f042bd45e9ba139cf3753d2960461265d07394a5c182a35c9f35d33105e7ca5536b6e279c44335baf6b8ba645e531186ffbf3c4d9790dcc
-  data.tar.gz: 02f478db61cabfce5f8e66b7303f47f9ed548d08dafded39d364e579f68ebf448f17ddf851e9717bfea0e755ab41e0821d450ab4b4e3353823a3b161e9ad0dea
+  metadata.gz: 44891a0644cd45f3b8c22a8256f48e509933b7a35a4504f9ac046d8b761fcd5a8bee09d2ecefa89d85616953e7a70e18b7fc84a1a5435a97f4d5dc4eb2fbcef2
+  data.tar.gz: 8af558314cab90d174ac1555f590eaeaab3bd87530928da99eea571486c962ef2926f41d82ff030107fc4ad4d615a7835030579b5497970bfd65a3653ec8991d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    slack_bot-events (0.4.0)
+    slack_bot-events (0.4.2)
       class_composer (~> 1.0)
       faraday
       faye-websocket

data/lib/slack_bot/events/client.rb

@@ -20,7 +20,7 @@ module SlackBot
             process_message(socket_event: socket_event) do |listener:, parsed_data:, schema: nil|
               case parsed_data["type"]
               when "events_api"
-                events_api(handler: listener[:handler], schema: schema, parsed_data: parsed_data)
+                events_api(handler: listener&.dig(:handler), schema: schema, parsed_data: parsed_data)
               end
             end
           end
@@ -52,7 +52,7 @@ module SlackBot
       end
 
       def events_api(handler:, schema:, parsed_data:)
-        return if listener.nil?
+        return if handler.nil?
 
         Events.logger.info { schema.tldr } if Events.config.print_tldr
 

data/lib/slack_bot/events/configuration.rb

@@ -15,11 +15,7 @@ module SlackBot
         :on_receive,
       ]
 
-      add_composer :client_id, allowed: String, default: ENV["SLACK_CLIENT_ID"]
-      add_composer :client_secret, allowed: String, default: ENV["SLACK_CLIENT_SECRET"]
-      add_composer :client_signing_secret, allowed: String, default: ENV["SLACK_SIGNING_SECRET"]
       add_composer :client_socket_token, allowed: String, default: ENV["SLACK_SOCKET_TOKEN"]
-      add_composer :client_verification_token, allowed: String, default: ENV["SLACK_VERIFICATION_TOKEN"]
       add_composer :print_tldr, allowed: [true.class, false.class], default: true
       add_composer :message_middleware, allowed: Middleware::Chain, default: Middleware::Chain.new(type: :message)
       add_composer :open_middleware, allowed: Middleware::Chain, default: Middleware::Chain.new(type: :open)

data/lib/slack_bot/events/middleware/chain.rb

@@ -19,9 +19,12 @@ module SlackBot
         attr_reader :type
 
         DEFAULT_ENTRIES = {
-          message: [Middleware::EventTracer, Middleware::MessageHandler],
-          open: [Middleware::EventTracer],
-          close: [Middleware::EventTracer],
+          message: {
+            base: [Middleware::EventTracer, Middleware::MessageHandler],
+            immutable: [Middleware::MessageHandler]
+          },
+          open: { base: [Middleware::EventTracer] },
+          close: { base: [Middleware::EventTracer] },
         }
 
         def initialize(type:)
@@ -29,7 +32,7 @@ module SlackBot
         end
 
         def self.default_entry(type)
-          DEFAULT_ENTRIES[type].map { Entry.new(_1) }
+          DEFAULT_ENTRIES[type][:base].map { Entry.new(_1) }
         end
 
         def entries
@@ -37,7 +40,7 @@ module SlackBot
         end
 
         def remove(klass)
-          raise ArgumentError, "Unable to remove default Middleware #{klass}" if self.class.default_entry.map(:klass).include?(klass)
+          raise ArgumentError, "Unable to remove default Middleware #{klass}" if Array(DEFAULT_ENTRIES[@type][:immutable]).include?(klass)
 
           entries.delete_if { |entry| entry.klass == klass }
         end

data/lib/slack_bot/events/middleware/event_tracer.rb

@@ -11,21 +11,23 @@ module SlackBot
           when :close
             additional_info = "code: #{socket_event.code} reason:#{socket_event.reason}"
           when :message
-            accurate_type = parsed_data.dig("payload","event","subtype") || parsed_data.dig("payload","event","type")
-            p_type = [
-              parsed_data.dig("type"),
-              accurate_type
-            ].compact.join(":")
-            case p_type
+
+            case parsed_data.dig("type")
             when "app_rate_limited"
               # https://api.slack.com/apis/rate-limits#events
               # Total allowed workspace events are 30,000 per hour
               # This message type is received once you have gone beyond that
-              temp_type += ":#{p_type}"
+              temp_type += ":#{parsed_data.dig("type")}"
               additional_info = "minute_rate_limited:#{parsed_data["minute_rate_limited"]} " \
                 "team_id:#{parsed_data["team_id"]} " \
                 "api_app_id:#{parsed_data["api_app_id"]}"
             else
+              accurate_type = parsed_data.dig("payload","event","subtype") || parsed_data.dig("payload","event","type")
+              p_type = [
+                parsed_data.dig("type"),
+                accurate_type
+              ].compact.join(":")
+
               # Expected other types are `events_api` and `hello`
               temp_type += ":#{p_type}"
             end

data/lib/slack_bot/events/middleware/message_handler.rb

@@ -17,8 +17,6 @@ module SlackBot
             acknowledge!(websocket: websocket, schema: schema)
           end
         rescue StandardError => error
-          puts error.message
-          puts error.backtrace
           Events.logger.error do
             "#{listener[:handler]} returned #{error.class} => #{error.message}. #{error.backtrace[0...10]}"
           end

data/lib/slack_bot/events/version.rb

@@ -2,6 +2,6 @@
 
 module SlackBot
   module Events
-    VERSION = "0.4.0"
+    VERSION = "0.4.2"
   end
 end

data/lib/slack_bot/events.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "pry"
-
 require "slack_bot/events/configuration"
 require "slack_bot/events/client"
 require "slack_bot/events/middleware/chain"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slack_bot-events
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Matt Taylor