Skip to content

Commit e4c2fdc

Browse files
committed
Revise *_id_page_size handling
1 parent 6681fda commit e4c2fdc

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,8 +293,8 @@ logger | Optional `Logger` instance that logs HTTP request
293293
timeout | Optional open/read timeout in seconds.
294294
open_timeout | Optional connection open timeout in seconds.
295295
default_page_size | Optional page size for paginated requests, default is _100_.
296-
conversations_id_page_size | Optional page size for conversations_list requests made when calculating conversation id from a conversation name, default is _equal to default_page_size_.
297-
users_id_page_size | Optional page size for users_list requests made when calculating user id from a user name, default is _equal to default_page_size_.
296+
conversations_id_page_size | Optional page size for conversations_list requests made when calculating conversation id from a conversation name, default is _nil_, which will use the default_page_size.
297+
users_id_page_size | Optional page size for users_list requests made when calculating user id from a user name, default is _nil_, which will use the default_page_size.
298298
default_max_retries | Optional number of retries for paginated requests, default is _100_.
299299
adapter | Optional HTTP adapter to use, defaults to `Faraday.default_adapter`.
300300

lib/slack/web/api/mixins/conversations.id.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def conversations_id(options = {})
2626
prefix: '#',
2727
enum_method: :conversations_list,
2828
list_method: :channels,
29-
options: { limit: limit }
29+
options: { limit: limit }.compact
3030
)
3131
end
3232
end

lib/slack/web/api/mixins/users.id.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def users_id(options = {})
2626
prefix: '@',
2727
enum_method: :users_list,
2828
list_method: :members,
29-
options: { limit: limit }
29+
options: { limit: limit }.compact
3030
)
3131
end
3232
end

lib/slack/web/config.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ def reset
3434
self.timeout = nil
3535
self.open_timeout = nil
3636
self.default_page_size = 100
37-
self.conversations_id_page_size = default_page_size
38-
self.users_id_page_size = default_page_size
37+
self.conversations_id_page_size = nil
38+
self.users_id_page_size = nil
3939
self.default_max_retries = 100
4040
self.adapter = ::Faraday.default_adapter
4141
end

spec/slack/web/api/mixins/conversations_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
end
3232

3333
it 'translates a channel that starts with a #' do
34-
expect(conversations).to receive(:conversations_list).with(limit: 100)
34+
expect(conversations).to receive(:conversations_list)
3535
expect(conversations.conversations_id(channel: '#general')).to(
3636
eq('ok' => true, 'channel' => { 'id' => 'CDEADBEEF' })
3737
)

spec/slack/web/api/mixins/users_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
end
3131

3232
it 'translates a user that starts with a @' do
33-
expect(users).to receive(:users_list).with(limit: 100)
33+
expect(users).to receive(:users_list)
3434
expect(users.users_id(user: '@aws')).to eq('ok' => true, 'user' => { 'id' => 'UDEADBEEF' })
3535
end
3636

0 commit comments

Comments
 (0)