grape-slack-bot 1.6.6 → 1.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae374ea5f4698b8505bde66baa7a67eaf75764e130d2f40e9de6fd29848966a8
-  data.tar.gz: 01ec55f539994166f4d3b90cf70953c5b4e2f421a9622affa5a44d7d0adcf888
+  metadata.gz: 6a31fa79061f0f8f494f3c088331f9ca5d176a93f3909bd8719b2f43c4a80b8e
+  data.tar.gz: 70f14bbc48bddd7eb690a864603e17683abc9713fabbc59239cfe6e095abef81
 SHA512:
-  metadata.gz: 7a0223855ad9173023eb667115a6e2137212164c06069ca78db6289a813b9ea92da38c062577b6ab18642a4e3f1689326f353b159e21c05672e2447573e248e7
-  data.tar.gz: b44baf6641e68b2815afaf915485e9052d2594a1d43e92ae56d7e9a25463de0395253819627349ec8257814c0372bef1fb1fd72bb7b3ed91b436e7c2e84a5aba
+  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)
 
@@ -23,8 +23,8 @@ module SlackBot
       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)
 
@@ -38,6 +38,22 @@ module SlackBot
       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
+
     attr_reader :current_user, :params, :callback, :config
     def initialize(current_user: nil, params: nil, callback: nil, config: nil)
       @current_user = current_user
@@ -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.6'.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.6
+  version: 1.6.7
 platform: ruby
 authors:
 - Andrei Makarov