discorb 0.0.8 → 0.1.0

data/lib/discorb/http.rb

@@ -227,7 +227,7 @@ module Discorb
     end
 
     def get_headers(headers, body = "", audit_log_reason = nil)
-      ret = if body.nil? || body.empty?
+      ret = if body.nil? || body == ""
           { "User-Agent" => USER_AGENT, "authorization" => "Bot #{@client.token}" }
         else
           { "User-Agent" => USER_AGENT, "authorization" => "Bot #{@client.token}",

data/lib/discorb/interaction.rb

@@ -75,11 +75,15 @@ module Discorb
 
       # @!visibility private
       def make_interaction(client, data)
+        interaction = nil
         descendants.each do |klass|
-          return klass.make_interaction(client, data) if !klass.interaction_type.nil? && klass.interaction_type == data[:type]
+          interaction = klass.make_interaction(client, data) if !klass.interaction_type.nil? && klass.interaction_type == data[:type]
         end
-        client.log.warn("Unknown interaction type #{data[:type]}, initialized Interaction")
-        Interaction.new(client, data)
+        if interaction.nil?
+          client.log.warn("Unknown interaction type #{data[:type]}, initialized Interaction")
+          interaction = Interaction.new(client, data)
+        end
+        interaction
       end
 
       # @!visibility private
@@ -95,14 +99,14 @@ module Discorb
       #
       # Response with `DEFERRED_CHANNEL_MESSAGE_WITH_SOURCE`(`5`).
       #
-      # @param [Boolean] hide Whether to hide the response (ephemeral).
+      # @param [Boolean] ephemeral Whether to make the response ephemeral.
       #
-      def defer_source(hide: false)
+      def defer_source(ephemeral: false)
         Async do
           @client.http.post("/interactions/#{@id}/#{@token}/callback", {
             type: 5,
             data: {
-              flags: (hide ? 1 << 6 : 0),
+              flags: (ephemeral ? 1 << 6 : 0),
             },
           }).wait
           @defered = true
@@ -118,9 +122,9 @@ module Discorb
       # @param [Array<Discorb::Embed>] embeds The embeds to send. (max: 10)
       # @param [Discorb::AllowedMentions] allowed_mentions The allowed mentions to send.
       # @param [Array<Discorb::Components>, Array<Array<Discorb::Components>>] components The components to send.
-      # @param [Boolean] hide Whether to hide the response (ephemeral).
+      # @param [Boolean] ephemeral Whether to make the response ephemeral.
       #
-      def post(content, tts: false, embed: nil, embeds: nil, allowed_mentions: nil, components: nil, hide: false)
+      def post(content = nil, tts: false, embed: nil, embeds: nil, allowed_mentions: nil, components: nil, ephemeral: false)
         payload = {}
         payload[:content] = content if content
         payload[:tts] = tts
@@ -151,7 +155,7 @@ module Discorb
           tmp_components << tmp_row
           payload[:components] = tmp_components.filter { |c| c.length.positive? }.map { |c| { type: 1, components: c.map(&:to_hash) } }
         end
-        payload[:flags] = (hide ? 1 << 6 : 0)
+        payload[:flags] = (ephemeral ? 1 << 6 : 0)
         if @responded
           @client.http.post("/webhooks/#{@id}/#{@token}", { type: 4, data: payload }).wait
         elsif @defered
@@ -170,14 +174,14 @@ module Discorb
       #
       # Response with `DEFERRED_UPDATE_MESSAGE`(`6`).
       #
-      # @param [Boolean] hide Whether to hide the response (ephemeral).
+      # @param [Boolean] ephemeral Whether to make the response ephemeral.
       #
-      def defer_update(hide: false)
+      def defer_update(ephemeral: false)
         Async do
           @client.http.post("/interactions/#{@id}/#{@token}/callback", {
             type: 7,
             data: {
-              flags: (hide ? 1 << 6 : 0),
+              flags: (ephemeral ? 1 << 6 : 0),
             },
           }).wait
         end
@@ -192,9 +196,9 @@ module Discorb
       # @param [Array<Discorb::Embed>] embeds The embeds to send. (max: 10)
       # @param [Discorb::AllowedMentions] allowed_mentions The allowed mentions to send.
       # @param [Array<Discorb::Components>, Array<Array<Discorb::Components>>] components The components to send.
-      # @param [Boolean] hide Whether to hide the response (ephemeral).
+      # @param [Boolean] ephemeral Whether to make the response ephemeral.
       #
-      def edit(content, tts: false, embed: nil, embeds: nil, allowed_mentions: nil, components: nil, hide: false)
+      def edit(content, tts: false, embed: nil, embeds: nil, allowed_mentions: nil, components: nil, ephemeral: false)
         payload = {}
         payload[:content] = content if content
         payload[:tts] = tts
@@ -225,7 +229,7 @@ module Discorb
           tmp_components << tmp_row
           payload[:components] = tmp_components.filter { |c| c.length.positive? }.map { |c| { type: 1, components: c.map(&:to_hash) } }
         end
-        payload[:flags] = (hide ? 1 << 6 : 0)
+        payload[:flags] = (ephemeral ? 1 << 6 : 0)
         @client.http.post("/interactions/#{@id}/#{@token}/callback", { type: 6, data: payload }).wait
       end
     end
@@ -238,15 +242,123 @@ module Discorb
   end
 
   #
-  # Represents a slash command interaction.
+  # Represents a command interaction.
   # @todo Implement this.
   #
-  class SlashCommandInteraction < Interaction
+  class CommandInteraction < Interaction
     @interaction_type = 2
-    @interaction_name = :slash_command
+    @interaction_name = :application_command
+    include Interaction::SourceResponse
+
+    #
+    # Represents a slash command interaction.
+    #
+    class SlashCommand < CommandInteraction
+      @command_type = 1
+
+      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
+          options ||= []
+          options.map! do |option|
+            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
+          end
+
+          unless (command = @client.commands.find { |c| c.to_s == name })
+            @client.log.warn "Unknown command name #{name}, ignoreing"
+            next
+          end
+
+          command.block.call(self, *options)
+        end
+      end
+    end
+
+    #
+    # Represents a user context menu interaction.
+    #
+    class UserMenuCommand < CommandInteraction
+      @command_type = 2
+
+      # @return [Discorb::Member, Discorb::User] The target user.
+      attr_reader :target
+
+      def _set_data(data)
+        @target = guild.members[data[:target_id]] || Discorb::Member.new(@client, @guild_id, data[:resolved][:users][data[:target_id].to_sym], data[:resolved][:members][data[:target_id].to_sym])
+        @client.commands.find { |c| c.name == data[:name] && c.type_raw == 2 }.block.call(self, @target)
+      end
+    end
+
+    #
+    # Represents a message context menu interaction.
+    #
+    class MessageMenuCommand < CommandInteraction
+      @command_type = 3
+
+      # @return [Discorb::Message] The target message.
+      attr_reader :target
+
+      def _set_data(data)
+        @target = Message.new(@client, data[:resolved][:messages][data[:target_id].to_sym].merge({ guild_id: @guild_id.to_s }))
+        @client.commands.find { |c| c.name == data[:name] && c.type_raw == 3 }.block.call(self, @target)
+      end
+    end
+
+    private
 
     def _set_data(data)
-      p data
+      @name = data[:name]
+    end
+
+    class << self
+      # @!visibility private
+      attr_reader :command_type
+
+      # @!visibility private
+      def make_interaction(client, data)
+        nested_classes.each do |klass|
+          return klass.new(client, data) if !klass.command_type.nil? && klass.command_type == data[:data][:type]
+        end
+        client.log.warn("Unknown command type #{data[:type]}, initialized CommandInteraction")
+        CommandInteraction.new(client, data)
+      end
+
+      # @!visibility private
+      def nested_classes
+        constants.select { |c| const_get(c).is_a? Class }.map { |c| const_get(c) }
+      end
     end
   end
 

data/lib/discorb/log.rb

@@ -61,7 +61,7 @@ module Discorb
       return unless @out
 
       if @colorize_log
-        @out.puts("[#{Time.now.iso8601}] #{color}#{name}\e[m -- #{message}")
+        @out.puts("\e[2;90m[#{Time.now.iso8601}] #{color}#{name}\e[m -- #{message}")
       else
         @out.puts("[#{Time.now.iso8601}] #{name} -- #{message}")
       end

data/lib/discorb/member.rb

@@ -78,6 +78,15 @@ module Discorb
       "@#{name}"
     end
 
+    #
+    # Format the member to `Username#Discriminator` style.
+    #
+    # @return [String] The formatted member.
+    #
+    def to_s_user
+      "#{username}##{discriminator}"
+    end
+
     def name
       @nick || @username
     end
@@ -223,8 +232,8 @@ module Discorb
       @hoisted_role_id = member_data[:hoisted_role]
       @deaf = member_data[:deaf]
       @custom_avatar = member_data[:avatar] && Asset.new(member_data[:avatar])
-      @display_avatar = Asset.new(self, member_data[:avatar] || user_data[:avatar])
       super(user_data)
+      @display_avatar = @avatar || @custom_avatar
       @client.guilds[@guild_id].members[@id] = self unless @guild_id.nil?
       @_member_data.update(member_data)
     end

data/lib/discorb/user.rb

@@ -21,6 +21,8 @@ module Discorb
     # @return [Boolean] Whether the user is a bot.
     attr_reader :bot
     alias bot? bot
+    # @return [Time] The time the user was created.
+    attr_reader :created_at
 
     include Discorb::Messageable
 
@@ -41,6 +43,8 @@ module Discorb
       "#{@username}##{@discriminator}"
     end
 
+    alias to_s_user to_s
+
     def inspect
       "#<#{self.class} #{self}>"
     end
@@ -123,10 +127,11 @@ module Discorb
       @id = Snowflake.new(data[:id])
       @flag = User::Flag.new(data[:public_flags] | (data[:flags] || 0))
       @discriminator = data[:discriminator]
-      @avatar = Asset.new(self, data[:avatar])
+      @avatar = data[:avatar] ? Asset.new(self, data[:avatar]) : DefaultAvatar.new(data[:discriminator])
       @bot = data[:bot]
       @raw_data = data
       @client.users[@id] = self if !data[:no_cache] && data.is_a?(User)
+      @created_at = @id.timestamp
       @data.update(data)
     end
   end

data/lib/discorb/webhook.rb

@@ -377,9 +377,20 @@ module Discorb
           @bot = data[:bot]
           @id = Snowflake.new(data[:id])
           @username = data[:username]
-          @avatar = data[:avatar]
+          @avatar = data[:avatar] ? Asset.new(self, data[:avatar]) : DefaultAvatar.new(data[:discriminator])
           @discriminator = data[:discriminator]
         end
+
+        #
+        # Format author with `Name#Discriminator` style.
+        #
+        # @return [String] Formatted author.
+        #
+        def to_s
+          "#{@username}##{@discriminator}"
+        end
+
+        alias to_s_user to_s
       end
     end
 

data/lib/discorb.rb

@@ -24,17 +24,17 @@ module Discorb
   #
   def macro
     # NOTE: this method is only for YARD.
-    puts 'Wow, You found the easter egg!\n\n'
+    puts "Wow, You found the easter egg!\n"
     red = "\e[31m"
     reset = "\e[m"
     puts <<~"EASTEREGG"
-               | .               #{red}   |     #{reset}
-             __|                 #{red}   |__   #{reset}
-            /  | |  __   __  _   #{red} _ |  \\  #{reset}
-           (   | | (__  /   / \\ #{red}|/  |   ) #{reset}
+                 .               #{red}         #{reset}
+               |                 #{red}   |     #{reset}
+             __| |  __   __  _   #{red} _ |__    #{reset}
+            /  | | (__  /   / \\ #{red}|/  |  \\ #{reset}
             \\__| |  __) \\__ \\_/ #{red}|   |__/  #{reset}
 
-                 https://github.com/discorb-lib/discorb
+           Thank you for using this library!
          EASTEREGG
   end
 end
@@ -44,7 +44,7 @@ require_order = %w[common flag dictionary error http intents emoji_table modules
                 %w[application audit_logs color components event extension] +
                 %w[file guild_template image integration interaction invite log permission] +
                 %w[presence reaction role sticker utils voice_state webhook] +
-                %w[gateway_requests gateway] +
+                %w[gateway_requests gateway command] +
                 %w[asset client extend]
 require_order.each do |name|
   require_relative "discorb/#{name}.rb"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discorb
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors:
 - sevenc-nanashi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-29 00:00:00.000000000 Z
+date: 2021-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -85,8 +85,13 @@ files:
 - bin/setup
 - discorb.gemspec
 - docs/Examples.md
+- docs/application_command.md
 - docs/events.md
+- docs/extension.md
 - docs/voice_events.md
+- examples/commands/bookmarker.rb
+- examples/commands/hello.rb
+- examples/commands/inspect.rb
 - examples/components/authorization_button.rb
 - examples/components/select_menu.rb
 - examples/extension/main.rb
@@ -102,6 +107,7 @@ files:
 - lib/discorb/channel.rb
 - lib/discorb/client.rb
 - lib/discorb/color.rb
+- lib/discorb/command.rb
 - lib/discorb/common.rb
 - lib/discorb/components.rb
 - lib/discorb/dictionary.rb