grape-slack-bot 1.6.8 → 1.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ee0328733fee526e8f992dece493e894280db110b1127712fabafd28d222ed9
-  data.tar.gz: d850fb2692c5bdd4408de299bbb6f619e54b3fb73eb4c8f3350caf17d369571b
+  metadata.gz: 182ee366d5e5d1fb89152bcd753a75e4361b8f611fa1d9ca0a4b81dc5f6221ab
+  data.tar.gz: 49f18848a1abef7bf401eb3af87a2037ba25850d0a9043428a4f44cba6bd2371
 SHA512:
-  metadata.gz: 5f221c0f3fec3983431af2040d2b91ad042418a223c7359a995b9ea84b42706c4dac9061574c3297748d6dc5b84ad41f946669975ed39f971f49f954d5db166f
-  data.tar.gz: 333a047add211a3160d474f19ac3b7151f0758412170d7725e041ba35a19be6aa3a7af53c41d20854c77544288e88b76eab5b09a8066a9e9d38d8c0d152ec876
+  metadata.gz: 8379e1b62eb08f3dcf9507dffa299ac07d4c4753ac544e502ecef8f28107f7166df66c8f2783a338e58cd1a41f8f5702678650ac19aad100c597300097bb330e
+  data.tar.gz: 7ee9589a200c7c105948df9751878ebf231430b3aa6313cfc86533de254e0340e01205e2d339810741fe7c2411c368083a1924511280671de63cb9be2d87f0ca

data/lib/slack_bot/grape_extension.rb

@@ -61,7 +61,7 @@ module SlackBot
           if current_user
             true
           else
-            raise SlackBot::UserAuthenticationError.new("User is not authorized")
+            raise SlackBot::Errors::UserAuthenticationError.new("User is not authorized")
           end
         end
 

data/lib/slack_bot/interaction.rb

@@ -9,7 +9,7 @@ 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)
 
@@ -18,13 +18,15 @@ module SlackBot
       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)
 
@@ -33,9 +35,11 @@ module SlackBot
       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.8'.freeze
+  VERSION = '1.6.10'.freeze
 end

metadata

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