grape-slack-bot 1.6.9 → 1.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f90d900df6a6bcab262e5479a71d1be2e5ed088dc896f2f05e55fc6b7b8a8dba
-  data.tar.gz: f21f2799f1c828d0f57449201090044b591a5277124f47259b283dbb1ece9c65
+  metadata.gz: 04dc265b92f03e4dcb6d84e61ef38af6e089f8780366567e4698812e69ca57a9
+  data.tar.gz: c9247448391075868c2a101973a08718890f872ecbf76907fb6125f4c8f42d73
 SHA512:
-  metadata.gz: 8f8c4dd245b689378703f5c9c7c3b26bea0c7d85c9ef5df0a4a4cd36c8b32625af795ac8bfdfacd512f54676017635b6725fe30222427ca70dc152b5cfb8a297
-  data.tar.gz: abce9cdd4da556f77912c53211322e22bb9f85bd4ef537528997f71b15ecee50ee54a9ddf029908c85f63f7c93743bb173322130d217d8bc223d22a89ce4f641
+  metadata.gz: 5ffa34f2c2f321d5f6e150d69e0ef4382e6e06d047ed5f6ec584d6ca1f1fb0ff95b9279d28c6630a3c7c89257ed1aeadfde06ed18cc6438a541b8d872f2e5d6e
+  data.tar.gz: 95b6338f453227ecca727accb27b5525491d68761de8ef9c773755a8bc0a731743a92385a2d12c3e7dc4ba3e4112bc9f9eb9c804478bce411ac11351b1312a13

data/lib/slack_bot/interaction.rb

@@ -9,33 +9,37 @@ module SlackBot
     include SlackBot::Concerns::ViewKlass
 
     def self.open_modal(callback:, trigger_id:, view:)
-      view = view.merge({ type: "modal", callback_id: callback.id })
+      view = view.merge({ type: "modal", callback_id: callback&.id })
       response =
         SlackBot::ApiClient.new.views_open(trigger_id: trigger_id, view: view)
 
       if !response.ok?
-        raise SlackBot::Errors::OpenModalError.new(response.error, data: response.data, payload: payload)
+        raise SlackBot::Errors::OpenModalError.new(response.error, data: response.data, payload: view)
       end
 
       view_id = response.data.dig("view", "id")
-      callback.view_id = view_id if view_id.present?
-
-      SlackViewsReply.new(callback.id, view_id)
+      if callback.present? && view_id.present?
+        callback.view_id = view_id
+        callback.save
+      end
+      SlackViewsReply.new(callback&.id, view_id)
     end
 
     def self.update_modal(callback:, view_id:, view:)
-      view = view.merge({ type: "modal", callback_id: callback.id })
+      view = view.merge({ type: "modal", callback_id: callback&.id })
       response =
         SlackBot::ApiClient.new.views_update(view_id: view_id, view: view)
 
       if !response.ok?
-        raise SlackBot::Errors::UpdateModalError.new(response.error, data: response.data, payload: payload)
+        raise SlackBot::Errors::UpdateModalError.new(response.error, data: response.data, payload: view)
       end
 
       view_id = response.data.dig("view", "id")
-      callback.view_id = view_id if view_id.present?
-
-      SlackViewsReply.new(callback.id, view_id)
+      if callback.present? && view_id.present?
+        callback.view_id = view_id
+        callback.save
+      end
+      SlackViewsReply.new(callback&.id, view_id)
     end
 
     def self.publish_view(callback: nil, metadata: nil, user_id:, view:)
@@ -49,9 +53,11 @@ module SlackBot
       end
 
       view_id = response.data.dig("view", "id")
-      callback.view_id = view_id if view_id.present? && callback.present?
-
-      SlackViewsReply.new(callback.id, view_id)
+      if callback.present? && view_id.present?
+        callback.view_id = view_id
+        callback.save
+      end
+      SlackViewsReply.new(callback&.id, view_id)
     end
 
     attr_reader :current_user, :params, :callback, :config

data/lib/slack_bot.rb

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

metadata

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