discorb 0.12.4 → 0.13.3

data/lib/discorb/message.rb

@@ -29,6 +29,10 @@ module Discorb
       @replied_user = replied_user
     end
 
+    def inspect
+      "#<#{self.class} @everyone=#{@everyone} @roles=#{@roles} @users=#{@users} @replied_user=#{@replied_user}>"
+    end
+
     # @private
     def to_hash(other = nil)
       payload = {
@@ -290,6 +294,7 @@ module Discorb
 
     #
     # Edit the message.
+    # @async
     #
     # @param [String] content The message content.
     # @param [Discorb::Embed] embed The embed to send.
@@ -298,6 +303,8 @@ module Discorb
     # @param [Array<Discorb::Component>, Array<Array<Discorb::Component>>] components The components to send.
     # @param [Boolean] supress Whether to supress embeds.
     #
+    # @return [Async::Task<void>] The task.
+    #
     def edit(content = nil, embed: nil, embeds: nil, allowed_mentions: nil,
                             components: nil, supress: nil)
       Async do
@@ -308,9 +315,12 @@ module Discorb
 
     #
     # Delete the message.
+    # @async
     #
     # @param [String] reason The reason for deleting the message.
     #
+    # @return [Async::Task<void>] The task.
+    #
     def delete!(reason: nil)
       Async do
         channel.delete_message!(@id, reason: reason).wait
@@ -338,8 +348,7 @@ module Discorb
     end
 
     # Reply to the message.
-    # @macro async
-    # @macro http
+    # @async
     # @param (see #post)
     # @return [Async::Task<Discorb::Message>] The message.
     def reply(*args, **kwargs)
@@ -350,8 +359,9 @@ module Discorb
 
     #
     # Publish the message.
-    # @macro async
-    # @macro http
+    # @async
+    #
+    # @return [Async::Task<void>] The task.
     #
     def publish
       Async do
@@ -361,11 +371,12 @@ module Discorb
 
     #
     # Add a reaction to the message.
-    # @macro async
-    # @macro http
+    # @async
     #
     # @param [Discorb::Emoji] emoji The emoji to react with.
     #
+    # @return [Async::Task<void>] The task.
+    #
     def add_reaction(emoji)
       Async do
         @client.http.put("/channels/#{@channel_id}/messages/#{@id}/reactions/#{emoji.to_uri}/@me", nil).wait
@@ -376,11 +387,12 @@ module Discorb
 
     #
     # Remove a reaction from the message.
-    # @macro async
-    # @macro http
+    # @async
     #
     # @param [Discorb::Emoji] emoji The emoji to remove.
     #
+    # @return [Async::Task<void>] The task.
+    #
     def remove_reaction(emoji)
       Async do
         @client.http.delete("/channels/#{@channel_id}/messages/#{@id}/reactions/#{emoji.to_uri}/@me").wait
@@ -391,12 +403,13 @@ module Discorb
 
     #
     # Remove other member's reaction from the message.
-    # @macro async
-    # @macro http
+    # @async
     #
     # @param [Discorb::Emoji] emoji The emoji to remove.
     # @param [Discorb::Member] member The member to remove the reaction from.
     #
+    # @return [Async::Task<void>] The task.
+    #
     def remove_reaction_of(emoji, member)
       Async do
         @client.http.delete("/channels/#{@channel_id}/messages/#{@id}/reactions/#{emoji.to_uri}/#{member.is_a?(Member) ? member.id : member}").wait
@@ -407,8 +420,7 @@ module Discorb
 
     #
     # Fetch reacted users of reaction.
-    # @macro async
-    # @macro http
+    # @async
     #
     # @param [Discorb::Emoji] emoji The emoji to fetch.
     # @param [Integer, nil] limit The maximum number of users to fetch. `nil` for no limit.
@@ -441,11 +453,12 @@ module Discorb
 
     #
     # Pin the message.
-    # @macro async
-    # @macro http
+    # @async
     #
     # @param [String] reason The reason for pinning the message.
     #
+    # @return [Async::Task<void>] The task.
+    #
     def pin(reason: nil)
       Async do
         channel.pin_message(self, reason: reason).wait
@@ -454,11 +467,12 @@ module Discorb
 
     #
     # Unpin the message.
-    # @macro async
-    # @macro http
+    # @async
     #
     # @param [String] reason The reason for unpinning the message.
     #
+    # @return [Async::Task<void>] The task.
+    #
     def unpin(reason: nil)
       Async do
         channel.unpin_message(self, reason: reason).wait
@@ -467,10 +481,11 @@ module Discorb
 
     #
     # Start thread from the message.
+    # @async
     #
     # @param (see Discorb::Channel#start_thread)
     #
-    # @return [Async::Task<<Type>>] <description>
+    # @return [Async::Task<Discorb::ThreadChannel>] <description>
     #
     def start_thread(*args, **kwargs)
       Async do

data/lib/discorb/modules.rb

@@ -7,8 +7,7 @@ module Discorb
   module Messageable
     #
     # Post a message to the channel.
-    # @macro async
-    # @macro http
+    # @async
     #
     # @param [String] content The message content.
     # @param [Boolean] tts Whether the message is tts.
@@ -38,14 +37,8 @@ module Discorb
           allowed_mentions ? allowed_mentions.to_hash(@client.allowed_mentions) : @client.allowed_mentions.to_hash
         payload[:message_reference] = reference.to_reference if reference
         payload[:components] = Component.to_payload(components) if components
-        files = [file] if file
-        if files
-          seperator, payload = HTTP.multipart(payload, files)
-          headers = { "content-type" => "multipart/form-data; boundary=#{seperator}" }
-        else
-          headers = {}
-        end
-        _resp, data = @client.http.post("/channels/#{channel_id.wait}/messages", payload, headers: headers).wait
+        files = [file]
+        _resp, data = @client.http.multipart_post("/channels/#{channel_id.wait}/messages", payload, files).wait
         Message.new(@client, data.merge({ guild_id: @guild_id.to_s }))
       end
     end
@@ -54,8 +47,7 @@ module Discorb
 
     #
     # Edit a message.
-    # @macro async
-    # @macro http
+    # @async
     #
     # @param [#to_s] message_id The message id.
     # @param [String] content The message content.
@@ -65,6 +57,8 @@ module Discorb
     # @param [Array<Discorb::Component>, Array<Array<Discorb::Component>>] components The components to send.
     # @param [Boolean] supress Whether to supress embeds.
     #
+    # @return [Async::Task<void>] The task.
+    #
     def edit_message(message_id, content = nil, embed: nil, embeds: nil, allowed_mentions: nil,
                                                 components: nil, supress: nil)
       Async do
@@ -86,12 +80,13 @@ module Discorb
 
     #
     # Delete a message.
-    # @macro async
-    # @macro http
+    # @async
     #
     # @param [#to_s] message_id The message id.
     # @param [String] reason The reason for deleting the message.
     #
+    # @return [Async::Task<void>] The task.
+    #
     def delete_message!(message_id, reason: nil)
       Async do
         @client.http.delete("/channels/#{channel_id.wait}/messages/#{message_id}", audit_log_reason: reason).wait
@@ -102,8 +97,7 @@ module Discorb
 
     #
     # Fetch a message from ID.
-    # @macro async
-    # @macro http
+    # @async
     #
     # @param [Discorb::Snowflake] id The ID of the message.
     #
@@ -119,8 +113,7 @@ module Discorb
 
     #
     # Fetch a message history.
-    # @macro async
-    # @macro http
+    # @async
     #
     # @param [Integer] limit The number of messages to fetch.
     # @param [Discorb::Snowflake] before The ID of the message to fetch before.
@@ -144,8 +137,7 @@ module Discorb
 
     #
     # Fetch the pinned messages in the channel.
-    # @macro async
-    # @macro http
+    # @async
     #
     # @return [Async::Task<Array<Discorb::Message>>] The pinned messages in the channel.
     #
@@ -158,12 +150,13 @@ module Discorb
 
     #
     # Pin a message in the channel.
-    # @macro async
-    # @macro http
+    # @async
     #
     # @param [Discorb::Message] message The message to pin.
     # @param [String] reason The reason of pinning the message.
     #
+    # @return [Async::Task<void>] The task.
+    #
     def pin_message(message, reason: nil)
       Async do
         @client.http.put("/channels/#{channel_id.wait}/pins/#{message.id}", {}, audit_log_reason: reason).wait
@@ -172,12 +165,13 @@ module Discorb
 
     #
     # Unpin a message in the channel.
-    # @macro async
-    # @macro http
+    # @async
     #
     # @param [Discorb::Message] message The message to unpin.
     # @param [String] reason The reason of unpinning the message.
     #
+    # @return [Async::Task<void>] The task.
+    #
     def unpin_message(message, reason: nil)
       Async do
         @client.http.delete("/channels/#{channel_id.wait}/pins/#{message.id}", audit_log_reason: reason).wait
@@ -186,8 +180,7 @@ module Discorb
 
     #
     # Trigger the typing indicator in the channel.
-    # @macro async
-    # @macro http
+    # @async
     #
     # If block is given, trigger typing indicator during executing block.
     # @example

data/lib/discorb/permission.rb

@@ -164,6 +164,10 @@ module Discorb
       @deny
     end
 
+    def inspect
+      "#<#{self.class} allow=#{allow} deny=#{deny}>"
+    end
+
     #
     # Converts the permission overwrite to a hash.
     #

data/lib/discorb/rate_limit.rb

@@ -14,6 +14,10 @@ module Discorb
       @global = false
     end
 
+    def inspect
+      "#<#{self.class}>"
+    end
+
     #
     # Wait for the rate limit to reset.
     #
@@ -23,8 +27,8 @@ module Discorb
     def wait(method, path)
       return if path.start_with?("https://")
 
-      if @global
-        time = b[:reset_at] - Time.now.to_f
+      if @global && @global > Time.now.to_f
+        time = @global - Time.now.to_f
         @client.log.info("global rate limit reached, waiting #{time} seconds")
         sleep(time)
         @global = false

data/lib/discorb/role.rb

@@ -90,12 +90,13 @@ module Discorb
 
     #
     # Moves the role to a new position.
-    # @macro async
-    # @macro http
+    # @async
     #
     # @param [Integer] position The new position.
     # @param [String] reason The reason for moving the role.
     #
+    # @return [Async::Task<void>] The task.
+    #
     def move(position, reason: nil)
       Async do
         @client.http.patch("/guilds/#{@guild.id}/roles", { id: @id, position: position }, audit_log_reason: reason).wait
@@ -104,8 +105,7 @@ module Discorb
 
     #
     # Edits the role.
-    # @macro async
-    # @macro http
+    # @async
     # @macro edit
     #
     # @param [String] name The new name of the role.
@@ -116,15 +116,17 @@ module Discorb
     # @param [Discorb::Image, Discorb::UnicodeEmoji] icon The new icon or emoji of the role.
     # @param [String] reason The reason for editing the role.
     #
-    def edit(name: :unset, position: :unset, color: :unset, hoist: :unset, mentionable: :unset, icon: :unset, reason: nil)
+    # @return [Async::Task<void>] The task.
+    #
+    def edit(name: Discorb::Unset, position: Discorb::Unset, color: Discorb::Unset, hoist: Discorb::Unset, mentionable: Discorb::Unset, icon: Discorb::Unset, reason: nil)
       Async do
         payload = {}
-        payload[:name] = name if name != :unset
-        payload[:position] = position if position != :unset
-        payload[:color] = color.to_i if color != :unset
-        payload[:hoist] = hoist if hoist != :unset
-        payload[:mentionable] = mentionable if mentionable != :unset
-        if icon != :unset
+        payload[:name] = name if name != Discorb::Unset
+        payload[:position] = position if position != Discorb::Unset
+        payload[:color] = color.to_i if color != Discorb::Unset
+        payload[:hoist] = hoist if hoist != Discorb::Unset
+        payload[:mentionable] = mentionable if mentionable != Discorb::Unset
+        if icon != Discorb::Unset
           if icon.is_a?(Discorb::Image)
             payload[:icon] = icon.to_s
           else
@@ -142,6 +144,8 @@ module Discorb
     #
     # @param [String] reason The reason for deleting the role.
     #
+    # @return [Async::Task<void>] The task.
+    #
     def delete!(reason: nil)
       Async do
         @client.http.delete("/guilds/#{@guild.id}/roles/#{@id}", audit_log_reason: reason).wait

data/lib/discorb/sticker.rb

@@ -51,6 +51,15 @@ module Discorb
       # @!attribute [r] guild
       #   @macro client_cache
       #   @return [Discorb::Guild] The guild the sticker is in.
+      @sticker_type = {
+        1 => :official,
+        2 => :guild,
+      }.freeze
+      @sticker_format = {
+        1 => :png,
+        2 => :apng,
+        3 => :lottie,
+      }
 
       def guild
         @client.guilds[@guild_id]
@@ -58,8 +67,7 @@ module Discorb
 
       #
       # Edits the sticker.
-      # @macro async
-      # @macro http
+      # @async
       # @macro edit
       #
       # @param [String] name The new name of the sticker.
@@ -67,12 +75,14 @@ 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
+          payload[:name] = name unless name == Discorb::Unset
+          payload[:description] = description unless description == Discorb::Unset
+          payload[:tags] = tag.name unless tag == Discorb::Unset
           @client.http.patch("/guilds/#{@guild_id}/stickers/#{@id}", payload, audit_log_reason: reason).wait
         end
       end
@@ -81,8 +91,7 @@ module Discorb
 
       #
       # Deletes the sticker.
-      # @macro async
-      # @macro http
+      # @async
       #
       # @param [String] reason The reason for the deletion.
       #
@@ -103,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.
     #
@@ -123,6 +122,7 @@ module Discorb
         verified_bot: 16,
         early_verified_bot_developer: 17,
         discord_certified_moderator: 18,
+        bot_http_interactions: 19,
       }.freeze
     end
 
@@ -149,18 +149,19 @@ 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

data/lib/discorb/voice_state.rb

@@ -166,19 +166,20 @@ 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
+        payload[:topic] = topic if topic != Discorb::Unset
+        payload[:privacy_level] = self.class.privacy_level.key(privacy_level) if privacy_level != Discorb::Unset
         @client.http.edit("/stage-instances/#{@channel_id}", payload, audit_log_reason: reason).wait
         self
       end
@@ -191,6 +192,8 @@ 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