discordrb-webhooks 3.5.0 → 3.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac23678014708b3612c2b64182fc560e28fffaff546fe32068b6c80f92241a49
-  data.tar.gz: 1af3c1de510f8262df3074bbcb28af659ad233c0447feab33709ccafbb99bf9b
+  metadata.gz: 64adff3c11dc30cbe5688e48d2dad1b827fc6ef225cfce9d767e21082f3a0469
+  data.tar.gz: 11bc596b4feb9d4805ab73c313dc918a346ffde62db136fb544231b42f91014a
 SHA512:
-  metadata.gz: eb90480b721262fe38147e7f117ebd102ab05f9dc5435ef4fdf2263c0c4bb9b0886077f10ebb8f4b73db57e8cd751bad1e97f90917c5c3f4ad9b6714fd92212b
-  data.tar.gz: '0678b594744221149421bb72ed219ee9b916aca0e2ad58f4f7002fc94627d3d9aed6bcbaaca73cf8116eed7a0b7a5a5dd3f0c8a71cf5183a256d6af6471fe61d'
+  metadata.gz: 5742b179ad21db8f23f73b55da2a6739cf6a7c16b63a3368a83f01c4e7b59c7e72ca26aa17b5f8beceb1aca1a72e6b9431d8d5da158625ef4c199a7ded04e53a
+  data.tar.gz: 75516b95f3346a5774ddd5e0067613acad2b83bf055b55e4296c14c03b45202d3a9b0113409fab37e8d78f67e7f9df5becaba878b713cfd49bef05889359180e

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,18 +123,21 @@ 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&.to_a&.any?
+      RestClient.post(@url + (query.empty? ? '' : "?#{query}"), data.compact)
     end
 
     def generate_url(id, token)
-      "https://discord.com/api/v8/webhooks/#{id}/#{token}"
+      "https://discord.com/api/v9/webhooks/#{id}/#{token}"
     end
   end
 end

data/lib/discordrb/webhooks/version.rb

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

data/lib/discordrb/webhooks/view.rb

@@ -49,7 +49,7 @@ class Discordrb::Webhooks::View
               when Integer, String
                 emoji.to_i.positive? ? { id: emoji } : { name: emoji }
               else
-                emoji.to_h
+                emoji&.to_h
               end
 
       @components << { type: COMPONENT_TYPES[:button], label: label, emoji: emoji, style: style, custom_id: custom_id, disabled: disabled, url: url }
@@ -149,7 +149,7 @@ class Discordrb::Webhooks::View
               when Integer, String
                 emoji.to_i.positive? ? { id: emoji } : { name: emoji }
               else
-                emoji.to_h
+                emoji&.to_h
               end
 
       @options << { label: label, value: value, description: description, emoji: emoji, default: default }

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discordrb-webhooks
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.7.1
 platform: ruby
 authors:
 - meew0
 - swarley
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-05 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -44,7 +43,6 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -52,15 +50,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Webhook client for discordrb
 test_files: []