discorb 0.0.1 → 0.0.5

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,25 +1,72 @@
 --- !ruby/object:Gem::Specification
 name: discorb
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.5
 platform: ruby
 authors:
 - sevenc-nanashi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-28 00:00:00.000000000 Z
-dependencies: []
-description: "# discorb\n[![rubydoc](https://img.shields.io/badge/Document-rubydoc.info-blue.svg)](https://rubydoc.info/gems/discorb)\n[![Gem](https://img.shields.io/gem/dt/discorb?logo=rubygems&logoColor=fff)](https://rubygems.org/gems/discorb)\n[![Gem](https://img.shields.io/gem/v/discorb?logo=rubygems&logoColor=fff)](https://rubygems.org/gems/discorb)
-  \ \n\ndiscorb is a Discord API wrapper for Ruby.\n\n## Installation\n\nAdd this
-  line to your application's Gemfile:\n\n```ruby\ngem 'discorb'\n```\n\nAnd then execute:\n\n
-  \   $ bundle install\n\nOr install it yourself as:\n\n    $ gem install discorb\n\n##
-  Usage\n\n### Simple ping-pong\n\n```ruby\nrequire \"discorb\"\n\nclient = Discorb::Client.new\n\nclient.once
-  :ready do\n  puts \"Logged in as #{client.user}\"\nend\n\nclient.on :message do
-  |_task, message|\n  next if message.author.bot?\n  next unless message.content ==
-  \"ping\"\n\n  message.channel.post(\"Pong!\")\nend\n\nclient.run(ENV[\"DISCORD_BOT_TOKEN\"])\n```\n\n##
-  Contributing\n\nBug reports and pull requests are welcome on GitHub at https://github.com/sevenc-nanashi/discorb.\n\n##
-  License\n\nThe gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).\n"
+date: 2021-08-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: async
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: async-http
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: async-websocket
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+description:
 email:
 - sevenc-nanashi@sevenbot.jp
 executables: []
@@ -71,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
@@ -90,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: