grape-slack-bot 1.5.2 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '049b94a107e222f8e3662dc34cacef51262a1d50e4d0945bcad042a507352218'
-  data.tar.gz: 30e9fe036b313632de57ce8ea17ddf496569115dbeebf993d2c7d24bd34c7c19
+  metadata.gz: b7ec90d89547fb9fddd4972b16caad8cb96cc4f2163f82eebc40747d2ca79c1f
+  data.tar.gz: bf2fa99739aa63e4e0e63425abde569021d1e0ec061f155c3e07e58b966f2115
 SHA512:
-  metadata.gz: 882f712999c11d787a68ff23b8c9c9a675191f4d95c56700fd06fb5020d11e23b39b532d364e511619d9976d63055e5365669994d596d1f370c51bc93c6d806c
-  data.tar.gz: 13fb5097d19007d8c907ccc59267c8b5f4d1c80878b58f665c8c8f5759677fdeafaa32160cb936a466e3b12b25cac6dce5be5cd3179a29b2414db3a3f24f0cdc
+  metadata.gz: 94aed6e295eb7150315c9bcc40fe3be10d5de81b257178e5691918b5ff3832f21622655b779c9ab6fcfd3aa4a9377870da16b91c6f9e69fc74d443f034e83b10
+  data.tar.gz: 5857289c58cb8bec70b25067848c623e0c60b5450562efa1ba48859b59271b0a10b08a807e662c1bfdfdabfd48e952be60f290f3395af01dd34b6e7925fced8f

data/lib/slack_bot/callback.rb

@@ -15,9 +15,9 @@ module SlackBot
       nil
     end
 
-    def self.create(class_name:, user:, channel_id: nil, config: nil, payload: nil, expires_in: nil, user_scope: nil)
+    def self.create(id: nil, class_name:, user:, channel_id: nil, config: nil, payload: nil, expires_in: nil, user_scope: nil)
       callback =
-        new(class_name: class_name, user: user, channel_id: channel_id, payload: payload, config: config, expires_in: expires_in, user_scope: user_scope)
+        new(id: id, class_name: class_name, user: user, channel_id: channel_id, payload: payload, config: config, expires_in: expires_in, user_scope: user_scope)
       callback.save
       callback
     end
@@ -26,7 +26,7 @@ module SlackBot
       callback = find(id, user: user, config: config)
       return callback if callback.present?
 
-      create(class_name: class_name, user: user, channel_id: channel_id, payload: payload, config: config, expires_in: expires_in, user_scope: user_scope)
+      create(id: id, class_name: class_name, user: user, channel_id: channel_id, payload: payload, config: config, expires_in: expires_in, user_scope: user_scope)
     end
 
     attr_reader :id, :data, :args, :config, :expires_in, :user_scope
@@ -105,6 +105,13 @@ module SlackBot
       @data[:payload] = payload
     end
 
+    def handler_class=(handler_class)
+      new_class_name = handler_class&.name
+      raise "Callback handler class not found" if !config.find_handler_class(class_name)
+
+      self.class_name = new_class_name
+    end
+
     def handler_class
       return if class_name.blank?
 

data/lib/slack_bot/event.rb

@@ -4,8 +4,7 @@ module SlackBot
       define_singleton_method(:view_klass) { klass }
     end
 
-    attr_reader :current_user, :params, :config
-    attr_accessor :callback
+    attr_reader :current_user, :params, :config, :callback, :metadata
     def initialize(current_user: nil, params: nil, callback: nil, config: nil)
       @current_user = current_user
       @params = params
@@ -19,6 +18,14 @@ module SlackBot
 
     private
 
+    def callback=(callback)
+      @callback = callback
+    end
+
+    def metadata=(metadata)
+      @metadata = metadata
+    end
+
     def event_type
       params["event"]["type"]
     end
@@ -30,6 +37,7 @@ module SlackBot
           .new(current_user: current_user, params: params, context: context)
           .send(view_method_name)
       view = view.merge(callback_id: callback.id) if callback.present?
+      view = view.merge(private_metadata: metadata) if metadata.present?
       response =
         SlackBot::ApiClient.new.views_publish(user_id: user_id, view: view)
 

data/lib/slack_bot/grape_extension.rb

@@ -8,12 +8,12 @@ module SlackBot
       base.use ActionDispatch::RemoteIp
       base.helpers do
         def fetch_team_id
-          params.dig("team_id") || params.dig("team", "id")
+          params.dig("team_id") || params.dig("team", "id") || params.dig("payload", "user", "team_id")
         end
 
         def fetch_user_id
           params.dig("user_id") || params.dig("user", "id") ||
-            params.dig("event", "user")
+            params.dig("event", "user") || params.dig("payload", "user", "id")
         end
 
         def verify_slack_signature!

data/lib/slack_bot/view.rb

@@ -20,6 +20,12 @@ module SlackBot
       @context = context.with_indifferent_access if context.is_a?(Hash)
     end
 
+    def method_missing(method_name, *args, &block)
+      return @context[method_name.to_sym] if @context.key?(method_name.to_sym)
+
+      super
+    end
+
     def text_modal
       {
         title: {
@@ -34,20 +40,20 @@ module SlackBot
 
     private
 
-    def current_date
-      Date.current
-    end
-
     def divider_block
       { type: "divider" }
     end
 
+    def current_date
+      Date.current
+    end
+
     def command
       params[:command]
     end
 
     def paginate(cursor)
-      SlackBot::Pager.new(cursor, args: args)
+      self.class.pager_klass.new(cursor, args: args)
     end
   end
 end

data/lib/slack_bot.rb

@@ -22,5 +22,5 @@ require 'slack_bot/pager'
 require 'slack_bot/grape_extension'
 
 module SlackBot
-  VERSION = '1.5.2'.freeze
+  VERSION = '1.5.4'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grape-slack-bot
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.4
 platform: ruby
 authors:
 - Andrei Makarov