discorb 0.13.0 → 0.13.4

data/lib/discorb/sticker.rb

@@ -67,8 +67,7 @@ module Discorb
 
       #
       # Edits the sticker.
-      # @macro async
-      # @macro http
+      # @async
       # @macro edit
       #
       # @param [String] name The new name of the sticker.
@@ -76,13 +75,15 @@ module Discorb
       # @param [Discorb::Emoji] tag The new tags of the sticker.
       # @param [String] reason The reason for the edit.
       #
-      def edit(name: :unset, description: :unset, tag: :unset, reason: :unset)
+      # @return [Async::Task<void>] The task.
+      #
+      def edit(name: Discorb::Unset, description: Discorb::Unset, tag: Discorb::Unset, reason: Discorb::Unset)
         Async do
           payload = {}
-          payload[:name] = name unless name == :unset
-          payload[:description] = description unless description == :unset
-          payload[:tags] = tag.name unless tag == :unset
-          @client.http.patch("/guilds/#{@guild_id}/stickers/#{@id}", payload, audit_log_reason: reason).wait
+          payload[:name] = name unless name == Discorb::Unset
+          payload[:description] = description unless description == Discorb::Unset
+          payload[:tags] = tag.name unless tag == Discorb::Unset
+          @client.http.request(Route.new("/guilds/#{@guild_id}/stickers/#{@id}", "//guilds/:guild_id/stickers/:sticker_id", :patch), payload, audit_log_reason: reason).wait
         end
       end
 
@@ -90,14 +91,13 @@ module Discorb
 
       #
       # Deletes the sticker.
-      # @macro async
-      # @macro http
+      # @async
       #
       # @param [String] reason The reason for the deletion.
       #
       def delete!(reason: nil)
         Async do
-          @client.http.delete("/guilds/#{@guild_id}/stickers/#{@id}", audit_log_reason: reason).wait
+          @client.http.request(Route.new("/guilds/#{@guild_id}/stickers/#{@id}", "//guilds/:guild_id/stickers/:sticker_id", :delete), audit_log_reason: reason).wait
         end
       end
 
@@ -112,14 +112,10 @@ module Discorb
       attr_reader :id
       # @return [String] The name of the sticker pack.
       attr_reader :name
-      # @return [Discorb::Snowflake] The ID of the SKU.
-      attr_reader :sku_id
       # @return [Discorb::Snowflake] The cover sticker of the pack.
       attr_reader :cover_sticker_id
       # @return [String] The description of the pack.
       attr_reader :description
-      # @return [Discorb::Store::SKU] The banner asset ID of the pack.
-      attr_reader :banner_asset_id
       # @return [Array<Discorb::Sticker>] The stickers in the pack.
       attr_reader :stickers
       # @return [Discorb::Asset] The banner of the pack.

data/lib/discorb/user.rb

@@ -58,8 +58,7 @@ module Discorb
 
     #
     # Whether the user is a owner of the client.
-    # @macro async
-    # @macro http
+    # @async
     #
     # @param [Boolean] strict Whether don't allow if the user is a member of the team.
     #
@@ -85,7 +84,7 @@ module Discorb
       Async do
         next @dm_channel_id if @dm_channel_id
 
-        _resp, dm_channel = @client.http.post("/users/@me/channels", { recipient_id: @id }).wait
+        _resp, dm_channel = @client.http.request(Route.new("/users/@me/channels", "//users/@me/channels", :post), { recipient_id: @id }).wait
         @dm_channel_id = dm_channel[:id]
         @dm_channel_id
       end
@@ -138,7 +137,7 @@ module Discorb
       @avatar = data[:avatar] ? Asset.new(self, data[:avatar]) : DefaultAvatar.new(data[:discriminator])
       @bot = data[:bot]
       @raw_data = data
-      @client.users[@id] = self if !data[:no_cache] && data.is_a?(User)
+      @client.users[@id] = self if !data[:no_cache]
       @created_at = @id.timestamp
       @data.update(data)
     end
@@ -150,25 +149,26 @@ module Discorb
   class ClientUser < User
     #
     # Edit the client user.
-    # @macro async
-    # @macro http
+    # @async
     # @macro edit
     #
     # @param [String] name The new username.
     # @param [Discorb::Image] avatar The new avatar.
     #
-    def edit(name: :unset, avatar: :unset)
+    # @return [Async::Task<void>] The task.
+    #
+    def edit(name: Discorb::Unset, avatar: Discorb::Unset)
       Async do
         payload = {}
-        payload[:username] = name unless name == :unset
-        if avatar == :unset
+        payload[:username] = name unless name == Discorb::Unset
+        if avatar == Discorb::Unset
           # Nothing
         elsif avatar.nil?
           payload[:avatar] = nil
         else
           payload[:avatar] = avatar.to_s
         end
-        @client.http.patch("/users/@me", payload).wait
+        @client.http.request(Route.new("/users/@me", "//users/@me", :patch), payload).wait
         self
       end
     end

data/lib/discorb/voice_state.rb

@@ -166,20 +166,23 @@ module Discorb
 
     #
     # Edits the stage instance.
-    # @macro async
-    # @macro http
+    # @async
     # @macro edit
     #
     # @param [String] topic The new topic of the stage instance.
     # @param [:public, :guild_only] privacy_level The new privacy level of the stage instance.
     # @param [String] reason The reason for editing the stage instance.
     #
-    def edit(topic: :unset, privacy_level: :unset, reason: nil)
+    # @return [Async::Task<void>] The task.
+    #
+    def edit(topic: Discorb::Unset, privacy_level: Discorb::Unset, reason: nil)
       Async do
         payload = {}
-        payload[:topic] = topic if topic != :unset
-        payload[:privacy_level] = self.class.privacy_level.key(privacy_level) if privacy_level != :unset
-        @client.http.edit("/stage-instances/#{@channel_id}", payload, audit_log_reason: reason).wait
+        payload[:topic] = topic if topic != Discorb::Unset
+        payload[:privacy_level] = self.class.privacy_level.key(privacy_level) if privacy_level != Discorb::Unset
+        @client.http.request(
+          Route.new("/stage-instances/#{@channel_id}", "//stage-instances/:channel_id", :patch), payload, audit_log_reason: reason,
+        ).wait
         self
       end
     end
@@ -191,9 +194,11 @@ module Discorb
     #
     # @param [String] reason The reason for deleting the stage instance.
     #
+    # @return [Async::Task<void>] The task.
+    #
     def delete!(reason: nil)
       Async do
-        @client.http.delete("/stage-instances/#{@channel_id}", audit_log_reason: reason).wait
+        @client.http.request(Route.new("/stage-instances/#{@channel_id}", "//stage-instances/:stage_instance_id", :delete), audit_log_reason: reason).wait
         self
       end
     end

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_request(Route.new("#{url}?wait=#{wait}", "//webhooks/:webhook_id/:token", :post), files, payload, headers: headers).wait
         data && Webhook::Message.new(self, data)
       end
     end
@@ -93,21 +84,22 @@ 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
-        @http.patch(url.to_s, payload).wait
+        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.request(Route.new(url, "//webhooks/:webhook_id/:token", :patch), payload).wait
       end
     end
 
@@ -115,12 +107,13 @@ module Discorb
 
     #
     # Deletes the webhook.
-    # @macro async
-    # @macro http
+    # @async
+    #
+    # @return [Async::Task<void>] The task.
     #
     def delete!
       Async do
-        @http.delete(url).wait
+        @http.request(Route.new(url, "//webhooks/:webhook_id/:token", :delete)).wait
         self
       end
     end
@@ -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_request(Route.new("#{url}/messages/#{Utils.try(message, :id)}", "//webhooks/:webhook_id/:token/messages/:message_id", :patch), payload, headers: headers).wait
         message.send(:_set_data, data)
         message
       end
@@ -175,9 +162,14 @@ 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
+        @http.request(Route.new(
+          "#{url}/messages/#{Utils.try(message, :id)}",
+          "//webhooks/:webhook_id/:token/messages/:message_id", :delete
+        )).wait
         message
       end
     end
@@ -308,12 +300,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 +315,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.