discorb 0.17.1 → 0.19.0

data/lib/discorb/presence.rb

@@ -113,8 +113,8 @@ module Discorb
         @details = data[:details]
         @state = data[:state]
         @emoji = if data[:emoji]
-                   data[:emoji][:id].nil? ? UnicodeEmoji.new(data[:emoji][:name]) : PartialEmoji.new(data[:emoji])
-        end
+            data[:emoji][:id].nil? ? UnicodeEmoji.new(data[:emoji][:name]) : PartialEmoji.new(data[:emoji])
+          end
         @party = data[:party] && Party.new(data[:party])
         @assets = data[:assets] && Asset.new(data[:assets])
         @instance = data[:instance]
@@ -141,6 +141,8 @@ module Discorb
           "#{@emoji} #{@state}"
         when :competing
           "Competing in #{@name}"
+        else
+          raise "Unknown activity type: #{@type}"
         end
       end
 

data/lib/discorb/reaction.rb

@@ -7,7 +7,7 @@ module Discorb
   class Reaction < DiscordModel
     # @return [Integer] The number of users that have reacted with this emoji.
     attr_reader :count
-    # @return [Discorb::Emoji] The emoji that was reacted with.
+    # @return [Discorb::Emoji, Discorb::PartialEmoji] The emoji that was reacted with.
     attr_reader :emoji
     # @return [Discorb::Message] The message that this reaction is on.
     attr_reader :message
@@ -33,7 +33,7 @@ module Discorb
     #
     # @param (see Message#fetch_reacted_users)
     #
-    # @return [Array<Discorb::User>] The users that reacted with this emoji.
+    # @return [Async::Task<Array<Discorb::User>>] The users that reacted with this emoji.
     #
     def fetch_users(...)
       message.fetch_reacted_users(@emoji, ...)

data/lib/discorb/role.rb

@@ -69,7 +69,7 @@ module Discorb
     # @return [Integer] -1 if the other role is higher, 0 if they are equal, 1 if the other role is lower.
     #
     def <=>(other)
-      return false unless other.is_a?(Role)
+      return nil unless other.is_a?(Role)
 
       @position <=> other.position
     end
@@ -165,7 +165,7 @@ module Discorb
     #
     # @return [Async::Task<void>] The task.
     #
-    def delete!(reason: nil)
+    def delete(reason: nil)
       Async do
         @client.http.request(
           Route.new("/guilds/#{@guild.id}/roles/#{@id}", "//guilds/:guild_id/roles/:role_id",
@@ -174,7 +174,7 @@ module Discorb
       end
     end
 
-    alias destroy! delete!
+    alias destroy delete
 
     def tag
       Tag.new(@tags)

data/lib/discorb/shard.rb

@@ -61,7 +61,7 @@ module Discorb
     #
     # @return [void]
     #
-    def close!
+    def close
       @status = :closed
       @main_task&.stop
       @thread.kill

data/lib/discorb/sticker.rb

@@ -17,7 +17,7 @@ module Discorb
     attr_reader :format
     # @return [String] The URL of the sticker.
     attr_reader :description
-    # @return [Discorb::Sticker] The ID of the sticker pack.
+    # @return [Discorb::Snowflake] The ID of the sticker pack.
     attr_reader :pack_id
     # @return [Integer] The sort value of the sticker.
     attr_reader :sort_value
@@ -87,7 +87,7 @@ module Discorb
           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
+                      :patch), payload, audit_log_reason: reason,
           ).wait
         end
       end
@@ -100,16 +100,16 @@ module Discorb
       #
       # @param [String] reason The reason for the deletion.
       #
-      def delete!(reason: nil)
+      def delete(reason: nil)
         Async do
           @client.http.request(
             Route.new("/guilds/#{@guild_id}/stickers/#{@id}", "//guilds/:guild_id/stickers/:sticker_id",
-                      :delete), {}, audit_log_reason: reason
+                      :delete), {}, audit_log_reason: reason,
           ).wait
         end
       end
 
-      alias destroy! delete!
+      alias destroy delete
     end
 
     #

data/lib/discorb/user.rb

@@ -16,7 +16,7 @@ module Discorb
     attr_reader :flag
     # @return [String] The user's discriminator.
     attr_reader :discriminator
-    # @return [Discorb::Asset] The user's avatar.
+    # @return [Discorb::Asset, Discorb::DefaultAvatar] The user's avatar.
     attr_reader :avatar
     # @return [Boolean] Whether the user is a bot.
     attr_reader :bot
@@ -147,7 +147,7 @@ module Discorb
       @flag = User::Flag.new(data[:public_flags] | (data[:flags] || 0))
       @discriminator = data[:discriminator]
       @avatar = data[:avatar] ? Asset.new(self, data[:avatar]) : DefaultAvatar.new(data[:discriminator])
-      @bot = data[:bot]
+      @bot = data[:bot] || false
       @raw_data = data
       @client.users[@id] = self unless data[:no_cache]
       @created_at = @id.timestamp

data/lib/discorb/voice_state.rb

@@ -95,10 +95,10 @@ module Discorb
       @user_id = data[:user_id]
       unless guild.nil?
         @member = if data.key?(:member)
-                    guild.members[data[:user_id]] || Member.new(@client, @guild_id, data[:member][:user], data[:member])
-                  else
-                    guild.members[data[:user_id]]
-        end
+            guild.members[data[:user_id]] || Member.new(@client, @guild_id, data[:member][:user], data[:member])
+          else
+            guild.members[data[:user_id]]
+          end
       end
       @session_id = data[:session_id]
       @deaf = data[:deaf]
@@ -213,18 +213,18 @@ module Discorb
     #
     # @return [Async::Task<void>] The task.
     #
-    def delete!(reason: nil)
+    def delete(reason: nil)
       Async do
         @client.http.request(
           Route.new("/stage-instances/#{@channel_id}", "//stage-instances/:stage_instance_id",
-                    :delete), {}, audit_log_reason: reason
+                    :delete), {}, audit_log_reason: reason,
         ).wait
         self
       end
     end
 
-    alias destroy! delete!
-    alias end! delete!
+    alias destroy delete
+    alias end delete
 
     private
 

data/lib/discorb/webhook.rb

@@ -91,8 +91,15 @@ module Discorb
         payload[:username] = username if username
         payload[:avatar_url] = avatar_url if avatar_url != Discorb::Unset
         attachments = [attachment] if attachment
-        _resp, data = @http.multipart_request(Route.new("#{url}?wait=#{wait}", "//webhooks/:webhook_id/:token", :post),
-                                              attachments, payload, headers: headers).wait
+        _resp, data = @http.multipart_request(
+          Route.new(
+            "#{url}?wait=#{wait}",
+            "//webhooks/:webhook_id/:token",
+            :post
+          ),
+          attachments,
+          payload
+        ).wait
         data && Webhook::Message.new(self, data)
       end
     end
@@ -128,14 +135,14 @@ module Discorb
     #
     # @return [Async::Task<void>] The task.
     #
-    def delete!
+    def delete
       Async do
         @http.request(Route.new(url, "//webhooks/:webhook_id/:token", :delete)).wait
         self
       end
     end
 
-    alias destroy! delete!
+    alias destroy delete
 
     #
     # Edits the webhook's message.
@@ -184,7 +191,7 @@ module Discorb
     #
     # @return [Async::Task<void>] The task.
     #
-    def delete_message!(message)
+    def delete_message(message)
       Async do
         @http.request(
           Route.new(
@@ -207,11 +214,12 @@ module Discorb
       # Initializes the webhook from URL.
       #
       # @param [String] url The URL of the webhook.
+      # @param [Discorb::Client] client The client to associate with the webhook.
       #
-      def initialize(url)
+      def initialize(url, client: nil)
         @url = url
         @token = ""
-        @http = Discorb::HTTP.new(self)
+        @http = Discorb::HTTP.new(client || Discorb::Client.new)
       end
     end
 
@@ -377,9 +385,9 @@ module Discorb
       #
       # @return [Async::Task<void>] The task.
       #
-      def delete!
+      def delete
         Async do
-          @webhook.delete_message!(self).wait
+          @webhook.delete_message(self).wait
         end
       end
 
@@ -459,12 +467,13 @@ module Discorb
       # Creates URLWebhook.
       #
       # @param [String] url The URL of the webhook.
+      # @param [Discorb::Client] client The client to associate with the webhook.
       #
       # @return [Discorb::Webhook::URLWebhook] The URLWebhook.
       #
-      def new(url)
+      def new(url, client: nil)
         if self == Webhook
-          URLWebhook.new(url)
+          URLWebhook.new(url, client: client)
         else
           super
         end

data/lib/discorb.rb

@@ -46,10 +46,10 @@ end
 require_order = %w[common flag dictionary error rate_limit http intents emoji_table modules] +
                 %w[channel/container message_meta allowed_mentions] +
                 %w[user member guild emoji channel embed message] +
-                %w[application audit_logs color components event event_handler] +
+                %w[application audit_logs color components event event_handler automod] +
                 %w[attachment guild_template image integration interaction invite permission] +
                 %w[presence reaction role sticker utils voice_state webhook] +
-                %w[gateway_requests gateway app_command] +
+                %w[gateway_requests gateway_events gateway app_command] +
                 %w[asset extension shard client extend]
 require_order.each do |name|
   require_relative "discorb/#{name}.rb"

data/rbs_collection.lock.yaml

@@ -1,96 +1,88 @@
----
-sources:
-- name: ruby/gem_rbs_collection
-  remote: https://github.com/ruby/gem_rbs_collection.git
-  revision: main
-  repo_dir: gems
-path: ".gem_rbs_collection"
-gems:
-- name: activesupport
-  version: '6.0'
-  source:
-    type: git
-    name: ruby/gem_rbs_collection
-    revision: 8e1f19e0c8768b6bac2815fe65a3310298ba400e
-    remote: https://github.com/ruby/gem_rbs_collection.git
-    repo_dir: gems
-- name: ast
-  version: '2.4'
-  source:
-    type: git
-    name: ruby/gem_rbs_collection
-    revision: 8e1f19e0c8768b6bac2815fe65a3310298ba400e
-    remote: https://github.com/ruby/gem_rbs_collection.git
-    repo_dir: gems
-- name: date
-  version: '0'
-  source:
-    type: stdlib
-- name: forwardable
-  version: '0'
-  source:
-    type: stdlib
-- name: i18n
-  version: '1.10'
-  source:
-    type: git
-    name: ruby/gem_rbs_collection
-    revision: 8e1f19e0c8768b6bac2815fe65a3310298ba400e
-    remote: https://github.com/ruby/gem_rbs_collection.git
-    repo_dir: gems
-- name: listen
-  version: '3.2'
-  source:
-    type: git
-    name: ruby/gem_rbs_collection
-    revision: 8e1f19e0c8768b6bac2815fe65a3310298ba400e
-    remote: https://github.com/ruby/gem_rbs_collection.git
-    repo_dir: gems
-- name: parallel
-  version: '1.20'
-  source:
-    type: git
-    name: ruby/gem_rbs_collection
-    revision: 8e1f19e0c8768b6bac2815fe65a3310298ba400e
-    remote: https://github.com/ruby/gem_rbs_collection.git
-    repo_dir: gems
-- name: prime
-  version: '0'
-  source:
-    type: stdlib
-- name: rainbow
-  version: '3.0'
-  source:
-    type: git
-    name: ruby/gem_rbs_collection
-    revision: 8e1f19e0c8768b6bac2815fe65a3310298ba400e
-    remote: https://github.com/ruby/gem_rbs_collection.git
-    repo_dir: gems
-- name: singleton
-  version: '0'
-  source:
-    type: stdlib
-- name: time
-  version: '0'
-  source:
-    type: stdlib
-- name: uri
-  version: '0'
-  source:
-    type: stdlib
-- name: monitor
-  version: '0'
-  source:
-    type: stdlib
-- name: logger
-  version: '0'
-  source:
-    type: stdlib
-- name: mutex_m
-  version: '0'
-  source:
-    type: stdlib
-- name: pathname
-  version: '0'
-  source:
-    type: stdlib
+---
+sources:
+- name: ruby/gem_rbs_collection
+  remote: https://github.com/ruby/gem_rbs_collection.git
+  revision: main
+  repo_dir: gems
+path: ".gem_rbs_collection"
+gems:
+- name: net-http
+  version: '0'
+  source:
+    type: stdlib
+- name: logger
+  version: '0'
+  source:
+    type: stdlib
+- name: ast
+  version: '2.4'
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 347858a6750d478f6cf1285b4ebd6ae945af2609
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
+- name: forwardable
+  version: '0'
+  source:
+    type: stdlib
+- name: i18n
+  version: '1.10'
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 347858a6750d478f6cf1285b4ebd6ae945af2609
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
+- name: listen
+  version: '3.2'
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 347858a6750d478f6cf1285b4ebd6ae945af2609
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
+- name: minitest
+  version: '0'
+  source:
+    type: stdlib
+- name: parallel
+  version: '1.20'
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 347858a6750d478f6cf1285b4ebd6ae945af2609
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
+- name: prime
+  version: '0'
+  source:
+    type: stdlib
+- name: rainbow
+  version: '3.0'
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 347858a6750d478f6cf1285b4ebd6ae945af2609
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
+- name: singleton
+  version: '0'
+  source:
+    type: stdlib
+- name: uri
+  version: '0'
+  source:
+    type: stdlib
+- name: timeout
+  version: '0'
+  source:
+    type: stdlib
+- name: monitor
+  version: '0'
+  source:
+    type: stdlib
+- name: mutex_m
+  version: '0'
+  source:
+    type: stdlib

data/rbs_collection.yaml

@@ -1,17 +1,21 @@
-# Download sources
-sources:
-  - name: ruby/gem_rbs_collection
-    remote: https://github.com/ruby/gem_rbs_collection.git
-    revision: main
-    repo_dir: gems
-
-# A directory to install the downloaded RBSs
-path: .gem_rbs_collection
-
-gems:
-  # Skip loading rbs gem's RBS.
-  # It's unnecessary if you don't use rbs as a library.
-  - name: rbs
-    ignore: true
-  - name: discorb
-    ignore: true
+# Download sources
+sources:
+  - name: ruby/gem_rbs_collection
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    revision: main
+    repo_dir: gems
+
+# A directory to install the downloaded RBSs
+path: .gem_rbs_collection
+
+gems:
+  # Skip loading rbs gem's RBS.
+  # It's unnecessary if you don't use rbs as a library.
+  - name: rbs
+    ignore: true
+  - name: discorb
+    ignore: true
+  - name: net-http
+  - name: logger
+  - name: activesupport
+    ignore: true

data/sig/async.rbs

@@ -1,5 +1,11 @@
-module Async
-  class Task[T]
-    def wait: () -> T
-  end
-end
+module Async
+  class Task[T]
+    def wait: -> T
+  end
+
+  module WebSocket
+    class Connection
+      def initialize: (untyped, ?untyped, response: untyped, **untyped) -> void
+    end
+  end
+end

data/sig/discorb/activity.rbs

@@ -0,0 +1,24 @@
+module Discorb
+  #
+  # Represents an activity for Gateway Command.
+  class Activity
+    TYPES: untyped
+
+    #
+    # Initializes a new Activity.
+    #
+    # @param [String] name The name of the activity.
+    # @param [:playing, :streaming, :listening, :watching, :competing] type The type of activity.
+    # @param [String] url The URL of the activity.
+    def initialize: (String name, ?Symbol `type`, ?String? url) -> void
+
+    #
+    # Converts the activity to a hash.
+    #
+    # @return [Hash] A hash representation of the activity.
+    def to_hash: -> Discorb::json
+
+    %a{pure}
+    def inspect: -> String
+  end
+end

data/sig/discorb/allowed_mentions.rbs

@@ -0,0 +1,45 @@
+module Discorb
+  #
+  # Represents a allowed mentions in a message.
+  class AllowedMentions
+    #
+    # Initializes a new instance of the AllowedMentions class.
+    #
+    # @param [Boolean] everyone Whether to allow @everyone or @here.
+    # @param [Boolean, Array<Discorb::Role>] roles The roles to allow, or false to disable.
+    # @param [Boolean, Array<Discorb::User>] users The users to allow, or false to disable.
+    # @param [Boolean] replied_user Whether to ping the user that sent the message to reply.
+    def initialize: (
+      ?everyone: bool?,
+      ?roles: (bool | ::Array[Discorb::Role])?,
+      ?users: (bool | ::Array[Discorb::User])?,
+      ?replied_user: bool?
+    ) -> void
+
+    %a{pure}
+    def inspect: -> String
+
+    #
+    # Converts the object to a hash.
+    # @private
+    #
+    # @param [Discorb::AllowedMentions, nil] other The object to merge.
+    #
+    # @return [Hash] The hash.
+    def to_hash: (?Discorb::AllowedMentions? other) -> ::Hash[untyped, untyped]
+
+    def nil_merge: (*untyped args) -> untyped
+
+    # @return [Boolean] Whether to allow @everyone or @here.
+    attr_accessor everyone: bool?
+
+    # @return [Boolean, Array<Discorb::Role>] The roles to allow, or false to disable.
+    attr_accessor roles: (bool | ::Array[Discorb::Role])?
+
+    # @return [Boolean, Array<Discorb::User>] The users to allow, or false to disable.
+    attr_accessor users: (bool | ::Array[Discorb::User])?
+
+    # @return [Boolean] Whether to ping the user that sent the message to reply.
+    attr_accessor replied_user: bool?
+  end
+end