Do not resolve channel_id.

Author: dblock

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2025-02-08 15:48:35 UTC using RuboCop version 1.26.1.
+# on 2025-02-08 15:52:13 UTC using RuboCop version 1.26.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -47,7 +47,7 @@ Lint/RedundantCopDisableDirective:
 # Offense count: 13
 # Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 61
+  Max: 58
 
 # Offense count: 6
 # Configuration parameters: IgnoredMethods.
@@ -57,7 +57,7 @@ Metrics/CyclomaticComplexity:
 # Offense count: 15
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
 Metrics/MethodLength:
-  Max: 37
+  Max: 35
 
 # Offense count: 1
 # Configuration parameters: CountKeywordArgs, MaxOptionalParameters.
@@ -106,7 +106,7 @@ RSpec/ContextMethod:
 RSpec/ContextWording:
   Enabled: false
 
-# Offense count: 69
+# Offense count: 70
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
   Max: 18
@@ -117,13 +117,13 @@ RSpec/ExampleLength:
 RSpec/FilePath:
   Enabled: false
 
-# Offense count: 69
+# Offense count: 70
 # Configuration parameters: .
 # SupportedStyles: have_received, receive
 RSpec/MessageSpies:
   EnforcedStyle: receive
 
-# Offense count: 94
+# Offense count: 95
 RSpec/MultipleExpectations:
   Max: 5
 

CHANGELOG.md

@@ -6,6 +6,7 @@
 * [#530](https://github.com/slack-ruby/slack-ruby-client/pull/530): Specify dependency on `logger` - [@rwstauner](https://github.com/rwstauner).
 * [#533](https://github.com/slack-ruby/slack-ruby-client/pull/533), [#536](https://github.com/slack-ruby/slack-ruby-client/pull/536): Added `files_upload_v2` - [@gregsaab](https://github.com/gregsaab).
 * [#538](https://github.com/slack-ruby/slack-ruby-client/pull/538): Translate channel names and support an array of channels in `files_upload_v2` - [@dblock](https://github.com/dblock).
+* [#540](https://github.com/slack-ruby/slack-ruby-client/pull/540): Added support for `channel` and `channel_id`, do not require channel in `files_upload_v2` - [@dblock](https://github.com/dblock).
 * Your contribution here.
 
 ### 2.4.0 (2024/07/14)

lib/slack/web/api/helpers/files.rb

@@ -45,14 +45,12 @@ def files_upload_v2(params = {})
               complete_upload_request_params[:channels] = Array(params[:channels]).map do |channel|
                 conversations_id(channel: channel)['channel']['id']
               end.uniq.join(',')
-            elsif params[:channel_id]
-              complete_upload_request_params[:channel_id] = conversations_id(
-                channel: params[:channel_id]
-              )['channel']['id']
             elsif params[:channel]
               complete_upload_request_params[:channel] = conversations_id(
                 channel: params[:channel]
               )['channel']['id']
+            elsif params[:channel_id]
+              complete_upload_request_params[:channel_id] = params[:channel_id]
             end
 
             content = params[:content]

spec/slack/web/api/endpoints/custom_specs/files_spec.rb

@@ -57,7 +57,7 @@
     end.to raise_error ArgumentError, 'Only one of :channel, :channels, or :channel_id is required'
   end
 
-  %i[channel channel_id channels].each do |arg|
+  %i[channel channels].each do |arg|
     it "completes the upload with #{arg}", vcr: { cassette_name: "web/files_upload_v2_#{arg}" } do
       expect(client.files_upload_v2(
         filename: 'test.txt',
@@ -88,6 +88,15 @@
     end
   end
 
+  it 'completes the upload with channel_id', vcr: { cassette_name: 'web/files_upload_v2_channel_id' } do
+    expect(client).not_to receive(:conversations_list)
+    expect(client.files_upload_v2(
+      filename: 'test.txt',
+      content: 'Test File Contents',
+      channel_id: 'C08AZ76CA4V'
+    ).files.size).to eq 1
+  end
+
   context 'when using a list for channels', vcr: { cassette_name: 'web/files_upload_v2_with_channels_list' } do
     it 'completes the upload' do
       expect(client.files_upload_v2(