discorb 0.6.0 → 0.7.2

data/lib/discorb/interaction.rb

@@ -64,6 +64,7 @@ module Discorb
     end
 
     alias fired_by target
+    alias from target
 
     def inspect
       "#<#{self.class} id=#{@id}>"
@@ -99,6 +100,9 @@ module Discorb
       #
       # Response with `DEFERRED_CHANNEL_MESSAGE_WITH_SOURCE`(`5`).
       #
+      # @macro async
+      # @macro http
+      #
       # @param [Boolean] ephemeral Whether to make the response ephemeral.
       #
       def defer_source(ephemeral: false)
@@ -116,6 +120,9 @@ module Discorb
       #
       # Response with `CHANNEL_MESSAGE_WITH_SOURCE`(`4`).
       #
+      # @macro async
+      # @macro http
+      #
       # @param [String] content The content of the response.
       # @param [Boolean] tts Whether to send the message as text-to-speech.
       # @param [Discorb::Embed] embed The embed to send.
@@ -125,45 +132,48 @@ module Discorb
       # @param [Boolean] ephemeral Whether to make the response ephemeral.
       #
       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
-        tmp_embed = if embed
-            [embed]
-          elsif embeds
-            embeds
-          end
-        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
+        Async do
+          payload = {}
+          payload[:content] = content if content
+          payload[:tts] = tts
+          tmp_embed = if embed
+              [embed]
+            elsif embeds
+              embeds
+            end
+          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[:components] = tmp_components.filter { |c| c.length.positive? }.map { |c| { type: 1, components: c.map(&:to_hash) } }
           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[:flags] = (ephemeral ? 1 << 6 : 0)
-        if @responded
-          @client.http.post("/webhooks/#{@id}/#{@token}", { type: 4, data: payload }).wait
-        elsif @defered
-          @client.http.post("/interactions/#{@id}/#{@token}/@original/edit", { type: 4, data: payload }).wait
-        else
-          @client.http.post("/interactions/#{@id}/#{@token}/callback", { type: 4, data: payload }).wait
+          payload[:flags] = (ephemeral ? 1 << 6 : 0)
+
+          if @responded
+            @client.http.post("/webhooks/#{@application_id}/#{@token}", payload).wait
+          elsif @defered
+            @client.http.patch("/webhooks/#{@application_id}/#{@token}/messages/@original", payload).wait
+          else
+            @client.http.post("/interactions/#{@id}/#{@token}/callback", { type: 4, data: payload }).wait
+          end
+          @responded = true
         end
-        @responded = true
       end
     end
 
@@ -190,6 +200,9 @@ module Discorb
       #
       # Response with `UPDATE_MESSAGE`(`7`).
       #
+      # @macro async
+      # @macro http
+      #
       # @param [String] content The content of the response.
       # @param [Boolean] tts Whether to send the message as text-to-speech.
       # @param [Discorb::Embed] embed The embed to send.
@@ -199,38 +212,40 @@ module Discorb
       # @param [Boolean] ephemeral Whether to make the response ephemeral.
       #
       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
-        tmp_embed = if embed
-            [embed]
-          elsif embeds
-            embeds
-          end
-        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
+        Async do
+          payload = {}
+          payload[:content] = content if content
+          payload[:tts] = tts
+          tmp_embed = if embed
+              [embed]
+            elsif embeds
+              embeds
+            end
+          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[:components] = tmp_components.filter { |c| c.length.positive? }.map { |c| { type: 1, components: c.map(&:to_hash) } }
           end
-          tmp_components << tmp_row
-          payload[:components] = tmp_components.filter { |c| c.length.positive? }.map { |c| { type: 1, components: c.map(&:to_hash) } }
+          payload[:flags] = (ephemeral ? 1 << 6 : 0)
+          @client.http.post("/interactions/#{@id}/#{@token}/callback", { type: 6, data: payload }).wait
         end
-        payload[:flags] = (ephemeral ? 1 << 6 : 0)
-        @client.http.post("/interactions/#{@id}/#{@token}/callback", { type: 6, data: payload }).wait
       end
     end
 

data/lib/discorb/log.rb

@@ -22,34 +22,34 @@ module Discorb
       raise ArgumentError, "Invalid log level: #{level}" unless @level
     end
 
-    def debug(message)
+    def debug(message, fallback: nil)
       return unless @level <= 0
 
-      write_output("DEBUG", "\e[90m", message)
+      write_output("DEBUG", "\e[90m", message, fallback)
     end
 
-    def info(message)
+    def info(message, fallback: nil)
       return unless @level <= 1
 
-      write_output("INFO", "\e[94m", message)
+      write_output("INFO", "\e[94m", message, fallback)
     end
 
-    def warn(message)
+    def warn(message, fallback: nil)
       return unless @level <= 2
 
-      write_output("WARN", "\e[93m", message)
+      write_output("WARN", "\e[93m", message, fallback)
     end
 
-    def error(message)
+    def error(message, fallback: nil)
       return unless @level <= 3
 
-      write_output("ERROR", "\e[31m", message)
+      write_output("ERROR", "\e[31m", message, fallback)
     end
 
-    def fatal(message)
+    def fatal(message, fallback: nil)
       return unless @level <= 4
 
-      write_output("FATAL", "\e[91m", message)
+      write_output("FATAL", "\e[91m", message, fallback)
     end
 
     class << self
@@ -58,8 +58,12 @@ module Discorb
 
     private
 
-    def write_output(name, color, message)
-      return unless @out
+    def write_output(name, color, message, fallback)
+      unless @out
+        fallback.puts(message) if fallback
+
+        return
+      end
 
       if @colorize_log
         @out.puts("\e[2;90m[#{Time.now.iso8601}] #{color}#{name}\e[m -- #{message}")

data/lib/discorb/member.rb

@@ -59,6 +59,8 @@ module Discorb
     # @!attribute [r] status
     #   @macro client_cache
     #   @return [Symbol] The status of the member. It's from the {#presence}.
+    # @!attribute [r] owner?
+    #   @return [Boolean] Whether the member is the owner of the guild.
 
     # @!visibility private
     def initialize(client, guild_id, user_data, member_data)
@@ -99,18 +101,27 @@ module Discorb
       guild.voice_states[@id]
     end
 
+    def owner?
+      guild.owner_id == @id
+    end
+
     def guild
       @client.guilds[@guild_id]
     end
 
     def roles
-      @role_ids.map { |r| guild.roles[r] }
+      @role_ids.map { |r| guild.roles[r] }.sort_by(&:position).reverse + [guild.roles[guild.id]]
     end
 
     def permissions
+      if owner?
+        return Permission.new((1 << 38) - 1)
+      end
       roles.map(&:permissions).sum(Permission.new(0))
     end
 
+    alias guild_permissions permissions
+
     def hoisted_role
       @hoisted_role_id && guild.roles[@hoisted_role_id]
     end
@@ -234,7 +245,7 @@ module Discorb
       @custom_avatar = member_data[:avatar] && Asset.new(member_data[:avatar])
       super(user_data)
       @display_avatar = @avatar || @custom_avatar
-      @client.guilds[@guild_id].members[@id] = self unless @guild_id.nil?
+      @client.guilds[@guild_id].members[@id] = self unless @guild_id.nil? || @client.guilds[@guild_id].nil?
       @_member_data.update(member_data)
     end
   end

data/lib/discorb/message.rb

@@ -522,11 +522,11 @@ module Discorb
       if data[:member].nil? && data[:webhook_id]
         @webhook_id = Snowflake.new(data[:webhook_id])
         @author = Webhook::Message::Author.new(data[:author])
-      elsif data[:guild_id].nil? || data[:guild_id].empty?
+      elsif data[:guild_id].nil? || data[:guild_id].empty? || data[:member].nil?
         @author = @client.users[data[:author][:id]] || User.new(@client, data[:author])
       else
-        @author = guild.members[data[:author][:id]] || Member.new(@client,
-                                                                  @guild_id, data[:author], data[:member])
+        @author = guild&.members&.get(data[:author][:id]) || Member.new(@client,
+                                                                        @guild_id, data[:author], data[:member])
       end
       @content = data[:content]
       @created_at = Time.iso8601(data[:timestamp])

data/lib/discorb.rb

@@ -44,7 +44,7 @@ require_order = %w[common flag dictionary error rate_limit http intents emoji_ta
                 %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[gateway_requests gateway app_command] +
                 %w[asset extension client extend]
 require_order.each do |name|
   require_relative "discorb/#{name}.rb"

data/po/yard.pot

@@ -322,7 +322,7 @@ msgid "## How do I register an application command?"
 msgstr ""
 
 #: ../docs/application_command.md:13
-msgid "Use {Discorb::Command::Handler#slash}, {Discorb::Command::Handler#group} for slash commands, {Discorb::Command::Handler#user_command} for user menu commands, and {Discorb::Command::Handler#message_command} for message menu commands."
+msgid "Use {Discorb::ApplicationCommand::Handler#slash}, {Discorb::ApplicationCommand::Handler#group} for slash commands, {Discorb::ApplicationCommand::Handler#user_command} for user menu commands, and {Discorb::ApplicationCommand::Handler#message_command} for message menu commands."
 msgstr ""
 
 #: ../docs/application_command.md:15
@@ -349,7 +349,7 @@ msgid "client.slash(\"hello\", \"Greet for you\") do |interaction|\n"
 msgstr ""
 
 #: ../docs/application_command.md:36
-msgid "{Discorb::Command::Handler#slash} takes 5 arguments:"
+msgid "{Discorb::ApplicationCommand::Handler#slash} takes 5 arguments:"
 msgstr ""
 
 #: ../docs/application_command.md:38
@@ -441,7 +441,7 @@ msgid "### Group Slash Commands"
 msgstr ""
 
 #: ../docs/application_command.md:104
-msgid "To register a group of slash commands, use {Discorb::Command::Handler#slash_group}."
+msgid "To register a group of slash commands, use {Discorb::ApplicationCommand::Handler#slash_group}."
 msgstr ""
 
 #: ../docs/application_command.md:106
@@ -473,7 +473,7 @@ msgid "group.slash(\"bump_alert\", \"Whether bot should notify DISBOARD bump.\",
 msgstr ""
 
 #: ../docs/application_command.md:128
-msgid "You can make subcommand group by using {Discorb::Command::GroupCommand#group}."
+msgid "You can make subcommand group by using {Discorb::ApplicationCommand::GroupCommand#group}."
 msgstr ""
 
 #: ../docs/application_command.md:130
@@ -558,7 +558,7 @@ msgid "```ruby\n"
 "  interaction.post(\"Hello, #{user.name}!\")\n"
 "end\n"
 "```\n"
-"{Discorb::Command::Handler#user_command} takes 3 arguments:"
+"{Discorb::ApplicationCommand::Handler#user_command} takes 3 arguments:"
 msgstr ""
 
 #: ../docs/application_command.md:216
@@ -595,7 +595,7 @@ msgid "```ruby\n"
 msgstr ""
 
 #: ../docs/application_command.md:238
-msgid "{Discorb::Command::Handler#message_command} takes 3 arguments:"
+msgid "{Discorb::ApplicationCommand::Handler#message_command} takes 3 arguments:"
 msgstr ""
 
 #: ../docs/application_command.md:248
@@ -4592,7 +4592,7 @@ msgstr ""
 msgid "The logger."
 msgstr ""
 
-# @return [Array<Discorb::Command::Command>]
+# @return [Array<Discorb::ApplicationCommand::Command>]
 #: ../lib/discorb/client.rb:45
 msgid "The commands that the client is using."
 msgstr ""
@@ -5262,17 +5262,17 @@ msgstr ""
 msgid "A Discord color name."
 msgstr ""
 
-# Discorb::Command
+# Discorb::ApplicationCommand
 #: ../lib/discorb/command.rb:5
 msgid "Handles application commands."
 msgstr ""
 
-# Discorb::Command::Handler
+# Discorb::ApplicationCommand::Handler
 #: ../lib/discorb/command.rb:9
 msgid "Module to handle commands."
 msgstr ""
 
-# Discorb::Command::Handler#slash
+# Discorb::ApplicationCommand::Handler#slash
 #: ../lib/discorb/command.rb:13
 msgid "Add new top-level command."
 msgstr ""
@@ -5364,14 +5364,14 @@ msgstr ""
 msgid "tag|param|options"
 msgstr ""
 
-# Discorb::Command::Handler#slash_group
+# Discorb::ApplicationCommand::Handler#slash_group
 #: ../lib/discorb/command.rb:41
 msgid "Add new command with group."
 msgstr ""
 
-# @return [Discorb::Command::Command::GroupCommand]
-# @return [Discorb::Command::Command::SubcommandGroup]
-# @return [Discorb::Command::Command]
+# @return [Discorb::ApplicationCommand::Command::GroupCommand]
+# @return [Discorb::ApplicationCommand::Command::SubcommandGroup]
+# @return [Discorb::ApplicationCommand::Command]
 #: ../lib/discorb/command.rb:51
 #: ../lib/discorb/command.rb:69
 #: ../lib/discorb/command.rb:87
@@ -5385,7 +5385,7 @@ msgstr ""
 msgid "tag|see|file:docs/slash_command.md"
 msgstr ""
 
-# Discorb::Command::Handler#message_command
+# Discorb::ApplicationCommand::Handler#message_command
 #: ../lib/discorb/command.rb:58
 msgid "Add message context menu command."
 msgstr ""
@@ -5397,13 +5397,13 @@ msgstr ""
 msgid "Block to execute."
 msgstr ""
 
-# @yieldparam [Discorb::CommandInteraction::UserMenuCommand]
+# @yieldparam [Discorb::ApplicationCommandInteraction::UserMenuCommand]
 #: ../lib/discorb/command.rb:69
 #: ../lib/discorb/command.rb:87
 msgid "tag|yieldparam|Interaction"
 msgstr ""
 
-# @yieldparam [Discorb::CommandInteraction::UserMenuCommand] Interaction
+# @yieldparam [Discorb::ApplicationCommandInteraction::UserMenuCommand] Interaction
 #: ../lib/discorb/command.rb:69
 #: ../lib/discorb/command.rb:87
 msgid "object."
@@ -5421,7 +5421,7 @@ msgstr ""
 msgid "Message object."
 msgstr ""
 
-# Discorb::Command::Handler#user_command
+# Discorb::ApplicationCommand::Handler#user_command
 #: ../lib/discorb/command.rb:76
 msgid "Add user context menu command."
 msgstr ""
@@ -5431,7 +5431,7 @@ msgstr ""
 msgid "User object."
 msgstr ""
 
-# Discorb::Command::Handler#setup_commands
+# Discorb::ApplicationCommand::Handler#setup_commands
 #: ../lib/discorb/command.rb:94
 msgid "Setup commands."
 msgstr ""
@@ -5456,7 +5456,7 @@ msgstr ""
 msgid "tag|see|Client#initialize"
 msgstr ""
 
-# Discorb::Command::Command
+# Discorb::ApplicationCommand::Command
 #: ../lib/discorb/command.rb:119
 msgid "Represents a application command."
 msgstr ""
@@ -5497,7 +5497,7 @@ msgstr ""
 msgid "a new instance of Command"
 msgstr ""
 
-# Discorb::Command::Command::SlashCommand
+# Discorb::ApplicationCommand::Command::SlashCommand
 #: ../lib/discorb/command.rb:163
 msgid "Represents the slash command."
 msgstr ""
@@ -5518,18 +5518,18 @@ msgstr ""
 msgid "a new instance of SlashCommand"
 msgstr ""
 
-# Discorb::Command::Command::SlashCommand#to_s
+# Discorb::ApplicationCommand::Command::SlashCommand#to_s
 #: ../lib/discorb/command.rb:185
 msgid "Returns the commands name."
 msgstr ""
 
-# Discorb::Command::Command::GroupCommand
+# Discorb::ApplicationCommand::Command::GroupCommand
 #: ../lib/discorb/command.rb:236
 msgid "Represents the command with subcommands."
 msgstr ""
 
-# @return [Array<Discorb::Command::Command::SlashCommand, Discorb::Command::Command::SubcommandGroup>]
-# @return [Array<Discorb::Command::Command::SlashCommand>]
+# @return [Array<Discorb::ApplicationCommand::Command::SlashCommand, Discorb::ApplicationCommand::Command::SubcommandGroup>]
+# @return [Array<Discorb::ApplicationCommand::Command::SlashCommand>]
 #: ../lib/discorb/command.rb:240
 #: ../lib/discorb/command.rb:361
 msgid "The subcommands of the command."
@@ -5540,20 +5540,20 @@ msgstr ""
 msgid "a new instance of GroupCommand"
 msgstr ""
 
-# Discorb::Command::Command::GroupCommand#slash
-# Discorb::Command::Command::SubcommandGroup#slash
+# Discorb::ApplicationCommand::Command::GroupCommand#slash
+# Discorb::ApplicationCommand::Command::SubcommandGroup#slash
 #: ../lib/discorb/command.rb:253
 #: ../lib/discorb/command.rb:376
 msgid "Add new subcommand."
 msgstr ""
 
-# @return [Discorb::Command::Command::SlashCommand]
+# @return [Discorb::ApplicationCommand::Command::SlashCommand]
 #: ../lib/discorb/command.rb:258
 #: ../lib/discorb/command.rb:380
 msgid "The added subcommand."
 msgstr ""
 
-# Discorb::Command::Command::GroupCommand#group
+# Discorb::ApplicationCommand::Command::GroupCommand#group
 #: ../lib/discorb/command.rb:301
 msgid "Add new subcommand group."
 msgstr ""
@@ -5568,7 +5568,7 @@ msgstr ""
 msgid "Group description."
 msgstr ""
 
-# Discorb::Command::Command::GroupCommand#to_s
+# Discorb::ApplicationCommand::Command::GroupCommand#to_s
 #: ../lib/discorb/command.rb:317
 msgid "Returns the command name."
 msgstr ""
@@ -5578,7 +5578,7 @@ msgstr ""
 msgid "The command name."
 msgstr ""
 
-# Discorb::Command::Command::SubcommandGroup
+# Discorb::ApplicationCommand::Command::SubcommandGroup
 #: ../lib/discorb/command.rb:357
 msgid "Represents the subcommand group."
 msgstr ""
@@ -5589,7 +5589,7 @@ msgid "a new instance of SubcommandGroup"
 msgstr ""
 
 # Discorb::Activity.types
-# Discorb::Command::Command.types
+# Discorb::ApplicationCommand::Command.types
 #: ../lib/discorb/command.rb:390
 #: ../lib/discorb/gateway_requests.rb:45
 msgid "Returns the value of attribute types."
@@ -9873,7 +9873,7 @@ msgstr ""
 msgid "Response with `UPDATE_MESSAGE`(`7`)."
 msgstr ""
 
-# Discorb::CommandInteraction
+# Discorb::ApplicationCommandInteraction
 #: ../lib/discorb/interaction.rb:245
 msgid "Represents a command interaction."
 msgstr ""
@@ -9883,12 +9883,12 @@ msgstr ""
 msgid "Implement this."
 msgstr ""
 
-# Discorb::CommandInteraction::SlashCommand
+# Discorb::ApplicationCommandInteraction::SlashCommand
 #: ../lib/discorb/interaction.rb:254
 msgid "Represents a slash command interaction."
 msgstr ""
 
-# Discorb::CommandInteraction::UserMenuCommand
+# Discorb::ApplicationCommandInteraction::UserMenuCommand
 #: ../lib/discorb/interaction.rb:310
 msgid "Represents a user context menu interaction."
 msgstr ""
@@ -9898,7 +9898,7 @@ msgstr ""
 msgid "The target user."
 msgstr ""
 
-# Discorb::CommandInteraction::MessageMenuCommand
+# Discorb::ApplicationCommandInteraction::MessageMenuCommand
 #: ../lib/discorb/interaction.rb:325
 msgid "Represents a message context menu interaction."
 msgstr ""
@@ -9908,7 +9908,7 @@ msgstr ""
 msgid "The target message."
 msgstr ""
 
-# Discorb::CommandInteraction.command_type
+# Discorb::ApplicationCommandInteraction.command_type
 #: ../lib/discorb/interaction.rb:348
 msgid "Returns the value of attribute command_type."
 msgstr ""