discorb 0.9.3 → 0.9.4

data/lib/discorb/emoji.rb

@@ -40,7 +40,7 @@ module Discorb
     # @!attribute [r] roles?
     #   @return [Boolean] whether or not this emoji is restricted to certain roles.
 
-    # @!visibility private
+    # @private
     def initialize(client, guild, data)
       @client = client
       @guild = guild
@@ -147,7 +147,7 @@ module Discorb
     attr_reader :deleted
     alias deleted? deleted
 
-    # @!visibility private
+    # @private
     def initialize(data)
       @id = Snowflake.new(data[:id])
       @name = data[:name]
@@ -189,7 +189,7 @@ module Discorb
     # @return [Integer] The skin tone of the emoji.
     attr_reader :skin_tone
 
-    # @!visibility private
+    # @private
     def initialize(name, tone: 0)
       if EmojiTable::DISCORD_TO_UNICODE.key?(name)
         @name = name

data/lib/discorb/error.rb

@@ -43,7 +43,7 @@ module Discorb
     # @return [Net::HTTPResponse] the HTTP response.
     attr_reader :response
 
-    # @!visibility private
+    # @private
     def initialize(resp, data)
       @code = data[:code]
       @response = resp
@@ -55,7 +55,7 @@ module Discorb
   # Represents a 400 error.
   #
   class BadRequestError < HTTPError
-    # @!visibility private
+    # @private
     def initialize(resp, data)
       @code = data[:code]
       @response = resp

data/lib/discorb/exe/init.rb

@@ -6,7 +6,7 @@ require_relative "../utils/colored_puts"
 
 $path = Dir.pwd
 
-# @!visibility private
+# @private
 FILES = {
   "main.rb" => <<~'RUBY',
     require "discorb"
@@ -133,12 +133,12 @@ FILES = {
   MARKDOWN
 }
 
-# @!visibility private
+# @private
 def create_file(name)
   File.write($path + "/#{name}", format(FILES[name], token: $values[:token], name: $values[:name]), mode: "wb")
 end
 
-# @!visibility private
+# @private
 def make_files
   iputs "Making files..."
   create_file("main.rb")
@@ -146,7 +146,7 @@ def make_files
   sputs "Made files.\n"
 end
 
-# @!visibility private
+# @private
 def bundle_init
   iputs "Initializing bundle..."
   create_file("Gemfile")
@@ -155,7 +155,7 @@ def bundle_init
   sputs "Installed gems.\n"
 end
 
-# @!visibility private
+# @private
 def git_init
   create_file(".gitignore")
   iputs "Initializing git repository..."
@@ -167,7 +167,7 @@ def git_init
           " to change commit message of initial commit.\n"
 end
 
-# @!visibility private
+# @private
 def make_descs
   iputs "Making descriptions..."
   create_file(".env.sample")
@@ -246,8 +246,8 @@ bundle_init if $values[:bundle]
 
 make_files
 
-git_init if $values[:git]
-
 make_descs if $values[:descs]
 
+git_init if $values[:git]
+
 sputs "\nSuccessfully made a new project at \e[32m#{$path}\e[92m."

data/lib/discorb/exe/run.rb

@@ -5,7 +5,7 @@ require "discorb/utils/colored_puts"
 require "io/console"
 
 ARGV.delete_at 0
-# @!visibility private
+# @private
 LOG_LEVELS = %w[none debug info warn error fatal]
 
 opt = OptionParser.new <<~BANNER

data/lib/discorb/extension.rb

@@ -54,7 +54,7 @@ module Discorb
     # @private
     attr_reader :bottom_commands
 
-    # @!visibility private
+    # @private
     attr_accessor :client
 
     def self.extended(obj)

data/lib/discorb/file.rb

@@ -32,7 +32,7 @@ module Discorb
     # @!attribute [r] image?
     #   @return [Boolean] whether the file is an image.
 
-    # @!visibility private
+    # @private
     def initialize(data)
       @id = Snowflake.new(data[:id])
       @filename = data[:filename]

data/lib/discorb/gateway.rb

@@ -16,7 +16,7 @@ module Discorb
     # Represents an event.
     #
     class GatewayEvent
-      # @!visibility private
+      # @private
       def initialize(data)
         @data = data
       end
@@ -61,7 +61,7 @@ module Discorb
       alias reactor fired_by
       alias from fired_by
 
-      # @!visibility private
+      # @private
       def initialize(client, data)
         @client = client
         @data = data
@@ -129,7 +129,7 @@ module Discorb
       # @return [Discorb::Message] The message the reaction was sent in.
       attr_reader :message
 
-      # @!visibility private
+      # @private
       def initialize(client, data)
         @client = client
         @data = data
@@ -180,7 +180,7 @@ module Discorb
       # @return [Discorb::UnicodeEmoji, Discorb::PartialEmoji] The emoji that was reacted with.
       attr_reader :emoji
 
-      # @!visibility private
+      # @private
       def initialize(client, data)
         @client = client
         @data = data
@@ -296,7 +296,7 @@ module Discorb
       #   @macro client_cache
       #   @return [Discorb::Guild] The guild the message was sent in.
 
-      # @!visibility private
+      # @private
       def initialize(client, id, data)
         @client = client
         @id = id
@@ -328,7 +328,7 @@ module Discorb
       #   @macro client_cache
       #   @return [Discorb::Guild] The guild the message was sent in.
 
-      # @!visibility private
+      # @private
       def initialize(client, data)
         @client = client
         @data = data
@@ -381,7 +381,7 @@ module Discorb
       #   @macro client_cache
       #   @return [Discorb::Member, Discorb::User] The member or user that started typing.
 
-      # @!visibility private
+      # @private
       def initialize(client, data)
         @client = client
         @data = data
@@ -458,7 +458,7 @@ module Discorb
       #   @macro client_cache
       #   @return [Discorb::Guild] The guild where the webhook was updated.
 
-      # @!visibility private
+      # @private
       def initialize(client, data)
         @client = client
         @data = data

data/lib/discorb/gateway_requests.rb

@@ -40,7 +40,7 @@ module Discorb
     end
 
     class << self
-      # @!visibility private
+      # @private
       attr_reader :types
     end
   end

data/lib/discorb/guild.rb

@@ -118,14 +118,14 @@ module Discorb
     @default_message_notifications = %i[all_messages only_mentions].freeze
     @explicit_content_filter = %i[disabled_in_text members_without_roles all_members].freeze
 
-    # @!visibility private
+    # @private
     def initialize(client, data, is_create_event)
       @client = client
       @data = {}
       _set_data(data, is_create_event)
     end
 
-    # @!visibility private
+    # @private
     def update!
       Async do
         _, data = @client.get("/guilds/#{@id}").wait
@@ -952,7 +952,7 @@ module Discorb
       # @!attribute [r] url
       #   @return [String] The vanity URL.
 
-      # @!visibility private
+      # @private
       def initialize(client, guild, data)
         @client = client
         @guild = guild
@@ -987,7 +987,7 @@ module Discorb
       # @!attribute [r] json_url
       #   @return [String] The JSON URL.
 
-      # @!visibility private
+      # @private
       def initialize(client, guild_id, data)
         @client = client
         @enabled = data[:enabled]
@@ -1050,7 +1050,7 @@ module Discorb
       # @return [String] The reason for the ban.
       attr_reader :reason
 
-      # @!visibility private
+      # @private
       def initialize(client, guild, data)
         @client = client
         @guild = guild
@@ -1060,7 +1060,7 @@ module Discorb
     end
 
     class << self
-      # @!visibility private
+      # @private
       attr_reader :nsfw_levels, :mfa_levels, :verification_levels, :default_message_notifications, :explicit_content_filter
 
       #
@@ -1175,7 +1175,7 @@ module Discorb
     # @return [Discorb::Guild] The guild the welcome screen belongs to.
     attr_reader :guild
 
-    # @!visibility private
+    # @private
     def initialize(client, guild, data)
       @client = client
       @description = data[:description]

data/lib/discorb/guild_template.rb

@@ -33,7 +33,7 @@ module Discorb
     #   @return [Discorb::Guild] The guild this template is based on.
     #   @return [nil] Client wasn't able to find the guild this template is based on.
 
-    # @!visibility private
+    # @private
     def initialize(client, data)
       @client = client
       _set_data(data)
@@ -117,7 +117,7 @@ module Discorb
       attr_reader :widget_enabled
       alias widget_enabled? widget_enabled
 
-      # @!visibility private
+      # @private
       def initialize(data)
         @name = data[:name]
         @description = data[:description]
@@ -143,7 +143,7 @@ module Discorb
         # @return [Discorb::Color] The color of the role.
         attr_reader :color
 
-        # @!visibility private
+        # @private
         def initialize(data)
           @name = data[:name]
           @permissions = Permission.new(data[:permissions])
@@ -174,7 +174,7 @@ module Discorb
         # @return [Class] The class of the channel.
         attr_reader :type
 
-        # @!visibility private
+        # @private
         def initialize(data)
           @name = data[:name]
           @position = data[:position]

data/lib/discorb/http.rb

@@ -10,7 +10,7 @@ module Discorb
   class HTTP
     @nil_body = nil
 
-    # @!visibility private
+    # @private
     def initialize(client)
       @client = client
       @ratelimit_handler = RatelimitHandler.new(client)

data/lib/discorb/integration.rb

@@ -43,7 +43,7 @@ module Discorb
       1 => :kick,
     }
 
-    # @!visibility private
+    # @private
     def initialize(client, data, guild_id, no_cache: false)
       @client = client
       @data = data
@@ -88,7 +88,7 @@ module Discorb
     end
 
     class << self
-      # @!visibility private
+      # @private
       attr_reader :expire_behavior
     end
 
@@ -101,7 +101,7 @@ module Discorb
       # @return [String] The name of the account.
       attr_reader :name
 
-      # @!visibility private
+      # @private
       def initialize(data)
         @id = data[:id]
         @name = data[:name]

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
@@ -184,7 +184,7 @@ module Discorb
       end
 
       class CallbackMessage
-        # @!visibility private
+        # @private
         def initialize(client, data, application_id, token)
           @client = client
           @data = data
@@ -418,7 +418,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
@@ -430,10 +430,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]
@@ -442,7 +442,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
@@ -462,17 +462,17 @@ module Discorb
     @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]
@@ -481,7 +481,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 = {}
@@ -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

@@ -192,18 +192,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 = {}