grape-slack-bot 1.6.3 → 1.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1329dfec4d088344fdfec6196c57d74afb0da0b97c4366a5613d1d73f4a86137
-  data.tar.gz: c55a6ac5ed4bbe4315e418f8fee85ae8c46725ebc1bb7e772d74dfb2caaf20a7
+  metadata.gz: 6dd62b47329ef32dcdcca944a6e92d61010e99c3521bdc10993a8d7495a5f664
+  data.tar.gz: 2c8a5746152b33a557567405079a14a9646e4ba7fcb1819a042128c9e2830f7d
 SHA512:
-  metadata.gz: 67d60fcee908e3f81b56ccecd4698f709ea91a3873288a557c44b59a7c3b3c0005e39f3cb386110b7466266e8a5711cd2fc3d6b8b6315d57f422f5d6873f1da9
-  data.tar.gz: 35ec83c38bf5072996657f701067d4e4efb6e271755cc1ada7affd77935c2cb8915a1cff0f123ece587b40cdb96cf5e5dcc8975190f5cd56a5c73e42db128379
+  metadata.gz: 5b2faa38f309c0851235d6528eda0b110f219eed374c7791999f8b3ded2063ca050360d5a312fa1f9cafd56d3e44041c0b1c08e40f9200637007f8350f84c77c
+  data.tar.gz: 681ebb8c167698b46c8f300491d3097a85809da8584796688f305a783ea64f3d6e5be56cee798338474f081aa25e51241e4a98f4b9de41a3ab7082205c84eaf1

data/lib/slack_bot/callback.rb

@@ -15,6 +15,14 @@ module SlackBot
       nil
     end
 
+    def self.find_by_view_id(view_id, user: nil, config: nil)
+      callback = new(view_id: view_id, user: user, config: config)
+      callback_id = callback.read_view_callback_id
+      return if callback_id.blank?
+
+      find(callback_id, user: user, config: config)
+    end
+
     def self.create(id: nil, class_name:, user:, channel_id: nil, config: nil, payload: nil, expires_in: nil, user_scope: nil)
       callback =
         new(id: id, class_name: class_name, user: user, channel_id: channel_id, payload: payload, config: config, expires_in: expires_in, user_scope: user_scope)
@@ -30,12 +38,13 @@ module SlackBot
     end
 
     attr_reader :id, :data, :args, :config, :expires_in, :user_scope
-    def initialize(id: nil, class_name: nil, user: nil, channel_id: nil, payload: nil, config: nil, expires_in: nil, user_scope: nil)
+    def initialize(id: nil, class_name: nil, user: nil, channel_id: nil, payload: nil, config: nil, expires_in: nil, user_scope: nil, view_id: nil)
       @id = id
       @data = {
         class_name: class_name,
         user_id: user&.id,
         channel_id: channel_id,
+        view_id: view_id,
         payload: payload
       }
       @args = SlackBot::Args.new
@@ -105,6 +114,10 @@ module SlackBot
       @data[:payload] = payload
     end
 
+    def view_id=(view_id)
+      @data[:view_id] = view_id
+    end
+
     def handler_class=(handler_class)
       new_class_name = handler_class&.name
       config.find_handler_class(class_name)
@@ -125,6 +138,12 @@ module SlackBot
       super
     end
 
+    def read_view_callback_id
+      return if view_id.blank?
+
+      config.callback_storage_instance.read(view_storage_key)
+    end
+
     private
 
     def parse_args
@@ -140,13 +159,15 @@ module SlackBot
     end
 
     def storage_key
-      if user_scope
-        raise "User is required for scoped callback" if user.blank?
+      raise "User is required for scoped callback" if user.blank?
 
-        "#{CALLBACK_KEY_PREFIX}:u#{user.id}:#{id}"
-      else
-        "#{CALLBACK_KEY_PREFIX}:#{id}"
-      end
+      "#{CALLBACK_KEY_PREFIX}:u#{user.id}:#{id}"
+    end
+
+    def view_storage_key
+      raise "User is required for scoped callback" if user.blank?
+
+      "#{CALLBACK_KEY_PREFIX}:u#{user.id}:#{view_id}"
     end
 
     def read_data
@@ -155,10 +176,12 @@ module SlackBot
 
     def write_data(data, expires_in: nil)
       expires_in ||= CALLBACK_RECORD_EXPIRES_IN
+      config.callback_storage_instance.write(view_storage_key, id, expires_in: expires_in) if view_id.present?
       config.callback_storage_instance.write(storage_key, data, expires_in: expires_in)
     end
 
     def delete_data
+      config.callback_storage_instance.delete(view_storage_key) if view_id.present?
       config.callback_storage_instance.delete(storage_key)
     end
   end

data/lib/slack_bot/interaction.rb

@@ -71,8 +71,8 @@ module SlackBot
       view.send(view_name)
     end
 
-    def open_modal(view_name, context: nil, callback: nil)
-      callback ||= Callback.create(
+    def open_modal(view_name, context: nil)
+      self.callback ||= Callback.create(
         class_name: self.class.name,
         user: @current_user,
         config: config

data/lib/slack_bot.rb

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

data/spec/slack_bot/callback_spec.rb

@@ -78,7 +78,8 @@ describe SlackBot::Callback do
         user_id: user.id,
         channel_id: "test_channel_id",
         payload: { test: "test" },
-        args: ""
+        args: "",
+        view_id: nil
       }
     }
 

metadata

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