discorb 0.12.4 → 0.13.3

data/lib/discorb/webhook.rb

@@ -43,8 +43,7 @@ module Discorb
 
     #
     # Posts a message to the webhook.
-    # @macro async
-    # @macro http
+    # @async
     #
     # @param [String] content The content of the message.
     # @param [Boolean] tts Whether the message should be sent as text-to-speech.
@@ -61,7 +60,7 @@ module Discorb
     # @return [Async::Task<nil>] If `wait` is false.
     #
     def post(content = nil, tts: false, embed: nil, embeds: nil, allowed_mentions: nil,
-                            file: nil, files: nil, username: nil, avatar_url: :unset, wait: true)
+                            file: nil, files: nil, username: nil, avatar_url: Discorb::Unset, wait: true)
       Async do
         payload = {}
         payload[:content] = content if content
@@ -74,17 +73,9 @@ module Discorb
         payload[:embeds] = tmp_embed.map(&:to_hash) if tmp_embed
         payload[:allowed_mentions] = allowed_mentions&.to_hash
         payload[:username] = username if username
-        payload[:avatar_url] = avatar_url if avatar_url != :unset
-        files = [file] if file
-        if files
-          headers, payload = HTTP.multipart(payload, files)
-        else
-          headers = {
-            "Content-Type" => "application/json",
-          }
-        end
-        _resp, data = @http.post("#{url}?wait=#{wait}", payload, headers: headers).wait
-
+        payload[:avatar_url] = avatar_url if avatar_url != Discorb::Unset
+        files = [file]
+        _resp, data = @http.multipart_post("#{url}?wait=#{wait}", files, payload, headers: headers).wait
         data && Webhook::Message.new(self, data)
       end
     end
@@ -93,20 +84,21 @@ module Discorb
 
     #
     # Edits the webhook.
-    # @macro async
-    # @macro http
+    # @async
     # @macro edit
     #
     # @param [String] name The new name of the webhook.
     # @param [Discorb::Image] avatar The new avatar of the webhook.
     # @param [Discorb::GuildChannel] channel The new channel of the webhook.
     #
-    def edit(name: :unset, avatar: :unset, channel: :unset)
+    # @return [Async::Task<void>] The task.
+    #
+    def edit(name: Discorb::Unset, avatar: Discorb::Unset, channel: Discorb::Unset)
       Async do
         payload = {}
-        payload[:name] = name if name != :unset
-        payload[:avatar] = avatar if avatar != :unset
-        payload[:channel_id] = Utils.try(channel, :id) if channel != :unset
+        payload[:name] = name if name != Discorb::Unset
+        payload[:avatar] = avatar if avatar != Discorb::Unset
+        payload[:channel_id] = Utils.try(channel, :id) if channel != Discorb::Unset
         @http.patch(url.to_s, payload).wait
       end
     end
@@ -115,8 +107,9 @@ module Discorb
 
     #
     # Deletes the webhook.
-    # @macro async
-    # @macro http
+    # @async
+    #
+    # @return [Async::Task<void>] The task.
     #
     def delete!
       Async do
@@ -129,8 +122,7 @@ module Discorb
 
     #
     # Edits the webhook's message.
-    # @macro async
-    # @macro http
+    # @async
     # @macro edit
     #
     # @param [Discorb::Webhook::Message] message The message to edit.
@@ -142,29 +134,24 @@ module Discorb
     # @param [Array<Discorb::File>] files The files to send.
     # @param [Discorb::AllowedMentions] allowed_mentions The allowed mentions to send.
     #
+    # @return [Async::Task<void>] The task.
+    #
     def edit_message(
-      message, content = :unset,
-      embed: :unset, embeds: :unset,
-      file: :unset, files: :unset,
-      attachments: :unset,
-      allowed_mentions: :unset
+      message, content = Discorb::Unset,
+      embed: Discorb::Unset, embeds: Discorb::Unset,
+      file: Discorb::Unset, files: Discorb::Unset,
+      attachments: Discorb::Unset,
+      allowed_mentions: Discorb::Unset
     )
       Async do
         payload = {}
-        payload[:content] = content if content != :unset
-        payload[:embeds] = embed ? [embed.to_hash] : [] if embed != :unset
-        payload[:embeds] = embeds.map(&:to_hash) if embeds != :unset
-        payload[:attachments] = attachments.map(&:to_hash) if attachments != :unset
-        payload[:allowed_mentions] = allowed_mentions if allowed_mentions != :unset
-        files = [file] if file != :unset
-        if files == :unset
-          headers = {
-            "Content-Type" => "application/json",
-          }
-        else
-          headers, payload = HTTP.multipart(payload, files)
-        end
-        _resp, data = @http.patch("#{url}/messages/#{Utils.try(message, :id)}", payload, headers: headers).wait
+        payload[:content] = content if content != Discorb::Unset
+        payload[:embeds] = embed ? [embed.to_hash] : [] if embed != Discorb::Unset
+        payload[:embeds] = embeds.map(&:to_hash) if embeds != Discorb::Unset
+        payload[:attachments] = attachments.map(&:to_hash) if attachments != Discorb::Unset
+        payload[:allowed_mentions] = allowed_mentions if allowed_mentions != Discorb::Unset
+        files = [file] if file != Discorb::Unset
+        _resp, data = @http.multipart_patch("#{url}/messages/#{Utils.try(message, :id)}", payload, headers: headers).wait
         message.send(:_set_data, data)
         message
       end
@@ -175,6 +162,8 @@ module Discorb
     #
     # @param [Discorb::Webhook::Message] message The message to delete.
     #
+    # @return [Async::Task<void>] The task.
+    #
     def delete_message!(message)
       Async do
         @http.delete("#{url}/messages/#{Utils.try(message, :id)}").wait
@@ -308,12 +297,13 @@ module Discorb
 
       #
       # Edits the message.
-      # @macro async
-      # @macro http
+      # @async
       # @macro edit
       #
       # @param (see Webhook#edit_message)
       #
+      # @return [Async::Task<void>] The task.
+      #
       def edit(...)
         Async do
           @webhook.edit_message(self, ...).wait
@@ -322,8 +312,9 @@ module Discorb
 
       #
       # Deletes the message.
-      # @macro async
-      # @macro http
+      # @async
+      #
+      # @return [Async::Task<void>] The task.
       #
       def delete!
         Async do

data/lib/discorb.rb

@@ -16,7 +16,7 @@ module Discorb
   #   @note You must enable `GUILD_MEMBERS` intent to use this method.
   #
   # @!macro edit
-  #   @note The arguments of this method are defaultly set to `:unset`. Specify value to set the value, if not don't specify or specify `:unset`.
+  #   @note The arguments of this method are defaultly set to `Discorb::Unset`. Specify value to set the value, if not don't specify or specify `Discorb::Unset`.
   #
   # @!macro http
   #   @note This method calls HTTP request.
@@ -41,7 +41,7 @@ end
 
 require_order = %w[common flag dictionary error rate_limit http intents emoji_table modules] +
                 %w[user member guild emoji channel embed message] +
-                %w[application audit_logs color components event] +
+                %w[application audit_logs color components event event_handler] +
                 %w[file guild_template image integration interaction invite log permission] +
                 %w[presence reaction role sticker utils voice_state webhook] +
                 %w[gateway_requests gateway app_command] +