grape-slack-bot 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d1e2ef3d6febf5115a2d8276cb673f6ed5559ee9a3db93116bd7171bade5bf0
-  data.tar.gz: ec20059fae8d6c3198ac5d989d8a61913a780f3b45c4345c7b744d46a31e50f7
+  metadata.gz: c4cd56999a5a9b67729fe61e5f95a79f6a0ab89aeafaa43f7537b4501fe6b81a
+  data.tar.gz: 867a61f2c1f28c82f1c0d3e5bef97ecf6602176c7d89fe221d57c8161048b628
 SHA512:
-  metadata.gz: 2be7aab3a38801d1b8e8f1581badb224a9e3767f638805c69d1a7efcf59ad8e8be75589a49c636c2fe0793591f431063ea824688fbf8cce1647020151bc970c1
-  data.tar.gz: 36821a7bc17bf1641c3d0a8da65497ec46a35713b7b71abed8a95c38c7cff276d501483c8d378c56105bd60669b421d31ae879f0de15f09c4d42143de2d2f6dc
+  metadata.gz: 1bed9b092db2eaa13610c7e892663d2d5313321d49dc5e097b7278a1d12f9e47d812e101f153892b8b3d7a71cb5141a2fc189fd5689f54cbcd36ae747e7510f3
+  data.tar.gz: bce0459566f928181c2bef05062109d11f2633717c06e60841b2001c003bf0d317b92f234ed1eb7b0fdba0424120fd7fe6886f7753cedc3a2f784c3cd03a78c1

data/lib/slack_bot/command.rb

@@ -46,7 +46,7 @@ module SlackBot
 
     private
 
-    def open_modal(view_name, context: nil)
+    def render_view(view_name, context: nil)
       view = self.class.view_klass.new(
         args: args,
         current_user: @current_user,
@@ -54,13 +54,17 @@ module SlackBot
         context: context,
         config: config
       )
-      payload = view.send(view_name)
+      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],
         class_name: self.class.name,
         user: @current_user,
-        payload: payload,
+        payload: view_payload,
         config: config
       )
       render_response

data/lib/slack_bot/event.rb

@@ -32,12 +32,20 @@ module SlackBot
       params["event"]["type"]
     end
 
+    def render_view(view_name, context: nil)
+      view = self.class.view_klass.new(
+        args: callback&.args,
+        current_user: current_user,
+        params: params,
+        context: context,
+        config: config
+      )
+      view.send(view_name)
+    end
+
     def publish_view(view_method_name, context: nil)
       user_id = params["event"]["user"]
-      view =
-        self.class.view_klass
-          .new(current_user: current_user, params: params, context: context)
-          .send(view_method_name)
+      view = render_view(view_method_name, context: context)
       view = view.merge(callback_id: callback.id) if callback.present?
       view = view.merge(private_metadata: metadata) if metadata.present?
       response =

data/lib/slack_bot/interaction.rb

@@ -13,7 +13,7 @@ module SlackBot
       payload:,
       class_name:,
       user:,
-      channel_id:,
+      channel_id: nil,
       config: nil
     )
       callback =
@@ -91,20 +91,33 @@ module SlackBot
       payload["actions"]
     end
 
+    def render_view(view_name, context: nil)
+      view = self.class.view_klass.new(
+        args: callback&.args,
+        current_user: current_user,
+        params: params,
+        context: context,
+        config: config
+      )
+      view.send(view_name)
+    end
+
+    def open_modal(view_name, context: nil)
+      view_payload = render_view(view_name, context: context)
+      self.class.open_modal(
+        trigger_id: payload["trigger_id"],
+        payload: view_payload,
+        class_name: self.class.name,
+        user: current_user,
+        config: config
+      )
+    end
+
     def update_modal(view_name, context: nil)
       return if callback.blank?
 
       view_id = payload["view"]["id"]
-      args = callback.args
-      view =
-        self.class.view_klass.new(
-          args: args,
-          current_user: current_user,
-          params: params,
-          context: context,
-          config: config
-        )
-      payload = view.send(view_name)
+      payload = render_view(view_name, context: context)
 
       self.class.update_modal(
         view_id: view_id,

data/lib/slack_bot.rb

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

metadata

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