discorb 0.5.2 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d17006d6ca103247dcf304581c61104054722b1af32bc8b3ec3d23b7f5e8680
-  data.tar.gz: 92c481e5532d3e990ca73b891c71a87f5a4a2e6217ff7d7c5677519dbeaf4259
+  metadata.gz: 8484feb78582222a91d4fee1225fe649edc6a24a4c6c77eb83fa6c3094b3935d
+  data.tar.gz: 7597101823bd4f3f6900636af7f06320d9c296659069ff69bc829b7528171372
 SHA512:
-  metadata.gz: b305d2f608c0506b7c84f53d16e4384710d454d5deacc69d51a55dbf81fe25d80ab7226717cb12480e07ba25f069a59a49a50608826d711c2a84edb4ec67258c
-  data.tar.gz: c40281fb460527163504b8fe999f02a57db3190532a47c78ee25d71871372ff4c720a7ec0e17c70853083ad7327ae574e418b080d7379c98d683fcc1ccb0169e
+  metadata.gz: e6a690ccd8d95f66db74cafd22a430472841183d3048b10529009a0a64a1ba4c21f553fe83746c7356b3069c87badd3768c88834a34cecb0194ccf818a128947
+  data.tar.gz: cd46b4dd261aea5d4f9b2257e1cb81f07b377922364080863cce61551293dbb08ded110d15bac44812307d7846edb7a77787ef2e3f003bcb1ae977f8c35545b6

data/Changelog.md

@@ -117,3 +117,24 @@
 
 - Fix: Fix bug of registering commands
 - Add: Add way to register commands in Extension
+
+## 0.5.3
+
+- Add: Add way to handle raw events with `event_xxx`
+- Add: Add `Client#session_id`
+- Add: Add `Connectable`
+- Fix: Fix error by sending DM
+
+## 0.5.4
+
+- Fix: Fix issue of receiving component events
+
+## 0.5.5
+
+- Fix: Fix some bugs
+
+## 0.5.6
+
+- Add: Raise error when intents are invalid
+- Fix: Fix Emoji#==
+

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    discorb (0.5.2)
+    discorb (0.5.6)
       async (~> 1.30.1)
       async-http (~> 0.56.5)
       async-websocket (~> 0.19.0)

data/lib/discorb/channel.rb

@@ -636,7 +636,6 @@ module Discorb
 
   #
   # Represents a voice channel.
-  # @todo Implement connecting to voice channel.
   #
   class VoiceChannel < GuildChannel
     # @return [Integer] The bitrate of the voice channel.
@@ -645,6 +644,8 @@ module Discorb
     # @return [nil] If the user limit is not set.
     attr_reader :user_limit
 
+    include Connectable
+
     @channel_type = 2
     #
     # Edit the voice channel.
@@ -699,6 +700,8 @@ module Discorb
     # @!visibility private
     attr_reader :stage_instances
 
+    include Connectable
+
     # @!attribute [r] stage_instance
     #   @return [Discorb::StageInstance] The stage instance of the channel.
 

data/lib/discorb/client.rb

@@ -49,6 +49,8 @@ module Discorb
     attr_reader :ping
     # @return [:initialized, :running, :closed] The status of the client.
     attr_reader :status
+    # @return [Integer] The session ID of connection.
+    attr_reader :session_id
     # @private
     attr_reader :bottom_commands
 
@@ -458,7 +460,7 @@ module Discorb
         }
         @token = token.to_s
         @close_condition = Async::Condition.new
-        main_task = Async do
+        @main_task = Async do
           @status = :running
           connect_gateway(true).wait
         rescue
@@ -467,7 +469,7 @@ module Discorb
           raise
         end
         @close_condition.wait
-        main_task.stop
+        @main_task.stop
       end
     end
   end

data/lib/discorb/common.rb

@@ -4,7 +4,7 @@ module Discorb
   # @return [String] The API base URL.
   API_BASE_URL = "https://discord.com/api/v9"
   # @return [String] The version of discorb.
-  VERSION = "0.5.2"
+  VERSION = "0.5.6"
   # @return [String] The user agent for the bot.
   USER_AGENT = "DiscordBot (https://github.com/discorb-lib/discorb #{VERSION}) Ruby/#{RUBY_VERSION}"
 

data/lib/discorb/embed.rb

@@ -65,9 +65,9 @@ module Discorb
         @timestamp = data[:timestamp] && Time.iso8601(data[:timestamp])
         @type = data[:type]
         @color = data[:color] && Color.new(data[:color])
-        @footer = data[:footer] && Footer.new(data[:footer][:text], icon: data[:footer][:icon])
+        @footer = data[:footer] && Footer.new(data[:footer][:text], icon: data[:footer][:icon_url])
         @author = if data[:author]
-            Author.new(data[:author][:name], icon: data[:author][:icon],
+            Author.new(data[:author][:name], icon: data[:author][:icon_url],
                                              url: data[:author][:url])
           end
         @thumbnail = data[:thumbnail] && Thumbnail.new(data[:thumbnail])

data/lib/discorb/emoji.rb

@@ -6,6 +6,13 @@ module Discorb
   # Represents a Discord emoji.
   # @abstract
   class Emoji
+    def eql?(other)
+      other.is_a?(self.class) && other.to_uri == to_uri
+    end
+
+    def ==(other)
+      eql?(other)
+    end
   end
 
   # Represents a custom emoji in discord.

data/lib/discorb/exe/init.rb

@@ -171,10 +171,10 @@ if (dir = ARGV[0])
   $path += "/#{dir}"
   if Dir.exist?($path)
     if Dir.empty?($path)
-      gputs "Found \e[30m#{dir}\e[90m and empty, using this directory."
+      iputs "Found \e[30m#{dir}\e[90m and empty, using this directory."
     else
       if $values[:force]
-        gputs "Found \e[30m#{dir}\e[90m and not empty, but force is on, using this directory."
+        iputs "Found \e[30m#{dir}\e[90m and not empty, but force is on, using this directory."
       else
         eputs "Directory \e[31m#{dir}\e[91m already exists and not empty. Use \e[31m-f\e[91m to force."
         exit
@@ -182,7 +182,7 @@ if (dir = ARGV[0])
     end
   else
     Dir.mkdir($path)
-    gputs "Couldn't find \e[30m#{dir}\e[90m, created directory."
+    iputs "Couldn't find \e[30m#{dir}\e[90m, created directory."
   end
   Dir.chdir($path)
 end

data/lib/discorb/gateway.rb

@@ -513,7 +513,6 @@ module Discorb
           case payload[:op]
           when 10
             @heartbeat_interval = data[:heartbeat_interval]
-            @tasks << handle_heartbeat(@heartbeat_interval)
             if @first
               payload = {
                 token: @token,
@@ -523,6 +522,13 @@ module Discorb
               }
               payload[:presence] = @identify_presence if @identify_presence
               send_gateway(2, **payload)
+              Async do
+                sleep 2
+                next unless @uncached_guilds.nil?
+
+                raise ClientError, "Failed to connect to gateway.\nHint: This usually means that your intents are invalid."
+                exit 1
+              end
             else
               payload = {
                 token: @token,
@@ -540,7 +546,7 @@ module Discorb
               connect_gateway(false)
             else
               @log.info "Connection is not resumable, reconnecting with opcode 2"
-              task.sleep(2)
+              sleep(2)
               @connection.close
               connect_gateway(true)
             end
@@ -555,7 +561,7 @@ module Discorb
 
       def handle_heartbeat(interval)
         Async do |task|
-          task.sleep((interval / 1000.0 - 1) * rand)
+          sleep((interval / 1000.0 - 1) * rand)
           loop do
             @heartbeat_before = Time.now.to_f
             @connection.write({ op: 1, d: @last_s }.to_json)
@@ -578,6 +584,7 @@ module Discorb
           @session_id = data[:session_id]
           @user = ClientUser.new(self, data[:user])
           @uncached_guilds = data[:guilds].map { |g| g[:id] }
+          @tasks << handle_heartbeat(@heartbeat_interval)
         when "GUILD_CREATE"
           if @uncached_guilds.include?(data[:id])
             Guild.new(self, data, true)
@@ -977,7 +984,11 @@ module Discorb
           @log.info("Successfully resumed connection")
           dispatch(:resumed)
         else
-          @log.warn "Unknown event: #{event_name}\n#{data.inspect}"
+          if respond_to?("event_" + event_name.downcase)
+            __send__("event_" + event_name.downcase, data)
+          else
+            @log.debug "Received unknown event: #{event_name}\n#{data.inspect}"
+          end
         end
       end
     end

data/lib/discorb/interaction.rb

@@ -336,7 +336,7 @@ module Discorb
       private
 
       def _set_data(data)
-        @target = Message.new(@client, data[:resolved][:messages][data[:target_id].to_sym].merge({ guild_id: @guild_id.to_s }))
+        @target = Message.new(@client, data[:resolved][:messages][data[:target_id].to_sym])
         @client.commands.find { |c| c.name == data[:name] && c.type_raw == 3 }.block.call(self, @target)
       end
     end
@@ -393,7 +393,7 @@ module Discorb
       # @!visibility 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[:type]
+          return klass.new(client, data) if !klass.component_type.nil? && klass.component_type == data[:data][:component_type]
         end
         client.log.warn("Unknown component type #{data[:component_type]}, initialized Interaction")
         MessageComponentInteraction.new(client, data)

data/lib/discorb/modules.rb

@@ -208,4 +208,14 @@ module Discorb
       end
     end
   end
+
+  #
+  # Module for connecting to a voice channel.
+  # This will be discord-voice gem.
+  #
+  module Connectable
+    def connect
+      raise NotImplementedError, "This method is implemented by discord-voice gem."
+    end
+  end
 end

data/lib/discorb/user.rb

@@ -78,7 +78,7 @@ module Discorb
       Async do
         next @dm_channel_id if @dm_channel_id
 
-        dm_channel = @client.http.post("/users/#{@id}/channels", { recipient_id: @client.user.id }).wait
+        _resp, dm_channel = @client.http.post("/users/@me/channels", { recipient_id: @id }).wait
         @dm_channel_id = dm_channel[:id]
         @dm_channel_id
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discorb
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.6
 platform: ruby
 authors:
 - sevenc-nanashi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-10 00:00:00.000000000 Z
+date: 2021-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async