discorb 0.13.2 → 0.15.0

data/lib/discorb/gateway.rb

@@ -108,6 +108,35 @@ module Discorb
       end
     end
 
+    #
+    # Represents a `INTEGRATION_DELETE` event.
+    #
+    class IntegrationDeleteEvent < GatewayEvent
+      # @return [Discorb::Snowflake] The ID of the integration.
+      attr_reader :id
+      # @!attribute [r] guild
+      #   @macro client_cache
+      #   @return [Discorb::Guild] The guild of the integration.
+      # @!attribute [r] user
+      #   @macro client_cache
+      #   @return [Discorb::User] The user associated with the integration.
+
+      # @private
+      def initialize(_client, data)
+        @id = Snowflake.new(data[:id])
+        @guild_id = data[:guild_id]
+        @user_id = data[:application_id]
+      end
+
+      def guild
+        @client.guilds[@guild_id]
+      end
+
+      def user
+        @client.users[@user_id]
+      end
+    end
+
     #
     # Represents a `MESSAGE_REACTION_REMOVE_ALL` event.
     #
@@ -232,7 +261,6 @@ module Discorb
     #
     # Represents a `MESSAGE_UPDATE` event.
     #
-
     class MessageUpdateEvent < GatewayEvent
       # @return [Discorb::Message] The message before update.
       attr_reader :before
@@ -277,8 +305,8 @@ module Discorb
         @timestamp = Time.iso8601(data[:edited_timestamp])
         @mention_everyone = data[:mention_everyone]
         @mention_roles = data[:mention_roles].map { |r| guild.roles[r] } if data.key?(:mention_roles)
-        @attachments = data[:attachments].map { |a| Attachment.new(a) } if data.key?(:attachments)
-        @embeds = data[:embeds] ? data[:embeds].map { |e| Embed.new(data: e) } : [] if data.key?(:embeds)
+        @attachments = data[:attachments].map { |a| Attachment.from_hash(a) } if data.key?(:attachments)
+        @embeds = data[:embeds] ? data[:embeds].map { |e| Embed.from_hash(e) } : [] if data.key?(:embeds)
       end
 
       def channel
@@ -364,6 +392,9 @@ module Discorb
       end
     end
 
+    #
+    # Represents a `GUILD_INTEGRATIONS_UPDATE` event.
+    #
     class GuildIntegrationsUpdateEvent < GatewayEvent
       def initialize(client, data)
         @client = client
@@ -499,18 +530,28 @@ module Discorb
     module Handler
       private
 
-      def connect_gateway(reconnect, no_close: false)
+      def connect_gateway(reconnect)
         if reconnect
           @log.info "Reconnecting to gateway..."
         else
           @log.info "Connecting to gateway..."
         end
         Async do
-          @connection&.close rescue nil unless no_close
+          if @connection && !@connection.closed?
+            Async do
+              @connection.close
+            end
+          end
           @http = HTTP.new(self)
-          _, gateway_response = @http.get("/gateway").wait
+          _, gateway_response = @http.request(Route.new("/gateway", "//gateway", :get)).wait
           gateway_url = gateway_response[:url]
-          endpoint = Async::HTTP::Endpoint.parse("#{gateway_url}?v=9&encoding=json&compress=zlib-stream",
+          gateway_version = if @intents.to_h[:message_content].nil?
+              warn "message_content intent not set, using gateway version 9. You should specify `message_content` intent for preventing unexpected changes in the future."
+              9
+            else
+              10
+            end
+          endpoint = Async::HTTP::Endpoint.parse("#{gateway_url}?v=#{gateway_version}&encoding=json&compress=zlib-stream",
                                                  alpn_protocols: Async::HTTP::Protocol::HTTP11.names)
           begin
             @connection = Async::WebSocket::Client.connect(endpoint, headers: [["User-Agent", Discorb::USER_AGENT]], handler: RawConnection)
@@ -533,9 +574,16 @@ module Discorb
                   end
                 end
               end
-            rescue Async::Wrapper::Cancelled, OpenSSL::SSL::SSLError, Async::Wrapper::WaitError, EOFError, Errno::EPIPE => e
+            rescue Async::Wrapper::Cancelled,
+                   OpenSSL::SSL::SSLError,
+                   Async::Wrapper::WaitError,
+                   EOFError,
+                   Errno::EPIPE,
+                   Errno::ECONNRESET,
+                   IOError => e
               @log.error "Gateway connection closed accidentally: #{e.class}: #{e.message}"
-              connect_gateway(true, no_close: true)
+              @connection.force_close
+              connect_gateway(true)
             else # should never happen
               connect_gateway(true)
             end
@@ -550,13 +598,13 @@ module Discorb
             when 4014
               raise ClientError.new("Disallowed intents were specified"), cause: nil
             when 4002, 4003, 4005, 4007
-              raise ClientError.new(<<~EOS), cause: e
-                                               Disconnected from gateway, probably due to library issues.
-                                               #{e.message}
+              raise ClientError.new(<<~ERROR), cause: e
+                                                 Disconnected from gateway, probably due to library issues.
+                                                 #{e.message}
 
-                                               Please report this to the library issue tracker.
-                                               https://github.com/discorb-lib/discorb/issues
-                                             EOS
+                                                 Please report this to the library issue tracker.
+                                                 https://github.com/discorb-lib/discorb/issues
+                                               ERROR
             when 1001
               @log.info "Gateway closed with code 1001, reconnecting."
               connect_gateway(true)
@@ -565,8 +613,9 @@ module Discorb
               @log.debug "#{e.message}"
               connect_gateway(false)
             end
-          rescue => e
+          rescue StandardError => e
             @log.error "Discord WebSocket error: #{e.full_message}"
+            @connection.force_close
             connect_gateway(false)
           end
         end
@@ -579,7 +628,7 @@ module Discorb
       end
 
       def handle_gateway(payload, reconnect)
-        Async do |task|
+        Async do |_task|
           data = payload[:d]
           @last_s = payload[:s] if payload[:s]
           @log.debug "Received message with opcode #{payload[:op]} from gateway:"
@@ -605,7 +654,7 @@ module Discorb
               send_gateway(2, **payload)
             end
           when 7
-            @log.info "Received opcode 7, reconnecting"
+            @log.info "Received opcode 7, stopping tasks"
             @tasks.map(&:stop)
           when 9
             @log.warn "Received opcode 9, closed connection"
@@ -630,7 +679,7 @@ module Discorb
       end
 
       def handle_heartbeat
-        Async do |task|
+        Async do |_task|
           interval = @heartbeat_interval
           sleep((interval / 1000.0 - 1) * rand)
           loop do
@@ -657,9 +706,7 @@ module Discorb
           @session_id = data[:session_id]
           @user = ClientUser.new(self, data[:user])
           @uncached_guilds = data[:guilds].map { |g| g[:id] }
-          if @uncached_guilds == [] or !@intents.guilds
-            ready
-          end
+          ready if (@uncached_guilds == []) || !@intents.guilds
           dispatch(:ready)
           @tasks << handle_heartbeat
         when "GUILD_CREATE"
@@ -862,13 +909,12 @@ module Discorb
         when "INTEGRATION_UPDATE"
           return @log.warn "Unknown guild id #{data[:guild_id]}, ignoring" unless (guild = @guilds[data[:guild_id]])
 
-          before = Integration.new(self, data, data[:guild_id])
+          integration = Integration.new(self, data, data[:guild_id])
           dispatch(:integration_update, integration)
         when "INTEGRATION_DELETE"
           return @log.warn "Unknown guild id #{data[:guild_id]}, ignoring" unless (guild = @guilds[data[:guild_id]])
-          return @log.warn "Unknown integration id #{data[:id]}, ignoring" unless (integration = guild.integrations.delete(data[:id]))
 
-          dispatch(:integration_delete, integration)
+          dispatch(:integration_delete, IntegrationDeleteEvent.new(self, data))
         when "WEBHOOKS_UPDATE"
           dispatch(:webhooks_update, WebhooksUpdateEvent.new(self, data))
         when "INVITE_CREATE"
@@ -1054,7 +1100,7 @@ module Discorb
           dispatch(:typing_start, TypingStartEvent.new(self, data))
         when "INTERACTION_CREATE"
           interaction = Interaction.make_interaction(self, data)
-          dispatch(:integration_create, interaction)
+          dispatch(:interaction_create, interaction)
 
           dispatch(interaction.class.event_name, interaction)
         when "RESUMED"
@@ -1072,15 +1118,15 @@ module Discorb
           old = event.dup
           event.send(:_set_data, data)
           dispatch(:scheduled_event_update, old, event)
-          if old.status != event.status
+          if old.status == event.status
+            dispatch(:scheduled_event_edit, old, event)
+          else
             case event.status
             when :active
               dispatch(:scheduled_event_start, event)
             when :completed
               dispatch(:scheduled_event_end, event)
             end
-          else
-            dispatch(:scheduled_event_edit, old, event)
           end
         when "GUILD_SCHEDULED_EVENT_DELETE"
           @log.warn("Unknown guild id #{data[:guild_id]}, ignoring") unless (guild = @guilds[data[:guild_id]])
@@ -1140,6 +1186,13 @@ module Discorb
       def close
         super
         @closed = true
+      rescue StandardError
+        force_close
+      end
+
+      def force_close
+        @framer.instance_variable_get(:@stream).instance_variable_get(:@io).instance_variable_get(:@io).instance_variable_get(:@io).close
+        @closed = true
       end
 
       def parse(buffer)