discorb 0.9.5 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39902a57677adf3ce903678e58060ee04da318617ba81611546772131c9d1696
-  data.tar.gz: 6f0f17d2230a19b79f6330cda2d567f704f8ffe44ca59e8938cc0ec0f32dfb35
+  metadata.gz: 5ea8e05d77b37b7a269b43dff64422e3d49b08d6c09a639d40dc019baaa26a8c
+  data.tar.gz: c8ea6f45759aaf22112f6400f7d950fb09f427f98d01302a18094ad3d6a3ae08
 SHA512:
-  metadata.gz: 453b9228e5afca3d9b206b54aa3f34f97b3a4c6d6ade46034fe3d0fd8620c1069d0288fa672bc20cdcce2816405f925d92a9fcf6012bc73d5a09fdb4bc7c0335
-  data.tar.gz: 11920dcfc13754975686abe69504af19f81331fa684fd5d51aa1065ff426300dfa90ef373c626a84f1c3533e511dd0f35641126f020c1838bc7262538d6fa505
+  metadata.gz: b3f5e77107192aec6943087251c5b61ab1476eb421ddb0297d61178e5146466a5a59c50f4665a2b81c362d927765259142ed1bc08ed9c07e3018102becab3294
+  data.tar.gz: b88f74d4f3e0f0025f7086e95c2b1e2b96ed19a35a258a72dd29f1814986465ac9fdd8443f920fe8b7dcd610d35871b59354ba8cc6b478bcf883797cd17d463d

data/Changelog.md

@@ -1,260 +1,309 @@
-# Changelog
-
-## v0.0.1
-
-- Initial release
-
-## v0.0.2
-
-- Fix: Fix rubygems description
-
-## v0.0.3
-
-- Fix: Fix no dependencies
-
-## v0.0.4
-
-- Fix: Fix NoMethodError by webhook message
-- Add: Add `#author` to webhook message
-- Fix: Add `#bot?` to webhook author
-
-## v0.0.5
-
-- Fix: Fix GitHub link
-- Change: Internet to HTTP
-
-## v0.0.6
-
-- Fix: Fix error in client without members intent
-- Add: Add ThreadChannel::News
-- Add: Add official discord link
-
-## v0.0.7
-
-- Fix: Fix `member_xxx` event
-
-## 0.0.8
-
-- Delete: Delete task parameter
-
-## 0.1.0
-
-- Add: Add `User#created_at`
-- Add: Add `Member#to_s_user`
-- Add: Add `DefaultAvatar`
-- Add: Support application commands
-- Add: Add `Client#ping`
-- Add: Allow `String` for `Embed#initialize`
-- Change: Change log format
-
-## 0.2.0
-
-- Fix: Fix unused dependency
-- Add: Add `Client#close!`
-- Add: Add discord-irb
-
-## 0.2.1
-
-- Fix: Fix NoMethodError in reaction event
-- Add: Add Changelog.md to document
-
-## 0.2.2 (yanked)
-
-- Add: Add `Snowflake#to_str`
-
-## 0.2.3
-
-- Fix: Fix critical error
-
-## 0.2.4
-
-- Fix: Fix error in `Embed#image=`, `Embed#thumbnail=`
-
-## 0.2.5
-
-- Add: Add way to add event listener
-- Change: Move document to https://discorb-lib.github.io/
-
-## 0.3.0
-
-- Add: Improve CLI tools
-- Add: Add `discorb init`
-- Change: Change `discord-irb` to `discorb irb`
-  
-## 0.3.1
-
-- Add: Add `discorb show`
-- Fix: Fix documenting
-
-## 0.4.0
-
-- Add: Add `discorb setup`
-- Add: Add `discorb run`
-- Add: Add realtime documentation
-
-## 0.4.1
-
-- Add: Add `-s` option to `discorb run`
-  
-## 0.4.2
-
-- Fix: Fix error in `discorb run`
-  
-## 0.5.0
-
-- Change: Use zlib stream instead
-- Add: Add tutorials
-- Add: Add ratelimit handler
-- Change: Make `--git` option in `discorb init` false
-  
-## 0.5.1
-
-- Add: Can use block for defining group commands
-- Fix: Fix bug in subcommands
-- Fix: Fix bug in receiving commands
-
-## 0.5.2
-
-- Fix: Fix bug of registering commands
-- Add: Add way to register commands in Extension
-
-## 0.5.3
-
-- Add: Add way to handle raw events with `event_xxx`
-- Add: Add `Client#session_id`
-- Add: Add `Connectable`
-- Fix: Fix error by sending DM
-
-## 0.5.4
-
-- Fix: Fix issue of receiving component events
-
-## 0.5.5
-
-- Fix: Fix some bugs
-
-## 0.5.6
-
-- Add: Raise error when intents are invalid
-- Fix: Fix Emoji#==
-
-## 0.6.0
-
-- Fix: Fix issue with client with no guilds
-- Add: Add rbs (experimental)
-- Add: Add `-t`, `--token` option to `discorb run`
-- Add: Add `-g`, `--guild` option to `discorb setup`
-- Change: Use `Async::Task<R>` instead of `R` in return value
-
-## 0.6.1
-
-- Change: Rename `Event#discriminator` to `Event#metadata`
-- Add: Add `:override` to `Client#on`
-
-## 0.7.0
-
-- Add: Add `error` event
-- Fix: Fix some issues with client without guild intent
-- Add: Add alias for `#fired_by`
-- Change!: Change block usage of `ApplicationCommand::Handler#group`
-
-```ruby
-# before
-client.slash_group do
-  slash "help", "Help" do |interaction|
-    # ...
-  end
-end
-
-# after
-client.slash_group do |group|
-  group.slash "help", "Help" do |interaction|
-    # ...
-  end
-end
-
-```
-
-## 0.7.1
-
-- Fix: Fix error of responding to interaction
-  
-## 0.7.2
-
-- Add: Add `Member#owner?`
-- Fix: Fix `Member#permissions`
-- Add: Add `Member#guild_permissions` as alias of `Member#permissions`
-- Add: Add default role to `Member#roles`
-- Fix: Fix error in `Integration#_set_data`
-- Change: Reverse `Member#roles`
-
-## 0.7.3
-
-- Add: Improve `discorb init`
-
-## 0.7.4 (yanked)
-
-- Fix: Fix disconnected client
-  
-## 0.7.5 (yanked)
-
-- Fix: Fix critical error
-
-## 0.7.6
-
-- Fix: Fix heartbeating error
-
-## 0.8.0
-
-- Add: Add `Guild#fetch_members`
-- Add: Add `Guild#fetch_member_list` as alias of `Guild#fetch_members`
-- Add: Add `Intents#to_h`
-- Add: Add `fetch_member` parameter to `Client#initialize`; Note you should set `false` if your bot doesn't have `GUILD_MEMBERS` intent
-- Change: Change `ready` to `standby` event
-- Change: `ready` will be fired when client receives `READY` event
-
-## 0.8.1
-
-- Add: Add FAQ
-- Fix: Fix sending files
-- Add: Add `File.from_string`
-- Fix: Fix `Client#update_presence`
-- Add: Add information in `discorb run -d`
-
-## 0.8.2
-
-- Fix: Fix `Client#initialize`
-
-## 0.9.0
-
-- Delete: Delete `-d` parameter from `discorb run`; This is caused by segement fault error.
-- Change: Rename `-t`, `--token` to `-e`, `--env` parameter
-- Add: Add `-t`, `--title` parameter to `discorb run`
-- Add: Add `title` parameter to `Client#initialize`
-
-## 0.9.1
-
-- Fix: Fix member fetching
-
-## 0.9.2 (yanked)
-
-- Add: Make `Async::Task#inspect` shorter
-- Add: `SourceResponse#post` will return message now
-- Fix: Fix member caching
-
-## 0.9.3
-
-- Fix: Fix interaction responding
-
-## 0.9.4
-
-- Change: `Messageable#typing` with block is now synchronous
-- Fix: Fix some issues in document
-- Add: Add some attributes to `Message`
-- Fix: Fix guild parameter in message of message command
-
-## 0.9.5
-
-- Fix: Fix editing message
-- Add: Add `required` in slash command argument
-- Add: Add `default` in slash command argument
+# @title Changelog
+
+# Changelog
+
+## v0.10
+
+### v0.10.2
+
+- Change: `discorb init` is now `discorb new`
+- Add: Add `:channel_types` parameter to `ApplicationCommand::Handler#slash` and some
+
+### v0.10.1
+
+- Add: Add `Client#extensions`
+- Change: `Client#load_extension` allows instance of `Extension`
+- Add: Add `-b` option to `discorb run`
+
+### v0.10.0
+
+- Change: Sort versions
+- Change: Snowflake is now String
+- Change: Extension is now Class
+- Add: Add `SelectMenu#disabled=`
+
+## v0.9
+
+### v0.9.6
+
+- Add: Add `Messageable#send_message` as alias of `Messageable#post`
+- Fix: Fix interaction responding with updating message
+- Fix: Fix `MessageComponentInteraction#message`
+
+### v0.9.5
+
+- Fix: Fix editing message
+- Add: Add `required` in slash command argument
+- Add: Add `default` in slash command argument
+
+### v0.9.4
+
+- Change: `Messageable#typing` with block is now synchronous
+- Fix: Fix some issues in document
+- Add: Add some attributes to `Message`
+- Fix: Fix guild parameter in message of message command
+
+### v0.9.3
+
+- Fix: Fix interaction responding
+
+### v0.9.2 (yanked)
+
+- Add: Make `Async::Task#inspect` shorter
+- Add: `SourceResponse#post` will return message now
+- Fix: Fix member caching
+
+### v0.9.1
+
+- Fix: Fix member fetching
+
+### v0.9.0
+
+- Delete: Delete `-d` parameter from `discorb run`; This is caused by segement fault error.
+- Change: Rename `-t`, `--token` to `-e`, `--env` parameter
+- Add: Add `-t`, `--title` parameter to `discorb run`
+- Add: Add `title` parameter to `Client#initialize`
+
+## v0.8
+
+### v0.8.2
+
+- Fix: Fix `Client#initialize`
+
+### v0.8.1
+
+- Add: Add FAQ
+- Fix: Fix sending files
+- Add: Add `File.from_string`
+- Fix: Fix `Client#update_presence`
+- Add: Add information in `discorb run -d`
+
+### v0.8.0
+
+- Add: Add `Guild#fetch_members`
+- Add: Add `Guild#fetch_member_list` as alias of `Guild#fetch_members`
+- Add: Add `Intents#to_h`
+- Add: Add `fetch_member` parameter to `Client#initialize`; Note you should set `false` if your bot doesn't have `GUILD_MEMBERS` intent
+- Change: Change `ready` to `standby` event
+- Change: `ready` will be fired when client receives `READY` event
+
+## v0.7
+
+### v0.7.6
+
+- Fix: Fix heartbeating error
+
+### v0.7.5 (yanked)
+
+- Fix: Fix critical error
+
+### v0.7.4 (yanked)
+
+- Fix: Fix disconnected client
+
+### v0.7.3
+
+- Add: Improve `discorb init`
+
+### v0.7.2
+
+- Add: Add `Member#owner?`
+- Fix: Fix `Member#permissions`
+- Add: Add `Member#guild_permissions` as alias of `Member#permissions`
+- Add: Add default role to `Member#roles`
+- Fix: Fix error in `Integration#_set_data`
+- Change: Reverse `Member#roles`
+
+### v0.7.1
+
+- Fix: Fix error of responding to interaction
+
+### v0.7.0
+
+- Add: Add `error` event
+- Fix: Fix some issues with client without guild intent
+- Add: Add alias for `#fired_by`
+- Change!: Change block usage of `ApplicationCommand::Handler#group`
+
+```ruby
+# before
+client.slash_group do
+  slash "help", "Help" do |interaction|
+    # ...
+  end
+end
+
+# after
+client.slash_group do |group|
+  group.slash "help", "Help" do |interaction|
+    # ...
+  end
+end
+
+```
+
+## v0.6
+
+### v0.6.1
+
+- Change: Rename `Event#discriminator` to `Event#metadata`
+- Add: Add `:override` to `Client#on`
+
+### v0.6.0
+
+- Fix: Fix issue with client with no guilds
+- Add: Add rbs (experimental)
+- Add: Add `-t`, `--token` option to `discorb run`
+- Add: Add `-g`, `--guild` option to `discorb setup`
+- Change: Use `Async::Task<R>` instead of `R` in return value
+
+## v0.5
+
+### v0.5.6
+
+- Add: Raise error when intents are invalid
+- Fix: Fix Emoji#==
+
+### v0.5.5
+
+- Fix: Fix some bugs
+
+### v0.5.4
+
+- Fix: Fix issue of receiving component events
+
+### v0.5.3
+
+- Add: Add way to handle raw events with `event_xxx`
+- Add: Add `Client#session_id`
+- Add: Add `Connectable`
+- Fix: Fix error by sending DM
+
+### v0.5.2
+
+- Fix: Fix bug of registering commands
+- Add: Add way to register commands in Extension
+
+### v0.5.1
+
+- Add: Can use block for defining group commands
+- Fix: Fix bug in subcommands
+- Fix: Fix bug in receiving commands
+
+### v0.5.0
+
+- Change: Use zlib stream instead
+- Add: Add tutorials
+- Add: Add ratelimit handler
+- Change: Make `--git` option in `discorb init` false
+
+## v0.4
+
+### v0.4.2
+
+- Fix: Fix error in `discorb run`
+
+### v0.4.1
+
+- Add: Add `-s` option to `discorb run`
+
+### v0.4.0
+
+- Add: Add `discorb setup`
+- Add: Add `discorb run`
+- Add: Add realtime documentation
+
+## v0.3
+
+### v0.3.1
+
+- Add: Add `discorb show`
+- Fix: Fix documenting
+
+### v0.3.0
+
+- Add: Improve CLI tools
+- Add: Add `discorb init`
+- Change: Change `discord-irb` to `discorb irb`
+
+## v0.2
+
+### v0.2.5
+
+- Add: Add way to add event listener
+- Change: Move document to https://discorb-lib.github.io/
+
+### v0.2.4
+
+- Fix: Fix error in `Embed#image=`, `Embed#thumbnail=`
+
+### v0.2.3
+
+- Fix: Fix critical error
+
+### v0.2.2 (yanked)
+
+- Add: Add `Snowflake#to_str`
+
+### v0.2.1
+
+- Fix: Fix NoMethodError in reaction event
+- Add: Add Changelog.md to document
+
+### v0.2.0
+
+- Fix: Fix unused dependency
+- Add: Add `Client#close!`
+- Add: Add discord-irb
+
+## v0.1
+
+### v0.1.0
+
+- Add: Add `User#created_at`
+- Add: Add `Member#to_s_user`
+- Add: Add `DefaultAvatar`
+- Add: Support application commands
+- Add: Add `Client#ping`
+- Add: Allow `String` for `Embed#initialize`
+- Change: Change log format
+
+## v0.0
+
+### v0.0.8
+
+- Delete: Delete task parameter
+
+### v0.0.7
+
+- Fix: Fix `member_xxx` event
+
+### v0.0.6
+
+- Fix: Fix error in client without members intent
+- Add: Add ThreadChannel::News
+- Add: Add official discord link
+
+### v0.0.5
+
+- Fix: Fix GitHub link
+- Change: Internet to HTTP
+
+### v0.0.4
+
+- Fix: Fix NoMethodError by webhook message
+- Add: Add `#author` to webhook message
+- Fix: Add `#bot?` to webhook author
+
+### v0.0.3
+
+- Fix: Fix no dependencies
+
+### v0.0.2
+
+- Fix: Fix rubygems description
+
+### v0.0.1
+
+- Initial release
+

data/docs/application_command.md

@@ -68,6 +68,7 @@ In `options`, hash should be like this:
 | `:type` | `Object` | Type of the option. |
 | `:choice` | `Hash{String => String, Integer, Float}` | Type of the option. |
 | `:default` | `Object` | Default value of the option. |
+| `:channel_types` | `Array<Class<Discorb::Channel>>` | Type of the channel option. |
 
 `choices` should be unspecified if you don't want to use it.
 `choices` is hash like this:

data/docs/cli/init.md

@@ -1,13 +1,13 @@
-# @title CLI: discorb init
+# @title CLI: discorb new
 
-# discorb init
+# discorb new
 
 This command will create a new project in the directory.
 
 ## Usage
 
 ```bash
-discorb init [options] [dir]
+discorb new [options] [dir]
 ```
 
 ## Options

data/docs/cli/run.md

@@ -53,4 +53,8 @@ Whether to setup application commands.
 
 #### `-e`, `--env`
 
-The name of the environment variable to use for token, or just `-t` or `--token` for intractive prompt.
+The name of the environment variable to use for token, or just `-t` or `--token` for intractive prompt.
+
+#### `-b`, `--bundler`
+
+Whether to use bundler to load the script.

data/docs/extension.md

@@ -2,16 +2,16 @@
 
 # Extension
 
-Extension allows you to split your code into multiple files.
+Extension allows you to seperate your code from the main application.
+
+# @since 
 
 ## Make a new extension
 
-Make a new module, and extend {Discorb::Extension}.
+Make a new class that extends Extension.
 
 ```ruby
-module MyExtension
-  extend Discorb::Extension
-  
+class MyExtension < Discorb::Extension
   # ...
 end
 ```
@@ -21,27 +21,25 @@ end
 Use {Discorb::Extension.event} to register event, or {Discorb::Extension.once_event} to register event only once.
 
 ```ruby
-module MyExtension
-  extend Discorb::Extension
-
+class MyExtension < Discorb::Extension
   event :message do |message|
     # ...
   end
 
-  once_event :ready do |message|
+  once_event :standby do |message|
     # ...
   end
 end
 ```
 
+Note block will be binded to the extension instance.
+
 ## Register Command
 
-Since v0.5.2, {Discorb::Extension} includes {Discorb::ApplicationCommand::Handler} module, so you can register command with {Discorb::ApplicationCommand::Handler#slash} and {Discorb::ApplicationCommand::Handler#slash_group}.
+Use `Discorb::Extension.command` to register command, see {Discorb::ApplicationCommand::Handler} for more information.
 
 ```ruby
-module MyExtension
-  extend Discorb::Extension
-
+class MyExtension < Discorb::Extension
   slash("command", "Command") do |interaction|
     # ...
   end
@@ -63,18 +61,16 @@ end
 
 ## Load extension
 
-Use {Discorb::Client#extend} to load extension.
+Use {Discorb::Client#load_extension} to load extension.
 
 ```ruby
-module MyExtension
-  extend Discorb::Extension
-
+class MyExtension < Discorb::Extension
   event :message do |message|
     # ...
   end
 end
 
-client.extend MyExtension
+client.load_extension(MyExtension)
 ```
 
 ## Access Client from extension
@@ -82,10 +78,8 @@ client.extend MyExtension
 You can access {Discorb::Client} from extension with `@client`.
 
 ```ruby
-module MyExtension
-  extend Discorb::Extension
-
-  event :ready do |message|
+class MyExtension < Discorb::Extension
+  event :standby do |message|
     puts "Logged in as #{@client.user}"
   end
 end

data/docs/license.md

@@ -4,4 +4,8 @@
 
 discorb is licensed under the [MIT license](https://opensource.org/licenses/MIT).
 
+----
+
 {include:file:LICENSE.txt}
+
+----

data/docs/tutorial.md

@@ -74,7 +74,7 @@ Create a new directory and go to it.
 Open terminal and type:
 
 ```
-discorb init
+discorb new
 ```
 
 Specify `--git` if you want to use git.

data/examples/extension/main.rb

@@ -7,6 +7,6 @@ client.once :standby do
   puts "Logged in as #{client.user}"
 end
 
-client.extend(MessageExpander)
+client.load_extension(MessageExpander)
 
 client.run(ENV["DISCORD_BOT_TOKEN"])

data/examples/extension/message_expander.rb

@@ -1,9 +1,7 @@
 require "discorb"
 
-module MessageExpander
-  extend Discorb::Extension
-
-  @message_regex = Regexp.new(
+class MessageExpander < Discorb::Extension
+  @@message_regex = Regexp.new(
     '(?!<)https://(?:ptb\.|canary\.)?discord(?:app)?\.com/channels/' \
     "(?<guild>[0-9]{18})/(?<channel>[0-9]{18})/(?<message>[0-9]{18})(?!>)"
   )
@@ -11,7 +9,7 @@ module MessageExpander
   event :message do |message|
     next if message.author.bot?
 
-    message.content.to_enum(:scan, @message_regex).map { Regexp.last_match }.each do |match|
+    message.content.to_enum(:scan, @@message_regex).map { Regexp.last_match }.each do |match|
       ch = @client.channels[match[:channel]]
       next if ch.nil?
 
@@ -27,7 +25,7 @@ module MessageExpander
           author: Discorb::Embed::Author.new(
             url_message.author.name,
             url: url_message.jump_url,
-            icon: url_message.author.display_avatar.url,
+            icon: url_message.author.avatar.url,
           ),
           footer: Discorb::Embed::Footer.new(
             "#{url_message.guild.name} / #{ch.name}",

data/lib/discorb/app_command.rb

@@ -25,6 +25,7 @@ module Discorb
       #   | `:type` | `Object` | Type of the option. |
       #   | `:choice` | `Hash{String => String, Integer, Float}` | Type of the option. |
       #   | `:default` | `Object` | Default value of the option. |
+      #   | `:channel_types` | `Array<Class<Discorb::Channel>>` | Type of the channel option. |
       #
       # @param [Array<#to_s>, false, nil] guild_ids Guild IDs to set the command to. `false` to global command, `nil` to use default.
       # @param [Proc] block Command block.
@@ -238,6 +239,9 @@ module Discorb
             if value[:choices]
               ret[:choices] = value[:choices].map { |t| { name: t[0], value: t[1] } }
             end
+            if value[:channel_types]
+              ret[:channel_types] = value[:channel_types].map(&:channel_type)
+            end
             ret
           end
           {

data/lib/discorb/client.rb

@@ -52,6 +52,8 @@ module Discorb
     attr_reader :status
     # @return [Integer] The session ID of connection.
     attr_reader :session_id
+    # @return [Hash{String => Discorb::Extension}] The loaded extensions.
+    attr_reader :extensions
     # @private
     attr_reader :bottom_commands
 
@@ -97,6 +99,7 @@ module Discorb
       @status = :initialized
       @fetch_member = fetch_member
       @title = title
+      @extensions = {}
       set_default_events
     end
 
@@ -369,31 +372,38 @@ module Discorb
     #
     # Load the extension.
     #
-    # @param [Module] mod The extension to load.
+    # @param [Class, Discorb::Extension] ext The extension to load.
+    # @param [Object] ... The arguments to pass to the `ext#initialize`.
     #
-    def extend(mod)
-      if mod.respond_to?(:events)
-        @events.each_value do |event|
-          event.delete_if { |c| c.metadata[:extension] == mod.name }
-        end
-        mod.events.each do |name, events|
-          @events[name] ||= []
-          @events[name].delete_if { |c| c.metadata[:override] }
-          events.each do |event|
-            @events[name] << event
-          end
-        end
-        @commands.delete_if do |cmd|
-          cmd.respond_to? :extension and cmd.extension == mod.name
-        end
-        mod.commands.each do |cmd|
-          cmd.define_singleton_method(:extension) { mod.name }
-          @commands << cmd
+    def load_extension(ext, ...)
+      if ext.is_a?(Class)
+        raise ArgumentError, "#{ext} is not a extension" unless ext < Discorb::Extension
+        ins = ext.new(self, ...)
+      elsif ext.is_a?(Discorb::Extension)
+        ins = ext
+      else
+        raise ArgumentError, "#{ext} is not a extension"
+      end
+
+      @events.each_value do |event|
+        event.delete_if { |c| c.metadata[:extension] == ins.class.name }
+      end
+      ins.events.each do |name, events|
+        @events[name] ||= []
+        events.each do |event|
+          @events[name] << event
         end
-        @bottom_commands += mod.bottom_commands
-        mod.client = self
       end
-      super(mod)
+      @commands.delete_if do |cmd|
+        cmd.respond_to? :extension and cmd.extension == ins.name
+      end
+      ins.class.commands.each do |cmd|
+        cmd.define_singleton_method(:extension) { ins.name }
+        @commands << cmd
+      end
+      @bottom_commands += ins.class.bottom_commands
+      @extensions[ins.class.name] = ins
+      ins
     end
 
     include Discorb::Gateway::Handler

data/lib/discorb/common.rb

@@ -4,9 +4,9 @@ module Discorb
   # @return [String] The API base URL.
   API_BASE_URL = "https://discord.com/api/v9"
   # @return [String] The version of discorb.
-  VERSION = "0.9.5"
+  VERSION = "0.10.2"
   # @return [String] The user agent for the bot.
-  USER_AGENT = "DiscordBot (https://github.com/discorb-lib/discorb #{VERSION}) Ruby/#{RUBY_VERSION}"
+  USER_AGENT = "DiscordBot (https://discorb-lib.github.io #{VERSION}) Ruby/#{RUBY_VERSION}"
 
   #
   # @abstract
@@ -39,10 +39,11 @@ module Discorb
   # Represents Snowflake of Discord.
   #
   # @see https://discord.com/developers/docs/reference#snowflakes Official Discord API docs
-  class Snowflake < DiscordModel
+  class Snowflake < String
     # @private
     def initialize(value)
       @value = value.to_i
+      super(@value.to_s)
     end
 
     # @!attribute [r] timestamp
@@ -64,26 +65,6 @@ module Discorb
     #
     #   @return [Integer] Increment of snowflake.
 
-    #
-    # Stringify snowflake.
-    #
-    # @return [String] Stringified snowflake.
-    #
-    def to_s
-      @value.to_s
-    end
-
-    alias to_str to_s
-
-    #
-    # Integerize snowflake.
-    #
-    # @return [Integer] Integerized snowflake.
-    #
-    def to_i
-      @value.to_i
-    end
-
     #
     # Compares snowflake with other object.
     #

data/lib/discorb/components.rb

@@ -36,6 +36,34 @@ module Discorb
           )
         end
       end
+
+      #
+      # Convert components to a hash.
+      #
+      # @param [Array<Discorb::Component>, Array<Array<Discorb::Component>>] components Components.
+      #
+      # @return [Array<Hash>] Hash data.
+      #
+      def to_payload(components)
+        tmp_components = []
+        tmp_row = []
+        components.each do |c|
+          case c
+          when Array
+            tmp_components << tmp_row
+            tmp_row = []
+            tmp_components << c
+          when SelectMenu
+            tmp_components << tmp_row
+            tmp_row = []
+            tmp_components << [c]
+          else
+            tmp_row << c
+          end
+        end
+        tmp_components << tmp_row
+        return tmp_components.filter { |c| c.length.positive? }.map { |c| { type: 1, components: c.map(&:to_hash) } }
+      end
     end
   end
 
@@ -152,7 +180,7 @@ module Discorb
     # @return [Integer] The maximum number of values.
     attr_accessor :max_values
     # @return [Boolean] Whether the select menu is disabled.
-    attr_reader :disabled
+    attr_accessor :disabled
     alias disabled? disabled
 
     #

data/lib/discorb/exe/{init.rb → new.rb}

@@ -178,7 +178,7 @@ end
 opt = OptionParser.new <<~BANNER
                          A tool to make a new project.
 
-                         Usage: discorb init [options] [dir]
+                         Usage: discorb new [options] [dir]
 
                                    dir                        The directory to make the files in.
                        BANNER

data/lib/discorb/exe/run.rb

@@ -22,6 +22,7 @@ options = {
   log_color: nil,
   setup: nil,
   token: false,
+  bundler: :default,
 }
 opt.on("-l", "--log-level LEVEL", "Log level.") do |v|
   unless LOG_LEVELS.include? v.downcase
@@ -36,6 +37,7 @@ opt.on("-c", "--[no-]log-color", "Whether to colorize log output.") { |v| option
 opt.on("-s", "--setup", "Whether to setup application commands.") { |v| options[:setup] = v }
 opt.on("-e", "--env [ENV]", "The name of the environment variable to use for token, or just `-e` or `--env` for intractive prompt.") { |v| options[:token] = v }
 opt.on("-t", "--title TITLE", "The title of process.") { |v| options[:title] = v }
+opt.on("-b", "--[no-]bundler", "Whether to use bundler. Default to true if Gemfile exists, otherwise false.") { |v| options[:bundler] = v }
 opt.parse!(ARGV)
 
 script = ARGV[0]
@@ -54,10 +56,25 @@ elsif options[:token].nil? || options[:token] == "-"
   puts ""
 end
 
+if options[:bundler] == :default
+  dir = Dir.pwd.split("/")
+  options[:bundler] = false
+  dir.length.times.reverse_each do |i|
+    if File.exist? "#{dir[0..i].join("/")}/Gemfile"
+      options[:bundler] = true
+      break
+    end
+  end
+end
+
 ENV["DISCORB_CLI_TITLE"] = options[:title]
 
-begin
-  load script
-rescue LoadError
+if File.exist? script
+  if options[:bundler]
+    system "bundle exec ruby #{script}"
+  else
+    system "ruby #{script}"
+  end
+else
   eputs "Could not load script: \e[31m#{script}\e[91m"
 end

data/lib/discorb/extension.rb

@@ -2,65 +2,78 @@
 
 module Discorb
   #
-  # Module to make extension.
-  # extend this module to make your own extension.
+  # Abstract class to make extension.
+  # Inherit from this class to make your own extension.
   # @see file:docs/extension.md
   # @abstract
   #
-  module Extension
-    include Discorb::ApplicationCommand::Handler
-    undef setup_commands
+  class Extension
+    extend Discorb::ApplicationCommand::Handler
 
     @events = {}
-    @client = nil
 
-    #
-    # Define a new event.
-    #
-    # @param [Symbol] event_name The name of the event.
-    # @param [Symbol] id The id of the event. Used to delete the event.
-    # @param [Hash] metadata Other metadata.
-    # @param [Proc] block The block to execute when the event is triggered.
-    #
-    # @return [Discorb::Event] The event.
-    #
-    def event(event_name, id: nil, **metadata, &block)
-      raise ArgumentError, "Event name must be a symbol" unless event_name.is_a?(Symbol)
-      raise ArgumentError, "block must be a Proc" unless block.is_a?(Proc)
-
-      @events[event_name] ||= []
-      metadata[:extension] = self.name
-      @events[event_name] << Discorb::Event.new(block, id, metadata)
+    def initialize(client)
+      @client = client
     end
 
-    #
-    # Define a new once event.
-    #
-    # @param [Symbol] event_name The name of the event.
-    # @param [Symbol] id The id of the event. Used to delete the event.
-    # @param [Hash] metadata Other metadata.
-    # @param [Proc] block The block to execute when the event is triggered.
-    #
-    # @return [Discorb::Event] The event.
-    #
-    def once_event(event_name, id: nil, **metadata, &block)
-      event(event_name, id: id, once: true, **metadata, &block)
+    def events
+      return @events if @events
+      ret = {}
+      self.class.events.each do |event, handlers|
+        ret[event] = handlers.map do |handler|
+          Discorb::Event.new(Proc.new { |*args, **kwargs| instance_exec(*args, **kwargs, &handler[2]) }, handler[0], handler[1])
+        end
+      end
+      @events = ret
     end
 
-    # @return [Hash{Symbol => Array<Discorb::Event>}] The events of the extension.
-    attr_reader :events
-    # @return [Array<Discorb::ApplicationCommand::Command>] The commands of the extension.
-    attr_reader :commands
-    # @private
-    attr_reader :bottom_commands
+    class << self
+      undef setup_commands
+
+      #
+      # Define a new event.
+      #
+      # @param [Symbol] event_name The name of the event.
+      # @param [Symbol] id The id of the event. Used to delete the event.
+      # @param [Hash] metadata Other metadata.
+      #
+      # @return [Discorb::Event] The event.
+      #
+      def event(event_name, id: nil, **metadata, &block)
+        raise ArgumentError, "Event name must be a symbol" unless event_name.is_a?(Symbol)
+        raise ArgumentError, "block must be given" unless block_given?
+
+        @events[event_name] ||= []
+        metadata[:extension] = self.name
+        @events[event_name] << [id, metadata, block]
+      end
+
+      #
+      # Define a new once event.
+      #
+      # @param [Symbol] event_name The name of the event.
+      # @param [Symbol] id The id of the event. Used to delete the event.
+      # @param [Hash] metadata Other metadata.
+      # @param [Proc] block The block to execute when the event is triggered.
+      #
+      # @return [Discorb::Event] The event.
+      #
+      def once_event(event_name, id: nil, **metadata, &block)
+        event(event_name, id: id, once: true, **metadata, &block)
+      end
 
-    # @private
-    attr_accessor :client
+      # @return [Hash{Symbol => Array<Discorb::Event>}] The events of the extension.
+      attr_reader :events
+      # @return [Array<Discorb::ApplicationCommand::Command>] The commands of the extension.
+      attr_reader :commands
+      # @private
+      attr_reader :bottom_commands
 
-    def self.extended(obj)
-      obj.instance_variable_set(:@events, {})
-      obj.instance_variable_set(:@commands, [])
-      obj.instance_variable_set(:@bottom_commands, [])
+      def inherited(klass)
+        klass.instance_variable_set(:@commands, [])
+        klass.instance_variable_set(:@bottom_commands, [])
+        klass.instance_variable_set(:@events, {})
+      end
     end
   end
 end

data/lib/discorb/interaction.rb

@@ -255,7 +255,7 @@ module Discorb
       def defer_update(ephemeral: false)
         Async do
           @client.http.post("/interactions/#{@id}/#{@token}/callback", {
-            type: 7,
+            type: 6,
             data: {
               flags: (ephemeral ? 1 << 6 : 0),
             },
@@ -310,7 +310,7 @@ module Discorb
             payload[:components] = tmp_components.filter { |c| c.length.positive? }.map { |c| { type: 1, components: c.map(&:to_hash) } }
           end
           payload[:flags] = (ephemeral ? 1 << 6 : 0)
-          @client.http.post("/interactions/#{@id}/#{@token}/callback", { type: 6, data: payload }).wait
+          @client.http.post("/interactions/#{@id}/#{@token}/callback", { type: 7, data: payload }).wait
         end
       end
     end
@@ -460,6 +460,8 @@ module Discorb
     include Interaction::UpdateResponse
     # @return [String] The content of the response.
     attr_reader :custom_id
+    # @return [Discorb::Message] The target message.
+    attr_reader :message
 
     @interaction_type = 3
     @interaction_name = :message_component

data/lib/discorb/modules.rb

@@ -37,26 +37,7 @@ module Discorb
         payload[:allowed_mentions] =
           allowed_mentions ? allowed_mentions.to_hash(@client.allowed_mentions) : @client.allowed_mentions.to_hash
         payload[:message_reference] = reference.to_reference if reference
-        if components
-          tmp_components = []
-          tmp_row = []
-          components.each do |c|
-            case c
-            when Array
-              tmp_components << tmp_row
-              tmp_row = []
-              tmp_components << c
-            when SelectMenu
-              tmp_components << tmp_row
-              tmp_row = []
-              tmp_components << [c]
-            else
-              tmp_row << c
-            end
-          end
-          tmp_components << tmp_row
-          payload[:components] = tmp_components.filter { |c| c.length.positive? }.map { |c| { type: 1, components: c.map(&:to_hash) } }
-        end
+        payload[:components] = Component.to_payload(components) if components
         files = [file] if file
         if files
           seperator, payload = HTTP.multipart(payload, files)
@@ -69,6 +50,8 @@ module Discorb
       end
     end
 
+    alias send_message post
+
     #
     # Edit a message.
     # @macro async
@@ -95,27 +78,8 @@ module Discorb
         payload[:embeds] = tmp_embed.map(&:to_hash) if tmp_embed
         payload[:allowed_mentions] =
           allowed_mentions ? allowed_mentions.to_hash(@client.allowed_mentions) : @client.allowed_mentions.to_hash
-        if components
-          tmp_components = []
-          tmp_row = []
-          components.each do |c|
-            case c
-            when Array
-              tmp_components << tmp_row
-              tmp_row = []
-              tmp_components << c
-            when SelectMenu
-              tmp_components << tmp_row
-              tmp_row = []
-              tmp_components << [c]
-            else
-              tmp_row << c
-            end
-          end
-          tmp_components << tmp_row
-          payload[:flags] = (supress ? 1 << 2 : 0) unless supress.nil?
-          payload[:components] = tmp_components.filter { |c| c.length.positive? }.map { |c| { type: 1, components: c.map(&:to_hash) } }
-        end
+        payload[:components] = Component.to_payload(components) if components
+        payload[:flags] = (supress ? 1 << 2 : 0) unless supress.nil?
         @client.http.patch("/channels/#{channel_id.wait}/messages/#{message_id}", payload).wait
       end
     end

data/template-replace/files/css/common.css

@@ -527,6 +527,7 @@ dd pre.code {
   padding: 9px 14px;
   border-radius: 4px;
   border: 1px solid var(--background-tertiary);
+  overflow-x: scroll;
 }
 
 #main {

data/template-replace/scripts/version.rb

@@ -4,21 +4,41 @@ def build_version_sidebar(dir, version)
   raw.gsub!(template, "")
   res = +""
   i = 0
-  `git tag`.force_encoding("utf-8").split("\n").each.with_index do |tag|
+  `git tag`
+    .force_encoding("utf-8")
+    .split("\n")
+    .sort_by { |v| Gem::Version.new(v[1..]) }
+    .reverse
+    .each.with_index do |tag|
     i += 1
     sha = `git rev-parse #{tag}`.force_encoding("utf-8").strip
-    version = tag.delete_prefix("v")
+    tag_version = tag.delete_prefix("v")
     cls = i % 2 == 0 ? "even" : "odd"
-    if version == "."
+    if tag_version == version
       cls += " current"
     end
-    res += template.gsub("!version!", version).gsub("!path!", "../" + version).gsub("!class!", cls).gsub("!sha!", sha)
+    res += template
+      .gsub("!version!", tag_version)
+      .gsub("!path!", "/" + tag_version)
+      .gsub("!class!", cls)
+      .gsub("!sha!", sha)
   end
   i += 1
   cls = i % 2 == 0 ? "even" : "odd"
   if version == "main"
     cls += " current"
   end
-  res += template.gsub("!version!", "main").gsub("!path!", "../main").gsub("!class!", cls).gsub("!sha!", "(Latest on GitHub)")
+  res.insert 0, template
+               .gsub("!version!", "main")
+               .gsub("!path!", "/main")
+               .gsub("!class!", cls)
+               .gsub("!sha!", "Latest on GitHub")
+  i += 1
+  cls = i % 2 == 0 ? "even" : "odd"
+  res.insert 0, template
+               .gsub("!version!", "Latest")
+               .gsub("!path!", "")
+               .gsub("!class!", cls)
+               .gsub("!sha!", "Latest on RubyGems")
   File.write(dir + "/version_list.html", raw.gsub("<!--replace-->", res))
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discorb
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.10.2
 platform: ruby
 authors:
 - sevenc-nanashi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-28 00:00:00.000000000 Z
+date: 2021-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -142,8 +142,8 @@ files:
 - lib/discorb/error.rb
 - lib/discorb/event.rb
 - lib/discorb/exe/about.rb
-- lib/discorb/exe/init.rb
 - lib/discorb/exe/irb.rb
+- lib/discorb/exe/new.rb
 - lib/discorb/exe/run.rb
 - lib/discorb/exe/setup.rb
 - lib/discorb/exe/show.rb