discorb 0.0.4 → 0.0.8

data/lib/discorb/client.rb

@@ -16,8 +16,8 @@ module Discorb
     # @return [Discorb::Application] The application that the client is using.
     # @return [nil] If never fetched application by {#fetch_application}.
     attr_reader :application
-    # @return [Discorb::Internet] The internet client.
-    attr_reader :internet
+    # @return [Discorb::HTTP] The http client.
+    attr_reader :http
     # @return [Integer] The heartbeat interval.
     attr_reader :heartbeat_interval
     # @return [Integer] The API version of the Discord gateway.
@@ -124,7 +124,7 @@ module Discorb
     # @param [Object] args The arguments to pass to the event.
     #
     def dispatch(event_name, *args)
-      Async do |_task|
+      Async do
         if (conditions = @conditions[event_name])
           ids = Set[*conditions.map(&:first).map(&:object_id)]
           conditions.delete_if do |condition|
@@ -148,7 +148,7 @@ module Discorb
           lambda { |event_args|
             Async(annotation: "Discorb event: #{event_name}") do |task|
               @events[event_name].delete(block) if block.discriminator[:once]
-              block.call(task, *event_args)
+              block.call(*event_args)
               @log.debug "Dispatched proc with ID #{block.id.inspect}"
             rescue StandardError, ScriptError => e
               message = "An error occurred while dispatching proc with ID #{block.id.inspect}\n#{e.full_message}"
@@ -187,7 +187,7 @@ module Discorb
     #
     def fetch_user(id)
       Async do
-        _resp, data = internet.get("/users/#{id}").wait
+        _resp, data = http.get("/users/#{id}").wait
         User.new(self, data)
       end
     end
@@ -205,7 +205,7 @@ module Discorb
     #
     def fetch_channel(id)
       Async do
-        _resp, data = internet.get("/channels/#{id}").wait
+        _resp, data = http.get("/channels/#{id}").wait
         Channel.make_channel(self, data)
       end
     end
@@ -223,7 +223,7 @@ module Discorb
     #
     def fetch_guild(id)
       Async do
-        _resp, data = internet.get("/guilds/#{id}").wait
+        _resp, data = http.get("/guilds/#{id}").wait
         Guild.new(self, data, false)
       end
     end
@@ -241,7 +241,7 @@ module Discorb
     #
     def fetch_invite(code, with_count: false, with_expiration: false)
       Async do
-        _resp, data = internet.get("/invites/#{code}?with_count=#{with_count}&with_expiration=#{with_expiration}").wait
+        _resp, data = http.get("/invites/#{code}?with_count=#{with_count}&with_expiration=#{with_expiration}").wait
         Invite.new(self, data, false)
       end
     end
@@ -260,7 +260,7 @@ module Discorb
       Async do
         next @application if @application && !force
 
-        _resp, data = internet.get("/oauth2/applications/@me").wait
+        _resp, data = http.get("/oauth2/applications/@me").wait
         @application = Application.new(self, data)
         @application
       end
@@ -275,7 +275,7 @@ module Discorb
     #
     def fetch_nitro_sticker_packs
       Async do
-        _resp, data = internet.get("/stickers-packs").wait
+        _resp, data = http.get("/stickers-packs").wait
         data.map { |pack| Sticker::Pack.new(self, pack) }
       end
     end
@@ -293,7 +293,7 @@ module Discorb
       end
       payload[:status] = status unless status.nil?
       if @connection
-        Async do |_task|
+        Async do
           send_gateway(3, **payload)
         end
       else

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.0.4"
+  VERSION = "0.0.8"
   # @return [String] The user agent for the bot.
   USER_AGENT = "DiscordBot (https://github.com/discorb-lib/discorb #{VERSION}) Ruby/#{RUBY_VERSION}"
 

data/lib/discorb/emoji.rb

@@ -86,7 +86,7 @@ module Discorb
         payload = {}
         payload[:name] = name if name != :unset
         payload[:roles] = roles.map { |r| Discorb::Utils.try(r, :id) } if roles != :unset
-        @client.internet.patch("/guilds/#{@guild.id}/emojis/#{@id}", payload, audit_log_reason: reason)
+        @client.http.patch("/guilds/#{@guild.id}/emojis/#{@id}", payload, audit_log_reason: reason)
         self
       end
     end
@@ -104,7 +104,7 @@ module Discorb
     #
     def delete!(reason: nil)
       Async do
-        @client.internet.delete("/guilds/#{@guild.id}/emojis/#{@id}", audit_log_reason: reason).wait
+        @client.http.delete("/guilds/#{@guild.id}/emojis/#{@id}", audit_log_reason: reason).wait
         @available = false
         self
       end

data/lib/discorb/gateway.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "async/http"
+
 module Discorb
   #
   # A module to handle gateway.
@@ -87,7 +89,7 @@ module Discorb
       #
       # @return [Discorb::Message] The message.
       def fetch_message(force: false)
-        Async do |_task|
+        Async do
           next @message if !force && @message
 
           @message = @channel.fetch_message(@message_id).wait
@@ -136,7 +138,7 @@ module Discorb
       #
       # @return [Discorb::Message] The message.
       def fetch_message(force: false)
-        Async do |_task|
+        Async do
           next @message if !force && @message
 
           @message = @channel.fetch_message(@message_id).wait
@@ -188,7 +190,7 @@ module Discorb
       #
       # @return [Discorb::Message] The message.
       def fetch_message(force: false)
-        Async do |_task|
+        Async do
           next @message if !force && @message
 
           @message = @channel.fetch_message(@message_id).wait
@@ -453,10 +455,10 @@ module Discorb
 
     def connect_gateway(first)
       @log.info "Connecting to gateway."
-      Async do |_task|
-        @internet = Internet.new(self) if first
+      Async do
+        @http = HTTP.new(self) if first
         @first = first
-        _, gateway_response = @internet.get("/gateway").wait
+        _, gateway_response = @http.get("/gateway").wait
         gateway_url = gateway_response[:url]
         endpoint = Async::HTTP::Endpoint.parse("#{gateway_url}?v=9&encoding=json",
                                                alpn_protocols: Async::HTTP::Protocol::HTTP11.names)
@@ -710,14 +712,14 @@ module Discorb
         dispatch(:member_add, nm)
       when "GUILD_MEMBER_UPDATE"
         return @log.warn "Unknown guild id #{data[:guild_id]}, ignoring" unless (guild = @guilds[data[:guild_id]])
-        return @log.warn "Unknown member id #{data[:id]}, ignoring" unless (nm = guild.members[data[:id]])
+        return @log.warn "Unknown member id #{data[:user][:id]}, ignoring" unless (nm = guild.members[data[:user][:id]])
 
         old = Member.new(self, data[:guild_id], data[:user], data.update({ no_cache: true }))
         nm.send(:_set_data, data[:user], data)
         dispatch(:member_update, old, nm)
       when "GUILD_MEMBER_REMOVE"
         return @log.warn "Unknown guild id #{data[:guild_id]}, ignoring" unless (guild = @guilds[data[:guild_id]])
-        return @log.warn "Unknown member id #{data[:id]}, ignoring" unless (member = guild.members.delete(data[:id]))
+        return @log.warn "Unknown member id #{data[:user][:id]}, ignoring" unless (member = guild.members.delete(data[:user][:id]))
 
         dispatch(:member_remove, member)
       when "GUILD_BAN_ADD"

data/lib/discorb/guild.rb

@@ -164,7 +164,7 @@ module Discorb
     #
     def leave!
       Async do
-        @client.internet.delete("/users/@me/guilds/#{@id}").wait
+        @client.http.delete("/users/@me/guilds/#{@id}").wait
         @client.guilds.delete(@id)
       end
     end
@@ -179,7 +179,7 @@ module Discorb
     #
     def fetch_emoji_list
       Async do
-        _resp, data = @client.internet.get("/guilds/#{@id}/emojis").wait
+        _resp, data = @client.http.get("/guilds/#{@id}/emojis").wait
         @emojis = Dictionary.new
         ids = @emojis.map(&:id).map(&:to_s)
         data.map do |e|
@@ -204,7 +204,7 @@ module Discorb
     # @return [Discorb::CustomEmoji] The emoji with the given id.
     #
     def fetch_emoji(id)
-      _resp, data = @client.internet.get("/guilds/#{@id}/emojis/#{id}").wait
+      _resp, data = @client.http.get("/guilds/#{@id}/emojis/#{id}").wait
       @emojis[e[:id]] = CustomEmoji.new(@client, self, data)
     end
 
@@ -220,7 +220,7 @@ module Discorb
     # @return [Discorb::CustomEmoji] The created emoji.
     #
     def create_emoji(name, image, roles: [])
-      _resp, data = @client.internet.post(
+      _resp, data = @client.http.post(
         "/guilds/#{@id}/emojis",
         {
           name: name,
@@ -240,7 +240,7 @@ module Discorb
     #
     def fetch_webhooks
       Async do
-        _resp, data = @client.internet.get("/guilds/#{@id}/webhooks").wait
+        _resp, data = @client.http.get("/guilds/#{@id}/webhooks").wait
         data.map { |webhook| Webhook.new([@client, webhook]) }
       end
     end
@@ -254,7 +254,7 @@ module Discorb
     #
     def fetch_audit_log
       Async do
-        _resp, data = @client.internet.get("/guilds/#{@id}/audit-logs").wait
+        _resp, data = @client.http.get("/guilds/#{@id}/audit-logs").wait
         AuditLog.new(@client, data, self)
       end
     end
@@ -268,7 +268,7 @@ module Discorb
     #
     def fetch_channels
       Async do
-        _resp, data = @client.internet.get("/guilds/#{@id}/channels").wait
+        _resp, data = @client.http.get("/guilds/#{@id}/channels").wait
         data.map { |c| Channel.make_channel(@client, c) }
       end
     end
@@ -312,7 +312,7 @@ module Discorb
           end
         end
         payload[:parent_id] = parent.id if parent
-        _resp, data = @client.internet.post(
+        _resp, data = @client.http.post(
           "/guilds/#{@id}/channels", payload, audit_log_reason: reason,
         ).wait
         payload[:parent_id] = parent&.id
@@ -355,7 +355,7 @@ module Discorb
           end
         end
         payload[:parent_id] = parent.id if parent
-        _resp, data = @client.internet.post(
+        _resp, data = @client.http.post(
           "/guilds/#{@id}/channels", payload, audit_log_reason: reason,
         ).wait
         payload[:parent_id] = parent&.id
@@ -391,7 +391,7 @@ module Discorb
           end
         end
         payload[:parent_id] = parent&.id
-        _resp, data = @client.internet.post(
+        _resp, data = @client.http.post(
           "/guilds/#{@id}/channels", payload, audit_log_reason: reason,
         ).wait
         Channel.make_channel(@client, data)
@@ -431,7 +431,7 @@ module Discorb
           end
         end
         payload[:parent_id] = parent&.id
-        _resp, data = @client.internet.post(
+        _resp, data = @client.http.post(
           "/guilds/#{@id}/channels", payload, audit_log_reason: reason,
         ).wait
         Channel.make_channel(@client, data)
@@ -477,7 +477,7 @@ module Discorb
         end
         payload[:nsfw] = nsfw unless nsfw.nil?
         payload[:parent_id] = parent&.id
-        _resp, data = @client.internet.post(
+        _resp, data = @client.http.post(
           "/guilds/#{@id}/channels", payload, audit_log_reason: reason,
         ).wait
         Channel.make_channel(@client, data)
@@ -493,7 +493,7 @@ module Discorb
     #
     def fetch_active_threads
       Async do
-        _resp, data = @client.internet.get("/guilds/#{@id}/threads/active").wait
+        _resp, data = @client.http.get("/guilds/#{@id}/threads/active").wait
         data[:threads].map { |t| Channel.make_thread(@client, t) }
       end
     end
@@ -511,7 +511,7 @@ module Discorb
     #
     def fetch_member(id)
       Async do
-        _resp, data = @client.internet.get("/guilds/#{@id}/members/#{id}").wait
+        _resp, data = @client.http.get("/guilds/#{@id}/members/#{id}").wait
       rescue Discorb::NotFoundError
         nil
       else
@@ -531,7 +531,7 @@ module Discorb
     #
     def fetch_members_named(name, limit: 1)
       Async do
-        _resp, data = @client.internet.get("/guilds/#{@id}/members/search?#{URI.encode_www_form({ query: name, limit: limit })}").wait
+        _resp, data = @client.http.get("/guilds/#{@id}/members/search?#{URI.encode_www_form({ query: name, limit: limit })}").wait
         data.map { |d| Member.new(@client, @id, d[:user], d) }
       end
     end
@@ -558,7 +558,7 @@ module Discorb
     #
     def edit_nickname(nickname, reason: nil)
       Async do
-        @client.internet.patch("/guilds/#{@id}/members/@me/nick", { nick: nickname }, audit_log_reason: reason).wait
+        @client.http.patch("/guilds/#{@id}/members/@me/nick", { nick: nickname }, audit_log_reason: reason).wait
       end
     end
 
@@ -576,7 +576,7 @@ module Discorb
     #
     def kick_member(member, reason: nil)
       Async do
-        @client.internet.delete("/guilds/#{@id}/members/#{member.id}", audit_log_reason: reason).wait
+        @client.http.delete("/guilds/#{@id}/members/#{member.id}", audit_log_reason: reason).wait
       end
     end
 
@@ -589,7 +589,7 @@ module Discorb
     #
     def fetch_bans
       Async do
-        _resp, data = @client.internet.get("/guilds/#{@id}/bans").wait
+        _resp, data = @client.http.get("/guilds/#{@id}/bans").wait
         data.map { |d| Ban.new(@client, self, d) }
       end
     end
@@ -606,7 +606,7 @@ module Discorb
     #
     def fetch_ban(user)
       Async do
-        _resp, data = @client.internet.get("/guilds/#{@id}/bans/#{user.id}").wait
+        _resp, data = @client.http.get("/guilds/#{@id}/bans/#{user.id}").wait
       rescue Discorb::NotFoundError
         nil
       else
@@ -642,7 +642,7 @@ module Discorb
     #
     def ban_member(member, delete_message_days: 0, reason: nil)
       Async do
-        _resp, data = @client.internet.post(
+        _resp, data = @client.http.post(
           "/guilds/#{@id}/bans", { user: member.id, delete_message_days: delete_message_days }, audit_log_reason: reason,
         ).wait
         Ban.new(@client, self, data)
@@ -659,7 +659,7 @@ module Discorb
     #
     def unban_user(user, reason: nil)
       Async do
-        @client.internet.delete("/guilds/#{@id}/bans/#{user.id}", audit_log_reason: reason).wait
+        @client.http.delete("/guilds/#{@id}/bans/#{user.id}", audit_log_reason: reason).wait
       end
     end
 
@@ -672,7 +672,7 @@ module Discorb
     #
     def fetch_roles
       Async do
-        _resp, data = @client.internet.get("/guilds/#{@id}/roles").wait
+        _resp, data = @client.http.get("/guilds/#{@id}/roles").wait
         data.map { |d| Role.new(@client, self, d) }
       end
     end
@@ -697,7 +697,7 @@ module Discorb
         payload[:color] = color.to_i if color
         payload[:hoist] = hoist if hoist
         payload[:mentionable] = mentionable if mentionable
-        _resp, data = @client.internet.post(
+        _resp, data = @client.http.post(
           "/guilds/#{@id}/roles", payload, audit_log_reason: reason,
         ).wait
         Role.new(@client, self, data)
@@ -721,7 +721,7 @@ module Discorb
           include_roles: @id.to_s,
         }
         param[:include_roles] = roles.map(&:id).map(&:to_s).join(";") if roles.any?
-        _resp, data = @client.internet.get("/guilds/#{@id}/prune?#{URI.encode_www_form(params)}").wait
+        _resp, data = @client.http.get("/guilds/#{@id}/prune?#{URI.encode_www_form(params)}").wait
         data[:pruned]
       end
     end
@@ -739,7 +739,7 @@ module Discorb
     #
     def prune(days = 7, roles: [], reason: nil)
       Async do
-        _resp, data = @client.internet.post(
+        _resp, data = @client.http.post(
           "/guilds/#{@id}/prune", { days: days, roles: roles.map(&:id) }, audit_log_reason: reason,
         ).wait
         data[:pruned]
@@ -755,7 +755,7 @@ module Discorb
     #
     def fetch_voice_regions
       Async do
-        _resp, data = @client.internet.get("/guilds/#{@id}/voice").wait
+        _resp, data = @client.http.get("/guilds/#{@id}/voice").wait
         data.map { |d| VoiceRegion.new(@client, d) }
       end
     end
@@ -769,7 +769,7 @@ module Discorb
     #
     def fetch_invites
       Async do
-        _resp, data = @client.internet.get("/guilds/#{@id}/invites").wait
+        _resp, data = @client.http.get("/guilds/#{@id}/invites").wait
         data.map { |d| Invite.new(@client, d) }
       end
     end
@@ -783,7 +783,7 @@ module Discorb
     #
     def fetch_integrations
       Async do
-        _resp, data = @client.internet.get("/guilds/#{@id}/integrations").wait
+        _resp, data = @client.http.get("/guilds/#{@id}/integrations").wait
         data.map { |d| Integration.new(@client, d) }
       end
     end
@@ -797,7 +797,7 @@ module Discorb
     #
     def fetch_widget
       Async do
-        _resp, data = @client.internet.get("/guilds/#{@id}/widget").wait
+        _resp, data = @client.http.get("/guilds/#{@id}/widget").wait
         Widget.new(@client, @id, data)
       end
     end
@@ -811,7 +811,7 @@ module Discorb
     #
     def fetch_vanity_invite
       Async do
-        _resp, data = @client.internet.get("/guilds/#{@id}/vanity-url").wait
+        _resp, data = @client.http.get("/guilds/#{@id}/vanity-url").wait
         VanityInvite.new(@client, self, data)
       end
     end
@@ -825,7 +825,7 @@ module Discorb
     #
     def fetch_welcome_screen
       Async do
-        _resp, data = @client.internet.get("/guilds/#{@id}/welcome-screen").wait
+        _resp, data = @client.http.get("/guilds/#{@id}/welcome-screen").wait
         WelcomeScreen.new(@client, self, data)
       end
     end
@@ -839,7 +839,7 @@ module Discorb
     #
     def fetch_stickers
       Async do
-        _resp, data = @client.internet.get("/guilds/#{@id}/stickers").wait
+        _resp, data = @client.http.get("/guilds/#{@id}/stickers").wait
         data.map { |d| Sticker::GuildSticker.new(@client, d) }
       end
     end
@@ -856,7 +856,7 @@ module Discorb
     #
     def fetch_sticker(id)
       Async do
-        _resp, data = @client.internet.get("/guilds/#{@id}/stickers/#{id}").wait
+        _resp, data = @client.http.get("/guilds/#{@id}/stickers/#{id}").wait
       rescue Discorb::NotFoundError
         nil
       else
@@ -873,7 +873,7 @@ module Discorb
     #
     def fetch_templates
       Async do
-        _resp, data = @client.internet.get("/guilds/#{@id}/templates").wait
+        _resp, data = @client.http.get("/guilds/#{@id}/templates").wait
         data.map { |d| GuildTemplate.new(@client, d) }
       end
     end
@@ -901,7 +901,7 @@ module Discorb
     #
     def create_template(name, description = nil, reason: nil)
       Async do
-        _resp, data = @client.internet.post(
+        _resp, data = @client.http.post(
           "/guilds/#{@id}/templates", { name: name, description: description }, audit_log_reason: reason,
         ).wait
         GuildTemplate.new(@client, data)
@@ -982,7 +982,7 @@ module Discorb
           payload = {}
           payload[:enabled] = enabled unless enabled.nil?
           payload[:channel_id] = channel.id if channel_id
-          @client.internet.patch("/guilds/#{@guild_id}/widget", payload, audit_log_reason: reason).wait
+          @client.http.patch("/guilds/#{@guild_id}/widget", payload, audit_log_reason: reason).wait
         end
       end
 
@@ -1059,7 +1059,7 @@ module Discorb
       @members = Discorb::Dictionary.new
       data[:members].each do |m|
         Member.new(@client, @id, m[:user], m)
-      end
+      end if data[:members]
       @splash = data[:splash] && Asset.new(self, data[:splash], path: "splashes/#{@id}")
       @discovery_splash = data[:discovery_splash] && Asset.new(self, data[:discovery_splash], path: "discovery-splashes/#{@id}")
       @owner_id = data[:owner_id]
@@ -1236,7 +1236,7 @@ module Discorb
           payload[:enabled] = enabled unless enabled == :unset
           payload[:welcome_channels] = channels.map(&:to_hash) unless channels == :unset
           payload[:description] = description unless description == :unset
-          @client.internet.patch("/guilds/#{@guild.id}/welcome-screen", payload, audit_log_reason: reason).wait
+          @client.http.patch("/guilds/#{@guild.id}/welcome-screen", payload, audit_log_reason: reason).wait
         end
       end
     end