grape-slack-bot 1.6.5 → 1.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6dd62b47329ef32dcdcca944a6e92d61010e99c3521bdc10993a8d7495a5f664
-  data.tar.gz: 2c8a5746152b33a557567405079a14a9646e4ba7fcb1819a042128c9e2830f7d
+  metadata.gz: 6a31fa79061f0f8f494f3c088331f9ca5d176a93f3909bd8719b2f43c4a80b8e
+  data.tar.gz: 70f14bbc48bddd7eb690a864603e17683abc9713fabbc59239cfe6e095abef81
 SHA512:
-  metadata.gz: 5b2faa38f309c0851235d6528eda0b110f219eed374c7791999f8b3ded2063ca050360d5a312fa1f9cafd56d3e44041c0b1c08e40f9200637007f8350f84c77c
-  data.tar.gz: 681ebb8c167698b46c8f300491d3097a85809da8584796688f305a783ea64f3d6e5be56cee798338474f081aa25e51241e4a98f4b9de41a3ab7082205c84eaf1
+  metadata.gz: 4d85b0261724457c4f1181950ef12a545d093a692f9ac874ff625273b3d45e0425a10047137950886e910b59e48d02791730ea83f062320fd46dbe6438a23685
+  data.tar.gz: 790a31890e3d3c79974cbc5809f815932d24954d35174c96ea0b27cce55dc9016b2467b8dc36a4a9253c63bb36e0e9be01476b021b264c617a924382adcb32ac

data/lib/slack_bot/event.rb

@@ -43,17 +43,16 @@ module SlackBot
       view.send(view_name)
     end
 
-    def publish_view(view_method_name, context: nil)
+    def publish_view(view_method_name, context: nil, metadata: nil)
       user_id = params["event"]["user"]
       view = render_view(view_method_name, context: context)
-      view = view.merge(callback_id: callback.id) if callback.present?
-      view = view.merge(private_metadata: metadata) if metadata.present?
-      response =
-        SlackBot::ApiClient.new.views_publish(user_id: user_id, view: view)
-
-      if !response.ok?
-        raise SlackBot::Errors::PublishViewError.new(response.error, data: response.data, payload: view)
-      end
+
+      SlackBot::Interaction.publish_view(
+        callback: callback,
+        metadata: metadata,
+        user_id: user_id,
+        view: view
+      )
 
       nil
     end

data/lib/slack_bot/interaction.rb

@@ -8,8 +8,8 @@ module SlackBot
 
     include SlackBot::Concerns::ViewKlass
 
-    def self.open_modal(callback:, trigger_id:, payload:)
-      view = payload.merge({ type: "modal", callback_id: callback.id })
+    def self.open_modal(callback:, trigger_id:, view:)
+      view = view.merge({ type: "modal", callback_id: callback.id })
       response =
         SlackBot::ApiClient.new.views_open(trigger_id: trigger_id, view: view)
 
@@ -18,13 +18,13 @@ 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
 
-    def self.update_modal(callback:, view_id:, payload:)
-      view = payload.merge({ type: "modal", callback_id: callback.id })
+    def self.update_modal(callback:, view_id:, view:)
+      view = view.merge({ type: "modal", callback_id: callback.id })
       response =
         SlackBot::ApiClient.new.views_update(view_id: view_id, view: view)
 
@@ -33,7 +33,23 @@ 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
+
+    def self.publish_view(callback: nil, metadata: nil, user_id:, view:)
+      view = view.merge(callback_id: callback.id) if callback.present?
+      view = view.merge(private_metadata: metadata) if metadata.present?
+      response =
+        SlackBot::ApiClient.new.views_publish(user_id: user_id, view: view)
+
+      if !response.ok?
+        raise SlackBot::Errors::PublishViewError.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? && callback.present?
 
       SlackViewsReply.new(callback.id, view_id)
     end
@@ -98,6 +114,20 @@ module SlackBot
       )
     end
 
+    def publish_view(view_method_name, context: nil, metadata: nil)
+      user_id = payload["user"]["id"]
+      view = render_view(view_method_name, context: context)
+
+      SlackBot::Interaction.publish_view(
+        callback: callback,
+        metadata: metadata,
+        user_id: user_id,
+        view: view
+      )
+
+      nil
+    end
+
     def update_callback_args(&block)
       return if callback.blank?
       return if actions.blank?

data/lib/slack_bot/view.rb

@@ -16,7 +16,7 @@ module SlackBot
     end
 
     def method_missing(method_name, *args, &block)
-      return @context[method_name.to_sym] if @context.key?(method_name.to_sym)
+      return @context[method_name.to_sym] if @context.is_a?(Hash) && @context.key?(method_name.to_sym)
 
       super
     end

data/lib/slack_bot.rb

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

metadata

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