discorb 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54c64c3d8d4c8293ba42d1c6ab6042b9c03b12f52b2cbdd92afb3ab483e82b8b
-  data.tar.gz: ad9c479984defc53a872cf196bd7476f7838fe9f004be6d817e78b4b5ebf3fbd
+  metadata.gz: 3d17006d6ca103247dcf304581c61104054722b1af32bc8b3ec3d23b7f5e8680
+  data.tar.gz: 92c481e5532d3e990ca73b891c71a87f5a4a2e6217ff7d7c5677519dbeaf4259
 SHA512:
-  metadata.gz: fc9a269f561e1a53ce46dbf0a026ae34999633e966bc7f286383cb0583160a85e6aaf5a1d2ee8596e72a7454052a119e7db24394abdf689f744c0cef85b5e2a4
-  data.tar.gz: f0d14f5f858848e3a3d4877a505e998da9a76b12d57b31000d28b827d3acb47c1a1025214315abe900fcce6cf043632af563f4e43c4f6e942020c6f1bf059145
+  metadata.gz: b305d2f608c0506b7c84f53d16e4384710d454d5deacc69d51a55dbf81fe25d80ab7226717cb12480e07ba25f069a59a49a50608826d711c2a84edb4ec67258c
+  data.tar.gz: c40281fb460527163504b8fe999f02a57db3190532a47c78ee25d71871372ff4c720a7ec0e17c70853083ad7327ae574e418b080d7379c98d683fcc1ccb0169e

data/Changelog.md

@@ -111,4 +111,9 @@
 
 - Add: Can use block for defining group commands
 - Fix: Fix bug in subcommands
-- Fix: Fix bug in receiving commands
+- Fix: Fix bug in receiving commands
+
+## 0.5.2
+
+- Fix: Fix bug of registering commands
+- Add: Add way to register commands in Extension

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    discorb (0.5.1)
+    discorb (0.5.2)
       async (~> 1.30.1)
       async-http (~> 0.56.5)
       async-websocket (~> 0.19.0)

data/README.md

@@ -2,7 +2,8 @@
 [![Document](https://img.shields.io/badge/Document-discord--lib.github.io-blue.svg)](https://discorb-lib.github.io/)
 [![Gem](https://img.shields.io/gem/dt/discorb?logo=rubygems&logoColor=fff)](https://rubygems.org/gems/discorb)
 [![Gem](https://img.shields.io/gem/v/discorb?logo=rubygems&logoColor=fff)](https://rubygems.org/gems/discorb)
-[![Discord](https://img.shields.io/discord/863581274916913193?logo=discord&logoColor=fff&color=5865f2&label=Discord)](https://discord.gg/hCP6zq8Vpj)  
+[![Discord](https://img.shields.io/discord/863581274916913193?logo=discord&logoColor=fff&color=5865f2&label=Discord)](https://discord.gg/hCP6zq8Vpj)
+[![GitHub](https://img.shields.io/github/stars/discorb-lib/discorb?color=24292e&label=Stars&logo=GitHub&logoColor=fff)](https://github.com/discorb-lib/discorb)  
 
 discorb is a Discord API wrapper for Ruby.
 

data/docs/events.md

@@ -219,14 +219,13 @@ Fires when a guild integration is created.
 | ---------- | ----- | ----------- |
 |`integration`| {Discorb::Integration}| The created integration. |
 
-#### `integration_update(before, after)`
+#### `integration_update(after)`
 
 Fires when a guild integration is updated.
 
 
 | Parameter  | Type  | Description |
 | ---------- | ----- | ----------- |
-|`before`    | {Discorb::Integration}| The integration before the update. |
 |`after`     | {Discorb::Integration}| The integration after the update. |
 
 #### `integration_delete(integration)`

data/docs/extension.md

@@ -34,6 +34,33 @@ module MyExtension
 end
 ```
 
+## Register Command
+
+Since v0.5.2, {Discorb::Extension} includes {Discorb::Command::Handler} module, so you can register command with {Discorb::Command::Handler#slash} and {Discorb::Command::Handler#slash_group}.
+
+```ruby
+module MyExtension
+  extend Discorb::Extension
+
+  slash("command", "Command") do |interaction|
+    # ...
+  end
+
+  slash_group("group", "Group") do
+    slash("subcommand", "Subcommand") do |interaction|
+      # ...
+    end
+
+    group("subgroup", "Subcommand group") do
+      slash("group_subcommand", "Command in Subcommand group") do |interaction|
+        # ...
+      end
+    end
+  end
+end
+```
+
+
 ## Load extension
 
 Use {Discorb::Client#extend} to load extension.

data/lib/discorb/client.rb

@@ -49,6 +49,8 @@ module Discorb
     attr_reader :ping
     # @return [:initialized, :running, :closed] The status of the client.
     attr_reader :status
+    # @private
+    attr_reader :bottom_commands
 
     #
     # Initializes a new client.
@@ -85,6 +87,7 @@ module Discorb
       @tasks = []
       @conditions = {}
       @commands = []
+      @bottom_commands = []
       @status = :initialized
     end
 
@@ -372,6 +375,14 @@ module Discorb
             @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
+        end
+        @bottom_commands += mod.bottom_commands
         mod.client = self
       end
       super(mod)

data/lib/discorb/command.rb

@@ -34,6 +34,7 @@ module Discorb
       def slash(command_name, description, options = {}, guild_ids: [], &block)
         command = Discorb::Command::Command::SlashCommand.new(command_name, description, options, guild_ids, block, 1, "")
         @commands << command
+        @bottom_commands << command
         command
       end
 
@@ -54,6 +55,7 @@ module Discorb
       def slash_group(command_name, description, guild_ids: [], &block)
         command = Discorb::Command::Command::GroupCommand.new(command_name, description, guild_ids, nil, self)
         command.instance_eval(&block) if block_given?
+        @commands << command
         command
       end
 
@@ -248,7 +250,7 @@ module Discorb
         def initialize(name, description, guild_ids, type, client)
           super(name, guild_ids, block, type)
           @description = description
-          @commands = client.commands
+          @commands = []
           @client = client
           @id_map = Discorb::Dictionary.new
         end
@@ -261,42 +263,7 @@ module Discorb
         #
         def slash(command_name, description, options = {}, &block)
           command = Discorb::Command::Command::SlashCommand.new(command_name, description, options, [], block, 1, @name)
-          options_payload = options.map do |name, value|
-            ret = {
-              type: case (value[:type].is_a?(Array) ? value[:type].first : value[:type])
-              when String, :string
-                3
-              when Integer
-                4
-              when TrueClass, FalseClass, :boolean
-                5
-              when Discorb::User, Discorb::Member, :user, :member
-                6
-              when Discorb::Channel, :channel
-                7
-              when Discorb::Role, :role
-                8
-              when :mentionable
-                9
-              when Float
-                10
-              end,
-              name: name,
-              description: value[:description],
-              required: !value[:optional],
-            }
-            if value[:type].is_a?(Array)
-              ret[:choices] = value[:type]
-            end
-
-            ret
-          end
-          {
-            name: @name,
-            default_permission: true,
-            description: @description,
-            options: options_payload,
-          }
+          @client.bottom_commands << command
           @commands << command
           command
         end
@@ -317,6 +284,7 @@ module Discorb
         def group(command_name, description, &block)
           command = Discorb::Command::Command::SubcommandGroup.new(command_name, description, @name, @client)
           command.instance_eval(&block) if block_given?
+          @commands << command
           command
         end
 
@@ -371,7 +339,7 @@ module Discorb
         def initialize(name, description, parent, client)
           super(name, description, [], 1, client)
 
-          @commands = client.commands
+          @commands = []
           @parent = parent
         end
 
@@ -387,6 +355,7 @@ module Discorb
         def slash(command_name, description, options = {}, &block)
           command = Discorb::Command::Command::SlashCommand.new(command_name, description, options, [], block, 1, @parent + " " + @name)
           @commands << command
+          @client.bottom_commands << command
           command
         end
       end

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.5.1"
+  VERSION = "0.5.2"
   # @return [String] The user agent for the bot.
   USER_AGENT = "DiscordBot (https://github.com/discorb-lib/discorb #{VERSION}) Ruby/#{RUBY_VERSION}"
 

data/lib/discorb/extension.rb

@@ -8,6 +8,9 @@ module Discorb
   # @abstract
   #
   module Extension
+    include Discorb::Command::Handler
+    undef setup_commands
+
     @events = {}
     @client = nil
 
@@ -46,12 +49,18 @@ module Discorb
 
     # @return [Hash{Symbol => Array<Discorb::Event>}] The events of the extension.
     attr_reader :events
+    # @return [Array<Discorb::Command::Command] The commands of the extension.
+    attr_reader :commands
+    # @private
+    attr_reader :bottom_commands
 
     # @!visibility private
     attr_accessor :client
 
     def self.extended(obj)
       obj.instance_variable_set(:@events, {})
+      obj.instance_variable_set(:@commands, [])
+      obj.instance_variable_set(:@bottom_commands, [])
     end
   end
 end

data/lib/discorb/gateway.rb

@@ -778,11 +778,9 @@ module Discorb
           dispatch(:integration_create, Integration.new(self, data, data[:guild_id]))
         when "INTEGRATION_UPDATE"
           return @log.warn "Unknown guild id #{data[:guild_id]}, ignoring" unless (guild = @guilds[data[:guild_id]])
-          return @log.warn "Unknown integration id #{data[:id]}, ignoring" unless (integration = guild.integrations[data[:id]])
 
-          before = Integration.new(self, integration.instance_variable_get(:@data), data[:guild_id], no_cache: true)
-          integration.send(:_set_data, data)
-          dispatch(:integration_update, before, integration)
+          before = Integration.new(self, data, data[:guild_id])
+          dispatch(:integration_update, integration)
         when "INTEGRATION_DELETE"
           return @log.warn "Unknown guild id #{data[:guild_id]}, ignoring" unless (guild = @guilds[data[:guild_id]])
           return @log.warn "Unknown integration id #{data[:id]}, ignoring" unless (integration = guild.integrations.delete(data[:id]))

data/lib/discorb/interaction.rb

@@ -297,7 +297,7 @@ module Discorb
             end
           end
 
-          unless (command = @client.commands.find { |c| c.to_s == name && c.type_raw == 1 })
+          unless (command = @client.bottom_commands.find { |c| c.to_s == name && c.type_raw == 1 })
             @client.log.warn "Unknown command name #{name}, ignoreing"
             next
           end

data/lib/discorb.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: discorb
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - sevenc-nanashi