grape-slack-bot 1.6.1 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4cd56999a5a9b67729fe61e5f95a79f6a0ab89aeafaa43f7537b4501fe6b81a
-  data.tar.gz: 867a61f2c1f28c82f1c0d3e5bef97ecf6602176c7d89fe221d57c8161048b628
+  metadata.gz: 1329dfec4d088344fdfec6196c57d74afb0da0b97c4366a5613d1d73f4a86137
+  data.tar.gz: c55a6ac5ed4bbe4315e418f8fee85ae8c46725ebc1bb7e772d74dfb2caaf20a7
 SHA512:
-  metadata.gz: 1bed9b092db2eaa13610c7e892663d2d5313321d49dc5e097b7278a1d12f9e47d812e101f153892b8b3d7a71cb5141a2fc189fd5689f54cbcd36ae747e7510f3
-  data.tar.gz: bce0459566f928181c2bef05062109d11f2633717c06e60841b2001c003bf0d317b92f234ed1eb7b0fdba0424120fd7fe6886f7753cedc3a2f784c3cd03a78c1
+  metadata.gz: 67d60fcee908e3f81b56ccecd4698f709ea91a3873288a557c44b59a7c3b3c0005e39f3cb386110b7466266e8a5711cd2fc3d6b8b6315d57f422f5d6873f1da9
+  data.tar.gz: 35ec83c38bf5072996657f701067d4e4efb6e271755cc1ada7affd77935c2cb8915a1cff0f123ece587b40cdb96cf5e5dcc8975190f5cd56a5c73e42db128379

data/README.md

@@ -141,6 +141,7 @@ SlackBot::Config.configure do
 
   # TODO: Register event handlers
   event :app_home_opened, MySlackBot::AppHomeOpenedEvent
+  interaction MySlackBot::AppHomeInteraction
 
   # TODO: Register slash command handlers
   slash_command_endpoint :game, MySlackBot::Game::MenuCommand do

data/lib/slack_bot/command.rb

@@ -57,16 +57,19 @@ module SlackBot
       view.send(view_name)
     end
 
-    def open_modal(view_name, context: nil)
-      view_payload = render_view(view_name, context: context)
-      self.class.interaction_klass.open_modal(
-        trigger_id: params[:trigger_id],
-        channel_id: params[:channel_id],
+    def open_modal(view_name, context: nil, callback: nil)
+      callback ||= Callback.create(
         class_name: self.class.name,
         user: @current_user,
-        payload: view_payload,
+        channel_id: params[:channel_id],
         config: config
       )
+      view_payload = render_view(view_name, context: context)
+      self.class.interaction_klass.open_modal(
+        callback: callback,
+        trigger_id: params[:trigger_id],
+        payload: view_payload
+      )
       render_response
     end
   end

data/lib/slack_bot/config.rb

@@ -21,12 +21,18 @@ module SlackBot
       @callback_user_finder_method = method_lambda
     end
 
+    def interaction(interaction_klass, handler_name: nil)
+      handler_name ||= interaction_klass.name
+      handler_class(handler_name, interaction_klass)
+    end
+
     def event_handlers
       @event_handlers ||= {}
     end
 
-    def event(event_type, event_klass)
-      handler_class(event_klass.name, event_klass)
+    def event(event_type, event_klass, handler_name: nil)
+      handler_name ||= event_klass.name
+      handler_class(handler_name, event_klass)
       event_handlers[event_type.to_sym] = event_klass
     end
 
@@ -34,12 +40,17 @@ module SlackBot
       event_handlers[event_type.to_sym]
     end
 
-    def slash_command_endpoint(url_token, command_klass = nil, &block)
+    def slash_command_endpoint(url_token, command_klass = nil, handler_name: nil, &block)
       @slash_command_endpoints ||= {}
       @slash_command_endpoints[url_token.to_sym] ||=
         begin
           endpoint =
-            SlashCommandEndpointConfig.new(url_token, command_klass: command_klass, config: self)
+            SlashCommandEndpointConfig.new(
+              url_token,
+              command_klass: command_klass,
+              config: self,
+              handler_name: handler_name
+            )
           endpoint.instance_eval(&block) if block_given?
           endpoint
         end
@@ -81,16 +92,19 @@ module SlackBot
 
   class SlashCommandEndpointConfig
     attr_reader :url_token, :command_klass, :routes, :config
-    def initialize(url_token, config:, command_klass: nil, routes: {})
+    def initialize(url_token, config:, command_klass: nil, routes: {}, handler_name: nil)
       @url_token = url_token
       @command_klass = command_klass
       @routes = routes
       @config = config
 
-      config.handler_class(command_klass.name, command_klass) if command_klass.present?
+      if command_klass.present?
+        handler_name ||= command_klass.name
+        config.handler_class(handler_name, command_klass)
+      end
     end
 
-    def command(command_token, command_klass, &block)
+    def command(command_token, command_klass, handler_name: nil, &block)
       @command_configs ||= {}
       @command_configs[command_token.to_sym] ||=
         begin
@@ -98,7 +112,8 @@ module SlackBot
             SlashCommandConfig.new(
               command_klass: command_klass,
               token: command_token,
-              endpoint: self
+              endpoint: self,
+              handler_name: handler_name
             )
           command.instance_eval(&block) if block_given?
           command
@@ -127,14 +142,16 @@ module SlackBot
     end
 
     attr_accessor :command_klass, :token, :parent_configs, :endpoint
-    def initialize(command_klass:, token:, endpoint:, parent_configs: [])
+    def initialize(command_klass:, token:, endpoint:, parent_configs: [], handler_name: nil)
       @command_klass = command_klass
       @token = token
       @parent_configs = parent_configs || []
       @endpoint = endpoint
 
       endpoint.routes[full_token] = self
-      endpoint.config.handler_class(command_klass.name, command_klass)
+
+      handler_name ||= command_klass.name
+      endpoint.config.handler_class(handler_name, command_klass)
     end
 
     def argument_command(argument_token, klass = nil, &block)

data/lib/slack_bot/interaction.rb

@@ -8,22 +8,7 @@ module SlackBot
 
     include SlackBot::Concerns::ViewKlass
 
-    def self.open_modal(
-      trigger_id:,
-      payload:,
-      class_name:,
-      user:,
-      channel_id: nil,
-      config: nil
-    )
-      callback =
-        Callback.create(
-          class_name: class_name,
-          user: user,
-          channel_id: channel_id,
-          config: config
-        )
-
+    def self.open_modal(callback:, trigger_id:, payload:)
       view = payload.merge({ type: "modal", callback_id: callback.id })
       response =
         SlackBot::ApiClient.new.views_open(trigger_id: trigger_id, view: view)
@@ -38,23 +23,7 @@ module SlackBot
       SlackViewsReply.new(callback.id, view_id)
     end
 
-    def self.update_modal(
-      callback_id: nil,
-      view_id:,
-      payload:,
-      class_name: nil,
-      user: nil,
-      channel_id: nil,
-      config: nil
-    )
-      callback = Callback.find_or_create(
-        id: callback_id,
-        class_name: class_name,
-        user: user,
-        channel_id: channel_id,
-        config: config
-      )
-
+    def self.update_modal(callback:, view_id:, payload:)
       view = payload.merge({ type: "modal", callback_id: callback.id })
       response =
         SlackBot::ApiClient.new.views_update(view_id: view_id, view: view)
@@ -102,14 +71,17 @@ module SlackBot
       view.send(view_name)
     end
 
-    def open_modal(view_name, context: nil)
+    def open_modal(view_name, context: nil, callback: nil)
+      callback ||= Callback.create(
+        class_name: self.class.name,
+        user: @current_user,
+        config: config
+      )
       view_payload = render_view(view_name, context: context)
       self.class.open_modal(
+        callback: callback,
         trigger_id: payload["trigger_id"],
-        payload: view_payload,
-        class_name: self.class.name,
-        user: current_user,
-        config: config
+        payload: view_payload
       )
     end
 
@@ -122,8 +94,7 @@ module SlackBot
       self.class.update_modal(
         view_id: view_id,
         payload: payload,
-        callback_id: callback.id,
-        config: config
+        callback: callback
       )
     end
 

data/lib/slack_bot.rb

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

metadata

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