discorb 0.12.1 → 0.13.0

data/lib/discorb/image.rb

@@ -16,12 +16,10 @@ module Discorb
     #
     def initialize(source, type = nil)
       if source.respond_to?(:read)
-        @bytes = source.read
+        @io = source
         @type = type || MIME::Types.type_for(source.path).first.content_type
       elsif ::File.exist?(source)
-        ::File.open(source, "rb") do |file|
-          @bytes = file.read
-        end
+        @io = ::File.open(source, "rb")
         @type = MIME::Types.type_for(source).first.to_s
       else
         raise ArgumentError, "Couldn't read file."
@@ -34,7 +32,11 @@ module Discorb
     # @return [String] The image as a Discord style.
     #
     def to_s
-      "data:#{@type};base64,#{Base64.strict_encode64(@bytes)}"
+      "data:#{@type};base64,#{Base64.strict_encode64(@io.read)}"
+    end
+
+    def inspect
+      "#<#{self.class} #{@type}>"
     end
   end
 end

data/lib/discorb/integration.rb

@@ -84,7 +84,7 @@ module Discorb
       @account = Account.new(data[:account])
       @subscriber_count = data[:subscriber_count]
       @revoked = data[:revoked]
-      @application = Application.new(@client, data[:application])
+      @application = data[:application] and Application.new(@client, data[:application])
     end
 
     class << self

data/lib/discorb/intents.rb

@@ -19,6 +19,7 @@ module Discorb
       dm_messages: 1 << 12,
       dm_reactions: 1 << 13,
       dm_typing: 1 << 14,
+      scheduled_events: 1 << 16,
     }.freeze
 
     #
@@ -38,6 +39,7 @@ module Discorb
     # @param dm_messages [Boolean] Whether dm messages related events are enabled.
     # @param dm_reactions [Boolean] Whether dm reactions related events are enabled.
     # @param dm_typing [Boolean] Whether dm typing related events are enabled.
+    # @param scheduled_events [Boolean] Whether events related scheduled events are enabled.
     #
     # @note You must enable privileged intents to use `members` and/or `presences` intents.
     #
@@ -55,7 +57,8 @@ module Discorb
                    typing: true,
                    dm_messages: true,
                    dm_reactions: true,
-                   dm_typing: true)
+                   dm_typing: true,
+                   scheduled_events: true)
       @raw_value = {
         guilds: guilds,
         members: members,
@@ -72,6 +75,7 @@ module Discorb
         dm_messages: dm_messages,
         dm_reactions: dm_reactions,
         dm_typing: dm_typing,
+        scheduled_events: scheduled_events,
       }
     end
 
@@ -124,13 +128,14 @@ module Discorb
       end
 
       # Create new intent object with default values.
+      # This will return intents without members and presence.
       def default
-        from_value(32509)
+        from_value(@intent_bits.values.reduce(:+) - @intent_bits[:members] - @intent_bits[:presences])
       end
 
       # Create new intent object with all intents.
       def all
-        from_value(32767)
+        from_value(@intent_bits.values.reduce(:+))
       end
 
       # Create new intent object with no intents.

data/lib/discorb/interaction/autocomplete.rb

@@ -18,7 +18,7 @@ module Discorb
         end
 
         option_map = command.options.map { |k, v| [k.to_s, v[:default]] }.to_h
-        Discorb::CommandInteraction::SlashCommand.modify_option_map(option_map, options)
+        Discorb::CommandInteraction::SlashCommand.modify_option_map(option_map, options, guild)
         focused_index = options.find_index { |o| o[:focused] }
         val = command.options.values[focused_index][:autocomplete]&.call(self, *command.options.map { |k, v| option_map[k.to_s] })
         send_complete_result(val)

data/lib/discorb/interaction/command.rb

@@ -26,7 +26,7 @@ module Discorb
         end
 
         option_map = command.options.map { |k, v| [k.to_s, v[:default]] }.to_h
-        SlashCommand.modify_option_map(option_map, options)
+        SlashCommand.modify_option_map(option_map, options, guild)
 
         command.block.call(self, *command.options.map { |k, v| option_map[k.to_s] })
       end
@@ -59,7 +59,7 @@ module Discorb
         end
 
         # @private
-        def modify_option_map(option_map, options)
+        def modify_option_map(option_map, options, guild)
           options ||= []
           options.each_with_index do |option|
             val = case option[:type]

data/lib/discorb/log.rb

@@ -13,6 +13,10 @@ module Discorb
       @colorize_log = colorize_log
     end
 
+    def inspect
+      "#<#{self.class} level=#{level}>"
+    end
+
     def level
       self.class.levels[@level]
     end

data/lib/discorb/member.rb

@@ -233,7 +233,7 @@ module Discorb
       @joined_at = member_data[:joined_at] && Time.iso8601(member_data[:joined_at])
       @hoisted_role_id = member_data[:hoisted_role]
       @deaf = member_data[:deaf]
-      @custom_avatar = member_data[:avatar] && Asset.new(member_data[:avatar])
+      @custom_avatar = member_data[:avatar] && Asset.new(self, 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].nil?

data/lib/discorb/message.rb

@@ -29,6 +29,10 @@ module Discorb
       @replied_user = replied_user
     end
 
+    def inspect
+      "#<#{self.class} @everyone=#{@everyone} @roles=#{@roles} @users=#{@users} @replied_user=#{@replied_user}>"
+    end
+
     # @private
     def to_hash(other = nil)
       payload = {
@@ -109,9 +113,10 @@ module Discorb
     # * `:guild_discovery_grace_period_final_warning`
     # * `:thread_created`
     # * `:reply`
-    # * `:application_command`
+    # * `:chat_input_command`
     # * `:thread_starter_message`
     # * `:guild_invite_reminder`
+    # * `:context_menu_command`
     attr_reader :type
     # @return [Discorb::Message::Activity] The activity of the message.
     attr_reader :activity
@@ -143,28 +148,29 @@ module Discorb
     attr_reader :pinned
     alias pinned? pinned
     @message_type = {
-      default: 0,
-      recipient_add: 1,
-      recipient_remove: 2,
-      call: 3,
-      channel_name_change: 4,
-      channel_icon_change: 5,
-      channel_pinned_message: 6,
-      guild_member_join: 7,
-      user_premium_guild_subscription: 8,
-      user_premium_guild_subscription_tier_1: 9,
-      user_premium_guild_subscription_tier_2: 10,
-      user_premium_guild_subscription_tier_3: 11,
-      channel_follow_add: 12,
-      guild_discovery_disqualified: 14,
-      guild_discovery_requalified: 15,
-      guild_discovery_grace_period_initial_warning: 16,
-      guild_discovery_grace_period_final_warning: 17,
-      thread_created: 18,
-      reply: 19,
-      application_command: 20,
-      thread_starter_message: 21,
-      guild_invite_reminder: 22,
+      0 => :default,
+      1 => :recipient_add,
+      2 => :recipient_remove,
+      3 => :call,
+      4 => :channel_name_change,
+      5 => :channel_icon_change,
+      6 => :channel_pinned_message,
+      7 => :guild_member_join,
+      8 => :user_premium_guild_subscription,
+      9 => :user_premium_guild_subscription_tier_1,
+      10 => :user_premium_guild_subscription_tier_2,
+      11 => :user_premium_guild_subscription_tier_3,
+      12 => :channel_follow_add,
+      14 => :guild_discovery_disqualified,
+      15 => :guild_discovery_requalified,
+      16 => :guild_discovery_grace_period_initial_warning,
+      17 => :guild_discovery_grace_period_final_warning,
+      18 => :thread_created,
+      19 => :reply,
+      20 => :chat_input_command,
+      21 => :thread_starter_message,
+      22 => :guild_invite_reminder,
+      23 => :context_menu_command,
     }.freeze
 
     # @!attribute [r] channel

data/lib/discorb/permission.rb

@@ -164,6 +164,10 @@ module Discorb
       @deny
     end
 
+    def inspect
+      "#<#{self.class} allow=#{allow} deny=#{deny}>"
+    end
+
     #
     # Converts the permission overwrite to a hash.
     #

data/lib/discorb/rate_limit.rb

@@ -14,6 +14,10 @@ module Discorb
       @global = false
     end
 
+    def inspect
+      "#<#{self.class}>"
+    end
+
     #
     # Wait for the rate limit to reset.
     #
@@ -23,8 +27,8 @@ module Discorb
     def wait(method, path)
       return if path.start_with?("https://")
 
-      if @global
-        time = b[:reset_at] - Time.now.to_f
+      if @global && @global > Time.now.to_f
+        time = @global - Time.now.to_f
         @client.log.info("global rate limit reached, waiting #{time} seconds")
         sleep(time)
         @global = false

data/lib/discorb/sticker.rb

@@ -51,6 +51,15 @@ module Discorb
       # @!attribute [r] guild
       #   @macro client_cache
       #   @return [Discorb::Guild] The guild the sticker is in.
+      @sticker_type = {
+        1 => :official,
+        2 => :guild,
+      }.freeze
+      @sticker_format = {
+        1 => :png,
+        2 => :apng,
+        3 => :lottie,
+      }
 
       def guild
         @client.guilds[@guild_id]

data/lib/discorb/user.rb

@@ -123,6 +123,7 @@ module Discorb
         verified_bot: 16,
         early_verified_bot_developer: 17,
         discord_certified_moderator: 18,
+        bot_http_interactions: 19,
       }.freeze
     end
 

data/lib/discorb.rb

@@ -41,7 +41,7 @@ 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] +
+                %w[application audit_logs color components event event_handler] +
                 %w[file guild_template image integration interaction invite log permission] +
                 %w[presence reaction role sticker utils voice_state webhook] +
                 %w[gateway_requests gateway app_command] +

data/po/yard.pot

@@ -4784,7 +4784,7 @@ msgstr ""
 msgid "The block to execute when the event is triggered."
 msgstr ""
 
-# @return [Discorb::Event]
+# @return [Discorb::EventHandler]
 #: ../lib/discorb/client.rb:104
 #: ../lib/discorb/client.rb:118
 #: ../lib/discorb/extension.rb:24
@@ -7040,7 +7040,7 @@ msgstr ""
 msgid "a new instance of NotSupportedWarning"
 msgstr ""
 
-# Discorb::Event
+# Discorb::EventHandler
 #: ../lib/discorb/event.rb:5
 msgid "Represents a event.\n"
 "This class shouldn't be instantiated directly.\n"
@@ -7073,7 +7073,7 @@ msgstr ""
 msgid "a new instance of Event"
 msgstr ""
 
-# Discorb::Event#call
+# Discorb::EventHandler#call
 #: ../lib/discorb/event.rb:29
 msgid "Calls the block associated with the event."
 msgstr ""
@@ -7135,7 +7135,7 @@ msgstr ""
 msgid "Define a new once event."
 msgstr ""
 
-# @return [Hash{Symbol => Array<Discorb::Event>}]
+# @return [Hash{Symbol => Array<Discorb::EventHandler>}]
 #: ../lib/discorb/extension.rb:48
 msgid "The events of the extension."
 msgstr ""

data/sig/discorb.rbs

@@ -2183,12 +2183,12 @@ module Discorb
     # _@return_ — The event.
     # 
     # _@see_ `file:docs/Events.md`
-    def on: (Symbol event_name, ?id: Symbol?, **::Hash[untyped, untyped] metadata) -> Discorb::Event
+    def on: (Symbol event_name, ?id: Symbol?, **::Hash[untyped, untyped] metadata) -> Discorb::EventHandler
 
     # Almost same as {#on}, but only triggers the event once.
     # 
     # _@return_ — The event.
-    def once: (Symbol event_name, ?id: Symbol?, **::Hash[untyped, untyped] metadata) -> Discorb::Event
+    def once: (Symbol event_name, ?id: Symbol?, **::Hash[untyped, untyped] metadata) -> Discorb::EventHandler
 
     # Remove event by ID.
     # 
@@ -3981,7 +3981,7 @@ module Discorb
   module Command
     # 
     # Module to handle commands.
-    module Handler
+    module EventHandler
           # Add new top-level command.
       # 
       # _@param_ `command_name` — Command name.
@@ -4548,7 +4548,7 @@ module Discorb
 
     # 
     # A module to handle gateway events.
-    module Handler
+    module EventHandler
           def connect_gateway: (untyped first) -> untyped
 
             def send_gateway: (untyped opcode, **untyped value) -> untyped
@@ -5798,7 +5798,7 @@ module Discorb
     # _@param_ `block` — The block to execute when the event is triggered.
     # 
     # _@return_ — The event.
-    def event: (Symbol event_name, ?id: Symbol?, **::Hash[untyped, untyped] metadata) -> Discorb::Event
+    def event: (Symbol event_name, ?id: Symbol?, **::Hash[untyped, untyped] metadata) -> Discorb::EventHandler
 
     # Define a new once event.
     # 
@@ -5811,7 +5811,7 @@ module Discorb
     # _@param_ `block` — The block to execute when the event is triggered.
     # 
     # _@return_ — The event.
-    def once_event: (Symbol event_name, ?id: Symbol?, **::Hash[untyped, untyped] metadata) -> Discorb::Event
+    def once_event: (Symbol event_name, ?id: Symbol?, **::Hash[untyped, untyped] metadata) -> Discorb::EventHandler
 
     def self.extended: (untyped obj) -> untyped
 
@@ -5886,7 +5886,7 @@ module Discorb
     def setup_commands: (?String? token, ?guild_ids: (::Array[untyped] | bool)?) -> untyped
 
     # _@return_ — The events of the extension.
-    attr_reader events: ::Hash[Symbol, ::Array[Discorb::Event]]
+    attr_reader events: ::Hash[Symbol, ::Array[Discorb::EventHandler]]
 
     # _@return_ — The commands of the extension.
     attr_reader commands: ::Array[Discorb::ApplicationCommand::Command]

data/template-replace/scripts/yard_replace.rb

@@ -22,6 +22,12 @@ def yard_replace(dir, version)
 <h1 class="noborder title">Documentation by YARD 0.9.26</h1>
     HTML3
     HTML4
+    if version == "main"
+      display_version = "(main)"
+    else
+      display_version = "v" + version
+    end
+    contents.gsub!(/Documentation by YARD \d+\.\d+\.\d+/, "discorb #{display_version} documentation")
     File.write(file, contents)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discorb
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.13.0
 platform: ruby
 authors:
 - sevenc-nanashi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-24 00:00:00.000000000 Z
+date: 2021-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -144,6 +144,7 @@ files:
 - lib/discorb/emoji_table.rb
 - lib/discorb/error.rb
 - lib/discorb/event.rb
+- lib/discorb/event_handler.rb
 - lib/discorb/exe/about.rb
 - lib/discorb/exe/irb.rb
 - lib/discorb/exe/new.rb
@@ -221,5 +222,5 @@ requirements: []
 rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
-summary: discorb is a Discord API wrapper for Ruby.
+summary: A discord API wrapper written in Ruby
 test_files: []