grape-slack-bot 1.6.4 → 1.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d67c8a3223c22c71a6c65df3779ec80008a06534d389eefa56fb1758fd91f352
-  data.tar.gz: 1e220f3dc13b1dd5a0ade887bd13bd0e86612f08433897efd0a4cd84cb96c354
+  metadata.gz: ae374ea5f4698b8505bde66baa7a67eaf75764e130d2f40e9de6fd29848966a8
+  data.tar.gz: 01ec55f539994166f4d3b90cf70953c5b4e2f421a9622affa5a44d7d0adcf888
 SHA512:
-  metadata.gz: 3a731d872905dcc3da371323195b7c3efae2a4fc92a0174453e64f2815b82117d7dbd54f5b29e60077bdb5ea55716e17fd4882de7fc559d2c601bc01d447ca83
-  data.tar.gz: bd4409a17bbbb6191d4fd424fdf6502a06b4283bdcc7890e33c0052caa45b2a6ff23bb6870107b8ec802fbffac19859ac51f6d211ebb59cc3473e8ccac37fa03
+  metadata.gz: 7a0223855ad9173023eb667115a6e2137212164c06069ca78db6289a813b9ea92da38c062577b6ab18642a4e3f1689326f353b159e21c05672e2447573e248e7
+  data.tar.gz: b44baf6641e68b2815afaf915485e9052d2594a1d43e92ae56d7e9a25463de0395253819627349ec8257814c0372bef1fb1fd72bb7b3ed91b436e7c2e84a5aba

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

@@ -18,7 +18,7 @@ module SlackBot
       end
 
       view_id = response.data.dig("view", "id")
-      callback.update(view_id: view_id) if view_id.present?
+      callback.view_id = view_id if view_id.present?
 
       SlackViewsReply.new(callback.id, view_id)
     end
@@ -33,7 +33,7 @@ module SlackBot
       end
 
       view_id = response.data.dig("view", "id")
-      callback.update(view_id: view_id) if view_id.present?
+      callback.view_id = view_id if view_id.present?
 
       SlackViewsReply.new(callback.id, view_id)
     end

data/lib/slack_bot.rb

@@ -22,5 +22,5 @@ require 'slack_bot/pager'
 require 'slack_bot/grape_extension'
 
 module SlackBot
-  VERSION = '1.6.4'.freeze
+  VERSION = '1.6.6'.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.4
+  version: 1.6.6
 platform: ruby
 authors:
 - Andrei Makarov