discordrb-webhooks 3.6.1 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea7f479d399a6eb70070420977b975d481fec3a6dc993e6ed603b42d7d6163b2
-  data.tar.gz: a6270798325bcf6d6ec5f5f404b03a941e7c5142aad9c21493b107af14245e39
+  metadata.gz: 1fd4231a5be5dc1e5d6f731bc5a2b8edbe9737a527101c9b16a4eabeb37d8cea
+  data.tar.gz: fa8f69e94fd67b16b1915e6ff19237f5be5ee6b122bc3aba564b5464f93e2a0f
 SHA512:
-  metadata.gz: 3e4b37722f9eeb177f773fd17c2e84af0c21e2107ba8e0fabd032e120a5feace25651a223a7c2088b12bc1991be6c3e3d77bfccb629375c9c648e46d7b34919c
-  data.tar.gz: c8d64fb98e3557a0e4e9053b23f2e01e511a65270fb617a615dab9aba036c722fb7742c1be02fdc6e55c848459b8f04c84f4083c7e2419b1611364dd0e21b5f1
+  metadata.gz: 8bc105bb97f84aa22bf51f576029cc94486b5c0449740b338d5c75b3bbe786b7516b02c334d9599060d0671c0e8f3df6057b79f9cb6f796358ef2708a9e6299e
+  data.tar.gz: da63150a08d48567b2f671bde2a5980edfbb2771b8b4ceb36ad476bce6ad3d6728a6007f108e17c4fcfb2e81ddaac592c1290c89004139d296b193cc16d26b1e

data/lib/discordrb/webhooks/client.rb

@@ -22,6 +22,7 @@ module Discordrb::Webhooks
     # @param builder [Builder, nil] The builder to start out with, or nil if one should be created anew.
     # @param wait [true, false] Whether Discord should wait for the message to be successfully received by clients, or
     #   whether it should return immediately after sending the message.
+    # @param thread_id [String, Integer, nil] The thread_id of the thread if a thread should be targeted for the webhook execution
     # @yield [builder] Gives the builder to the block to add additional steps, or to do the entire building process.
     # @yieldparam builder [Builder] The builder given as a parameter which is used as the initial step to start from.
     # @example Execute the webhook with an already existing builder
@@ -38,7 +39,7 @@ module Discordrb::Webhooks
     #     end
     #   end
     # @return [RestClient::Response] the response returned by Discord.
-    def execute(builder = nil, wait = false, components = nil)
+    def execute(builder = nil, wait = false, components = nil, thread_id: nil)
       raise TypeError, 'builder needs to be nil or like a Discordrb::Webhooks::Builder!' unless
         (builder.respond_to?(:file) && builder.respond_to?(:to_multipart_hash)) || builder.respond_to?(:to_json_hash) || builder.nil?
 
@@ -50,9 +51,9 @@ module Discordrb::Webhooks
       components ||= view
 
       if builder.file
-        post_multipart(builder, components, wait)
+        post_multipart(builder, components, wait, thread_id)
       else
-        post_json(builder, components, wait)
+        post_json(builder, components, wait, thread_id)
       end
     end
 
@@ -79,6 +80,7 @@ module Discordrb::Webhooks
     # @param content [String] The message content.
     # @param embeds [Array<Embed, Hash>]
     # @param allowed_mentions [Hash]
+    # @param thread_id [String, Integer, nil] The id of the thread in which the message resides
     # @return [RestClient::Response] the response returned by Discord.
     # @example Edit message content
     #   client.edit_message(message_id, content: 'goodbye world!')
@@ -89,13 +91,17 @@ module Discordrb::Webhooks
     #     end
     #   end
     # @note Not all builder options are available when editing.
-    def edit_message(message_id, builder: nil, content: nil, embeds: nil, allowed_mentions: nil)
+    def edit_message(message_id, builder: nil, content: nil, embeds: nil, allowed_mentions: nil, thread_id: nil)
       builder ||= Builder.new
 
       yield builder if block_given?
 
+      query = URI.encode_www_form({ thread_id: }.compact)
       data = builder.to_json_hash.merge({ content: content, embeds: embeds, allowed_mentions: allowed_mentions }.compact)
-      RestClient.patch("#{@url}/messages/#{message_id}", data.compact.to_json, content_type: :json)
+      RestClient.patch(
+        "#{@url}/messages/#{message_id}#{(query.empty? ? '' : "?#{query}")}",
+        data.compact.to_json, content_type: :json
+      )
     end
 
     # Delete a message created by this webhook.
@@ -117,14 +123,17 @@ module Discordrb::Webhooks
       end
     end
 
-    def post_json(builder, components, wait)
+    def post_json(builder, components, wait, thread_id)
+      query = URI.encode_www_form({ wait:, thread_id: }.compact)
       data = builder.to_json_hash.merge({ components: components.to_a })
-      RestClient.post(@url + (wait ? '?wait=true' : ''), data.to_json, content_type: :json)
+      RestClient.post(@url + (query.empty? ? '' : "?#{query}"), data.to_json, content_type: :json)
     end
 
-    def post_multipart(builder, components, wait)
-      data = builder.to_multipart_hash.merge({ components: components.to_a })
-      RestClient.post(@url + (wait ? '?wait=true' : ''), data)
+    def post_multipart(builder, components, wait, thread_id)
+      query = URI.encode_www_form({ wait:, thread_id: }.compact)
+      data = builder.to_multipart_hash
+      data[:components] = components.to_a if components&.any?
+      RestClient.post(@url + (query.empty? ? '' : "?#{query}"), data.compact)
     end
 
     def generate_url(id, token)

data/lib/discordrb/webhooks/version.rb

@@ -4,6 +4,6 @@
 module Discordrb
   module Webhooks
     # The current version of discordrb-webhooks.
-    VERSION = '3.6.1'
+    VERSION = '3.7.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: discordrb-webhooks
 version: !ruby/object:Gem::Version
-  version: 3.6.1
+  version: 3.7.0
 platform: ruby
 authors:
 - meew0