discorb 0.10.2 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ea8e05d77b37b7a269b43dff64422e3d49b08d6c09a639d40dc019baaa26a8c
-  data.tar.gz: c8ea6f45759aaf22112f6400f7d950fb09f427f98d01302a18094ad3d6a3ae08
+  metadata.gz: f0bee36d996a7e3108f2d02247a0d7516ade1811aeb5a354d1d41f509373381d
+  data.tar.gz: ce6c4f496b8ed5309cd3798b8cf25e271e77e75617631010d77f5ab3347a26aa
 SHA512:
-  metadata.gz: b3f5e77107192aec6943087251c5b61ab1476eb421ddb0297d61178e5146466a5a59c50f4665a2b81c362d927765259142ed1bc08ed9c07e3018102becab3294
-  data.tar.gz: b88f74d4f3e0f0025f7086e95c2b1e2b96ed19a35a258a72dd29f1814986465ac9fdd8443f920fe8b7dcd610d35871b59354ba8cc6b478bcf883797cd17d463d
+  metadata.gz: 514f4b1ce307abe3424fa666a9fab56282e7b3817371411661675507658a42a92c23cda56e6358765fcad25bae69b850e754882576392ddc45da8be08ff3d252
+  data.tar.gz: e11b02e78f5029a0e544a0c7a55d79ee42ee22276160ba0f00dad0bd85c2d5d15109fa28c50dbfccbaf61066e293175e6b38357db396aeaba4b3033e38dbf2c4

data/.github/workflows/package_register.yml

@@ -0,0 +1,34 @@
+name: Publish Gem
+
+on:
+  push:
+    tags:
+      - "v*"
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@master
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.0"
+
+      - name: Setup Release Credentials
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+        run: |
+          mkdir -p $HOME/.gem
+          touch $HOME/.gem/credentials
+          chmod 600 $HOME/.gem/credentials
+          echo "---" >$HOME/.gem/credentials
+          echo ":github: Bearer ${GITHUB_TOKEN}" >> $HOME/.gem/credentials
+      - name: Publish Gem to GitHub Packages
+        run: |
+          export OWNER=$( echo ${{ github.repository }} | cut -d "/" -f 1 )
+          gem build *.gemspec
+          gem push --KEY github --host https://rubygems.pkg.github.com/${OWNER} *.gem

data/Changelog.md

@@ -2,8 +2,39 @@
 
 # Changelog
 
+## v0.11
+
+### v0.11.2
+
+- Add: Add `setup` event
+- Fix: Fix gateway resuming
+- Add: Add GitHub Packages
+
+### v0.11.1
+
+- Improve: Improve rate limit handling
+- Fix: Fix bug in Integration initalization
+- Change: Change log style
+- Add: Support OP code 7
+
+### v0.11.0
+
+- Add: Improve documents
+- Add: Implement global rate limits
+- Add: Add support autocomplete
+- Add: Add role icon editting
+- Change: Use `include Discorb::Extension` instead of `< Discorb::Extension`
+- Fix: Fix role operation
+
 ## v0.10
 
+### v0.10.3
+
+- Add: Support role icons
+- Fix: Fix version order
+- Change: Use `exec` instead of `system` in `discorb run`
+- Add: Add `Extension.loaded`
+
 ### v0.10.2
 
 - Change: `discorb init` is now `discorb new`

data/README.md

@@ -8,7 +8,7 @@
 
 ----
 
-discorb is a Discord API wrapper for Ruby.
+discorb is a Discord API wrapper written in Ruby.
 
 ## Installation
 
@@ -98,7 +98,7 @@ end
 client.run(ENV["DISCORD_BOT_TOKEN"])
 ```
 
-Note: You must run `discorb setup` before using slash commands.
+Note you must run `discorb setup` before using slash commands.
 
 ## Contributing
 

data/Rakefile

@@ -156,7 +156,7 @@ namespace :document do
     Rake::Task["document:replace:html"].execute
     Rake::Task["document:replace:css"].execute
     Rake::Task["document:replace:eol"].execute
-    tags = `git tag`.force_encoding("utf-8").split("\n")
+    tags = `git tag`.force_encoding("utf-8").split("\n").sort_by { |t| t[1..].split(".").map(&:to_i) }
     tags.each do |tag|
       sh "git checkout #{tag} -f"
       iputs "Building #{tag}"

data/discorb.gemspec

@@ -13,8 +13,6 @@ Gem::Specification.new do |spec|
   spec.license = "MIT"
   spec.required_ruby_version = Gem::Requirement.new(">= 3.0.0")
 
-  spec.metadata["allowed_push_host"] = "https://rubygems.org"
-
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/discorb-lib/discorb"
   spec.metadata["changelog_uri"] = "https://discorb-lib.github.io/file.Changelog.html"

data/docs/application_command.md

@@ -69,6 +69,7 @@ In `options`, hash should be like this:
 | `: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. |
+| `:autocomplete` | `Proc` | Autocomplete function. |
 
 `choices` should be unspecified if you don't want to use it.
 `choices` is hash like this:
@@ -107,7 +108,7 @@ In `type`, You must use one of the following:
 | `:channel` | Channel argument. | None |
 | `:role` | Role argument. | None |
 
-### Group Slash Commands
+#### Group Slash Commands
 
 To register a group of slash commands, use {Discorb::ApplicationCommand::Handler#slash_group}.
 
@@ -239,6 +240,31 @@ end
 
 Same as above, you can use block for register commands since v0.5.1.
 
+#### Use Auto Completing
+
+Since v0.11.0, you can use auto completion by setting Proc to `:autocomplete` in options.
+The proc will be called with interaction object and the argument.
+The proc should return an hash of the autocomplete result.
+
+```ruby
+client.slash("hello2", "Greet for you", {
+  "target" => {
+    type: :string,
+    description: "Person to greet",
+    autocomplete: ->(interaction, target) {
+      {
+        "You" => interaction.target.to_s
+      }
+    },
+  },
+}) do |interaction, target|
+  interaction.post("Hello, #{target}!")
+end
+```
+
+In the above example, `You` will be displayed in the user menu.
+Due to the limitation of Discord API, the proc must return the result in less than 3 second.
+
 ### Register User Context Menu Command
 
 ```ruby

data/docs/cli/setup.md

@@ -2,7 +2,7 @@
 
 # discorb setup
 
-This command will setup application commands.
+This command will setup application commands, and call `setup` event.
 
 ## Usage
 

data/docs/cli.md

@@ -16,7 +16,7 @@ Currently, discorb has the following commands:
 
 | Command | Description |
 |---------|-------------|
-| {file:docs/cli/init.md `init`} | Create a new project. |
+| {file:docs/cli/new.md `new`} | Create a new project. |
 | {file:docs/cli/irb.md `irb`} | Start an interactive Ruby shell with connected client. |
 | {file:docs/cli/run.md `run`} | Run a client. |
 | {file:docs/cli/setup.md `setup`} | Setup application commands. |

data/docs/events.md

@@ -88,6 +88,11 @@ Fires when the client is resumed connection.
 Fires when an error occurs during an event.
 Defaults to printing the error to stderr, override to handle it yourself.
 
+#### `setup()`
+
+Fires when `discorb setup` is run.
+This is useful for setting up some dependencies, such as the database.
+
 ### Guild events
 
 #### `guild_join(guild)`

data/docs/extension.md

@@ -2,16 +2,18 @@
 
 # Extension
 
-Extension allows you to seperate your code from the main application.
+Extension allows you to seperate events.
 
 # @since 
 
 ## Make a new extension
 
-Make a new class that extends Extension.
+Make a new class that includes Extension.
 
 ```ruby
-class MyExtension < Discorb::Extension
+class MyExtension
+  include Discorb::Extension
+
   # ...
 end
 ```
@@ -21,7 +23,9 @@ end
 Use {Discorb::Extension.event} to register event, or {Discorb::Extension.once_event} to register event only once.
 
 ```ruby
-class MyExtension < Discorb::Extension
+class MyExtension
+  include Discorb::Extension
+
   event :message do |message|
     # ...
   end
@@ -39,7 +43,9 @@ Note block will be binded to the extension instance.
 Use `Discorb::Extension.command` to register command, see {Discorb::ApplicationCommand::Handler} for more information.
 
 ```ruby
-class MyExtension < Discorb::Extension
+class MyExtension
+  include Discorb::Extension
+
   slash("command", "Command") do |interaction|
     # ...
   end
@@ -64,7 +70,9 @@ end
 Use {Discorb::Client#load_extension} to load extension.
 
 ```ruby
-class MyExtension < Discorb::Extension
+class MyExtension
+  include Discorb::Extension
+
   event :message do |message|
     # ...
   end
@@ -78,9 +86,45 @@ client.load_extension(MyExtension)
 You can access {Discorb::Client} from extension with `@client`.
 
 ```ruby
-class MyExtension < Discorb::Extension
+class MyExtension
+  include Discorb::Extension
+
   event :standby do |message|
     puts "Logged in as #{@client.user}"
   end
 end
 ```
+
+## Receiving Arguments on load
+
+You can receive arguments by adding some arguments to `#initialize`.
+
+```ruby
+class MyExtension
+  include Discorb::Extension
+
+  def initialize(client, arg1, arg2)
+    super(client)
+    # @client = client will also work, but it's not recommended.
+    @arg1 = arg1
+    @arg2 = arg2
+  end
+end
+
+client.load_extension(MyExtension, "arg1", "arg2")
+
+```
+
+## Do something on load
+
+You can do something on load by overriding `.loaded`. Client and arguments will be passed to it.
+
+```ruby
+class MyExtension
+  include Discorb::Extension
+
+  def self.loaded(client)
+    puts "This extension is loaded to #{client}"
+  end
+end
+```

data/docs/faq.md

@@ -2,13 +2,25 @@
 
 # Fequently asked questions
 
-## What is `Async::Task`?
+## What is ...?
+
+### What is `Async::Task`?
 
 Async::Task is a object for asynchronous tasks.
 
 https://socketry.github.io/async/ for more information.
 
-## How do I do something with sent messages?
+### What is `Guild`?
+
+It means a `server` of Discord.
+
+### What is difference between `User` and `Member`?
+
+`User` is a object for account, `Member` is a object for user in guild.
+
+## How can I ...?
+
+### How can I do something with sent messages?
 
 Use `Async::Task#wait` method.
 
@@ -22,11 +34,12 @@ message = channel.post("Hello world!").wait  # => Message
 message.pin
 ```
 
-## How can I send DM to a user?
+
+### How can I send DM to a user?
 
 Use {Discorb::User#post} method, {Discorb::User} includes {Discorb::Messageable}.
 
-## How can I edit status?
+### How can I edit status?
 
 Use {Discorb::Client#update_presence} method.
 
@@ -47,7 +60,7 @@ client.on :ready do
 end
 ```
 
-## How can I send files?
+### How can I send files?
 
 Use {Discorb::File} class.
 
@@ -62,6 +75,15 @@ message.channel.post "File!", files: [Discorb::File.new(File.open("./README.md")
 message.channel.post file: Discorb::File.from_string("Hello world!", "hello.txt")
 ```
 
+### How can I add reactions?
+
+Use {Discorb::Message#add_reaction} method.
+
+```ruby
+message.add_reaction Discorb::UnicodeEmoji["🤔"]
+message.add_reaction Discorb::UnicodeEmoji["thinking"]
+```
+
 # Not fequently asked questions
 
 ## How can I pronounce `discorb`?

data/docs/tutorial.md

@@ -2,7 +2,8 @@
 
 # Tutorial
 
-Welcome to discorb! This lib allows you to create a discord bot with ease. So, let's get started!
+Welcome to discorb! This lib allows you to create a discord bot with Ruby.
+Let's get started!
 
 ## Requirements
 
@@ -22,6 +23,7 @@ Welcome to discorb! This lib allows you to create a discord bot with ease. So, l
     - [Sublime Text](https://www.sublimetext.com/)
     - [Brackets](https://brackets.io/)
     - [Notepad++](https://notepad-plus-plus.org/)
+    - [Vim](https://www.vim.org/)
 - Git
 - Bundler
 

data/examples/extension/message_expander.rb

@@ -1,6 +1,8 @@
 require "discorb"
 
-class MessageExpander < Discorb::Extension
+class MessageExpander
+  include 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})(?!>)"

data/lib/discorb/app_command.rb

@@ -26,6 +26,7 @@ module Discorb
       #   | `: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. |
+      #   | `:autocomplete` | `Proc` | Autocomplete function. |
       #
       # @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.
@@ -236,12 +237,12 @@ module Discorb
               description: value[:description],
               required: value[:required].nil? ? !value[:optional] : value[:required],
             }
-            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[:choices] = value[:choices].map { |t| { name: t[0], value: t[1] } } if value[:choices]
+
+            ret[:channel_types] = value[:channel_types].map(&:channel_type) if value[:channel_types]
+
+            ret[:autocomplete] = !!value[:autocomplete] if value[:autocomplete]
             ret
           end
           {

data/lib/discorb/client.rb

@@ -401,6 +401,9 @@ module Discorb
         cmd.define_singleton_method(:extension) { ins.name }
         @commands << cmd
       end
+
+      cls = ins.class
+      cls.loaded(self, ...) if cls.respond_to? :loaded
       @bottom_commands += ins.class.bottom_commands
       @extensions[ins.class.name] = ins
       ins
@@ -443,16 +446,7 @@ module Discorb
                 ::File.open(options[:log_file], "a")
               end
             @log.level = options[:log_level].to_sym
-            @log.colorize_log = case options[:log_color]
-              when nil
-                if @log.out == $stdout || @log.out == $stderr
-                  true
-                else
-                  false
-                end
-              when true, false
-                options[:log_color]
-              end
+            @log.colorize_log = options[:log_color] == nil ? @log.out.isatty : options[:log_color]
           end
         end
         start_client(token)
@@ -465,6 +459,10 @@ module Discorb
           guild_ids = false
         end
         setup_commands(token, guild_ids: guild_ids).wait
+        @events[:setup]&.each do |event|
+          event.call
+        end
+        self.on_setup if respond_to? :on_setup
       end
     end
 
@@ -490,7 +488,7 @@ module Discorb
         @close_condition = Async::Condition.new
         @main_task = Async do
           @status = :running
-          connect_gateway(true).wait
+          connect_gateway(false).wait
         rescue
           @status = :stopped
           @close_condition.signal

data/lib/discorb/color.rb

@@ -130,6 +130,7 @@ module Discorb
     #
     # Create a color from a Discord's color.
     # Currently these colors are supported:
+    #
     # | Color Name | Hexadecimal |
     # |------------|------------|
     # | `:teal` | `#1abc9c` |

data/lib/discorb/common.rb

@@ -4,7 +4,7 @@ module Discorb
   # @return [String] The API base URL.
   API_BASE_URL = "https://discord.com/api/v9"
   # @return [String] The version of discorb.
-  VERSION = "0.10.2"
+  VERSION = "0.11.2"
   # @return [String] The user agent for the bot.
   USER_AGENT = "DiscordBot (https://discorb-lib.github.io #{VERSION}) Ruby/#{RUBY_VERSION}"
 

data/lib/discorb/components.rb

@@ -214,6 +214,7 @@ module Discorb
         placeholder: @placeholder,
         min_values: @min_values,
         max_values: @max_values,
+        disabled: @disabled,
       }
     end
 

data/lib/discorb/exe/run.rb

@@ -71,9 +71,9 @@ ENV["DISCORB_CLI_TITLE"] = options[:title]
 
 if File.exist? script
   if options[:bundler]
-    system "bundle exec ruby #{script}"
+    exec "bundle exec ruby #{script}"
   else
-    system "ruby #{script}"
+    exec "ruby #{script}"
   end
 else
   eputs "Could not load script: \e[31m#{script}\e[91m"

data/lib/discorb/extension.rb

@@ -3,15 +3,11 @@
 module Discorb
   #
   # Abstract class to make extension.
-  # Inherit from this class to make your own extension.
+  # Include from this module to make your own extension.
   # @see file:docs/extension.md
   # @abstract
   #
-  class Extension
-    extend Discorb::ApplicationCommand::Handler
-
-    @events = {}
-
+  module Extension
     def initialize(client)
       @client = client
     end
@@ -27,7 +23,12 @@ module Discorb
       @events = ret
     end
 
-    class << self
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      include Discorb::ApplicationCommand::Handler
       undef setup_commands
 
       #
@@ -69,7 +70,7 @@ module Discorb
       # @private
       attr_reader :bottom_commands
 
-      def inherited(klass)
+      def self.extended(klass)
         klass.instance_variable_set(:@commands, [])
         klass.instance_variable_set(:@bottom_commands, [])
         klass.instance_variable_set(:@events, {})

data/lib/discorb/gateway.rb

@@ -481,11 +481,10 @@ module Discorb
     module Handler
       private
 
-      def connect_gateway(first)
+      def connect_gateway(reconnect)
         @log.info "Connecting to gateway."
         Async do
-          @http = HTTP.new(self) if first
-          @first = first
+          @http = HTTP.new(self)
           _, gateway_response = @http.get("/gateway").wait
           gateway_url = gateway_response[:url]
           endpoint = Async::HTTP::Endpoint.parse("#{gateway_url}?v=9&encoding=json&compress=zlib-stream",
@@ -495,36 +494,55 @@ module Discorb
               @connection = connection
               @zlib_stream = Zlib::Inflate.new(Zlib::MAX_WBITS)
               @buffer = +""
-              while (message = @connection.read)
-                @buffer << message
-                if message.end_with?((+"\x00\x00\xff\xff").force_encoding("ASCII-8BIT"))
-                  begin
-                    data = @zlib_stream.inflate(@buffer)
-                    @buffer = +""
-                    message = JSON.parse(data, symbolize_names: true)
-                  rescue JSON::ParserError
-                    @buffer = +""
-                    @log.error "Received invalid JSON from gateway."
-                    @log.debug data
-                  else
-                    handle_gateway(message)
+              begin
+                while (message = @connection.read)
+                  @buffer << message
+                  if message.end_with?((+"\x00\x00\xff\xff").force_encoding("ASCII-8BIT"))
+                    begin
+                      data = @zlib_stream.inflate(@buffer)
+                      @buffer = +""
+                      message = JSON.parse(data, symbolize_names: true)
+                    rescue JSON::ParserError
+                      @buffer = +""
+                      @log.error "Received invalid JSON from gateway."
+                      @log.debug "#{data}"
+                    else
+                      handle_gateway(message, reconnect)
+                    end
                   end
                 end
+              rescue EOFError, Async::Wrapper::Cancelled, Async::Wrapper::WaitError
+                # Ignore
               end
             end
           rescue Protocol::WebSocket::ClosedError => e
-            case e.message
-            when "Authentication failed."
-              @tasks.map(&:stop)
-              raise ClientError.new("Authentication failed."), cause: nil
-            when "Discord WebSocket requesting client reconnect."
-              @log.info "Discord WebSocket requesting client reconnect"
-              connect_gateway(false)
+            @tasks.map(&:stop)
+            case e.code
+            when 4004
+              raise ClientError.new("Authentication failed"), cause: nil
+            when 4009
+              @log.info "Session timed out, reconnecting."
+              connect_gateway(true)
+            when 4014
+              raise ClientError.new("Disallowed intents were specified"), cause: nil
+            when 4002, 4003, 4005, 4007
+              raise ClientError.new(<<~EOS), cause: e
+                                               Disconnected from gateway, probably due to library issues.
+                                               #{e.message}
+
+                                               Please report this to the library issue tracker.
+                                               https://github.com/discorb-lib/discorb/issues
+                                             EOS
+            when 1001
+              @log.info "Gateway closed with code 1001, reconnecting."
+              connect_gateway(true)
             else
-              @log.error "Discord WebSocket closed: #{e.message}"
+              @log.error "Discord WebSocket closed with code #{e.code}."
+              @log.debug "#{e.message}"
               connect_gateway(false)
             end
-          rescue EOFError, Async::Wrapper::Cancelled
+          rescue => e
+            @log.error "Discord WebSocket error: #{e.message}"
             connect_gateway(false)
           end
         end
@@ -533,18 +551,26 @@ module Discorb
       def send_gateway(opcode, **value)
         @connection.write({ op: opcode, d: value }.to_json)
         @connection.flush
-        @log.debug "Sent message: #{{ op: opcode, d: value }.to_json.gsub(@token, "[Token]")}"
+        @log.debug "Sent message #{{ op: opcode, d: value }.to_json.gsub(@token, "[Token]")}"
       end
 
-      def handle_gateway(payload)
+      def handle_gateway(payload, reconnect)
         Async do |task|
           data = payload[:d]
           @last_s = payload[:s] if payload[:s]
-          @log.debug "Received message with opcode #{payload[:op]} from gateway: #{data}"
+          @log.debug "Received message with opcode #{payload[:op]} from gateway:"
+          @log.debug "#{payload.to_json.gsub(@token, "[Token]")}"
           case payload[:op]
           when 10
             @heartbeat_interval = data[:heartbeat_interval]
-            if @first
+            if reconnect
+              payload = {
+                token: @token,
+                session_id: @session_id,
+                seq: @last_s,
+              }
+              send_gateway(6, **payload)
+            else
               payload = {
                 token: @token,
                 intents: @intents.value,
@@ -553,33 +579,22 @@ module Discorb
               }
               payload[:presence] = @identify_presence if @identify_presence
               send_gateway(2, **payload)
-              Async do
-                sleep 2
-                next unless @uncached_guilds.nil?
-
-                raise ClientError, "Failed to connect to gateway.\nHint: This usually means that your intents are invalid."
-                exit 1
-              end
-            else
-              payload = {
-                token: @token,
-                session_id: @session_id,
-                seq: @last_s,
-              }
-              send_gateway(6, **payload)
             end
+          when 7
+            @log.info "Received opcode 7, reconnecting"
+            @tasks.map(&:stop)
           when 9
             @log.warn "Received opcode 9, closed connection"
             @tasks.map(&:stop)
             if data
               @log.info "Connection is resumable, reconnecting"
               @connection.close
-              connect_gateway(false)
+              connect_gateway(true)
             else
               @log.info "Connection is not resumable, reconnecting with opcode 2"
-              sleep(2)
               @connection.close
-              connect_gateway(true)
+              sleep(2)
+              connect_gateway(false)
             end
           when 11
             @log.debug "Received opcode 11"
@@ -1024,7 +1039,7 @@ module Discorb
           if respond_to?("event_" + event_name.downcase)
             __send__("event_" + event_name.downcase, data)
           else
-            @log.debug "Received unknown event: #{event_name}\n#{data.inspect}"
+            @log.debug "#{event_name}\n#{data.inspect}"
           end
         end
       end

data/lib/discorb/http.rb

@@ -36,13 +36,7 @@ module Discorb
         resp = http.get(get_path(path), get_headers(headers, "", audit_log_reason), **kwargs)
         data = get_response_data(resp)
         @ratelimit_handler.save("GET", path, resp)
-        test_error(if resp.code == "429"
-          @client.log.warn "Ratelimit exceeded for #{path}, trying again in #{data[:retry_after]} seconds."
-          task.sleep(data[:retry_after])
-          get(path, headers: headers, audit_log_reason: audit_log_reason, **kwargs).wait
-        else
-          [resp, data]
-        end)
+        handle_response(:patch, resp, data, path, nil, headers, audit_log_reason, kwargs)
       end
     end
 
@@ -67,12 +61,7 @@ module Discorb
         resp = http.post(get_path(path), get_body(body), get_headers(headers, body, audit_log_reason), **kwargs)
         data = get_response_data(resp)
         @ratelimit_handler.save("POST", path, resp)
-        test_error(if resp.code == "429"
-          task.sleep(data[:retry_after])
-          post(path, body, headers: headers, audit_log_reason: audit_log_reason, **kwargs).wait
-        else
-          [resp, data]
-        end)
+        handle_response(:post, resp, data, path, body, headers, audit_log_reason, kwargs)
       end
     end
 
@@ -97,12 +86,7 @@ module Discorb
         resp = http.patch(get_path(path), get_body(body), get_headers(headers, body, audit_log_reason), **kwargs)
         data = get_response_data(resp)
         @ratelimit_handler.save("PATCH", path, resp)
-        test_error(if resp.code == "429"
-          task.sleep(data[:retry_after])
-          patch(path, body, headers: headers, audit_log_reason: audit_log_reason, **kwargs).wait
-        else
-          [resp, data]
-        end)
+        handle_response(:patch, resp, data, path, body, headers, audit_log_reason, kwargs)
       end
     end
 
@@ -127,12 +111,7 @@ module Discorb
         resp = http.put(get_path(path), get_body(body), get_headers(headers, body, audit_log_reason), **kwargs)
         data = get_response_data(resp)
         @ratelimit_handler.save("PUT", path, resp)
-        test_error(if resp.code == "429"
-          task.sleep(data[:retry_after])
-          put(path, body, headers: headers, audit_log_reason: audit_log_reason, **kwargs).wait
-        else
-          [resp, data]
-        end)
+        handle_response(:put, resp, data, path, body, headers, audit_log_reason, kwargs)
       end
     end
 
@@ -151,17 +130,12 @@ module Discorb
     # @raise [Discorb::HTTPError] The request was failed.
     #
     def delete(path, headers: nil, audit_log_reason: nil, **kwargs)
-      Async do |task|
+      Async do
         @ratelimit_handler.wait("DELETE", path)
         resp = http.delete(get_path(path), get_headers(headers, "", audit_log_reason))
         data = get_response_data(resp)
         @ratelimit_handler.save("DELETE", path, resp)
-        test_error(if resp.code == "429"
-          task.sleep(data[:retry_after])
-          delete(path, headers: headers, audit_log_reason: audit_log_reason, **kwargs).wait
-        else
-          [resp, data]
-        end)
+        handle_response(:delete, resp, data, path, nil, headers, audit_log_reason, kwargs)
       end
     end
 
@@ -198,9 +172,16 @@ module Discorb
 
     private
 
-    def test_error(ary)
-      resp, data = *ary
+    def handle_response(method, resp, data, path, body, headers, audit_log_reason, kwargs)
       case resp.code
+      when "429"
+        @client.log.info("Rate limit exceeded for #{method} #{path}, waiting #{data[:retry_after]} seconds")
+        sleep(data[:retry_after])
+        if body
+          __send__(method, path, body, headers: headers, audit_log_reason: audit_log_reason, **kwargs).wait
+        else
+          __send__(method, path, headers: headers, audit_log_reason: audit_log_reason, **kwargs).wait
+        end
       when "400"
         raise BadRequestError.new(resp, data)
       when "401"
@@ -247,15 +228,19 @@ module Discorb
     end
 
     def get_response_data(resp)
-      if resp["Via"].nil? && resp.code == "429"
-        raise CloudFlareBanError.new(resp, @client)
+      begin
+        data = JSON.parse(resp.body, symbolize_names: true)
+      rescue JSON::ParserError, TypeError
+        if resp.body.nil? || resp.body.empty?
+          data = nil
+        else
+          data = resp.body
+        end
       end
-      rd = resp.body
-      if rd.nil? || rd.empty?
-        nil
-      else
-        JSON.parse(rd, symbolize_names: true)
+      if resp["Via"].nil? && resp.code == "429" && data.is_a?(String)
+        raise CloudFlareBanError.new(resp, @client)
       end
+      data
     end
 
     def http

data/lib/discorb/integration.rb

@@ -63,7 +63,7 @@ module Discorb
     #
     def delete!(reason: nil)
       Async do
-        @client.http.delete("/guilds/#{@guild}/integrations/#{@id}", reason: reason).wait
+        @client.http.delete("/guilds/#{@guild}/integrations/#{@id}", audit_log_reason: reason).wait
       end
     end
 
@@ -80,7 +80,7 @@ module Discorb
       @enable_emoticons = data[:enable_emoticons]
       @expire_behavior = self.class.expire_behavior[data[:expire_behavior]]
       @expire_grace_period = data[:expire_grace_period]
-      @user = @client.users[data[:user].to_i]
+      @user = @client.users[data[:user][:id]] or Discorb::User.new(@client, data[:user])
       @account = Account.new(data[:account])
       @subscriber_count = data[:subscriber_count]
       @revoked = data[:revoked]

data/lib/discorb/interaction.rb

@@ -364,7 +364,7 @@ module Discorb
           end
 
           unless (command = @client.bottom_commands.find { |c| c.to_s == name && c.type_raw == 1 })
-            @client.log.warn "Unknown command name #{name}, ignoreing"
+            @client.log.warn "Unknown command name #{name}, ignoring"
             next
           end
 
@@ -451,6 +451,89 @@ module Discorb
     end
   end
 
+  #
+  # Represents auto complete interaction.
+  #
+  class AutoComplete < Interaction
+    @interaction_type = 4
+    @interaction_name = :auto_complete
+
+    # @private
+    def _set_data(data)
+      super
+      Sync do
+        name = data[:name]
+        options = nil
+        if (option = data[:options]&.first)
+          case option[:type]
+          when 1
+            name += " #{option[:name]}"
+            options = option[:options]
+          when 2
+            name += " #{option[:name]}"
+            if (option_sub = option[:options]&.first)
+              if option_sub[:type] == 1
+                name += " #{option_sub[:name]}"
+                options = option_sub[:options]
+              else
+                options = option[:options]
+              end
+            end
+          else
+            options = data[:options]
+          end
+        end
+
+        unless (command = @client.bottom_commands.find { |c| c.to_s == name && c.type_raw == 1 })
+          @client.log.warn "Unknown command name #{name}, ignoring"
+          next
+        end
+
+        option_map = command.options.map { |k, v| [k.to_s, v[:default]] }.to_h
+        options ||= []
+        options.each_with_index do |option|
+          val = case option[:type]
+            when 3, 4, 5, 10
+              option[:value]
+            when 6
+              guild.members[option[:value]] || guild.fetch_member(option[:value]).wait
+            when 7
+              guild.channels[option[:value]] || guild.fetch_channels.wait.find { |channel| channel.id == option[:value] }
+            when 8
+              guild.roles[option[:value]] || guild.fetch_roles.wait.find { |role| role.id == option[:value] }
+            when 9
+              guild.members[option[:value]] || guild.roles[option[:value]] || guild.fetch_member(option[:value]).wait || guild.fetch_roles.wait.find { |role| role.id == option[:value] }
+            end
+          option_map[option[:name]] = val
+        end
+        focused_index = options.find_index { |o| o[:focused] }
+        val = command.options.values[focused_index][:autocomplete]&.call(self, *command.options.map { |k, v| option_map[k.to_s] })
+        send_complete_result(val)
+      end
+    end
+
+    # @private
+    def send_complete_result(val)
+      @client.http.post("/interactions/#{@id}/#{@token}/callback", {
+        type: 8,
+        data: {
+          choices: val.map do |vk, vv|
+            {
+              name: vk,
+              value: vv,
+            }
+          end,
+        },
+      }).wait
+    rescue Discorb::NotFoundError
+      @client.log.warn "Failed to send auto complete result, This may be caused by the suggestion is taking too long (over 3 seconds) to respond", fallback: $stderr
+    end
+
+    class << self
+      alias make_interaction new
+    end
+  end
+
   #
   # Represents a message component interaction.
   # @abstract

data/lib/discorb/log.rb

@@ -65,10 +65,11 @@ module Discorb
         return
       end
 
+      time = Time.now.iso8601
       if @colorize_log
-        @out.puts("\e[2;90m[#{Time.now.iso8601}] #{color}#{name}\e[m -- #{message}")
+        @out.puts("\e[90m#{time}\e[0m #{color}#{name.ljust(5)}\e[0m #{message}")
       else
-        @out.puts("[#{Time.now.iso8601}] #{name} -- #{message}")
+        @out.puts("#{time} #{name.ljust(5)} #{message}")
       end
     end
   end

data/lib/discorb/member.rb

@@ -71,21 +71,12 @@ module Discorb
       _set_data(user_data, member_data)
     end
 
-    #
-    # Format the member to `@name` style.
-    #
-    # @return [String] The formatted member.
-    #
-    def to_s
-      "@#{name}"
-    end
-
     #
     # Format the member to `Username#Discriminator` style.
     #
     # @return [String] The formatted member.
     #
-    def to_s_user
+    def to_s
       "#{username}##{discriminator}"
     end
 

data/lib/discorb/modules.rb

@@ -94,7 +94,7 @@ module Discorb
     #
     def delete_message!(message_id, reason: nil)
       Async do
-        @client.http.delete("/channels/#{channel_id.wait}/messages/#{message_id}", reason: reason).wait
+        @client.http.delete("/channels/#{channel_id.wait}/messages/#{message_id}", audit_log_reason: reason).wait
       end
     end
 

data/lib/discorb/rate_limit.rb

@@ -9,8 +9,9 @@ module Discorb
     # @private
     def initialize(client)
       @client = client
-      @ratelimit_hash = {}
-      @path_ratelimit_hash = {}
+      @current_ratelimits = {}
+      @path_ratelimit_bucket = {}
+      @global = false
     end
 
     #
@@ -22,18 +23,26 @@ module Discorb
     def wait(method, path)
       return if path.start_with?("https://")
 
-      return unless hash = @path_ratelimit_hash[method + path]
+      if @global
+        time = b[:reset_at] - Time.now.to_f
+        @client.log.info("global rate limit reached, waiting #{time} seconds")
+        sleep(time)
+        @global = false
+      end
+
+      return unless hash = @path_ratelimit_bucket[method + path]
 
-      return unless b = @ratelimit_hash[hash]
+      return unless b = @current_ratelimits[hash]
 
-      if b[:reset_at] < Time.now.to_i
-        @ratelimit_hash.delete(hash)
+      if b[:reset_at] < Time.now.to_f
+        @current_ratelimits.delete(hash)
         return
       end
       return if b[:remaining] > 0
 
-      @client.log.info("Ratelimit reached, waiting for #{b[:reset_at] - Time.now.to_i} seconds")
-      sleep(b[:reset_at] - Time.now.to_i)
+      time = b[:reset_at] - Time.now.to_f
+      @client.log.info("rate limit for #{method} #{path} reached, waiting #{time} seconds")
+      sleep(time)
     end
 
     #
@@ -44,12 +53,15 @@ module Discorb
     # @param [Net::HTTPResponse] resp The response.
     #
     def save(method, path, resp)
+      if resp["X-Ratelimit-Global"] == "true"
+        @global = Time.now.to_f + JSON.parse(resp.body, symbolize_names: true)[:retry_after]
+      end
       return unless resp["X-RateLimit-Remaining"]
 
-      @path_ratelimit_hash[method + path] = resp["X-RateLimit-Bucket"]
-      @ratelimit_hash[resp["X-RateLimit-Bucket"]] = {
+      @path_ratelimit_bucket[method + path] = resp["X-RateLimit-Bucket"]
+      @current_ratelimits[resp["X-RateLimit-Bucket"]] = {
         remaining: resp["X-RateLimit-Remaining"].to_i,
-        reset_at: resp["X-RateLimit-Reset"].to_i,
+        reset_at: Time.now.to_f + resp["X-RateLimit-Reset-After"].to_f,
       }
     end
   end

data/lib/discorb/role.rb

@@ -26,6 +26,10 @@ module Discorb
     # @return [Boolean] Whether the role is a default role.
     attr_reader :mentionable
     alias mentionable? mentionable
+    # @return [Discorb::Asset, nil] The icon of the role.
+    attr_reader :custom_icon
+    # @return [Discorb::Emoji, nil] The emoji of the role.
+    attr_reader :emoji
 
     # @!attribute [r] mention
     #   @return [String] The mention of the role.
@@ -33,6 +37,8 @@ module Discorb
     #   @return [Boolean] Whether the role has a color.
     # @!attribute [r] tag
     #   @return [Discorb::Role::Tag] The tag of the role.
+    # @!attribute [r] icon
+    #   @return [Discorb::Asset, Discorb::Emoji] The icon of the role.
 
     include Comparable
 
@@ -44,6 +50,10 @@ module Discorb
       _set_data(data)
     end
 
+    def icon
+      @custom_icon || @emoji
+    end
+
     #
     # Compares two roles by their position.
     #
@@ -88,7 +98,7 @@ module Discorb
     #
     def move(position, reason: nil)
       Async do
-        @client.http.patch("/guilds/#{@guild_id}/roles", { id: @id, position: position }, reason: reason).wait
+        @client.http.patch("/guilds/#{@guild.id}/roles", { id: @id, position: position }, audit_log_reason: reason).wait
       end
     end
 
@@ -103,9 +113,10 @@ module Discorb
     # @param [Discorb::Color] color The new color of the role.
     # @param [Boolean] hoist Whether the role should be hoisted.
     # @param [Boolean] mentionable Whether the role should be mentionable.
+    # @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, reason: nil)
+    def edit(name: :unset, position: :unset, color: :unset, hoist: :unset, mentionable: :unset, icon: :unset, reason: nil)
       Async do
         payload = {}
         payload[:name] = name if name != :unset
@@ -113,7 +124,14 @@ module Discorb
         payload[:color] = color.to_i if color != :unset
         payload[:hoist] = hoist if hoist != :unset
         payload[:mentionable] = mentionable if mentionable != :unset
-        @client.http.patch("/guilds/#{@guild_id}/roles/#{@id}", payload, reason: reason).wait
+        if icon != :unset
+          if icon.is_a?(Discorb::Image)
+            payload[:icon] = icon.to_s
+          else
+            payload[:unicode_emoji] = icon.to_s
+          end
+        end
+        @client.http.patch("/guilds/#{@guild.id}/roles/#{@id}", payload, audit_log_reason: reason).wait
       end
     end
 
@@ -126,7 +144,7 @@ module Discorb
     #
     def delete!(reason: nil)
       Async do
-        @client.http.delete("/guilds/#{@guild_id}/roles/#{@id}", reason: reason).wait
+        @client.http.delete("/guilds/#{@guild.id}/roles/#{@id}", audit_log_reason: reason).wait
       end
     end
 
@@ -182,6 +200,8 @@ module Discorb
       @managed = data[:managed]
       @mentionable = data[:mentionable]
       @tags = data[:tags] || {}
+      @custom_icon = data[:icon] ? Asset.new(self, data[:icon], path: "role-icons/#{@id}") : nil
+      @emoji = data[:unicode_emoji] ? UnicodeEmoji.new(data[:unicode_emoji]) : nil
       @guild.roles[@id] = self unless data[:no_cache]
       @data.update(data)
     end

data/lib/discorb/voice_state.rb

@@ -193,7 +193,7 @@ module Discorb
     #
     def delete!(reason: nil)
       Async do
-        @client.http.delete("/stage-instances/#{@channel_id}", reason: reason).wait
+        @client.http.delete("/stage-instances/#{@channel_id}", audit_log_reason: reason).wait
         self
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discorb
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.11.2
 platform: ruby
 authors:
 - sevenc-nanashi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-03 00:00:00.000000000 Z
+date: 2021-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -79,6 +79,7 @@ files:
 - ".github/ISSUE_TEMPLATE/feature_request.md"
 - ".github/workflows/build_main.yml"
 - ".github/workflows/build_version.yml"
+- ".github/workflows/package_register.yml"
 - ".gitignore"
 - ".yardopts"
 - Changelog.md
@@ -103,8 +104,8 @@ files:
 - docs/assets/08_hello_once.png
 - docs/assets/unused_ping_pong.png
 - docs/cli.md
-- docs/cli/init.md
 - docs/cli/irb.md
+- docs/cli/new.md
 - docs/cli/run.md
 - docs/cli/setup.md
 - docs/events.md
@@ -191,7 +192,6 @@ homepage: https://github.com/discorb-lib/discorb
 licenses:
 - MIT
 metadata:
-  allowed_push_host: https://rubygems.org
   homepage_uri: https://github.com/discorb-lib/discorb
   source_code_uri: https://github.com/discorb-lib/discorb
   changelog_uri: https://discorb-lib.github.io/file.Changelog.html