discorb 0.9.1 → 0.9.6

data/lib/discorb/interaction.rb

@@ -33,7 +33,7 @@ module Discorb
     @interaction_type = nil
     @interaction_name = nil
 
-    # @!visibility private
+    # @private
     def initialize(client, data)
       @client = client
       @id = Snowflake.new(data[:id])
@@ -71,10 +71,10 @@ module Discorb
     end
 
     class << self
-      # @!visibility private
+      # @private
       attr_reader :interaction_type, :interaction_name, :event_name
 
-      # @!visibility private
+      # @private
       def make_interaction(client, data)
         interaction = nil
         descendants.each do |klass|
@@ -87,7 +87,7 @@ module Discorb
         interaction
       end
 
-      # @!visibility private
+      # @private
       def descendants
         ObjectSpace.each_object(Class).select { |klass| klass < self }
       end
@@ -131,6 +131,8 @@ module Discorb
       # @param [Array<Discorb::Component>, Array<Array<Discorb::Component>>] components The components to send.
       # @param [Boolean] ephemeral Whether to make the response ephemeral.
       #
+      # @return [Discorb::Interaction::SourceResponse::CallbackMessage, Discorb::Webhook::Message] The callback message.
+      #
       def post(content = nil, tts: false, embed: nil, embeds: nil, allowed_mentions: nil, components: nil, ephemeral: false)
         Async do
           payload = {}
@@ -165,14 +167,78 @@ module Discorb
           end
           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
+          ret = if @responded
+              _resp, data = @client.http.post("/webhooks/#{@application_id}/#{@token}", payload).wait
+              webhook = Webhook::URLWebhook.new("/webhooks/#{@application_id}/#{@token}")
+              Webhook::Message.new(webhook, data, @client)
+            elsif @defered
+              @client.http.patch("/webhooks/#{@application_id}/#{@token}/messages/@original", payload).wait
+              CallbackMessage.new(@client, payload, @application_id, @token)
+            else
+              @client.http.post("/interactions/#{@id}/#{@token}/callback", { type: 4, data: payload }).wait
+              CallbackMessage.new(@client, payload, @application_id, @token)
+            end
           @responded = true
+          ret
+        end
+      end
+
+      class CallbackMessage
+        # @private
+        def initialize(client, data, application_id, token)
+          @client = client
+          @data = data
+          @application_id = application_id
+          @token = token
+        end
+
+        #
+        # Edits the callback message.
+        # @macro async
+        # @macro http
+        # @macro edit
+        #
+        # @param [String] content The new content of the message.
+        # @param [Discorb::Embed] embed The new embed of the message.
+        # @param [Array<Discorb::Embed>] embeds The new embeds of the message.
+        # @param [Array<Discorb::Attachment>] attachments The attachments to remain.
+        # @param [Discorb::File] file The file to send.
+        # @param [Array<Discorb::File>] files The files to send.
+        #
+        def edit(
+          content = :unset,
+          embed: :unset, embeds: :unset,
+          file: :unset, files: :unset,
+          attachments: :unset
+        )
+          Async do
+            payload = {}
+            payload[:content] = content if content != :unset
+            payload[:embeds] = embed ? [embed.to_hash] : [] if embed != :unset
+            payload[:embeds] = embeds.map(&:to_hash) if embeds != :unset
+            payload[:attachments] = attachments.map(&:to_hash) if attachments != :unset
+            files = [file] if file != :unset
+            if files == :unset
+              headers = {
+                "Content-Type" => "application/json",
+              }
+            else
+              headers, payload = HTTP.multipart(payload, files)
+            end
+            @client.http.patch("/webhooks/#{@application_id}/#{@token}/messages/@original", payload, headers: headers).wait
+          end
+        end
+
+        alias modify edit
+
+        #
+        # Deletes the callback message.
+        # @note This will fail if the message is ephemeral.
+        #
+        def delete!
+          Async do
+            @client.http.delete("/webhooks/#{@application_id}/#{@token}/messages/@original").wait
+          end
         end
       end
     end
@@ -189,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),
             },
@@ -244,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
@@ -296,28 +362,31 @@ module Discorb
               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.bottom_commands.find { |c| c.to_s == name && c.type_raw == 1 })
             @client.log.warn "Unknown command name #{name}, ignoreing"
             next
           end
 
-          command.block.call(self, *options)
+          option_map = command.options.map { |k, v| [k.to_s, v[:default]] }.to_h
+          options ||= []
+          options.each 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
+
+          command.block.call(self, *command.options.map { |k, v| option_map[k.to_s] })
         end
       end
     end
@@ -351,7 +420,7 @@ module Discorb
       private
 
       def _set_data(data)
-        @target = Message.new(@client, data[:resolved][:messages][data[:target_id].to_sym])
+        @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
@@ -363,10 +432,10 @@ module Discorb
     end
 
     class << self
-      # @!visibility private
+      # @private
       attr_reader :command_type
 
-      # @!visibility private
+      # @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]
@@ -375,7 +444,7 @@ module Discorb
         CommandInteraction.new(client, data)
       end
 
-      # @!visibility private
+      # @private
       def nested_classes
         constants.select { |c| const_get(c).is_a? Class }.map { |c| const_get(c) }
       end
@@ -391,21 +460,23 @@ 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
 
-    # @!visibility private
+    # @private
     def initialize(client, data)
       super
       @message = Message.new(@client, data[:message].merge({ member: data[:member] }))
     end
 
     class << self
-      # @!visibility private
+      # @private
       attr_reader :component_type
 
-      # @!visibility private
+      # @private
       def make_interaction(client, data)
         nested_classes.each do |klass|
           return klass.new(client, data) if !klass.component_type.nil? && klass.component_type == data[:data][:component_type]
@@ -414,7 +485,7 @@ module Discorb
         MessageComponentInteraction.new(client, data)
       end
 
-      # @!visibility private
+      # @private
       def nested_classes
         constants.select { |c| const_get(c).is_a? Class }.map { |c| const_get(c) }
       end

data/lib/discorb/invite.rb

@@ -72,7 +72,7 @@ module Discorb
       2 => :guild,
     }.freeze
 
-    # @!visibility private
+    # @private
     def initialize(client, data, gateway)
       @client = client
       @data = data[:data]
@@ -138,7 +138,7 @@ module Discorb
     end
 
     class << self
-      # @!visibility private
+      # @private
       attr_reader :target_types
     end
   end

data/lib/discorb/log.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Discorb
-  # @!visibility private
+  # @private
   class Logger
     attr_accessor :out, :colorize_log
 

data/lib/discorb/member.rb

@@ -62,7 +62,7 @@ module Discorb
     # @!attribute [r] owner?
     #   @return [Boolean] Whether the member is the owner of the guild.
 
-    # @!visibility private
+    # @private
     def initialize(client, guild_id, user_data, member_data)
       @guild_id = guild_id
       @client = client

data/lib/discorb/message.rb

@@ -29,7 +29,7 @@ module Discorb
       @replied_user = replied_user
     end
 
-    # @!visibility private
+    # @private
     def to_hash(other = nil)
       payload = {
         parse: %w[everyone roles users],
@@ -183,8 +183,32 @@ module Discorb
     # @!attribute [r] embed
     #   @return [Discorb::Embed] The embed of the message.
     #   @return [nil] If the message has no embed.
+    # @!attribute [r] embed?
+    #   @return [Boolean] Whether the message has an embed.
+    # @!attribute [r] reply?
+    #   @return [Boolean] Whether the message is a reply.
+    # @!attribute [r] dm?
+    #   @return [Boolean] Whether the message was sent in a DM.
+    # @!attribute [r] guild?
+    #   @return [Boolean] Whether the message was sent in a guild.
+
+    def embed?
+      @embeds.any?
+    end
+
+    def reply?
+      !@message_reference.nil?
+    end
+
+    def dm?
+      @guild_id.nil?
+    end
+
+    def guild?
+      !@guild_id.nil?
+    end
 
-    # @!visibility private
+    # @private
     def initialize(client, data, no_cache: false)
       @client = client
       @data = {}
@@ -272,11 +296,11 @@ module Discorb
     # @param [Array<Discorb::Component>, Array<Array<Discorb::Component>>] components The components to send.
     # @param [Boolean] supress Whether to supress embeds.
     #
-    def edit(message_id, content = nil, embed: nil, embeds: nil, allowed_mentions: nil,
-                                        components: nil, supress: nil)
+    def edit(content = nil, embed: nil, embeds: nil, allowed_mentions: nil,
+                            components: nil, supress: nil)
       Async do
-        channel.edit_message(@id, message_id, content, embed: embed, embeds: embeds, allowed_mentions: allowed_mentions,
-                                                       components: components, supress: supress).wait
+        channel.edit_message(@id, content, embed: embed, embeds: embeds, allowed_mentions: allowed_mentions,
+                                           components: components, supress: supress).wait
       end
     end
 
@@ -616,7 +640,7 @@ module Discorb
       # @return [Discorb::User] The user.
       attr_reader :user
 
-      # @!visibility private
+      # @private
       def initialize(client, data)
         @id = Snowflake.new(data[:id])
         @name = data[:name]
@@ -641,20 +665,20 @@ module Discorb
         5 => :join_request,
       }
 
-      # @!visibility private
+      # @private
       def initialize(data)
         @name = data[:name]
         @type = self.class.type(data[:type])
       end
 
       class << self
-        # @!visibility private
+        # @private
         attr_reader :type
       end
     end
 
     class << self
-      # @!visibility private
+      # @private
       attr_reader :message_type
     end
   end

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 flags.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
@@ -192,18 +156,20 @@ module Discorb
     #   end
     #
     def typing
-      Async do |task|
-        if block_given?
-          begin
-            post_task = task.async do
+      if block_given?
+        begin
+          post_task = Async do
+            loop do
               @client.http.post("/channels/#{@id}/typing", {})
               sleep(5)
             end
-            yield
-          ensure
-            post_task.stop
           end
-        else
+          yield
+        ensure
+          post_task.stop
+        end
+      else
+        Async do |task|
           @client.http.post("/channels/#{@id}/typing", {})
         end
       end

data/lib/discorb/permission.rb

@@ -138,7 +138,7 @@ module Discorb
     }.freeze
     @bits = @raw_bits.transform_values { |v| 1 << v }.freeze
 
-    # @!visibility private
+    # @private
     def initialize(allow, deny)
       @allow = allow
       @deny = deny
@@ -248,7 +248,7 @@ module Discorb
     end
 
     class << self
-      # @!visibility private
+      # @private
       attr_reader :bits
 
       #

data/lib/discorb/presence.rb

@@ -19,7 +19,7 @@ module Discorb
     # @!attribute [r] activity
     #   @return [Discorb::Presence::Activity] The activity of the presence.
 
-    # @!visibility private
+    # @private
     def initialize(client, data)
       @client = client
       @data = data
@@ -89,7 +89,7 @@ module Discorb
         5 => :competing,
       }
 
-      # @!visibility private
+      # @private
       def initialize(data)
         @name = data[:name]
         @type = self.class.activity_types[data[:type]]
@@ -140,7 +140,7 @@ module Discorb
         # @return [Time] The end time of the activity.
         attr_reader :end
 
-        # @!visibility private
+        # @private
         def initialize(data)
           @start = data[:start] && Time.at(data[:start])
           @end = data[:end] && Time.at(data[:end])
@@ -156,7 +156,7 @@ module Discorb
         # @!attribute [r] max_size
         #   @return [Integer] The max size of the party.
 
-        # @!visibility private
+        # @private
         def initialize(data)
           @id = data[:id]
           @size = data[:size]
@@ -226,7 +226,7 @@ module Discorb
         # @return [String] The match secret of the activity.
         attr_reader :match
 
-        # @!visibility private
+        # @private
         def initialize(data)
           @join = data[:join]
           @spectate = data[:spectate]
@@ -244,7 +244,7 @@ module Discorb
         attr_reader :url
         alias text label
 
-        # @!visibility private
+        # @private
         def initialize(data)
           @label = data[0]
           @url = data[1]
@@ -252,7 +252,7 @@ module Discorb
       end
 
       class << self
-        # @!visibility private
+        # @private
         attr_reader :activity_types
       end
     end
@@ -275,7 +275,7 @@ module Discorb
       # @!attribute [r] web?
       #   @return [Boolean] Whether the user is not offline on web.
 
-      # @!visibility private
+      # @private
       def initialize(data)
         @desktop = data[:desktop]&.to_sym || :offline
         @mobile = data[:mobile]&.to_sym || :offline

data/lib/discorb/rate_limit.rb

@@ -6,7 +6,7 @@ module Discorb
   # @private
   #
   class RatelimitHandler
-    # @!visibility private
+    # @private
     def initialize(client)
       @client = client
       @ratelimit_hash = {}

data/lib/discorb/reaction.rb

@@ -16,7 +16,7 @@ module Discorb
     alias me? me
     alias reacted? me
 
-    # @!visibility private
+    # @private
     def initialize(message, data)
       @message = message
       _set_data(data)

data/lib/discorb/role.rb

@@ -36,7 +36,7 @@ module Discorb
 
     include Comparable
 
-    # @!visibility private
+    # @private
     def initialize(client, guild, data)
       @client = client
       @guild = guild
@@ -154,7 +154,7 @@ module Discorb
       # @!attribute [r] integration?
       #   @return [Boolean] Whether the role is an integration role.
 
-      # @!visibility private
+      # @private
       def initialize(data)
         @bot_id = Snowflake.new(data[:bot_id])
         @integration_id = Snowflake.new(data[:integration_id])

data/lib/discorb/sticker.rb

@@ -38,7 +38,7 @@ module Discorb
       2 => :apng,
       3 => :lottie,
     }
-    # @!visibility private
+    # @private
     def initialize(client, data)
       @client = client
       _set_data(data)
@@ -116,7 +116,7 @@ module Discorb
       # @return [Discorb::Asset] The banner of the pack.
       attr_reader :banner
 
-      # @!visibility private
+      # @private
       def initialize(client, data)
         @client = client
         @id = Snowflake.new(data[:id])
@@ -150,7 +150,7 @@ module Discorb
     end
 
     class << self
-      # @!visibility private
+      # @private
       attr_reader :sticker_type, :sticker_format
     end
   end

data/lib/discorb/user.rb

@@ -26,7 +26,7 @@ module Discorb
 
     include Discorb::Messageable
 
-    # @!visibility private
+    # @private
     def initialize(client, data)
       @client = client
       @data = {}
@@ -73,7 +73,7 @@ module Discorb
 
     alias app_owner? bot_owner?
 
-    # @!visibility private
+    # @private
     def channel_id
       Async do
         next @dm_channel_id if @dm_channel_id

data/lib/discorb/utils/colored_puts.rb

@@ -1,14 +1,14 @@
-# @!visibility private
+# @private
 def sputs(text)
   puts "\e[92m#{text}\e[m"
 end
 
-# @!visibility private
+# @private
 def eputs(text)
   puts "\e[91m#{text}\e[m"
 end
 
-# @!visibility private
+# @private
 def iputs(text)
   puts "\e[90m#{text}\e[m"
 end

data/lib/discorb/utils.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Discorb
-  # @!visibility private
+  # @private
   module Utils
     def try(object, message, ...)
       if object.respond_to?(message)