discorb 0.17.0 → 0.18.1

data/examples/commands/message.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "discorb"
 require "json"
 
@@ -22,25 +23,28 @@ client.once :standby do
 end
 
 def bookmark_channel(guild)
-  guild.channels.find { |c| c.is_a?(Discorb::TextChannel) && c.name == "bookmarks" }
+  guild.text_channels.find { |c| c.name == "bookmarks" }
 end
 
 def build_embed_from_message(message)
   embed = Discorb::Embed.new
   embed.description = message.content
-  embed.author = Discorb::Embed::Author.new(message.author.to_s_user, icon: message.author.avatar.url)
+  embed.author = Discorb::Embed::Author.new(message.author.to_s, icon: message.author.avatar.url)
   embed.timestamp = message.timestamp
   embed.footer = Discorb::Embed::Footer.new("ID: #{message.id}")
   embed
 end
 
 client.message_command({
-  default: "Bookmark",
-  ja: "ブックマーク",
-}) do |interaction, message|
+                         default: "Bookmark",
+                         ja: "ブックマーク",
+                       }) do |interaction, message|
+  next unless interaction.guild
+
   unless channel = bookmark_channel(interaction.guild)
     interaction.post(
-      localizations[:context_command][:not_found][interaction.locale] || localizations[:context_command][:not_found][:en],
+      localizations[:context_command][:not_found][interaction.locale] ||
+      localizations[:context_command][:not_found][:en],
       ephemeral: true,
     )
     next
@@ -50,7 +54,8 @@ client.message_command({
     embed: build_embed_from_message(message),
   ).wait
   interaction.post(
-    localizations[:context_command][:done][interaction.locale] || localizations[:context_command][:done][:en], ephemeral: true,
+    localizations[:context_command][:done][interaction.locale] || localizations[:context_command][:done][:en],
+    ephemeral: true,
   )
 end
 

data/examples/commands/permission.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "discorb"
 
 client = Discorb::Client.new
@@ -9,7 +10,7 @@ end
 
 client.slash(
   "admin", "You can run this command if you have Administrator permission",
-  dm: false,
+  dm_permission: false,
   default_permission: Discorb::Permission.from_keys(:administrator),
 ) do |interaction, _name|
   interaction.post("Hello, admin!")

data/examples/commands/slash.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "discorb"
 
 client = Discorb::Client.new
@@ -16,27 +17,30 @@ client.once :standby do
   puts "Logged in as #{client.user}"
 end
 
-client.slash({
-  default: "greet",
-  ja: "挨拶",
-}, {
-  default: "Bot greets. Cute OwO",
-  ja: "Botが挨拶します。かわいいね",
-}, {
-  "name" => {
-    name_localizations: {
-      ja: "名前",
-    },
-    description: {
-      default: "The name to greet.",
-      ja: "挨拶する人の名前。",
+client.slash(
+  {
+    default: "greet",
+    ja: "挨拶",
+  }, {
+    default: "Bot greets. Cute OwO",
+    ja: "Botが挨拶します。かわいいね",
+  }, {
+    "name" => {
+      name_localizations: {
+        ja: "名前",
+      },
+      description: {
+        default: "The name to greet.",
+        ja: "挨拶する人の名前。",
+      },
+      type: :string,
+      optional: true,
     },
-    type: :string,
-    optional: true,
-  },
-}) do |interaction, name|
+  }
+) do |interaction, name|
   interaction.post(
-    format((localizations[:localized][:text][interaction.locale] || localizations[:localized][:text][:en]), name || interaction.target.to_s_user),
+    format((localizations[:localized][:text][interaction.locale] || localizations[:localized][:text][:en]),
+           name || interaction.user.to_s),
     ephemeral: true,
   )
 end

data/examples/commands/user.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "discorb"
 
 localizations = {
@@ -24,26 +25,28 @@ client.once :standby do
   puts "Logged in as #{client.user}"
 end
 
-client.user_command({
-  default: "info",
-  ja: "詳細",
-}) do |interaction|
+client.user_command(
+  {
+    default: "info",
+    ja: "詳細",
+  }
+) do |interaction, user|
   field_name = localizations[:info][:fields][interaction.locale] || localizations[:info][:fields][:en]
   interaction.post(
     embed: Discorb::Embed.new(
-      format((localizations[:info][:title][interaction.locale] || localizations[:info][:title][:en]), interaction.target.to_s_user),
+      format((localizations[:info][:title][interaction.locale] || localizations[:info][:title][:en]),
+             user.to_s),
       fields: [
-        Discorb::Embed::Field.new(field_name[0], interaction.target.to_s_user),
-        Discorb::Embed::Field.new(field_name[1], interaction.target.id),
+        Discorb::Embed::Field.new(field_name[0], user.to_s),
+        Discorb::Embed::Field.new(field_name[1], user.id),
         Discorb::Embed::Field.new(
           field_name[2],
-          (localizations[:info][:yn][interaction.locale] || localizations[:info][:yn][:en])[interaction.target.bot? ? 0 : 1]
+          (localizations[:info][:yn][locale] || localizations[:info][:yn][:en])[user.bot? ? 0 : 1]
         ),
-        Discorb::Embed::Field.new(field_name[3], interaction.target.joined_at.to_df("F")),
-        Discorb::Embed::Field.new(field_name[4], interaction.target.created_at.to_df("F")),
+        Discorb::Embed::Field.new(field_name[3], user.joined_at.to_df("F")),
+        Discorb::Embed::Field.new(field_name[4], user.created_at.to_df("F")),
       ],
-      thumbnail: interaction.target.avatar&.url,
-
+      thumbnail: user.avatar&.url,
     ), ephemeral: true,
   )
 end

data/examples/components/authorization_button.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "discorb"
 
 client = Discorb::Client.new
@@ -36,7 +37,7 @@ end
 client.on :button_click do |response|
   if response.custom_id.start_with?("auth:")
     id = response.custom_id.delete_prefix("auth:")
-    response.fired_by.add_role(id).wait
+    response.user.add_role(id).wait
     response.post("You got your role!\nHere's your role: <@&#{id}>", ephemeral: true)
   end
 end

data/examples/components/select_menu.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "discorb"
 
 client = Discorb::Client.new
@@ -41,7 +42,9 @@ client.on :message do |message|
   next if message.author.bot?
   next unless message.content == "!ruby"
 
-  options = SECTIONS.map.with_index { |section, i| Discorb::SelectMenu::Option.new("Page #{i + 1}", "sections:#{i}", description: section[0]) }
+  options = SECTIONS.map.with_index do |section, i|
+    Discorb::SelectMenu::Option.new("Page #{i + 1}", "sections:#{i}", description: section[0])
+  end
   message.channel.post(
     "Select a section", components: [Discorb::SelectMenu.new("sections", options)],
   )

data/examples/extension/main.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "discorb"
 require_relative "message_expander"
 

data/examples/extension/message_expander.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "discorb"
 
 #

data/examples/sig/commands/message.rbs

@@ -0,0 +1,5 @@
+class Object
+  def build_embed_from_message: (Discorb::Message message) -> Discorb::Embed
+
+  def bookmark_channel: (Discorb::Guild guild) -> Discorb::TextChannel?
+end

data/examples/simple/eval.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "discorb"
 
 client = Discorb::Client.new

data/examples/simple/ping_pong.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "discorb"
 
 client = Discorb::Client.new

data/examples/simple/rolepanel.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
+
 require "discorb"
 intents = Discorb::Intents.new
 intents.members = true
+
 client = Discorb::Client.new(intents: intents)
 
 def convert_role(guild, string)
@@ -15,6 +17,8 @@ client.once :standby do
 end
 
 client.on :reaction_add do |event|
+  next unless event.guild
+  next unless event.member
   next unless event.emoji.value.end_with?(0x0000fe0f.chr("utf-8") + 0x000020e3.chr("utf-8"))
   next if event.member.bot?
 
@@ -31,6 +35,7 @@ end
 
 client.on :reaction_remove do |event|
   next unless event.emoji.value.end_with?(0x0000fe0f.chr("utf-8") + 0x000020e3.chr("utf-8"))
+  next unless event.member
   next if event.member.bot?
 
   msg = event.fetch_message.wait
@@ -49,15 +54,21 @@ client.on :message do |message|
   next if message.author.bot?
 
   message.reply("Too many roles.") if message.content.split.length > 10
-  roles = message.content.delete_prefix("/rp ").split.map.with_index { |raw_role, index| [index, convert_role(message.guild, raw_role), raw_role] }
+  roles = message.content.delete_prefix("/rp ").split.map.with_index do |raw_role, index|
+    [index, convert_role(message.guild, raw_role), raw_role]
+  end
   if (convert_fails = roles.filter { |r| r[1].nil? }).length.positive?
     message.reply("#{convert_fails.map { |r| r[2] }.join(", ")} is not a role.")
     next
   end
-  rp_msg = message.channel.post(embed: Discorb::Embed.new(
-                                  "Role panel",
-                                  roles.map.with_index(1) { |r, index| "#{index}\ufe0f\u20e3#{r[1].mention}" }.join("\n")
-                                )).wait
+  rp_msg = message.channel.post(
+    embed: Discorb::Embed.new(
+      "Role panel",
+      roles.map.with_index(1) do |r, index|
+        "#{index}\ufe0f\u20e3#{r[1].mention}"
+      end.join("\n")
+    ),
+  ).wait
   1.upto(roles.length).each do |i|
     rp_msg.add_reaction(Discorb::UnicodeEmoji["#{i}\ufe0f\u20e3"]).wait
   end

data/examples/simple/shard.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
+
 require "discorb"
 
-client = Discorb::Client.new(log: Logger.new($stdout))
+client = Discorb::Client.new(logger: Logger.new($stderr))
 
 client.once :standby do
   puts "Logged in as #{client.user}"

data/examples/simple/wait_for_message.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "discorb"
 
 client = Discorb::Client.new
@@ -12,6 +13,8 @@ client.on :message do |message|
   next unless message.content == "!quiz"
 
   operator = %i[+ - *].sample
+  next unless operator
+
   num1 = rand(1..10)
   num2 = rand(1..10)
 

data/exe/discorb

@@ -40,8 +40,8 @@ require "bundler/setup" if options[:bundler]
 
 command = ARGV.shift
 
-begin
-  require "discorb/exe/#{command}"
-rescue LoadError
+unless $LOAD_PATH.resolve_feature_path("discorb/exe/#{command}.rb")
   warn "Unknown subcommand: #{command}"
+  abort
 end
+require "discorb/exe/#{command}"

data/lib/discorb/allowed_mentions.rb

@@ -23,7 +23,7 @@ module Discorb
     # @param [Boolean] replied_user Whether to ping the user that sent the message to reply.
     #
     def initialize(everyone: nil, roles: nil, users: nil, replied_user: nil)
-      @everyone = everyone
+      @everyone = !everyone.nil?
       @roles = roles
       @users = users
       @replied_user = replied_user

data/lib/discorb/app_command/command.rb

@@ -7,7 +7,7 @@ module Discorb
     # @abstract
     #
     class Command < DiscordModel
-      # @return [Hash{Symbol => String}] The name of the command.
+      # @return [Hash{String => String}] The name of the command.
       attr_reader :name
       # @return [Array<#to_s>] The guild ids that the command is enabled in.
       attr_reader :guild_ids
@@ -35,13 +35,13 @@ module Discorb
       # @private
       #
       # @param [String, Hash{Symbol => String}] name The name of the command.
-      # @param [Array<#to_s>] guild_ids The guild ids that the command is enabled in.
+      # @param [Array<#to_s>, false, nil] guild_ids The guild ids that the command is enabled in.
       # @param [Proc] block The block of the command.
-      # @param [:chat_input, :user, :message] type The type of the command.
+      # @param [Integer] type The type of the command.
       # @param [Boolean] dm_permission Whether the command is enabled in DMs.
       # @param [Discorb::Permission] default_permission The default permission of the command.
       #
-      def initialize(name, guild_ids, block, type, dm_permission = nil, default_permission = nil)
+      def initialize(name, guild_ids, block, type, dm_permission = true, default_permission = nil) # rubocop:disable Style/OptionalBooleanParameter
         @name = name.is_a?(String) ? { "default" => name } : ApplicationCommand.modify_localization_hash(name)
         @guild_ids = guild_ids&.map(&:to_s)
         @block = block
@@ -100,7 +100,7 @@ module Discorb
         # @param [Hash{String => Hash}] options The options of the command.
         # @param [Array<#to_s>] guild_ids The guild ids that the command is enabled in.
         # @param [Proc] block The block of the command.
-        # @param [:chat_input, :user, :message] type The type of the command.
+        # @param [Integer] type The type of the command.
         # @param [Discorb::ApplicationCommand::Command, nil] parent The parent command.
         # @param [Boolean] dm_permission Whether the command is enabled in DMs.
         # @param [Discorb::Permission] default_permission The default permission of the command.
@@ -195,6 +195,10 @@ module Discorb
               ret[:min_value] = value[:range].begin
               ret[:max_value] = value[:range].end
             end
+            if value[:length]
+              ret[:min_length] = value[:length].begin
+              ret[:max_length] = value[:length].end
+            end
             ret
           end
           {
@@ -213,12 +217,9 @@ module Discorb
       # Represents the command with subcommands.
       #
       class GroupCommand < Command
-        # @return [Array<
-        #     Discorb::ApplicationCommand::Command::ChatInputCommand,
-        #     Discorb::ApplicationCommand::Command::SubcommandGroup
-        #   >] The subcommands of the command.
+        # @return [Array<Discorb::ApplicationCommand::Command>] The subcommands of the command.
         attr_reader :commands
-        # @return [String] The description of the command.
+        # @return [Hash{String => String}] The description of the command.
         attr_reader :description
 
         #
@@ -228,13 +229,12 @@ module Discorb
         # @param [String, Hash{Symbol => String}] name The name of the command.
         # @param [String, Hash{Symbol => String}] description The description of the command.
         # @param [Array<#to_s>] guild_ids The guild ids that the command is enabled in.
-        # @param [:chat_input, :user, :message] type The type of the command.
         # @param [Discorb::Client] client The client of the command.
         # @param [Boolean] dm_permission Whether the command is enabled in DMs.
         # @param [Discorb::Permission] default_permission The default permission of the command.
         #
-        def initialize(name, description, guild_ids, type, client, dm_permission, default_permission)
-          super(name, guild_ids, block, type, dm_permission, default_permission)
+        def initialize(name, description, guild_ids, client, dm_permission, default_permission)
+          super(name, guild_ids, block, 1, dm_permission, default_permission)
           @description = if description.is_a?(String)
               {
                 "default" => description,
@@ -282,9 +282,9 @@ module Discorb
         #
         # @see file:docs/application_command.md Application Commands
         #
-        def group(command_name, description, &block)
-          command = Discorb::ApplicationCommand::Command::SubcommandGroup.new(command_name, description, @name, @client)
-          command.then(&block) if block_given?
+        def group(command_name, description)
+          command = Discorb::ApplicationCommand::Command::SubcommandGroup.new(command_name, description, self, @client)
+          yield command if block_given?
           @commands << command
           command
         end
@@ -368,7 +368,7 @@ module Discorb
         # @param [Discorb::ApplicationCommand::Command::GroupCommand] parent The parent command.
         # @param [Discorb::Client] client The client.
         def initialize(name, description, parent, client)
-          super(name, description, [], 1, client, nil, nil)
+          super(name, description, [], client, nil, nil)
 
           @commands = []
           @parent = parent

data/lib/discorb/app_command/handler.rb

@@ -6,6 +6,8 @@ module Discorb
     # Module to handle application commands.
     #
     module Handler
+      # @type instance: Discorb::Client
+
       #
       # Add new top-level command.
       #
@@ -21,6 +23,7 @@ module Discorb
       #
       #   | Key | Type | Description |
       #   | --- | --- | --- |
+      #   | `:name_localizations` | Hash{Symbol => String} | Localizations of option name. |
       #   | `:description` | `String` \| `Hash{Symbol => String}` |
       #     Description of the option. If hash is passed, it must be a pair of Language code and description,
       #     and `:default` key is required. You can use `_` instead of `-` in language code. |
@@ -36,6 +39,7 @@ module Discorb
       #   | `:channel_types` | `Array<Class<Discorb::Channel>>` | Type of the channel option. |
       #   | `:autocomplete` | `Proc` | Autocomplete function. |
       #   | `:range` | `Range` | Range of the option. Only valid for numeric options. (`:int`, `:float`) |
+      #   | `:length` | `Range` | Range of length of the option. Only valid for `:string`. |
       #
       # @param [Array<#to_s>, false, nil] guild_ids
       #  Guild IDs to set the command to. `false` to global command, `nil` to use default.
@@ -95,14 +99,20 @@ module Discorb
       # @see file:docs/application_command.md Application Commands
       # @see file:docs/cli/setup.md CLI: setup
       #
-      def slash_group(command_name, description, guild_ids: nil, dm_permission: true, default_permission: nil, &block)
+      def slash_group(command_name, description, guild_ids: nil, dm_permission: true, default_permission: nil)
         command_name = { default: command_name } if command_name.is_a?(String)
         description = { default: description } if description.is_a?(String)
         command_name = ApplicationCommand.modify_localization_hash(command_name)
         description = ApplicationCommand.modify_localization_hash(description)
-        command = Discorb::ApplicationCommand::Command::GroupCommand.new(command_name, description, guild_ids, nil,
-                                                                         self, dm_permission, default_permission)
-        command.then(&block) if block_given?
+        command = Discorb::ApplicationCommand::Command::GroupCommand.new(
+          command_name,
+          description,
+          guild_ids,
+          self,
+          dm_permission,
+          default_permission
+        )
+        yield command if block_given?
         @commands << command
         command
       end
@@ -125,8 +135,14 @@ module Discorb
       def message_command(command_name, guild_ids: nil, dm_permission: true, default_permission: nil, &block)
         command_name = { default: command_name } if command_name.is_a?(String)
         command_name = ApplicationCommand.modify_localization_hash(command_name)
-        command = Discorb::ApplicationCommand::Command.new(command_name, guild_ids, block, 3, dm_permission,
-                                                           default_permission)
+        command = Discorb::ApplicationCommand::Command.new(
+          command_name,
+          guild_ids,
+          block,
+          3,
+          dm_permission,
+          default_permission
+        )
         @commands << command
         command
       end

data/lib/discorb/audit_logs.rb

@@ -105,10 +105,11 @@ module Discorb
       # * `:thread_create`
       # * `:thread_update`
       # * `:thread_delete`
+      # * `:application_command_permission_update``
       attr_reader :type
       # @return [Discorb::AuditLog::Entry::Changes] The changes in this entry.
       attr_reader :changes
-      # @return [Discorb::Channel, Discorb::Role, Discorb::Member, Discorb::Guild, Discorb::Message]
+      # @return [Discorb::Channel, Discorb::Role, Discorb::Member, Discorb::Guild, Discorb::Message, Discorb::Snowflake]
       #   The target of the entry.
       attr_reader :target
       # @return [Hash{Symbol => Object}] The optional data for this entry.
@@ -170,6 +171,11 @@ module Discorb
         110 => :thread_create,
         111 => :thread_update,
         112 => :thread_delete,
+        121 => :application_command_permission_update,
+        140 => :automod_rule_create,
+        141 => :automod_rule_update,
+        142 => :automod_rule_delete,
+        143 => :automod_block_message,
       }.freeze
 
       #
@@ -195,14 +201,14 @@ module Discorb
         @id = Snowflake.new(data[:id])
         @user_id = Snowflake.new(data[:user_id])
         @target_id = Snowflake.new(data[:target_id])
-        @type = EVENTS[data[:action_type]]
+        @type = EVENTS[data[:action_type]] || :unknown
         @target = CONVERTERS[@type.to_s.split("_")[0].to_sym]&.call(client, @target_id, @gui)
         @target ||= Snowflake.new(data[:target_id])
         @changes = data[:changes] && Changes.new(data[:changes])
         @reason = data[:reason]
         data[:options]&.each do |option, value|
           define_singleton_method(option) { value }
-          if option.end_with?("_id")
+          if option.end_with?("_id") && CONVERTERS.key?(option.to_s.split("_")[0].to_sym)
             define_singleton_method(option.to_s.sub("_id", "")) do
               CONVERTERS[option.to_s.split("_")[0].to_sym]&.call(client, value, @guild_id)
             end