grape-slack-bot 1.6.2 → 1.6.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 82392f6ebad8f2ffdf5eb575cfb6c76773567805144202cd8d9ca3124fc7352e
4
- data.tar.gz: 8829c6658a0577206e927f1750b4d5c063c4666abc1d37b2428134ec65f05358
3
+ metadata.gz: 1329dfec4d088344fdfec6196c57d74afb0da0b97c4366a5613d1d73f4a86137
4
+ data.tar.gz: c55a6ac5ed4bbe4315e418f8fee85ae8c46725ebc1bb7e772d74dfb2caaf20a7
5
5
  SHA512:
6
- metadata.gz: 23f3d1b7e26aa66af1e8e0a0f0ca74c4b534b016a341aed1c1d47746e46a9df9d6280eb1a5671d75a331ed6f36c79e16cd08e37486ce521d051d656b1966ffd6
7
- data.tar.gz: e1f2d01b86e6134a49f92f2a84d5ed9f7943a1a80f8b6c528f941f5de431dbd8fdff48c13d03407a79db1a93846acc32cc9d32055975dcc20e2565f13830444a
6
+ metadata.gz: 67d60fcee908e3f81b56ccecd4698f709ea91a3873288a557c44b59a7c3b3c0005e39f3cb386110b7466266e8a5711cd2fc3d6b8b6315d57f422f5d6873f1da9
7
+ data.tar.gz: 35ec83c38bf5072996657f701067d4e4efb6e271755cc1ada7affd77935c2cb8915a1cff0f123ece587b40cdb96cf5e5dcc8975190f5cd56a5c73e42db128379
@@ -57,16 +57,19 @@ module SlackBot
57
57
  view.send(view_name)
58
58
  end
59
59
 
60
- def open_modal(view_name, context: nil)
61
- view_payload = render_view(view_name, context: context)
62
- self.class.interaction_klass.open_modal(
63
- trigger_id: params[:trigger_id],
64
- channel_id: params[:channel_id],
60
+ def open_modal(view_name, context: nil, callback: nil)
61
+ callback ||= Callback.create(
65
62
  class_name: self.class.name,
66
63
  user: @current_user,
67
- payload: view_payload,
64
+ channel_id: params[:channel_id],
68
65
  config: config
69
66
  )
67
+ view_payload = render_view(view_name, context: context)
68
+ self.class.interaction_klass.open_modal(
69
+ callback: callback,
70
+ trigger_id: params[:trigger_id],
71
+ payload: view_payload
72
+ )
70
73
  render_response
71
74
  end
72
75
  end
@@ -8,22 +8,7 @@ module SlackBot
8
8
 
9
9
  include SlackBot::Concerns::ViewKlass
10
10
 
11
- def self.open_modal(
12
- trigger_id:,
13
- payload:,
14
- class_name:,
15
- user:,
16
- channel_id: nil,
17
- config: nil
18
- )
19
- callback =
20
- Callback.create(
21
- class_name: class_name,
22
- user: user,
23
- channel_id: channel_id,
24
- config: config
25
- )
26
-
11
+ def self.open_modal(callback:, trigger_id:, payload:)
27
12
  view = payload.merge({ type: "modal", callback_id: callback.id })
28
13
  response =
29
14
  SlackBot::ApiClient.new.views_open(trigger_id: trigger_id, view: view)
@@ -38,23 +23,7 @@ module SlackBot
38
23
  SlackViewsReply.new(callback.id, view_id)
39
24
  end
40
25
 
41
- def self.update_modal(
42
- callback_id: nil,
43
- view_id:,
44
- payload:,
45
- class_name: nil,
46
- user: nil,
47
- channel_id: nil,
48
- config: nil
49
- )
50
- callback = Callback.find_or_create(
51
- id: callback_id,
52
- class_name: class_name,
53
- user: user,
54
- channel_id: channel_id,
55
- config: config
56
- )
57
-
26
+ def self.update_modal(callback:, view_id:, payload:)
58
27
  view = payload.merge({ type: "modal", callback_id: callback.id })
59
28
  response =
60
29
  SlackBot::ApiClient.new.views_update(view_id: view_id, view: view)
@@ -102,14 +71,17 @@ module SlackBot
102
71
  view.send(view_name)
103
72
  end
104
73
 
105
- def open_modal(view_name, context: nil)
74
+ def open_modal(view_name, context: nil, callback: nil)
75
+ callback ||= Callback.create(
76
+ class_name: self.class.name,
77
+ user: @current_user,
78
+ config: config
79
+ )
106
80
  view_payload = render_view(view_name, context: context)
107
81
  self.class.open_modal(
82
+ callback: callback,
108
83
  trigger_id: payload["trigger_id"],
109
- payload: view_payload,
110
- class_name: self.class.name,
111
- user: current_user,
112
- config: config
84
+ payload: view_payload
113
85
  )
114
86
  end
115
87
 
@@ -122,8 +94,7 @@ module SlackBot
122
94
  self.class.update_modal(
123
95
  view_id: view_id,
124
96
  payload: payload,
125
- callback_id: callback.id,
126
- config: config
97
+ callback: callback
127
98
  )
128
99
  end
129
100
 
data/lib/slack_bot.rb CHANGED
@@ -22,5 +22,5 @@ require 'slack_bot/pager'
22
22
  require 'slack_bot/grape_extension'
23
23
 
24
24
  module SlackBot
25
- VERSION = '1.6.2'.freeze
25
+ VERSION = '1.6.3'.freeze
26
26
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: grape-slack-bot
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.6.2
4
+ version: 1.6.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Andrei Makarov