grape-slack-bot 1.6.2 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82392f6ebad8f2ffdf5eb575cfb6c76773567805144202cd8d9ca3124fc7352e
-  data.tar.gz: 8829c6658a0577206e927f1750b4d5c063c4666abc1d37b2428134ec65f05358
+  metadata.gz: d67c8a3223c22c71a6c65df3779ec80008a06534d389eefa56fb1758fd91f352
+  data.tar.gz: 1e220f3dc13b1dd5a0ade887bd13bd0e86612f08433897efd0a4cd84cb96c354
 SHA512:
-  metadata.gz: 23f3d1b7e26aa66af1e8e0a0f0ca74c4b534b016a341aed1c1d47746e46a9df9d6280eb1a5671d75a331ed6f36c79e16cd08e37486ce521d051d656b1966ffd6
-  data.tar.gz: e1f2d01b86e6134a49f92f2a84d5ed9f7943a1a80f8b6c528f941f5de431dbd8fdff48c13d03407a79db1a93846acc32cc9d32055975dcc20e2565f13830444a
+  metadata.gz: 3a731d872905dcc3da371323195b7c3efae2a4fc92a0174453e64f2815b82117d7dbd54f5b29e60077bdb5ea55716e17fd4882de7fc559d2c601bc01d447ca83
+  data.tar.gz: bd4409a17bbbb6191d4fd424fdf6502a06b4283bdcc7890e33c0052caa45b2a6ff23bb6870107b8ec802fbffac19859ac51f6d211ebb59cc3473e8ccac37fa03

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/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)
@@ -103,13 +72,16 @@ module SlackBot
     end
 
     def open_modal(view_name, context: nil)
+      self.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.2'.freeze
+  VERSION = '1.6.4'.freeze
 end

metadata

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