discorb 0.13.0 → 0.13.4

data/lib/discorb/event.rb

@@ -90,8 +90,7 @@ module Discorb
 
     #
     # Create a scheduled event for the guild.
-    # @macro async
-    # @macro http
+    # @async
     #
     # @param [:stage_instance, :voice, :external] type The type of event to create.
     # @param [String] name The name of the event.
@@ -103,6 +102,8 @@ module Discorb
     # @param [:guild_only] privacy_level The privacy level of the event. This must be `:guild_only`.
     # @param [:active, :completed, :canceled] status The status of the event.
     #
+    # @return [Async::Task<Discorb::ScheduledEvent>] The event that was created.
+    #
     # @see Event#start
     # @see Event#cancel
     # @see Event#complete
@@ -163,7 +164,7 @@ module Discorb
           else
             raise ArgumentError, "Invalid scheduled event type: #{type}"
           end
-        @client.http.patch("/guilds/#{@guild_id}/scheduled-events/#{@id}", payload).wait
+        @client.http.request(Route.new("/guilds/#{@guild_id}/scheduled-events/#{@id}", "//guilds/:guild_id/scheduled-events/:scheduled_event_id", :patch), payload).wait
       end
     end
 
@@ -194,12 +195,13 @@ module Discorb
 
     #
     # Deletes the event.
-    # @macro async
-    # @macro http
+    # @async
+    #
+    # @return [Async::Task<void>] The task.
     #
     def delete!
       Async do
-        @client.http.delete("/guilds/#{@guild_id}/scheduled-events/#{@id}").wait
+        @client.http.request(Route.new("/guilds/#{@guild_id}/scheduled-events/#{@id}", "//guilds/:guild_id/scheduled-events/:scheduled_event_id", :delete)).wait
       end
     end
 
@@ -207,8 +209,7 @@ module Discorb
 
     #
     # Fetches the event users.
-    # @macro async
-    # @macro http
+    # @async
     #
     # @note You can fetch all of members by not specifying a parameter.
     #
@@ -218,7 +219,7 @@ module Discorb
     # @param [Boolean] with_member Whether to include the member object of the event. Defaults to `false`.
     #   This should be used for manual fetching of members.
     #
-    # @return [Array<Discorb::Member>] The event users.
+    # @return [Async::Task<Array<Discorb::Member>>] The event users.
     #
     def fetch_users(limit = nil, before: nil, after: nil, with_member: true)
       Async do
@@ -226,7 +227,7 @@ module Discorb
           after = 0
           res = []
           while true
-            _resp, users = @client.http.get("/guilds/#{@guild_id}/scheduled-events/#{@id}/users?limit=100&after=#{after}&with_member=true").wait
+            _resp, users = @client.http.request(Route.new("/guilds/#{@guild_id}/scheduled-events/#{@id}/users?limit=100&after=#{after}&with_member=true", "//guilds/:guild_id/scheduled-events/:scheduled_event_id/users", :get)).wait
             if users.empty?
               break
             end
@@ -241,7 +242,7 @@ module Discorb
             after: Discorb::Utils.try(around, :id),
             with_member: with_member,
           }.filter { |_k, v| !v.nil? }.to_h
-          _resp, messages = @client.http.get("/channels/#{channel_id.wait}/messages?#{URI.encode_www_form(params)}").wait
+          _resp, messages = @client.http.request(Route.new("/channels/#{channel_id.wait}/messages?#{URI.encode_www_form(params)}", "//channels/:channel_id/messages", :get)).wait
           messages.map { |m| Message.new(@client, m.merge({ guild_id: @guild_id.to_s })) }
         end
       end

data/lib/discorb/exe/show.rb

@@ -2,7 +2,9 @@
 
 require "etc"
 require "discorb"
+
 puts "\e[90mRuby:\e[m #{RUBY_VERSION}"
 puts "\e[90mdiscorb:\e[m #{Discorb::VERSION}"
 uname = Etc.uname
 puts "\e[90mSystem:\e[m #{uname[:sysname]} #{uname[:release]}"
+puts "\e[90mPlatform:\e[m #{RUBY_PLATFORM}"

data/lib/discorb/extension.rb

@@ -4,7 +4,7 @@ module Discorb
   #
   # Abstract class to make extension.
   # Include from this module to make your own extension.
-  # @see file:docs/extension.md
+  # @see file:docs/extension.md Extension
   # @abstract
   #
   module Extension

data/lib/discorb/flag.rb

@@ -92,7 +92,7 @@ module Discorb
     #
     # @return [Discorb::Flag] The negation of the flag.
     #
-    def ~@
+    def ~
       self.class.new(~@value)
     end
 

data/lib/discorb/gateway.rb

@@ -94,8 +94,7 @@ module Discorb
 
       # Fetch the message.
       # If message is cached, it will be returned.
-      # @macro async
-      # @macro http
+      # @async
       #
       # @param [Boolean] force Whether to force fetching the message.
       #
@@ -109,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.
     #
@@ -143,8 +171,7 @@ module Discorb
 
       # Fetch the message.
       # If message is cached, it will be returned.
-      # @macro async
-      # @macro http
+      # @async
       #
       # @param [Boolean] force Whether to force fetching the message.
       #
@@ -195,8 +222,7 @@ module Discorb
 
       # Fetch the message.
       # If message is cached, it will be returned.
-      # @macro async
-      # @macro http
+      # @async
       #
       # @param [Boolean] force Whether to force fetching the message.
       #
@@ -293,8 +319,7 @@ module Discorb
       end
 
       # Fetch the message.
-      # @macro async
-      # @macro http
+      # @async
       #
       # @return [Async::Task<Discorb::Message>] The message.
       def fetch_message
@@ -503,16 +528,24 @@ module Discorb
     module Handler
       private
 
-      def connect_gateway(reconnect)
+      def connect_gateway(reconnect, force_close: false)
         if reconnect
           @log.info "Reconnecting to gateway..."
         else
           @log.info "Connecting to gateway..."
         end
         Async do
-          @connection&.close
+          if @connection
+            Async do
+              if force_close
+                @connection.force_close
+              else
+                @connection.close
+              end
+            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",
                                                  alpn_protocols: Async::HTTP::Protocol::HTTP11.names)
@@ -537,9 +570,15 @@ module Discorb
                   end
                 end
               end
-            rescue Async::Wrapper::Cancelled, OpenSSL::SSL::SSLError, Async::Wrapper::WaitError, EOFError => e
-              @log.error "Gateway connection closed: #{e.class}: #{e.message}"
-              connect_gateway(true)
+            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, force_close: true)
             else # should never happen
               connect_gateway(true)
             end
@@ -870,9 +909,8 @@ module Discorb
           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"
@@ -888,6 +926,7 @@ module Discorb
             current = VoiceState.new(self, data)
             guild.voice_states[data[:user_id]] = current
           else
+            guild.voice_states.remove(data[:user_id]) if data[:channel_id].nil?
             old = VoiceState.new(self, current.instance_variable_get(:@data))
             current.send(:_set_data, data)
           end
@@ -1011,7 +1050,7 @@ module Discorb
               message.instance_variable_set(:@deleted, true)
               messages.push(message)
             else
-              messages.push(UnknownDeleteBulkMessage.new(self, id))
+              messages.push(UnknownDeleteBulkMessage.new(self, id, data))
             end
           end
           dispatch(:message_delete_bulk, messages)
@@ -1143,6 +1182,13 @@ module Discorb
       def close
         super
         @closed = true
+      rescue
+        force_close
+      end
+
+      def force_close
+        @framer.instance_variable_get(:@stream).close
+        @closed = true
       end
 
       def parse(buffer)