discorb 0.0.3 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6856a31e61787948958aa2469dfa36cf4224b3b5798ee598d8b91bae1b8762ef
-  data.tar.gz: c8f3b78fe320e7e83171b25b62b075127eb310d81fec68eb86dc69d2fb0cc375
+  metadata.gz: 066cdc59fc560a9d91badf19ac7628de7e7d7bf112b6a054ea68e697c7c738f2
+  data.tar.gz: 29558ecd466f3048aa3a7abac2b64bd526fee442cf7f84e49288e29422f0edc6
 SHA512:
-  metadata.gz: 84f36615725df03d6538aaafed8b5ce379d99c237ee3053b0f24799050d870cd434c67a08192517f2109cf49f6e6293db4543c0f040097ee81ca3da89d1a4cc8
-  data.tar.gz: c3d49c4f06d6a9de51fac152a1a5fae3e42e78e0824e66620ec687b2810cb55de992a468fb9c849120f3323934c6ce0ca9ed31e56fdfe22aaf704031fc84fa57
+  metadata.gz: a8ff733e1fc0caefcfb902584b6a9c2826f0bf1e4372e44cd1cd7a66c32da9a460e7c2b69e26a63812f4d15a2f94b49548496f589b56903c75233045bc4aa66d
+  data.tar.gz: cec8a40047b30df81c0c8e84f17e1d2aa73ad69204420811ec51427682595060b6632c81eadcef6e4435f831179f2b57f22fd9dc6a01dd8929dc1c56b7e0eddc

data/Changelog.md

@@ -1,5 +1,17 @@
 # Changelog
 
-## v0.0.1 - Initial release
+## v0.0.1
 
-- Initial release
+- Initial release
+
+## v0.0.2
+
+- Fix: Fix rubygems description
+
+## v0.0.3
+
+- Fix: Fix no dependencies
+
+## v0.0.4
+
+- Fix: Fix NoMethodError by webhook message

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    discorb (0.0.3)
+    discorb (0.0.7)
       async
       async-http
       async-websocket

data/README.md

@@ -1,7 +1,8 @@
 # discorb
 [![rubydoc](https://img.shields.io/badge/Document-rubydoc.info-blue.svg)](https://rubydoc.info/gems/discorb)
 [![Gem](https://img.shields.io/gem/dt/discorb?logo=rubygems&logoColor=fff)](https://rubygems.org/gems/discorb)
-[![Gem](https://img.shields.io/gem/v/discorb?logo=rubygems&logoColor=fff)](https://rubygems.org/gems/discorb)  
+[![Gem](https://img.shields.io/gem/v/discorb?logo=rubygems&logoColor=fff)](https://rubygems.org/gems/discorb)
+[![Discord](https://img.shields.io/discord/863581274916913193?logo=discord&logoColor=fff&color=5865f2&label=Discord)](https://discord.gg/hCP6zq8Vpj)  
 
 discorb is a Discord API wrapper for Ruby.
 
@@ -46,7 +47,7 @@ client.run(ENV["DISCORD_BOT_TOKEN"])
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/sevenc-nanashi/discorb.
+Bug reports and pull requests are welcome on GitHub at https://github.com/discorb-lib/discorb.
 
 ## License
 

data/discorb.gemspec

@@ -9,15 +9,15 @@ Gem::Specification.new do |spec|
   spec.email = ["sevenc-nanashi@sevenbot.jp"]
 
   spec.summary = "discorb is a Discord API wrapper for Ruby."
-  spec.homepage = "https://github.com/sevenc-nanashi/discorb"
+  spec.homepage = "https://github.com/discorb-lib/discorb"
   spec.license = "MIT"
   spec.required_ruby_version = Gem::Requirement.new(">= 3.0.0")
 
   spec.metadata["allowed_push_host"] = "https://rubygems.org"
 
   spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://github.com/sevenc-nanashi/discorb"
-  spec.metadata["changelog_uri"] = "https://github.com/sevenc-nanashi/discorb/blob/main/Changelog.md"
+  spec.metadata["source_code_uri"] = "https://github.com/discorb-lib/discorb"
+  spec.metadata["changelog_uri"] = "https://github.com/discorb-lib/discorb/blob/main/Changelog.md"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.

data/lib/discorb/channel.rb

@@ -175,7 +175,7 @@ module Discorb
     #
     def delete!(reason: nil)
       Async do
-        @client.internet.delete(base_url.wait.to_s, audit_log_reason: reason).wait
+        @client.http.delete(base_url.wait.to_s, audit_log_reason: reason).wait
         @deleted = true
         self
       end
@@ -203,7 +203,7 @@ module Discorb
         }
         payload[:lock_permissions] = lock_permissions
         payload[:parent_id] = parent&.id if parent != :unset
-        @client.internet.patch("/guilds/#{@guild_id}/channels", payload, audit_log_reason: reason).wait
+        @client.http.patch("/guilds/#{@guild_id}/channels", payload, audit_log_reason: reason).wait
       end
     end
 
@@ -295,7 +295,7 @@ module Discorb
         default_auto_archive_duration ||= archive_in
         payload[:default_auto_archive_duration] = default_auto_archive_duration if default_auto_archive_duration != :unset
 
-        @client.internet.patch("/channels/#{@id}", payload, audit_log_reason: reason).wait
+        @client.http.patch("/channels/#{@id}", payload, audit_log_reason: reason).wait
         self
       end
     end
@@ -317,7 +317,7 @@ module Discorb
         payload = {}
         payload[:name] = name
         payload[:avatar] = avatar.to_s if avatar
-        _resp, data = @client.internet.post("/channels/#{@id}/webhooks", payload).wait
+        _resp, data = @client.http.post("/channels/#{@id}/webhooks", payload).wait
         Webhook.new([@client, data])
       end
     end
@@ -331,7 +331,7 @@ module Discorb
     #
     def fetch_webhooks
       Async do
-        _resp, data = @client.internet.get("/channels/#{@id}/webhooks").wait
+        _resp, data = @client.http.get("/channels/#{@id}/webhooks").wait
         data.map { |webhook| Webhook.new([@client, webhook]) }
       end
     end
@@ -358,7 +358,7 @@ module Discorb
 
         message_ids = messages.map { |m| Discorb::Utils.try(m, :id).to_s }
 
-        @client.internet.post("/channels/#{@id}/messages/bulk-delete", { messages: message_ids }).wait
+        @client.http.post("/channels/#{@id}/messages/bulk-delete", { messages: message_ids }).wait
       end
     end
 
@@ -387,7 +387,7 @@ module Discorb
           deny: deny_value,
           type: target.is_a?(Member) ? 1 : 0,
         }
-        @client.internet.put("/channels/#{@id}/permissions/#{target.id}", payload, audit_log_reason: reason).wait
+        @client.http.put("/channels/#{@id}/permissions/#{target.id}", payload, audit_log_reason: reason).wait
       end
     end
 
@@ -406,7 +406,7 @@ module Discorb
     #
     def delete_permissions(target, reason: nil)
       Async do
-        @client.internet.delete("/channels/#{@id}/permissions/#{target.id}", audit_log_reason: reason).wait
+        @client.http.delete("/channels/#{@id}/permissions/#{target.id}", audit_log_reason: reason).wait
       end
     end
 
@@ -423,7 +423,7 @@ module Discorb
     #
     def fetch_invites
       Async do
-        _resp, data = @client.internet.get("/channels/#{@id}/invites").wait
+        _resp, data = @client.http.get("/channels/#{@id}/invites").wait
         data.map { |invite| Invite.new(@client, invite) }
       end
     end
@@ -444,7 +444,7 @@ module Discorb
     #
     def create_invite(max_age: nil, max_uses: nil, temporary: false, unique: false, reason: nil)
       Async do
-        _resp, data = @client.internet.post("/channels/#{@id}/invites", {
+        _resp, data = @client.http.post("/channels/#{@id}/invites", {
           max_age: max_age,
           max_uses: max_uses,
           temporary: temporary,
@@ -464,7 +464,7 @@ module Discorb
     #
     def follow_from(target, reason: nil)
       Async do
-        @client.internet.post("/channels/#{target.id}/followers", { webhook_channel_id: @id }, audit_log_reason: reason).wait
+        @client.http.post("/channels/#{target.id}/followers", { webhook_channel_id: @id }, audit_log_reason: reason).wait
       end
     end
 
@@ -478,7 +478,7 @@ module Discorb
     #
     def follow_to(target, reason: nil)
       Async do
-        @client.internet.post("/channels/#{@id}/followers", { webhook_channel_id: target.id }, audit_log_reason: reason).wait
+        @client.http.post("/channels/#{@id}/followers", { webhook_channel_id: target.id }, audit_log_reason: reason).wait
       end
     end
 
@@ -491,7 +491,7 @@ module Discorb
     #
     def fetch_pins
       Async do
-        _resp, data = @client.internet.get("/channels/#{@id}/pins").wait
+        _resp, data = @client.http.get("/channels/#{@id}/pins").wait
         data.map { |pin| Message.new(@client, pin) }
       end
     end
@@ -506,7 +506,7 @@ module Discorb
     #
     def pin_message(message, reason: nil)
       Async do
-        @client.internet.put("/channels/#{@id}/pins/#{message.id}", {}, audit_log_reason: reason).wait
+        @client.http.put("/channels/#{@id}/pins/#{message.id}", {}, audit_log_reason: reason).wait
       end
     end
 
@@ -520,7 +520,7 @@ module Discorb
     #
     def unpin_message(message, reason: nil)
       Async do
-        @client.internet.delete("/channels/#{@id}/pins/#{message.id}", {}, audit_log_reason: reason).wait
+        @client.http.delete("/channels/#{@id}/pins/#{message.id}", {}, audit_log_reason: reason).wait
       end
     end
 
@@ -540,12 +540,12 @@ module Discorb
     def start_thread(name, message: nil, auto_archive_duration: 1440, public: true, reason: nil)
       Async do
         _resp, data = if message.nil?
-            @client.internet.post("/channels/#{@id}/threads", {
+            @client.http.post("/channels/#{@id}/threads", {
               name: name, auto_archive_duration: auto_archive_duration, type: public ? 11 : 10,
             },
-                                  audit_log_reason: reason).wait
+                              audit_log_reason: reason).wait
           else
-            @client.internet.post("/channels/#{@id}/messages/#{Utils.try(message, :id)}/threads", {
+            @client.http.post("/channels/#{@id}/messages/#{Utils.try(message, :id)}/threads", {
               name: name, auto_archive_duration: auto_archive_duration,
             }, audit_log_reason: reason).wait
           end
@@ -564,7 +564,7 @@ module Discorb
     #
     def fetch_archived_public_threads
       Async do
-        _resp, data = @client.internet.get("/channels/#{@id}/threads/archived/public").wait
+        _resp, data = @client.http.get("/channels/#{@id}/threads/archived/public").wait
         data.map { |thread| Channel.make_channel(@client, thread) }
       end
     end
@@ -578,7 +578,7 @@ module Discorb
     #
     def fetch_archived_private_threads
       Async do
-        _resp, data = @client.internet.get("/channels/#{@id}/threads/archived/private").wait
+        _resp, data = @client.http.get("/channels/#{@id}/threads/archived/private").wait
         data.map { |thread| Channel.make_channel(@client, thread) }
       end
     end
@@ -599,7 +599,7 @@ module Discorb
           before = 0
           threads = []
           loop do
-            _resp, data = @client.internet.get("/channels/#{@id}/users/@me/threads/archived/private?before=#{before}").wait
+            _resp, data = @client.http.get("/channels/#{@id}/users/@me/threads/archived/private?before=#{before}").wait
             threads += data[:threads].map { |thread| Channel.make_channel(@client, thread) }
             before = data[:threads][-1][:id]
 
@@ -607,7 +607,7 @@ module Discorb
           end
           threads
         else
-          _resp, data = @client.internet.get("/channels/#{@id}/users/@me/threads/archived/private?limit=#{limit}&before=#{before}").wait
+          _resp, data = @client.http.get("/channels/#{@id}/users/@me/threads/archived/private?limit=#{limit}&before=#{before}").wait
           data.map { |thread| Channel.make_channel(@client, thread) }
         end
       end
@@ -670,7 +670,7 @@ module Discorb
         payload[:user_limit] = user_limit if user_limit != :unset
         payload[:rtc_region] = rtc_region if rtc_region != :unset
 
-        @client.internet.patch("/channels/#{@id}", payload, audit_log_reason: reason).wait
+        @client.http.patch("/channels/#{@id}", payload, audit_log_reason: reason).wait
         self
       end
     end
@@ -734,7 +734,7 @@ module Discorb
         payload[:position] = position if position != :unset
         payload[:bitrate] = bitrate if bitrate != :unset
         payload[:rtc_region] = rtc_region if rtc_region != :unset
-        @client.internet.patch("/channels/#{@id}", payload, audit_log_reason: reason).wait
+        @client.http.patch("/channels/#{@id}", payload, audit_log_reason: reason).wait
         self
       end
     end
@@ -754,7 +754,7 @@ module Discorb
     #
     def start(topic, public: false, reason: nil)
       Async do
-        _resp, data = @client.internet.post("/stage-instances", { channel_id: @id, topic: topic, public: public ? 2 : 1 }, audit_log_reason: reason).wait
+        _resp, data = @client.http.post("/stage-instances", { channel_id: @id, topic: topic, public: public ? 2 : 1 }, audit_log_reason: reason).wait
         StageInstance.new(@client, data)
       end
     end
@@ -769,7 +769,7 @@ module Discorb
     #
     def fetch_stage_instance
       Async do
-        _resp, data = @client.internet.get("/stage-instances/#{@id}").wait
+        _resp, data = @client.http.get("/stage-instances/#{@id}").wait
       rescue Discorb::NotFoundError
         nil
       else
@@ -865,7 +865,7 @@ module Discorb
         auto_archive_duration ||= archive_in
         payload[:auto_archive_duration] = auto_archive_duration if auto_archive_duration != :unset
         payload[:locked] = locked if locked != :unset
-        @client.internet.patch("/channels/#{@id}", payload, audit_log_reason: reason).wait
+        @client.http.patch("/channels/#{@id}", payload, audit_log_reason: reason).wait
         self
       end
     end
@@ -947,9 +947,9 @@ module Discorb
     def add_member(member = :me)
       Async do
         if member == :me
-          @client.internet.post("/channels/#{@id}/thread-members/@me").wait
+          @client.http.post("/channels/#{@id}/thread-members/@me").wait
         else
-          @client.internet.post("/channels/#{@id}/thread-members/#{Utils.try(member, :id)}").wait
+          @client.http.post("/channels/#{@id}/thread-members/#{Utils.try(member, :id)}").wait
         end
       end
     end
@@ -959,9 +959,9 @@ module Discorb
     def remove_member(member = :me)
       Async do
         if member == :me
-          @client.internet.delete("/channels/#{@id}/thread-members/@me").wait
+          @client.http.delete("/channels/#{@id}/thread-members/@me").wait
         else
-          @client.internet.delete("/channels/#{@id}/thread-members/#{Utils.try(member, :id)}").wait
+          @client.http.delete("/channels/#{@id}/thread-members/#{Utils.try(member, :id)}").wait
         end
       end
     end
@@ -970,11 +970,15 @@ module Discorb
 
     def fetch_members
       Async do
-        _resp, data = @client.internet.get("/channels/#{@id}/thread-members").wait
+        _resp, data = @client.http.get("/channels/#{@id}/thread-members").wait
         data.map { |d| @members[d[:id]] = Member.new(@client, d) }
       end
     end
 
+    class News < ThreadChannel
+      @channel_type = 10
+    end
+
     class Public < ThreadChannel
       @channel_type = 11
     end

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.
@@ -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

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.3"
+  VERSION = "0.0.7"
   # @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.
@@ -454,9 +456,9 @@ module Discorb
     def connect_gateway(first)
       @log.info "Connecting to gateway."
       Async do |_task|
-        @internet = Internet.new(self) if first
+        @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

data/lib/discorb/guild_template.rb

@@ -57,7 +57,7 @@ module Discorb
         payload = {}
         payload[:name] = name if name
         payload[:description] = description if description != :unset
-        @client.internet.patch("/guilds/#{@source_guild_id}/templates/#{@code}", payload).wait
+        @client.http.patch("/guilds/#{@source_guild_id}/templates/#{@code}", payload).wait
       end
     end
 
@@ -70,7 +70,7 @@ module Discorb
     #
     def update
       Async do
-        _resp, data = @client.internet.put("/guilds/#{@source_guild_id}/templates/#{@code}").wait
+        _resp, data = @client.http.put("/guilds/#{@source_guild_id}/templates/#{@code}").wait
         _set_data(data)
       end
     end
@@ -82,7 +82,7 @@ module Discorb
     #
     def delete!
       Async do
-        @client.internet.delete("/guilds/#{@source_guild_id}/templates/#{@code}").wait
+        @client.http.delete("/guilds/#{@source_guild_id}/templates/#{@code}").wait
       end
     end
 

data/lib/discorb/{internet.rb → http.rb}

@@ -4,10 +4,10 @@ require "net/https"
 
 module Discorb
   #
-  # A class to handle internet requests.
+  # A class to handle http requests.
   # This class is internal use only.
   #
-  class Internet
+  class HTTP
     @nil_body = nil
 
     # @!visibility private

data/lib/discorb/integration.rb

@@ -63,7 +63,7 @@ module Discorb
     #
     def delete!(reason: nil)
       Async do
-        @client.internet.delete("/guilds/#{@guild}/integrations/#{@id}", reason: reason).wait
+        @client.http.delete("/guilds/#{@guild}/integrations/#{@id}", reason: reason).wait
       end
     end
 

data/lib/discorb/interaction.rb

@@ -99,7 +99,7 @@ module Discorb
       #
       def defer_source(hide: false)
         Async do
-          @client.internet.post("/interactions/#{@id}/#{@token}/callback", {
+          @client.http.post("/interactions/#{@id}/#{@token}/callback", {
             type: 5,
             data: {
               flags: (hide ? 1 << 6 : 0),
@@ -153,11 +153,11 @@ module Discorb
         end
         payload[:flags] = (hide ? 1 << 6 : 0)
         if @responded
-          @client.internet.post("/webhooks/#{@id}/#{@token}", { type: 4, data: payload }).wait
+          @client.http.post("/webhooks/#{@id}/#{@token}", { type: 4, data: payload }).wait
         elsif @defered
-          @client.internet.post("/interactions/#{@id}/#{@token}/@original/edit", { type: 4, data: payload }).wait
+          @client.http.post("/interactions/#{@id}/#{@token}/@original/edit", { type: 4, data: payload }).wait
         else
-          @client.internet.post("/interactions/#{@id}/#{@token}/callback", { type: 4, data: payload }).wait
+          @client.http.post("/interactions/#{@id}/#{@token}/callback", { type: 4, data: payload }).wait
         end
         @responded = true
       end
@@ -174,7 +174,7 @@ module Discorb
       #
       def defer_update(hide: false)
         Async do
-          @client.internet.post("/interactions/#{@id}/#{@token}/callback", {
+          @client.http.post("/interactions/#{@id}/#{@token}/callback", {
             type: 7,
             data: {
               flags: (hide ? 1 << 6 : 0),
@@ -226,7 +226,7 @@ module Discorb
           payload[:components] = tmp_components.filter { |c| c.length.positive? }.map { |c| { type: 1, components: c.map(&:to_hash) } }
         end
         payload[:flags] = (hide ? 1 << 6 : 0)
-        @client.internet.post("/interactions/#{@id}/#{@token}/callback", { type: 6, data: payload }).wait
+        @client.http.post("/interactions/#{@id}/#{@token}/callback", { type: 6, data: payload }).wait
       end
     end
 

data/lib/discorb/invite.rb

@@ -104,7 +104,7 @@ module Discorb
     # @macro http
     def delete!(reason: nil)
       Async do
-        @client.internet.delete("/invites/#{@code}", audit_log_reason: reason)
+        @client.http.delete("/invites/#{@code}", audit_log_reason: reason)
       end
     end
 

data/lib/discorb/member.rb

@@ -140,7 +140,7 @@ module Discorb
     #
     def add_role(role, reason: nil)
       Async do
-        @client.internet.put("/guilds/#{@guild_id}/members/#{@id}/roles/#{role.is_a?(Role) ? role.id : role}", nil, audit_log_reason: reason).wait
+        @client.http.put("/guilds/#{@guild_id}/members/#{@id}/roles/#{role.is_a?(Role) ? role.id : role}", nil, audit_log_reason: reason).wait
       end
     end
 
@@ -154,7 +154,7 @@ module Discorb
     #
     def remove_role(role, reason: nil)
       Async do
-        @client.internet.delete("/guilds/#{@guild_id}/members/#{@id}/roles/#{role.is_a?(Role) ? role.id : role}", audit_log_reason: reason).wait
+        @client.http.delete("/guilds/#{@guild_id}/members/#{@id}/roles/#{role.is_a?(Role) ? role.id : role}", audit_log_reason: reason).wait
       end
     end
 
@@ -179,7 +179,7 @@ module Discorb
         payload[:mute] = mute if mute != :unset
         payload[:deaf] = deaf if deaf != :unset
         payload[:channel_id] = channel&.id if channel != :unset
-        @client.internet.patch("/guilds/#{@guild_id}/members/#{@id}", payload, audit_log_reason: reason).wait
+        @client.http.patch("/guilds/#{@guild_id}/members/#{@id}", payload, audit_log_reason: reason).wait
       end
     end
 

data/lib/discorb/message.rb

@@ -264,7 +264,7 @@ module Discorb
     #
     def add_reaction(emoji)
       Async do |_task|
-        @client.internet.put("/channels/#{@channel_id}/messages/#{@id}/reactions/#{emoji.to_uri}/@me", nil).wait
+        @client.http.put("/channels/#{@channel_id}/messages/#{@id}/reactions/#{emoji.to_uri}/@me", nil).wait
       end
     end
 
@@ -279,7 +279,7 @@ module Discorb
     #
     def remove_reaction(emoji)
       Async do |_task|
-        @client.internet.delete("/channels/#{@channel_id}/messages/#{@id}/reactions/#{emoji.to_uri}/@me").wait
+        @client.http.delete("/channels/#{@channel_id}/messages/#{@id}/reactions/#{emoji.to_uri}/@me").wait
       end
     end
 
@@ -295,7 +295,7 @@ module Discorb
     #
     def remove_reaction_of(emoji, member)
       Async do |_task|
-        @client.internet.delete("/channels/#{@channel_id}/messages/#{@id}/reactions/#{emoji.to_uri}/#{member.is_a?(Member) ? member.id : member}").wait
+        @client.http.delete("/channels/#{@channel_id}/messages/#{@id}/reactions/#{emoji.to_uri}/#{member.is_a?(Member) ? member.id : member}").wait
       end
     end
 
@@ -318,7 +318,7 @@ module Discorb
           after = 0
           users = []
           loop do
-            _resp, data = @client.internet.get("/channels/#{@channel_id}/messages/#{@id}/reactions/#{emoji.to_uri}?limit=100&after=#{after}").wait
+            _resp, data = @client.http.get("/channels/#{@channel_id}/messages/#{@id}/reactions/#{emoji.to_uri}?limit=100&after=#{after}").wait
             break if data.empty?
 
             users += data.map { |r| guild&.members&.[](r[:id]) || @client.users[r[:id]] || User.new(@client, r) }
@@ -329,7 +329,7 @@ module Discorb
           end
           next users
         else
-          _resp, data = @client.internet.get("/channels/#{@channel_id}/messages/#{@id}/reactions/#{emoji.to_uri}?limit=#{limit}&after=#{after}").wait
+          _resp, data = @client.http.get("/channels/#{@channel_id}/messages/#{@id}/reactions/#{emoji.to_uri}?limit=#{limit}&after=#{after}").wait
           next data.map { |r| guild&.members&.[](r[:id]) || @client.users[r[:id]] || User.new(@client, r) }
         end
       end
@@ -490,9 +490,9 @@ module Discorb
         @guild_id = nil
       end
 
-      if data[:author].nil? && data[:webhook_id]
+      if data[:member].nil? && data[:webhook_id]
         @webhook_id = Snowflake.new(data[:webhook_id])
-        # @author = WebhookAuthor.new(data[:webhook_id])
+        @author = Webhook::Message::Author.new(data[:author])
       elsif data[:guild_id].nil? || data[:guild_id].empty?
         @author = @client.users[data[:author][:id]] || User.new(@client, data[:author])
       else

data/lib/discorb/modules.rb

@@ -57,11 +57,11 @@ module Discorb
         end
         files = [file] if file
         if files
-          headers, payload = Internet.multipart(payload, files)
+          headers, payload = HTTP.multipart(payload, files)
         else
           headers = {}
         end
-        _resp, data = @client.internet.post("#{base_url.wait}/messages", payload, headers: headers).wait
+        _resp, data = @client.http.post("#{base_url.wait}/messages", payload, headers: headers).wait
         Message.new(@client, data.merge({ guild_id: @guild_id.to_s }))
       end
     end
@@ -76,7 +76,7 @@ module Discorb
     #
     def fetch_message(id)
       Async do
-        _resp, data = @client.internet.get("#{base_url.wait}/messages/#{id}").wait
+        _resp, data = @client.http.get("#{base_url.wait}/messages/#{id}").wait
         Message.new(@client, data.merge({ guild_id: @guild_id.to_s }))
       end
     end
@@ -99,7 +99,7 @@ module Discorb
           after: Discorb::Utils.try(around, :id),
           around: Discorb::Utils.try(before, :id),
         }.filter { |_k, v| !v.nil? }.to_h
-        _resp, messages = @client.internet.get("#{base_url.wait}/messages?#{URI.encode_www_form(params)}").wait
+        _resp, messages = @client.http.get("#{base_url.wait}/messages?#{URI.encode_www_form(params)}").wait
         messages.map { |m| Message.new(@client, m.merge({ guild_id: @guild_id.to_s })) }
       end
     end
@@ -122,7 +122,7 @@ module Discorb
         if block_given?
           begin
             post_task = task.async do
-              @client.internet.post("/channels/#{@id}/typing", {})
+              @client.http.post("/channels/#{@id}/typing", {})
               sleep(5)
             end
             yield
@@ -130,7 +130,7 @@ module Discorb
             post_task.stop
           end
         else
-          @client.internet.post("/channels/#{@id}/typing", {})
+          @client.http.post("/channels/#{@id}/typing", {})
         end
       end
     end

data/lib/discorb/role.rb

@@ -88,7 +88,7 @@ module Discorb
     #
     def move(position, reason: nil)
       Async do
-        @client.internet.patch("/guilds/#{@guild_id}/roles", { id: @id, position: position }, reason: reason).wait
+        @client.http.patch("/guilds/#{@guild_id}/roles", { id: @id, position: position }, reason: reason).wait
       end
     end
 
@@ -113,7 +113,7 @@ module Discorb
         payload[:color] = color.to_i if color != :unset
         payload[:hoist] = hoist if hoist != :unset
         payload[:mentionable] = mentionable if mentionable != :unset
-        @client.internet.patch("/guilds/#{@guild_id}/roles/#{@id}", payload, reason: reason).wait
+        @client.http.patch("/guilds/#{@guild_id}/roles/#{@id}", payload, reason: reason).wait
       end
     end
 
@@ -126,7 +126,7 @@ module Discorb
     #
     def delete!(reason: nil)
       Async do
-        @client.internet.delete("/guilds/#{@guild_id}/roles/#{@id}", reason: reason).wait
+        @client.http.delete("/guilds/#{@guild_id}/roles/#{@id}", reason: reason).wait
       end
     end
 

data/lib/discorb/sticker.rb

@@ -73,7 +73,7 @@ module Discorb
           payload[:name] = name unless name == :unset
           payload[:description] = description unless description == :unset
           payload[:tags] = tag.name unless tag == :unset
-          @client.internet.patch("/guilds/#{@guild_id}/stickers/#{@id}", payload, audit_log_reason: reason).wait
+          @client.http.patch("/guilds/#{@guild_id}/stickers/#{@id}", payload, audit_log_reason: reason).wait
         end
       end
 
@@ -88,7 +88,7 @@ module Discorb
       #
       def delete!(reason: nil)
         Async do
-          @client.internet.delete("/guilds/#{@guild_id}/stickers/#{@id}", audit_log_reason: reason).wait
+          @client.http.delete("/guilds/#{@guild_id}/stickers/#{@id}", audit_log_reason: reason).wait
         end
       end
 

data/lib/discorb/user.rb

@@ -74,7 +74,7 @@ module Discorb
       Async do
         next @dm_channel_id if @dm_channel_id
 
-        dm_channel = @client.internet.post("/users/#{@id}/channels", { recipient_id: @client.user.id }).wait
+        dm_channel = @client.http.post("/users/#{@id}/channels", { recipient_id: @client.user.id }).wait
         @dm_channel_id = dm_channel[:id]
         "/channels/#{@dm_channel_id}"
       end
@@ -155,7 +155,7 @@ module Discorb
         else
           payload[:avatar] = avatar.to_s
         end
-        @client.internet.patch("/users/@me", payload).wait
+        @client.http.patch("/users/@me", payload).wait
         self
       end
     end

data/lib/discorb/voice_state.rb

@@ -179,7 +179,7 @@ module Discorb
         payload = {}
         payload[:topic] = topic if topic != :unset
         payload[:privacy_level] = self.class.privacy_level.key(privacy_level) if privacy_level != :unset
-        @client.internet.edit("/stage-instances/#{@channel_id}", payload, audit_log_reason: reason).wait
+        @client.http.edit("/stage-instances/#{@channel_id}", payload, audit_log_reason: reason).wait
         self
       end
     end
@@ -193,7 +193,7 @@ module Discorb
     #
     def delete!(reason: nil)
       Async do
-        @client.internet.delete("/stage-instances/#{@channel_id}", reason: reason).wait
+        @client.http.delete("/stage-instances/#{@channel_id}", reason: reason).wait
         self
       end
     end

data/lib/discorb/webhook.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "async/http/internet"
-
 module Discorb
   #
   # Represents a webhook.
@@ -36,7 +34,7 @@ module Discorb
       @token = ""
       @application_id = data[:application_id]
       @client = client
-      @internet = Discorb::Internet.new(client)
+      @http = Discorb::HTTP.new(client)
     end
 
     def inspect
@@ -79,13 +77,13 @@ module Discorb
         payload[:avatar_url] = avatar_url if avatar_url != :unset
         files = [file] if file
         if files
-          headers, payload = Internet.multipart(payload, files)
+          headers, payload = HTTP.multipart(payload, files)
         else
           headers = {
             "Content-Type" => "application/json",
           }
         end
-        _resp, data = @internet.post("#{url}?wait=#{wait}", payload, headers: headers).wait
+        _resp, data = @http.post("#{url}?wait=#{wait}", payload, headers: headers).wait
 
         data && Webhook::Message.new(self, data)
       end
@@ -109,7 +107,7 @@ module Discorb
         payload[:name] = name if name != :unset
         payload[:avatar] = avatar if avatar != :unset
         payload[:channel_id] = Utils.try(channel, :id) if channel != :unset
-        @internet.patch(url.to_s, payload).wait
+        @http.patch(url.to_s, payload).wait
       end
     end
 
@@ -122,7 +120,7 @@ module Discorb
     #
     def delete!
       Async do
-        @internet.delete(url).wait
+        @http.delete(url).wait
         self
       end
     end
@@ -165,9 +163,9 @@ module Discorb
             "Content-Type" => "application/json",
           }
         else
-          headers, payload = Internet.multipart(payload, files)
+          headers, payload = HTTP.multipart(payload, files)
         end
-        _resp, data = @internet.patch("#{url}/messages/#{Utils.try(message, :id)}", payload, headers: headers).wait
+        _resp, data = @http.patch("#{url}/messages/#{Utils.try(message, :id)}", payload, headers: headers).wait
         message.send(:_set_data, data)
         message
       end
@@ -180,7 +178,7 @@ module Discorb
     #
     def delete_message!(message)
       Async do
-        @internet.delete("#{url}/messages/#{Utils.try(message, :id)}").wait
+        @http.delete("#{url}/messages/#{Utils.try(message, :id)}").wait
         message
       end
     end
@@ -200,7 +198,7 @@ module Discorb
       def initialize(url)
         @url = url
         @token = ""
-        @internet = Discorb::Internet.new(self)
+        @http = Discorb::HTTP.new(self)
       end
     end
 
@@ -362,6 +360,7 @@ module Discorb
         # @return [Boolean] Whether the author is a bot.
         # @note This will be always `true`.
         attr_reader :bot
+        alias bot? bot
         # @return [Discorb::Snowflake] The ID of the author.
         attr_reader :id
         # @return [String] The name of the author.

data/lib/discorb.rb

@@ -39,7 +39,7 @@ module Discorb
   end
 end
 
-require_order = %w[common flag dictionary error internet intents emoji_table modules] +
+require_order = %w[common flag dictionary error http intents emoji_table modules] +
                 %w[user member guild emoji channel embed message] +
                 %w[application audit_logs color components event extension] +
                 %w[file guild_template image integration interaction invite log permission] +

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discorb
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.7
 platform: ruby
 authors:
 - sevenc-nanashi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-28 00:00:00.000000000 Z
+date: 2021-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -118,11 +118,11 @@ files:
 - lib/discorb/gateway_requests.rb
 - lib/discorb/guild.rb
 - lib/discorb/guild_template.rb
+- lib/discorb/http.rb
 - lib/discorb/image.rb
 - lib/discorb/integration.rb
 - lib/discorb/intents.rb
 - lib/discorb/interaction.rb
-- lib/discorb/internet.rb
 - lib/discorb/invite.rb
 - lib/discorb/log.rb
 - lib/discorb/member.rb
@@ -137,14 +137,14 @@ files:
 - lib/discorb/utils.rb
 - lib/discorb/voice_state.rb
 - lib/discorb/webhook.rb
-homepage: https://github.com/sevenc-nanashi/discorb
+homepage: https://github.com/discorb-lib/discorb
 licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-  homepage_uri: https://github.com/sevenc-nanashi/discorb
-  source_code_uri: https://github.com/sevenc-nanashi/discorb
-  changelog_uri: https://github.com/sevenc-nanashi/discorb/blob/main/Changelog.md
+  homepage_uri: https://github.com/discorb-lib/discorb
+  source_code_uri: https://github.com/discorb-lib/discorb
+  changelog_uri: https://github.com/discorb-lib/discorb/blob/main/Changelog.md
 post_install_message:
 rdoc_options: []
 require_paths: